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 9507da1155fc38b123e29da356e41f630f6ebf29 (commit) via 13c9d8485391c063d003bed97d432b049cef2de1 (commit) via 56c0b63cd6dbe7c45b0c8e0104176974badda7f2 (commit) via 6b93268a57d5ad9edacd7d38372848387322644c (commit) via c8f122e554decf714bbcca41e2bf0771bc83ad2e (commit) via 4f670703583e19084ce439d68d5bc1ac3059d3be (commit) via f1e64edd30ad14c036a14fa2820a0eeeb82ac39b (commit) via 35de29fef77b9cca80fee857d6627a7a2b56565f (commit) via b1bb8428d3dc4a2e8b46ce930aaa22770344d54d (commit) from c211953bc7e1a3a0ef0f2923b29d86142f2ef018 (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 9507da1155fc38b123e29da356e41f630f6ebf29 Merge: 13c9d84 c211953 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 16 16:38:52 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
Conflicts: pth/pth.nm
commit 13c9d8485391c063d003bed97d432b049cef2de1 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 16 16:37:38 2011 +0100
kernel: Make package ready for ARMv7.
commit 56c0b63cd6dbe7c45b0c8e0104176974badda7f2 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 16 16:34:19 2011 +0100
gcc: Make package read for ARM architecture.
+ Update binary format to DWARF-4.
commit 6b93268a57d5ad9edacd7d38372848387322644c Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Dec 16 14:55:05 2011 +0100
beecrypt: Fix build (with openmp and threads).
commit c8f122e554decf714bbcca41e2bf0771bc83ad2e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 11 21:35:37 2011 +0100
kernel: Fix build on ARM.
Header files were exported for x86 and it was tried to install vdso files.
commit 4f670703583e19084ce439d68d5bc1ac3059d3be Merge: f1e64ed aa1df42 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Dec 11 02:18:07 2011 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit f1e64edd30ad14c036a14fa2820a0eeeb82ac39b Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 10 15:57:03 2011 +0100
db4: Fix package naming and including -devel package.
commit 35de29fef77b9cca80fee857d6627a7a2b56565f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Dec 10 15:56:26 2011 +0100
mpfr: Make proper compat package (2.4.2).
commit b1bb8428d3dc4a2e8b46ce930aaa22770344d54d Author: Arne Fitzenreiter arne.fitzenreiter@ipfire.org Date: Sat Dec 10 14:27:56 2011 +0100
pth: Fix build on ARM.
Fixes #300.
-----------------------------------------------------------------------
Summary of changes: beecrypt/beecrypt.nm | 10 +- beecrypt/patches/beecrypt-4.2.1-build-system.patch | 91 +++++++ db4/db4.nm | 8 +- gcc/gcc.nm | 252 ++++++++++++++++---- kernel/kernel.nm | 37 +++- mpfr/mpfr.nm | 30 ++- pth/patches/pth-2.0.5-parallelfix.patch0 | 15 ++ pth/pth.nm | 14 +- 8 files changed, 393 insertions(+), 64 deletions(-) create mode 100644 beecrypt/patches/beecrypt-4.2.1-build-system.patch create mode 100644 pth/patches/pth-2.0.5-parallelfix.patch0
Difference in files: diff --git a/beecrypt/beecrypt.nm b/beecrypt/beecrypt.nm index 8cfe957..8f3aa15 100644 --- a/beecrypt/beecrypt.nm +++ b/beecrypt/beecrypt.nm @@ -5,7 +5,7 @@
name = beecrypt version = 4.2.1 -release = 1 +release = 2
groups = System/Libraries url = http://beecrypt.sourceforge.net/ @@ -27,8 +27,6 @@ build automake gcc-c++ libtool - - perl-Carp end
prepare_cmds @@ -36,11 +34,17 @@ build autoreconf end
+ # Getting weird linking errors without --disable-threads. configure_options += \ + --disable-expert-mode \ + --disable-threads \ + --enable-openmp \ --with-cplusplus=no \ --with-java=no \ --with-python=no
+ make_build_targets += OPENMP_LIBS="-lgomp" + test make check end diff --git a/beecrypt/patches/beecrypt-4.2.1-build-system.patch b/beecrypt/patches/beecrypt-4.2.1-build-system.patch new file mode 100644 index 0000000..b2bd64a --- /dev/null +++ b/beecrypt/patches/beecrypt-4.2.1-build-system.patch @@ -0,0 +1,91 @@ +--- beecrypt-4.2.1/configure.ac ++++ beecrypt-4.2.1/configure.ac +@@ -11,7 +11,7 @@ + + # Checks for package options + AC_ARG_ENABLE(expert-mode, [ --enable-expert-mode follow user-defined CFLAGS settings [[default=no]]],[ +- ac_enable_expert_mode=yes ++ ac_enable_expert_mode=$enableval + ],[ + if test "X$CFLAGS" != "X"; then + echo "enabling expert mode" +@@ -25,7 +25,7 @@ + if test "$ac_enable_expert_mode" = yes; then + AC_MSG_ERROR([--enable-debug cannot be used in conjunction with --enable-expert-mode]) + fi +- ac_enable_debug=yes ++ ac_enable_debug=$enableval + ],[ + ac_enable_debug=no + ]) +@@ -456,7 +456,7 @@ + ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`" + ]) + AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [ +- ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'` ++ ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, 0)'` + ]) + fi + fi +--- beecrypt-4.2.1/java/Makefile.am ++++ beecrypt-4.2.1/java/Makefile.am +@@ -26,7 +26,7 @@ + + INCLUDES = -I$(top_srcdir)/include + +-libaltdir=$(prefix)/lib@LIBALT@ ++libaltdir=$(libdir) + + libalt_LTLIBRARIES = libbeecrypt_java.la + +--- beecrypt-4.2.1/acinclude.m4 ++++ beecrypt-4.2.1/acinclude.m4 +@@ -1589,20 +1589,5 @@ + AC_SUBST(TYPEDEF_BC_THREADID_T,$bc_typedef_bc_threadid_t) + ]) +- +-AH_BOTTOM([ +-#if ENABLE_THREADS +-# ifndef _REENTRANT +-# define _REENTRANT +-# endif +-# if LINUX +-# define _LIBC_REENTRANT +-# endif +-#else +-# ifdef _REENTRANT +-# undef _REENTRANT +-# endif +-#endif +-]) + + + dnl BEE_THREAD_LOCAL_STORAGE +@@ -1623,7 +1609,5 @@ + ]) + + AH_BOTTOM([ +-#if !ENABLE_THREAD_LOCAL_STORAGE +-# define __thread +-#endif ++#include "config.threads.h" + ]) +--- beecrypt-4.2.1/config.threads.h ++++ beecrypt-4.2.1/config.threads.h +@@ -0,0 +1,16 @@ ++#if ENABLE_THREADS ++# ifndef _REENTRANT ++# define _REENTRANT ++# endif ++# if LINUX ++# define _LIBC_REENTRANT ++# endif ++#else ++# ifdef _REENTRANT ++# undef _REENTRANT ++# endif ++#endif ++ ++#if !ENABLE_THREAD_LOCAL_STORAGE ++# define __thread ++#endif diff --git a/db4/db4.nm b/db4/db4.nm index 4fe07f9..3fd97eb 100644 --- a/db4/db4.nm +++ b/db4/db4.nm @@ -3,12 +3,13 @@ # Copyright (C) - IPFire Development Team info@ipfire.org # ###############################################################################
-name = db +name = db4 version_major = 4.8 version_minor = 30 version = %{version_major}.%{version_minor} -release = 1 +release = 2 epoch = 1 +thisapp = db-%{version}
# Never update this to major version 5.
@@ -55,6 +56,9 @@ packages package db4-devel template DEVEL
+ # Overwrite because of epoch != 0. + requires = %{name}=%{epoch}:%{thisver} + files += \ !/usr/lib*/libdb-%{version_major}.so end diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 8fd265a..575cd89 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_cloog_ppl = 1
name = gcc version = 4.6.2 -release = 3 +release = 4
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Compilers @@ -27,21 +27,20 @@ required_binutils_version = 2.21.51.0.8-1 source_dl = http://ftp.gnu.org/gnu/gcc/%%7Bthisapp%7D/ sources = %{thisapp}.tar.gz
-patches - gcc46-hack.patch0 - gcc46-c++-builtin-redecl.patch0 - gcc46-pr33763.patch0 - gcc46-libgomp-omp_h-multilib.patch0 - gcc46-libtool-no-rpath.patch0 - gcc46-cloog-dl.patch0 - gcc46-pr38757.patch0 - gcc46-no-add-needed.patch0 - gcc46-unwind-debughook-sdt.patch0 - gcc46-ppl-0.10.patch - gcc46-Woverlength-string.patch0 - gcc46-Woverlength-string-asm.patch0 +patches = \ + gcc46-hack.patch0 \ + gcc46-c++-builtin-redecl.patch0 \ + gcc46-pr33763.patch0 \ + gcc46-libgomp-omp_h-multilib.patch0 \ + gcc46-libtool-no-rpath.patch0 \ + gcc46-cloog-dl.patch0 \ + gcc46-pr38757.patch0 \ + gcc46-no-add-needed.patch0 \ + gcc46-unwind-debughook-sdt.patch0 \ + gcc46-ppl-0.10.patch \ + gcc46-Woverlength-string.patch0 \ + gcc46-Woverlength-string-asm.patch0 \ gcc-4.6.0-piepatches-20110407.patch -end
build requires @@ -54,7 +53,7 @@ build glibc-devel gmp-devel libffi-devel - mpc-devel + libmpc-devel mpfr-devel texinfo zlib-devel @@ -65,22 +64,43 @@ build requires += cloog-ppl-devel ppl-devel end
+ # Build libquadmath (only on x86). + build_libquadmath = 0 + # A couple of configure arguments depending on the architecture and # configuration. configure_options =
if "%{DISTRO_ARCH}" == "x86_64" configure_options = --disable-multilib + + build_libquadmath = 1 end
if "%{DISTRO_ARCH}" == "i686" configure_options = --with-arch=%{DISTRO_ARCH} --with-tune=generic + + build_libquadmath = 1 end
if "%{DISTRO_ARCH}" == "armv5tel" + configure_options += --disable-sjlj-exceptions + configure_options += --with-float=soft end
+ if "${DISTRO_ARCH}" == "armv7hl" + configure_options += --disable-sjlj-exceptions + + configure_options += \ + --with-cpu=cortex-a8 \ + --with-tune=cortex-a8 \ + --with-arch=armv7-a \ + --with-float=hard \ + --with-fpu=vfpv3-d16 \ + --with-abi=aapcs-linux + end + if "%{build_cloog_ppl}" == "1" configure_options += --with-cloog --with-ppl end @@ -129,6 +149,13 @@ build sed -i gcc/Makefile.in \ -e "s|^ESP_NOPIE_CFLAGS = .*|ESP_NOPIE_CFLAGS =|"
+ # Default to -gdwarf-4 -fno-debug-types-section rather than -gdwarf-2 + sed -i gcc/common.opt \ + -e '/UInteger Var(dwarf_version)/s/Init(2)/Init(4)/' \ + -e '/flag_debug_types_section/s/Init(1)/Init(0)/' \ + -e '/dwarf_record_gcc_switches/s/Init(0)/Init(1)/' \ + -e 's/(may be either 2, 3 or 4; the default version is )2./\14./' + ./contrib/gcc_update --touch end
@@ -136,12 +163,11 @@ build cd %{DIR_SRC}/gcc-build
# Modify CFLAGS - OPT_FLAGS="%{CFLAGS}" CFLAGS="%{CFLAGS}" CFLAGS=$(echo ${CFLAGS} | sed -e 's/(-Wp,)?-D_FORTIFY_SOURCE=[12]//g') CFLAGS=$(echo ${CFLAGS} | sed -e 's/-m64//g;s/-m32//g;s/-m31//g') - CFLAGS=$(echo ${CFLAGS} | sed -e 's/-march=i.86//g') - #CFLAGS=$(echo ${CFLAGS} | sed -e 's/ -pipe / /g') + CFLAGS=$(echo ${CFLAGS} | sed -e 's/-march=i.86//g') + CFLAGS=$(echo ${CFLAGS} | sed -e 's/ -pipe / /g') CFLAGS=$(echo "${CFLAGS}" | sed -e 's/[[:blank:]]+/ /g') CXXFLAGS=$(echo ${CFLAGS} | sed -e 's/ -Wall//g')
@@ -173,7 +199,7 @@ build %{configure_options}
# GCC does not support a parallel build. - make profiledbootstrap BOOT_CFLAGS="${OPT_FLAGS}" #%{PARALLELISMFLAGS} + make profiledbootstrap BOOT_CFLAGS="${CFLAGS}" end
#test @@ -185,6 +211,10 @@ build cd %{DIR_SRC}/gcc-build make install DESTDIR=%{BUILDROOT}
+ # Check if the installation path exists. + FULLPATH="%{BUILDROOT}/usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}" + [ -d "${FULLPATH}" ] || exit 1 + mkdir -pv %{BUILDROOT}/lib ln -sfv ../usr/bin/cpp %{BUILDROOT}/lib/cpp ln -sfv gcc %{BUILDROOT}/usr/bin/cc @@ -195,6 +225,25 @@ build
# Remove some GNU debugger stuff. rm -vf %{BUILDROOT}/usr/lib/lib*.py + + # libgomp + mv -vf %{BUILDROOT}/usr/lib/libgomp.spec ${FULLPATH}/ + ln -svf ../../../libgomp.so.1.0.0 ${FULLPATH}/libgomp.so + chmod 755 %{BUILDROOT}/usr/lib/libgomp.so.1.* + + # libstdc++ + ln -svf ../../../libstdc++.so.6.0.16 ${FULLPATH}/libstdc++.so + + # libmudflap + ln -svf ../../../libmudflap.so.0.0.0 ${FULLPATH}/libmudflap.so + ln -svf ../../../libmudflapth.so.0.0.0 ${FULLPATH}/libmudflapth.so + chmod 755 %{BUILDROOT}/usr/lib/libmudflap{,th}.so.0.* + + # libquadmath + if [ "%{build_libquadmath}" = "1" ]; then + ln -svf ../../../libquadmath.so.0.* ${FULLPATH}/libquadmath.so + chmod 755 %{BUILDROOT}/usr/lib/libquadmath.so.0.* + fi end
keep_libraries @@ -211,7 +260,9 @@ packages binutils>=%{required_binutils_version} glibc-devel gmp-devel - libgcc-devel + cpp=%{thisver} + libgcc=%{thisver} + libgomp=%{thisver} end
if "%{build_cloog_ppl}" == "1" @@ -219,10 +270,19 @@ packages end end
- # XXX add package descriptions - package %{name}-c++ - requires = gcc=%{thisver} libstdc++-devel + summary = C++ support for GCC. + description + This package adds C++ support to the GNU Compiler Collection. + It includes support for most of the current C++ specification, + including templates and exception handling. + end + + requires + gcc=%{thisver} + libstdc++=%{thisver} + libstdc++-devel=%{thisver} + end
files /usr/bin/*++ @@ -231,27 +291,76 @@ packages end end
- package libgcc + package cpp + summary = The C Preprocessor. + description + Cpp is the GNU C-Compatible Compiler Preprocessor. + Cpp is a macro processor which is used automatically + by the C compiler to transform your program before actual + compilation. It is called a macro processor because it allows + you to define macros, abbreviations for longer + constructs. + + The C preprocessor provides four separate functionalities: the + inclusion of header files (files of declarations that can be + substituted into your program); macro expansion (you can define macros, + and the C preprocessor will replace the macros with their definitions + throughout the program); conditional compilation (using special + preprocessing directives, you can include or exclude parts of the + program according to various conditions); and line control (if you use + a program to combine or rearrange source files into an intermediate + file which is then compiled, you can use line control to inform the + compiler about where each source line originated). + + You should install this package if you are a C programmer and you use + macros. + end + group = Development/Languages + files - /lib/libgcc*.so.* + /lib/cpp + /usr/bin/cpp + /usr/share/man/man1/cpp.1* + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/cc1 end end
- package libgcc-devel - requires = libgcc=%{thisver} + package libgcc + summary = GCC shared support library. + description + This package contains GCC shared support library which is needed + e.g. for exception handling support. + end
files - /usr/lib/libgcc*.so + /lib/libgcc*.so.* end end
package libstdc++ + summary = GNU Standard C++ Library. + description + The libstdc++ package contains a rewritten standard compliant GCC Standard + C++ Library. + end + files /usr/lib/libstdc++*.so.* end end
package libstdc++-devel + summary = Header files and libraries for C++ development. + description + This is the GNU implementation of the standard C++ libraries. This + package includes the header files and libraries needed for C++ + development. This includes rewritten implementation of STL. + end + + requires + libstdc++=%{thisver} + end + files /usr/include/c++ /usr/lib/libstdc++*.so @@ -259,39 +368,100 @@ packages end
package libgomp - files - /usr/lib/libgomp*.so.* + summary = GCC OpenMP v3.0 shared support library. + description + This package contains GCC shared support library which is needed + for OpenMP v3.0 support. end - end
- package libgomp files - /usr/lib/libgomp*.so - /usr/lib/libgomp.spec + /usr/lib/libgomp*.so.* end end
package libmudflap + summary = GCC mudflap shared support library. + description + This package contains GCC shared support library which is needed + for mudflap support. + end + files /usr/lib/libmudflap*.so.* end end
package libmudflap-devel + summary = Development files for GCC mudflap support. + description + This package contains headers for building mudflap-instrumented programs. + + To instrument a non-threaded program, add -fmudflap + option to GCC and when linking add -lmudflap, for threaded programs + also add -fmudflapth and -lmudflapth. + end + + requires + libmudflap=%{thisver} + end + files - /usr/lib/libmudflap*.so + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/mf-runtime.h + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/libmudflap.so + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/libmudflapth.so end end
- package libquadmath - files - /usr/lib/libquadmath*.so.* + if "%{build_libquadmath}" == "1" + package libquadmath + summary = GCC __float128 shared support library. + description + This package contains GCC shared support library which is needed + for __float128 math support and for Fortran REAL*16 support. + end + + files + /usr/lib/libquadmath*.so.* + end + end + + package libquadmath-devel + summary = Development files for GCC __float128 support. + description + This package contains headers for building Fortran programs using + REAL*16 and programs using __float128 math. + end + + requires + gcc=%{thisver} + libquadmath=%{thisver} + end + + files + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/quadmath.h + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/include/quadmath_weak.h + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/libquadmath.so + end end end
- package libquadmath-devel + package gcc-plugin-devel + summary = Support for compiling GCC plugins. + description + This package contains header files and other support files + for compiling GCC plugins. The GCC plugin ABI is currently + not stable, so plugins must be rebuilt any time GCC is updated. + end + + requires + gcc=%{thisver} + gmp-devel>=4.1.2-8 + mpfr-devel>=2.2.1 + libmpc-devel>=0.8.1 + end + files - /usr/lib/libquadmath*.so + /usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/plugin end end
diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 67a98bd..d6ec034 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@
name = kernel version = 3.1.4 -release = 2 +release = 3 thisapp = linux-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -41,14 +41,17 @@ build module-init-tools ncurses-devel net-tools - newt-devel - pciutils-devel perl python-devel - slang-devel xz-lzma-compat end
+ tools_cpupower_requires + newt-devel + pcituils-devel + slang-devel + end + # A list of kernels to build. kernels =
@@ -78,6 +81,15 @@ build build_cpupower = 0 end
+ if "%{DISTRO_ARCH}" == "armv7hl" + # Currently build no kernel images. + + kernel_arch = arm + + # ARM does not support cpupower. + build_cpupower = 0 + end + # Build default kernel. if "%{build_kernel_default}" == "1" kernels += default @@ -93,6 +105,11 @@ build kernels += versatile end
+ # Add tools' build requirements if build is requested. + if "%{build_cpupower}" == "1" + requires += %{tools_cpupower_requires} + end + prepare_cmds rm -f %{DIR_APP}/localversion-grsec
@@ -172,8 +189,14 @@ build # Install modules. make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} mod-fw= \ KERNELRELEASE=${fullversion} modules_install - make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \ - KERNELRELEASE=${fullversion} vdso_install + + # Install vdso. + case "%{DISTRO_ARCH}" in + i686) + make ARCH=%{kernel_arch} INSTALL_MOD_PATH=%{BUILDROOT} \ + KERNELRELEASE=${fullversion} vdso_install + ;; + esac
# Create an empty settings file for dracut mkdir -pv %{BUILDROOT}/etc/ld.so.conf.d @@ -244,7 +267,7 @@ build
install # Install the header files - make ARCH=x86 INSTALL_HDR_PATH=dest headers_install + make ARCH=%{kernel_arch} INSTALL_HDR_PATH=dest headers_install mkdir -pv %{BUILDROOT}/usr/include find dest/include ( -name .install -o -name ..install.cmd ) -delete cp -rv dest/include/* %{BUILDROOT}/usr/include diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index 848d037..4a19405 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -5,7 +5,9 @@
name = mpfr version = 3.1.0 -release = 1 +release = 2 + +compat_version = 2.4.2
groups = System/Libraries url = http://www.mpfr.org/ @@ -22,6 +24,7 @@ description end
source_dl = http://mpfr.loria.fr/mpfr-%%7Bversion%7D/ +sources += %{name}-%{compat_version}.tar.bz2
build requires @@ -29,15 +32,32 @@ build end
configure_options += \ - --enable-thread-safe + --enable-thread-safe \ + --disable-assert + + build_cmds + + cd %{DIR_SRC}/%{name}-%{compat_version} + ./configure \ + %{configure_options} + + export LD_LIBRARY_PATH=$(pwd)/.libs + make %{PARALLELISMFLAGS} + end
test + export LD_LIBRARY_PATH=$(pwd)/.libs + make check + + cd %{DIR_SRC}/%{name}-%{compat_version} + export LD_LIBRARY_PATH=$(pwd)/.libs make check end
install_cmds - ln -svf libmpfr.so.4 %{BUILDROOT}/usr/lib/libmpfr.so.1 - ln -svf libmpfr.so.4.1.0 %{BUILDROOT}/usr/lib/libmpfr.so.1.2.2 + cd %{DIR_SRC}/%{name}-%{compat_version} + install -m 644 .libs/libmpfr.so.1.2.2 %{BUILDROOT}/usr/lib/ + ln -svf libmpfr.so.1.2.2 %{BUILDROOT}/usr/lib/libmpfr.so.1 end end
@@ -51,8 +71,6 @@ packages package %{name}-compat summary = Compat libraries of %{thisapp}.
- provides = libmpfr.so.1 - files /usr/lib/libmpfr.so.1* end diff --git a/pth/patches/pth-2.0.5-parallelfix.patch0 b/pth/patches/pth-2.0.5-parallelfix.patch0 new file mode 100644 index 0000000..a305f59 --- /dev/null +++ b/pth/patches/pth-2.0.5-parallelfix.patch0 @@ -0,0 +1,15 @@ +--- Makefile.in.orig 2005-11-08 05:58:55.000000000 +1100 ++++ Makefile.in 2005-11-08 06:29:02.000000000 +1100 +@@ -148,10 +148,9 @@ + + # be aware of libtool when building the objects + .SUFFIXES: +-.SUFFIXES: .c .o .lo +-.c.o: ++%.o: %.c $(TARGET_PREQ) + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< +-.c.lo: ++%.lo: %.c $(TARGET_PREQ) + $(LIBTOOL) --mode=compile --quiet $(CC) -c $(CPPFLAGS) $(CFLAGS) $< + + # the default target diff --git a/pth/pth.nm b/pth/pth.nm index 345c159..67c5687 100644 --- a/pth/pth.nm +++ b/pth/pth.nm @@ -5,7 +5,7 @@
name = pth version = 2.0.7 -release = 1 +release = 2
groups = System/Libraries url = http://www.gnu.org/software/pth @@ -19,19 +19,24 @@ description applications. end
-source_dl = +source_dl = ftp://ftp.gnu.org/gnu/pth/
build requires libtool end
- PARALLELISMFLAGS = # No parallel build - configure_options += \ --disable-static \ --mandir=/usr/share/man
+ if "%{DISTRO_ARCH}" == "armv5tel" + configure_options += \ + --with-mctx-mth=sjlj \ + --with-mctx-dsp=ssjlj \ + --with-mctx-stk=sas + end + test make check end @@ -39,7 +44,6 @@ end
packages package %{name} - end
package %{name}-devel template DEVEL
hooks/post-receive -- IPFire 3.x development tree