[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0f5c5df0ea3724c36552719fa494464f17575466

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0f5c5df0ea3724c36552719fa494464f17575466

[git]

[-- Attachment #1: Type: text/plain, Size: 3437 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  0f5c5df0ea3724c36552719fa494464f17575466 (commit)
      from  0e7e5f640bdf39c5d79f85be2d3f1b621a69ef32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0f5c5df0ea3724c36552719fa494464f17575466
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Mar 4 20:42:49 2013 +0100

    polarssl: Remove cmake as a build system.
    
    Disable building tests which horribly fails on ARM.
    
    Finally fixes #10298 (Lucky Thirteen security update).

-----------------------------------------------------------------------

Summary of changes:
 polarssl/polarssl.nm | 62 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 52 insertions(+), 10 deletions(-)

Difference in files:
diff --git a/polarssl/polarssl.nm b/polarssl/polarssl.nm
index 7d7a5eb..e95dfb1 100644
--- a/polarssl/polarssl.nm
+++ b/polarssl/polarssl.nm
@@ -5,7 +5,7 @@
 
 name       = polarssl
 version    = 1.2.5
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://polarssl.org/
@@ -25,29 +25,71 @@ source_dl  = http://polarssl.org/code/releases/
 
 build
 	requires
-		cmake >= 2.8.4-2
 		perl
 	end
 
-	prepare_cmds
-		%{cmake} \
-			-D CMAKE_BUILD_TYPE:String="Release" \
-			-D USE_SHARED_POLARSSL_LIBRARY:BOOL=1 .
+	if "%{DISTRO_ARCH}" == "armv7hl"
+		prepare_cmds
+			sed -e "s/define POLARSSL_HAVE_ASM/undef POLARSSL_HAVE_ASM/" \
+				-i include/polarssl/config.h
+		end
+	end
+
+	build
+		# Compile library
+		make SHARED=1 -C library %{PARALLELISMFLAGS}
+		ln -svf libpolarssl.so library/libpolarssl.so.0
+
+		# Compile programs
+		make -C programs %{PARALLELISMFLAGS}
 	end
 
 	test
-		ctest --output-on-failure
+		pushd programs
+		make test/selftest
+		LD_LIBRARY_PATH="../library" ./test/selftest
+		popd
+
+		# Don't run the regular test suite because it cannot
+		# be built on ARM.
+		#LD_LIBRARY_PATH="../library" make check
 	end
 
-	install_cmds
-		# Remove binaries which already will be provided from coreutils.
-		rm -rvf %{BUILDROOT}/usr/bin
+	install
+		# Install headers
+		mkdir -pv %{BUILDROOT}%{includedir}/polarssl
+		install -v -m 644 include/polarssl/*.h \
+			%{BUILDROOT}%{includedir}/polarssl
+
+		# Install library
+		mkdir -pv %{BUILDROOT}%{libdir}
+		install -v -m 755 library/libpolarssl.so \
+			%{BUILDROOT}%{libdir}/libpolarssl.so.0
+		ln -svf libpolarssl.so.0 %{BUILDROOT}%{libdir}/libpolarssl.so
+
+		# Install programs
+		mkdir -pv %{BUILDROOT}%{bindir}
+		for p in programs/*/*; do
+			if [ -x "${p}" -a ! -d "${p}" ]; then
+				f="polarssl_$(basename ${p})"
+				install -m 755 ${p} %{BUILDROOT}%{bindir}/${f} || exit 1
+			fi
+		done
 	end
 end
 
 packages
 	package %{name}
 
+	package %{name}-utils
+		summary = PolarSSL utilities.
+		description = %{summary}
+
+		files
+			%{bindir}
+		end
+	end
+
 	package %{name}-devel
 		template DEVEL
 	end


hooks/post-receive
--
IPFire 3.x development tree