merging trunk

2025-08-01 06:57:50 +00:00 · 2010-04-15 14:44:30 +02:00 · 2010-04-15 14:44:30 +02:00 · 2aaf44f026
commit 2aaf44f026
parent 68b454f909 1394188245
9 changed files with 43 additions and 57 deletions
--- a/packages/toolchain/math/cloog-ppl/build
+++ b/packages/toolchain/math/cloog-ppl/build
@ -18,20 +18,12 @@ LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib" \
             --build=$HOST_NAME \
             --target=$TARGET_NAME \
             --prefix=$ROOT/$TOOLCHAIN \
-             --disable-shared \
-             --enable-static \
+             --enable-shared \
+             --disable-static \
             --with-bits=gmp \
             --with-gmp="$ROOT/$TOOLCHAIN" \
             --with-ppl="$ROOT/$TOOLCHAIN" \

-make libcloog.la
-
-mkdir -p $ROOT/$TOOLCHAIN/lib
-  cp -PR .libs/libcloog.a $ROOT/$TOOLCHAIN/lib
-
-mkdir -p $ROOT/$TOOLCHAIN/include/cloog
-  cp -PR include/cloog/*.h $ROOT/$TOOLCHAIN/include/cloog
-
-# use the follow if cloog-ppl is fixed for use with gmp-5.0
-# make
-# make check #
+make
+make check
+make install
--- a/packages/toolchain/math/cloog-ppl/patches/use_ppl_0.11.diff
+++ b/packages/toolchain/math/cloog-ppl/patches/use_ppl_0.11.diff
@ -1,24 +0,0 @@
-diff -Naur cloog-ppl-0.15.8/configure cloog-ppl-0.15.8.patch/configure
--- cloog-ppl-0.15.8/configure	2010-02-11 19:05:30.000000000 +0100
-+++ cloog-ppl-0.15.8.patch/configure	2010-02-20 14:25:38.957509566 +0100
-@@ -12684,7 +12684,7 @@
- POLYHEDRAL_BACKEND=polylib
- 
- ppl_major_version=0
-ppl_minor_version=10
-+ppl_minor_version=11
- 
- 
- 
-diff -Naur cloog-ppl-0.15.8/configure.in cloog-ppl-0.15.8.patch/configure.in
--- cloog-ppl-0.15.8/configure.in	2010-02-11 19:05:31.000000000 +0100
-+++ cloog-ppl-0.15.8.patch/configure.in	2010-02-20 14:26:01.755539644 +0100
-@@ -311,7 +311,7 @@
- 
- dnl Checking for PPL
- ppl_major_version=0
-ppl_minor_version=10
-+ppl_minor_version=11
- AC_SUBST(PPL_CPPFLAGS)
- AC_SUBST(PPL_LDFLAGS)
- AC_SUBST(PPL_LIBS)
--- a/packages/toolchain/math/cloog-ppl/url
+++ b/packages/toolchain/math/cloog-ppl/url
@ -1 +1 @@
-ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.8.tar.gz
+ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.9.tar.gz
--- a/packages/toolchain/math/gmp/build
+++ b/packages/toolchain/math/gmp/build
@ -8,7 +8,7 @@ setup_toolchain host

 # workaround gcc 4.3.2 bug on x86_64 hosts
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524472
-# export CFLAGS="$CFLAGS -fno-strict-aliasing -fPIC"
+ export CFLAGS="$CFLAGS -fno-strict-aliasing -fPIC"

 cd $PKG_BUILD

@ -17,13 +17,13 @@ cd objdir

 ../configure --host=$HOST_NAME \
             --build=$HOST_NAME \
+             --target=$TARGET_NAME \
             --prefix=$ROOT/$TOOLCHAIN \
-             --disable-shared \
-             --enable-static \
+             --enable-shared \
+             --disable-static \
             --enable-mpbsd \
             --enable-cxx \

 make
 make check
-
 make install
--- a/packages/toolchain/math/gmp/patches/10_cross-compile.diff
+++ b/packages/toolchain/math/gmp/patches/10_cross-compile.diff
@ -0,0 +1,27 @@
+diff -Naur gmp-4.2.3.orig/configure gmp-4.2.3/configure
+--- gmp-4.2.3.orig/configure	2008-08-05 13:56:41.000000000 +0200
+++ gmp-4.2.3/configure	2008-08-05 13:57:06.000000000 +0200
+@@ -1584,22 +1584,7 @@
+ 
+ 
+ 
+-# If --target is not used then $target_alias is empty, but if say
+-# "./configure athlon-pc-freebsd3.5" is used, then all three of
+-# $build_alias, $host_alias and $target_alias are set to
+-# "athlon-pc-freebsd3.5".
+-#
+-if test -n "$target_alias" && test "$target_alias" != "$host_alias"; then
+-  { { echo "$as_me:$LINENO: error: --target is not appropriate for GMP
+-Use --build=CPU-VENDOR-OS if you need to specify your CPU and/or system
+-explicitly.  Use --host if cross-compiling (see \"Installing GMP\" in the
+-manual for more on this)." >&5
+-echo "$as_me: error: --target is not appropriate for GMP
+-Use --build=CPU-VENDOR-OS if you need to specify your CPU and/or system
+-explicitly.  Use --host if cross-compiling (see \"Installing GMP\" in the
+-manual for more on this)." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+
+ 
+ gmp_configm4="config.m4"
+ gmp_tmpconfigm4=cnfm4.tmp
--- a/packages/toolchain/math/gmp/url
+++ b/packages/toolchain/math/gmp/url
@ -1 +1 @@
-ftp://sunsite.cnlab-switch.ch/mirror/gnu/gmp/gmp-5.0.1.tar.bz2
+http://ftp.sunet.se/pub/gnu/gmp/gmp-4.3.2.tar.bz2
--- a/packages/toolchain/math/mpfr/build
+++ b/packages/toolchain/math/mpfr/build
@ -22,5 +22,4 @@ LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib" \
             --with-gmp-include="$ROOT/$TOOLCHAIN/include" \

 make
-
 make install
--- a/packages/toolchain/math/ppl/build
+++ b/packages/toolchain/math/ppl/build
@ -12,25 +12,17 @@ cd $BUILD/$1*
 mkdir -p objdir
 cd objdir

+LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib" \
 ../configure --host=$HOST_NAME \
             --build=$HOST_NAME \
             --target=$TARGET_NAME \
             --prefix=$ROOT/$TOOLCHAIN \
-             --disable-shared \
-             --enable-static \
+             --enable-shared \
+             --disable-static \
             --enable-interfaces="c,cxx" \
             --disable-optimization \
             --with-libgmp-prefix="$ROOT/$TOOLCHAIN" \
             --with-libgmpxx-prefix="$ROOT/$TOOLCHAIN" \

 make
-
-mkdir -p $ROOT/$TOOLCHAIN/lib
-  cp -PR interfaces/C/.libs/libppl_c.a $ROOT/$TOOLCHAIN/lib
-  cp -PR src/.libs/libppl.a $ROOT/$TOOLCHAIN/lib
-  cp -PR Watchdog/src/.libs/libpwl.a $ROOT/$TOOLCHAIN/lib
-
-mkdir -p $ROOT/$TOOLCHAIN/include
-  cp -PR interfaces/C/ppl_c.h $ROOT/$TOOLCHAIN/include
-  cp -PR src/ppl.hh $ROOT/$TOOLCHAIN/include
-  cp -PR Watchdog/src/pwl.hh $ROOT/$TOOLCHAIN/include
+make install
--- a/packages/toolchain/math/ppl/url
+++ b/packages/toolchain/math/ppl/url
@ -1 +1 @@
-http://sources.openelec.tv/svn/ppl-20100220.tar.bz2
+http://www.cs.unipr.it/ppl/Download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2