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 a6ed23c7be93e8e9efe495642c706f30da2d6a11 (commit) via 0497e11dc05f8628267bda897cfb6d870c3a8026 (commit) via 482cb9d27db676487abb026cfb88cb4fa0f7b6b0 (commit) from ae24b96299af56edc2852ce90f7223eeedb23b1c (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 a6ed23c7be93e8e9efe495642c706f30da2d6a11 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 5 16:02:18 2011 +0100

xz: Enable testsuite.

commit 0497e11dc05f8628267bda897cfb6d870c3a8026 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 5 15:26:16 2011 +0100

xz: Build compat lib from 4.999.9beta release.

commit 482cb9d27db676487abb026cfb88cb4fa0f7b6b0 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 5 12:26:27 2011 +0100

gmp: Update to 5.0.2 and compat package.

A temporary compat package was added to make an easier transition to gmp 5.

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

Summary of changes: gmp/gmp.nm | 81 +++++++++++++++++++++++++++++++++++++++++------------------ xz/xz.nm | 34 +++++++++++++++++++++++- 2 files changed, 88 insertions(+), 27 deletions(-)

Difference in files: diff --git a/gmp/gmp.nm b/gmp/gmp.nm index 51f20d4..7a5f24e 100644 --- a/gmp/gmp.nm +++ b/gmp/gmp.nm @@ -4,8 +4,10 @@ ###############################################################################

name = gmp -version = 5.0.1 -release = 2 +version = 5.0.2 +release = 1 + +compat_version = 4.3.2

groups = System/Libraries url = http://gmplib.org/ @@ -13,17 +15,17 @@ license = LGPLv3+ summary = A GNU arbitrary precision library.

description - The gmp package contains GNU MP, a library for arbitrary precision \ - arithmetic, signed integers operations, rational numbers and floating \ - point numbers. GNU MP is designed for speed, for both small and very \ - large operands. GNU MP is fast because it uses fullwords as the basic \ - arithmetic type, it uses fast algorithms, it carefully optimizes \ - assembly code for many CPUs' most common inner loops, and it generally \ + The gmp package contains GNU MP, a library for arbitrary precision + arithmetic, signed integers operations, rational numbers and floating + point numbers. GNU MP is designed for speed, for both small and very + large operands. GNU MP is fast because it uses fullwords as the basic + arithmetic type, it uses fast algorithms, it carefully optimizes + assembly code for many CPUs' most common inner loops, and it generally emphasizes speed over simplicity/elegance in its operations. end

-source_dl = ftp://ftp.gmplib.org/pub/%{thisapp}/ -sources = %{thisapp}.tar.bz2 +source_dl += ftp://ftp.gmplib.org/pub/%{thisapp}/ ftp://ftp.gmplib.org/pub/%{name}-%{compat_version}/ +sources = %{thisapp}.tar.bz2 %{name}-%{compat_version}.tar.bz2

build requires @@ -64,45 +66,61 @@ build done end

+ build_one + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + ./configure \ + %{configure_options} + + # Kill RPATHs. + sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e 's|-lstdc++ -lm|-lstdc++|' \ + -i libtool + + export LD_LIBRARY_PATH=$(pwd)/.libs + make %{PARALLELISMFLAGS} \ + CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" + end + build for version in %{build_versions}; do cd build-${version}

CFLAGS="%{CFLAGS}" - CXXFLAFS="%{CXXFLAGS}" + CXXFLAGS="%{CXXFLAGS}" if [ "${version}" = "sse2" ]; then # Enable sse2. CFLAGS="${CFLAGS} -march=pentium4" CXXFLAGS="${CXXFLAGS} -march=pentium4" fi

- CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" \ - ./configure \ - %{configure_options} - - # Kill RPATHs. - sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - -e 's|-lstdc++ -lm|-lstdc++|' \ - -i libtool - - make %{PARALLELISMFLAGS} \ - CFLAGS="${CFLAGS}" \ - CXXFLAGS="${CXXFLAGS}" + %{build_one}

cd .. done + + # Build compat version of library. + cd %{DIR_SRC}/%{name}-%{compat_version} + %{build_one} end

test for version in %{build_versions}; do cd build-${version}

+ export LD_LIBRARY_PATH=$(pwd)/.libs make check

cd .. done + + # Check compat version of library. + cd %{DIR_SRC}/%{name}-%{compat_version} + + export LD_LIBRARY_PATH=$(pwd)/.libs + make check end

install @@ -130,6 +148,11 @@ build

cd .. done + + # Install compat version of library. + cd %{DIR_SRC}/%{name}-%{compat_version} + install -m 644 .libs/libgmp.so.3.5.2 %{BUILDROOT}/usr/lib/ + ln -svf libgmp.so.3.5.2 %{BUILDROOT}/usr/lib/libgmp.so.3 end end

@@ -139,4 +162,12 @@ packages package %{name}-devel template DEVEL end + + package %{name}-compat + summary = Compatibility version of %{thisapp} (%{compat_version}). + + files + /usr/lib/libgmp.so.3* + end + end end diff --git a/xz/xz.nm b/xz/xz.nm index 09104b4..3150feb 100644 --- a/xz/xz.nm +++ b/xz/xz.nm @@ -5,7 +5,9 @@

name = xz version = 5.0.3 -release = 4 +release = 6 + +compat_version = 4.999.9beta

groups = Applications/Compression url = http://tukaani.org/xz/ @@ -21,7 +23,27 @@ description end

source_dl = http://tukaani.org/xz/ -sources = %{thisapp}.tar.xz +sources = %{thisapp}.tar.xz %{name}-%{compat_version}.tar.xz + +build + build_cmds + # Build compat version of library. + cd %{DIR_SRC}/%{name}-%{compat_version} + ./configure %{configure_options} + make %{PARALLELISMFLAGS} + end + + test + export LD_LIBRARY_PATH=$(pwd)/src/liblzma/.libs + make check + end + + install_cmds + # Install comapt version of library. + cd %{DIR_SRC}/%{name}-%{compat_version} + cp -vr src/liblzma/.libs/liblzma.so.0* %{BUILDROOT}/usr/lib + end +end

packages package %{name} @@ -54,4 +76,12 @@ packages /usr/share/man/man1/*lz* end end + + package xz-compat-libs + summary = Compatibility version of %{name} (%{compat_version}). + + files + /usr/lib/lib*.so.0* + end + end end

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