From: Keri Harris Date: Sat, 10 Mar 2007 07:19:08 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=359e16f1edd0f42b863e6c114233fac61a80e8a6;p=gentoo.git Version bump. Package-Manager: portage-2.1.2-r12 --- diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index 097f563bc1e8..cae7a6f4008e 100644 --- a/dev-lang/swi-prolog/ChangeLog +++ b/dev-lang/swi-prolog/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/swi-prolog # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.75 2007/03/10 06:50:39 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.76 2007/03/10 07:19:08 keri Exp $ + +*swi-prolog-5.6.30 (10 Mar 2007) + + 10 Mar 2007; keri +files/swi-prolog-CFLAGS-r5.patch, + +swi-prolog-5.6.30.ebuild: + Version bump. 10 Mar 2007; keri +files/swi-prolog-arith-test.patch, swi-prolog-5.6.25.ebuild, swi-prolog-5.6.27.ebuild, diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index e7561de94278..2ec9641f6a85 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -26,6 +26,10 @@ AUX swi-prolog-CFLAGS-r4.patch 11312 RMD160 4e4d2282991da0531cb6ceb49c72e62d919f MD5 7a9216d7bc4d453a223e2f1421e3572c files/swi-prolog-CFLAGS-r4.patch 11312 RMD160 4e4d2282991da0531cb6ceb49c72e62d919f55a4 files/swi-prolog-CFLAGS-r4.patch 11312 SHA256 38974374d7d3c688e7866a080448518d4be8e6df701362f30dcbf68c338e5055 files/swi-prolog-CFLAGS-r4.patch 11312 +AUX swi-prolog-CFLAGS-r5.patch 11406 RMD160 19c05fafea60aad899e3b58789efe9600f35c44b SHA1 1da7246be79e0f5021831761cdcfc198d027b17c SHA256 333e8ce24cecb86a58fb921edf5035b0d532ef7da11198162289b69a38debe2b +MD5 17df61ea15a611b7e79100f3de071d00 files/swi-prolog-CFLAGS-r5.patch 11406 +RMD160 19c05fafea60aad899e3b58789efe9600f35c44b files/swi-prolog-CFLAGS-r5.patch 11406 +SHA256 333e8ce24cecb86a58fb921edf5035b0d532ef7da11198162289b69a38debe2b files/swi-prolog-CFLAGS-r5.patch 11406 AUX swi-prolog-O_DEBUG.patch 948 RMD160 5fd2855b70c9b9aab42c0bf7451b09451450b73b SHA1 3625177f4318515be9fef30c1c6da28d4f237aa9 SHA256 f9089756c12d799c6b934d188afd4a6b80cffef0503055b0a31a1af4cd0cea74 MD5 47d0ce7f6592b918290e9ecae0977f58 files/swi-prolog-O_DEBUG.patch 948 RMD160 5fd2855b70c9b9aab42c0bf7451b09451450b73b files/swi-prolog-O_DEBUG.patch 948 @@ -210,6 +214,7 @@ DIST pl-5.6.25.tar.gz 11651158 RMD160 298bb9946089276ad3504c7b692ab5b43d81a7b2 S DIST pl-5.6.27.tar.gz 11661684 RMD160 e180ad228946b36b2aaba561be25ba294da473af SHA1 7195af43f02f6569f7611cc5a6543fa00ae49c01 SHA256 cef264b0d022ca5c5f07547e5f11f1930cb9761fed7568b2a450978b3128d9a5 DIST pl-5.6.28.tar.gz 11687262 RMD160 8a5113b5c97ab58baa8b6e0a3f92ea078f28f6bb SHA1 a02eb1613d5772f94fdad98b5b400013fc3d575a SHA256 ae6600e48cfa246a0c81c047e158fe9e68a72bfabea6abba0bcdec40ad67690a DIST pl-5.6.29.tar.gz 11697773 RMD160 ac7298a8884a69fc5bb9d4b0656a1845b9d7e1b6 SHA1 fbee19a7b8ab581070aefc64ac0d0f764107af4d SHA256 0390d63fa3090d11569c27322ada7ddfca4dfd7b1e8d32b7f2b44ed192be35ff +DIST pl-5.6.30.tar.gz 11826456 RMD160 fdfb138a472af9109a4ab3ca91c0f3284a808a15 SHA1 e71aa52221207045bb73d3ade50ac0992f0c5fa5 SHA256 7ae6d35b9f3962463c7ec6057661e8c6b3c80f6791e52283c2097b39fee02d91 EBUILD swi-prolog-5.6.17-r1.ebuild 3799 RMD160 5dfb755c08250fdb9ac21187441bc55b4a8eb6d2 SHA1 74a16a2b3f64a1d9f315af4c52683412b0cf9363 SHA256 cbb68fa3284ce4f3dc55f184e7ef4fce073e5a18261100ae5214b7913fa4d237 MD5 c883caff349f028e966b808641fec7f0 swi-prolog-5.6.17-r1.ebuild 3799 RMD160 5dfb755c08250fdb9ac21187441bc55b4a8eb6d2 swi-prolog-5.6.17-r1.ebuild 3799 @@ -262,10 +267,14 @@ EBUILD swi-prolog-5.6.29.ebuild 3780 RMD160 b6041b5d1179d2a78943d3b948ecf000e4b9 MD5 d883f267b109cdcc403269892b4a996c swi-prolog-5.6.29.ebuild 3780 RMD160 b6041b5d1179d2a78943d3b948ecf000e4b90248 swi-prolog-5.6.29.ebuild 3780 SHA256 a32d6a1bac8ca1a79adb6e2c8924c5a48bee013d0327d0003516e758fa5ed2b7 swi-prolog-5.6.29.ebuild 3780 -MISC ChangeLog 14719 RMD160 003ba894dbd0f39cb8b56fe67a0ef97b02a90e44 SHA1 1263a587155a40d67063cbfd33ffe16695429a07 SHA256 686c2715c26a0124133b07f50b728b6302cffbe5a43d435575dcd787a97c58f3 -MD5 da8bd9af5786c122bec2e48bc00c7330 ChangeLog 14719 -RMD160 003ba894dbd0f39cb8b56fe67a0ef97b02a90e44 ChangeLog 14719 -SHA256 686c2715c26a0124133b07f50b728b6302cffbe5a43d435575dcd787a97c58f3 ChangeLog 14719 +EBUILD swi-prolog-5.6.30.ebuild 3765 RMD160 cac8e43f2f21852f7c807afbf057e848582d784e SHA1 bb9e6054fa09715893684e19e7d7968b29aef5fb SHA256 974dfd3bd33c0a2d34bdd64c6f6468761b51043bb63dcafc60712bc8078e66a8 +MD5 92e964737d4fd441a58dd8482c049f1b swi-prolog-5.6.30.ebuild 3765 +RMD160 cac8e43f2f21852f7c807afbf057e848582d784e swi-prolog-5.6.30.ebuild 3765 +SHA256 974dfd3bd33c0a2d34bdd64c6f6468761b51043bb63dcafc60712bc8078e66a8 swi-prolog-5.6.30.ebuild 3765 +MISC ChangeLog 14872 RMD160 660f734467a0bbd524a3c224422c35e12d07efe0 SHA1 7b784c0d89e1ab61dc97d3c0ad8971fc4acb153c SHA256 16fd0575d5ec6d9235eeece82494dd7e6e37896db80d3cb60610df0e9ece6603 +MD5 b3d77953ffee972f880729e07ff80d41 ChangeLog 14872 +RMD160 660f734467a0bbd524a3c224422c35e12d07efe0 ChangeLog 14872 +SHA256 16fd0575d5ec6d9235eeece82494dd7e6e37896db80d3cb60610df0e9ece6603 ChangeLog 14872 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 @@ -309,3 +318,6 @@ SHA256 834c5d1b84792be48a5276686117aa9a862d820a5335c2f473fc8fc232f995a8 files/di MD5 382b7817e5831ca8ea92692df86d2e04 files/digest-swi-prolog-5.6.29-r1 235 RMD160 61af4f6ab311437f193c41a630ab41b4b5ffd259 files/digest-swi-prolog-5.6.29-r1 235 SHA256 834c5d1b84792be48a5276686117aa9a862d820a5335c2f473fc8fc232f995a8 files/digest-swi-prolog-5.6.29-r1 235 +MD5 b1b912677493159a856f9da58209e2cd files/digest-swi-prolog-5.6.30 235 +RMD160 43dd24ed4e9ef86e21ee4bc6c75a8db697a21710 files/digest-swi-prolog-5.6.30 235 +SHA256 6b5b9ab84e66e1c4e41e7bf4888c52b803f4ff4f9e7370cce1308470ef54134f files/digest-swi-prolog-5.6.30 235 diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30 new file mode 100644 index 000000000000..a1015104e7b8 --- /dev/null +++ b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30 @@ -0,0 +1,3 @@ +MD5 a6df5d3e4199a296a8544a7574170f0c pl-5.6.30.tar.gz 11826456 +RMD160 fdfb138a472af9109a4ab3ca91c0f3284a808a15 pl-5.6.30.tar.gz 11826456 +SHA256 7ae6d35b9f3962463c7ec6057661e8c6b3c80f6791e52283c2097b39fee02d91 pl-5.6.30.tar.gz 11826456 diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r5.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r5.patch new file mode 100644 index 000000000000..0135434f7d48 --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r5.patch @@ -0,0 +1,356 @@ +diff -ur pl-5.6.30.orig/packages/clib/configure pl-5.6.30/packages/clib/configure +--- pl-5.6.30.orig/packages/clib/configure 2007-03-09 22:17:04.000000000 +1300 ++++ pl-5.6.30/packages/clib/configure 2007-03-10 19:56:36.000000000 +1300 +@@ -3117,7 +3117,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +@@ -3709,7 +3709,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="${COFLAGS--O2 -fno-strict-aliasing}" ++ COFLAGS="${COFLAGS-$CFLAGS -fno-strict-aliasing}" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS="${COFLAGS--O}" +diff -ur pl-5.6.30.orig/packages/clib/maildrop/rfc2045/configure pl-5.6.30/packages/clib/maildrop/rfc2045/configure +--- pl-5.6.30.orig/packages/clib/maildrop/rfc2045/configure 2005-07-25 02:37:57.000000000 +1200 ++++ pl-5.6.30/packages/clib/maildrop/rfc2045/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3155,7 +3155,7 @@ + + if test "$GCC" = yes ; then + CXXFLAGS="$CXXFLAGS -Wall" +- CFLAGS="$CFLAGS -Wall" ++ CFLAGS="$CFLAGS -fpic -Wall" + fi + + +diff -ur pl-5.6.30.orig/packages/clib/maildrop/rfc822/configure pl-5.6.30/packages/clib/maildrop/rfc822/configure +--- pl-5.6.30.orig/packages/clib/maildrop/rfc822/configure 2005-07-25 02:37:57.000000000 +1200 ++++ pl-5.6.30/packages/clib/maildrop/rfc822/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3144,7 +3144,7 @@ + + if test "$GCC" = yes ; then + CXXFLAGS="$CXXFLAGS -Wall" +- CFLAGS="$CFLAGS -Wall" ++ CFLAGS="$CFLAGS -fpic -Wall" + fi + + +diff -ur pl-5.6.30.orig/packages/cppproxy/configure pl-5.6.30/packages/cppproxy/configure +--- pl-5.6.30.orig/packages/cppproxy/configure 2007-01-24 08:25:14.000000000 +1300 ++++ pl-5.6.30/packages/cppproxy/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3111,7 +3111,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +@@ -3703,7 +3703,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O +diff -ur pl-5.6.30.orig/packages/db/configure pl-5.6.30/packages/db/configure +--- pl-5.6.30.orig/packages/db/configure 2007-01-24 08:25:14.000000000 +1300 ++++ pl-5.6.30/packages/db/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3140,13 +3140,13 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O + fi + +-CFLAGS="$CMFLAGS $CIFLAGS" ++#CFLAGS="$CMFLAGS $CIFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +diff -ur pl-5.6.30.orig/packages/jpl/configure pl-5.6.30/packages/jpl/configure +--- pl-5.6.30.orig/packages/jpl/configure 2006-12-22 02:41:37.000000000 +1300 ++++ pl-5.6.30/packages/jpl/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3115,12 +3115,12 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -cc-options,-fno-strict-aliasing" +- CWFLAGS="-Wall" ++ COFLAGS="$CFLAGS -cc-options,-fno-strict-aliasing" ++ CWFLAGS="-Wall -Wno-strict-aliasing" + else + COFLAGS=-O + CWFLAGS= +diff -ur pl-5.6.30.orig/packages/ltx2htm/configure pl-5.6.30/packages/ltx2htm/configure +--- pl-5.6.30.orig/packages/ltx2htm/configure 2007-01-24 08:25:14.000000000 +1300 ++++ pl-5.6.30/packages/ltx2htm/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -1384,6 +1384,7 @@ + CC=$PLLD + LD=$PLLD + LDSOFLAGS=-shared ++CMFLAGS=-fpic + + SO="$PLSOEXT" + +@@ -3048,7 +3049,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +@@ -3640,7 +3641,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O +diff -ur pl-5.6.30.orig/packages/nlp/configure pl-5.6.30/packages/nlp/configure +--- pl-5.6.30.orig/packages/nlp/configure 2007-01-24 08:25:14.000000000 +1300 ++++ pl-5.6.30/packages/nlp/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3111,7 +3111,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +@@ -3703,7 +3703,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O +diff -ur pl-5.6.30.orig/packages/odbc/configure pl-5.6.30/packages/odbc/configure +--- pl-5.6.30.orig/packages/odbc/configure 2007-01-24 08:25:14.000000000 +1300 ++++ pl-5.6.30/packages/odbc/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3147,7 +3147,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +@@ -3739,7 +3739,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O +diff -ur pl-5.6.30.orig/packages/semweb/configure pl-5.6.30/packages/semweb/configure +--- pl-5.6.30.orig/packages/semweb/configure 2007-03-09 22:17:10.000000000 +1300 ++++ pl-5.6.30/packages/semweb/configure 2007-03-10 19:59:10.000000000 +1300 +@@ -3145,7 +3145,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +@@ -4294,7 +4294,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="${COFLAGS--O3 -fno-strict-aliasing}" ++ COFLAGS="${COFLAGS-$CFLAGS -fno-strict-aliasing}" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O +diff -ur pl-5.6.30.orig/packages/sgml/configure pl-5.6.30/packages/sgml/configure +--- pl-5.6.30.orig/packages/sgml/configure 2007-01-25 03:17:48.000000000 +1300 ++++ pl-5.6.30/packages/sgml/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -2394,7 +2394,7 @@ + SO="$PLSOEXT" + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O +@@ -3190,7 +3190,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 + echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 + if test "${ac_cv_c_bigendian+set}" = set; then +diff -ur pl-5.6.30.orig/packages/ssl/configure pl-5.6.30/packages/ssl/configure +--- pl-5.6.30.orig/packages/ssl/configure 2007-01-24 08:25:14.000000000 +1300 ++++ pl-5.6.30/packages/ssl/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3110,7 +3110,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +@@ -3702,7 +3702,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O +diff -ur pl-5.6.30.orig/packages/table/configure pl-5.6.30/packages/table/configure +--- pl-5.6.30.orig/packages/table/configure 2007-01-24 08:25:14.000000000 +1300 ++++ pl-5.6.30/packages/table/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3112,7 +3112,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +@@ -3704,7 +3704,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O +diff -ur pl-5.6.30.orig/packages/xpce/src/configure pl-5.6.30/packages/xpce/src/configure +--- pl-5.6.30.orig/packages/xpce/src/configure 2007-03-10 02:41:39.000000000 +1300 ++++ pl-5.6.30/packages/xpce/src/configure 2007-03-10 20:09:50.000000000 +1300 +@@ -6522,13 +6522,13 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="${COFLAGS--O2 -fno-strict-aliasing}" ++ COFLAGS="${COFLAGS-$CFLAGS -fno-strict-aliasing}" + CWFLAGS="${CWFLAGS--Wall}" + else + COFLAGS="${COFLAGS--O}" + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + echo "$as_me:$LINENO: checking for inline" >&5 + echo $ECHO_N "checking for inline... $ECHO_C" >&6 + if test "${ac_cv_c_inline+set}" = set; then +diff -ur pl-5.6.30.orig/packages/zlib/configure pl-5.6.30/packages/zlib/configure +--- pl-5.6.30.orig/packages/zlib/configure 2007-01-24 08:25:14.000000000 +1300 ++++ pl-5.6.30/packages/zlib/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3109,7 +3109,7 @@ + + fi + +-CFLAGS="$CMFLAGS" ++#CFLAGS="$CMFLAGS" + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo "$as_me:$LINENO: checking for working alloca.h" >&5 +@@ -3701,7 +3701,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=${CWFLAGS--Wall} + else + COFLAGS=-O +diff -ur pl-5.6.30.orig/src/Makefile.in pl-5.6.30/src/Makefile.in +--- pl-5.6.30.orig/src/Makefile.in 2007-03-07 23:58:49.000000000 +1300 ++++ pl-5.6.30/src/Makefile.in 2007-03-10 19:53:20.000000000 +1300 +@@ -69,7 +69,7 @@ + CWFLAGS=@CWFLAGS@ + CIFLAGS=@CIFLAGS@ + CMFLAGS=@CMFLAGS@ +-CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) ++CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS) + LDFLAGS=@LDFLAGS@ + + PLFOREIGN=@PLFOREIGN@ +diff -ur pl-5.6.30.orig/src/configure pl-5.6.30/src/configure +--- pl-5.6.30.orig/src/configure 2007-03-09 22:16:37.000000000 +1300 ++++ pl-5.6.30/src/configure 2007-03-10 19:53:20.000000000 +1300 +@@ -3809,7 +3809,7 @@ + esac + fi + else +- COFLAGS=$CFLAGS ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + fi + + +@@ -15704,7 +15704,7 @@ + LNLIBS="$LIBS" + fi + +-echo " CFLAGS=$CWFLAGS $COFLAGS $CIFLAGS $CMFLAGS" ++echo " CFLAGS=$CWFLAGS $COFLAGS $CMFLAGS" + echo " LDFLAGS=$LDFLAGS" + echo " LIBS=$LIBS" + +diff -ur pl-5.6.30.orig/src/libtai/Makefile.in pl-5.6.30/src/libtai/Makefile.in +--- pl-5.6.30.orig/src/libtai/Makefile.in 2006-07-11 20:41:05.000000000 +1200 ++++ pl-5.6.30/src/libtai/Makefile.in 2007-03-10 19:53:20.000000000 +1300 +@@ -29,7 +29,7 @@ + CIFLAGS=@CIFLAGS@ + CMFLAGS=@CMFLAGS@ + LDFLAGS=@LDFLAGS@ +-CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) ++CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS) + + INSTALL=@INSTALL@ + INSTALL_PROGRAM=@INSTALL_PROGRAM@ +diff -ur pl-5.6.30.orig/src/rc/Makefile.in pl-5.6.30/src/rc/Makefile.in +--- pl-5.6.30.orig/src/rc/Makefile.in 2006-07-11 20:22:28.000000000 +1200 ++++ pl-5.6.30/src/rc/Makefile.in 2007-03-10 19:53:20.000000000 +1300 +@@ -30,7 +30,7 @@ + CIFLAGS=@CIFLAGS@ + CMFLAGS=@CMFLAGS@ + LDFLAGS=@LDFLAGS@ +-CFLAGS= $(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS) ++CFLAGS= $(CWFLAGS) $(COFLAGS) $(CMFLAGS) + + INSTALL=@INSTALL@ + INSTALL_PROGRAM=@INSTALL_PROGRAM@ diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.30.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.30.ebuild new file mode 100644 index 000000000000..0ca1edc7a1df --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-5.6.30.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.30.ebuild,v 1.1 2007/03/10 07:19:08 keri Exp $ + +inherit eutils flag-o-matic java-pkg-opt-2 + +DESCRIPTION="free, small, and standard compliant Prolog compiler" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="berkdb debug doc gmp java minimal odbc readline ssl static tetex threads zlib X" + +DEPEND="!dev-lang/swi-prolog-lite + sys-libs/ncurses + zlib? ( sys-libs/zlib ) + odbc? ( dev-db/unixODBC ) + berkdb? ( sys-libs/db ) + readline? ( sys-libs/readline ) + gmp? ( dev-libs/gmp ) + ssl? ( dev-libs/openssl ) + java? ( >=virtual/jdk-1.4 + dev-java/junit ) + X? ( + media-libs/jpeg + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXpm + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM + x11-proto/xproto )" + +S="${WORKDIR}/pl-${PV}" + +src_unpack() { + unpack ${A} + cd "${S}" + + sed -i -e "s/man boot library/boot library/" src/Makefile.in + epatch "${FILESDIR}"/${PN}-portage-r1.patch + epatch "${FILESDIR}"/${PN}-CFLAGS-r5.patch + epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch + epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch + epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch + epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch + epatch "${FILESDIR}"/${PN}-jpl-junit.patch + epatch "${FILESDIR}"/${PN}-jpl-check_java-r1.patch + epatch "${FILESDIR}"/${PN}-ltx2htm.patch + epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch + epatch "${FILESDIR}"/${PN}-set_prolog_IO.patch + epatch "${FILESDIR}"/${PN}-thread-sandbox.patch + epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch + epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch + epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch +} + +src_compile() { + einfo "Building SWI-Prolog compiler" + + use debug && append-flags -DO_DEBUG + + local threadconf + if use java && ! use minimal || use threads ; then + threadconf="--enable-mt" + else + threadconf="--disable-mt" + fi + + cd "${S}"/src + econf \ + --libdir=/usr/$(get_libdir) \ + ${threadconf} \ + $(use_enable gmp) \ + $(use_enable readline) \ + $(use_enable !static shared) \ + --disable-custom-flags \ + || die "econf failed" + emake || die "emake failed" + + if ! use minimal ; then + einfo "Building SWI-Prolog additional packages" + + cd "${S}/packages" + econf \ + COFLAGS="${CFLAGS}" \ + --libdir=/usr/$(get_libdir) \ + ${threadconf} \ + $(use_enable !static shared) \ + --without-C-sicstus \ + --with-chr \ + --with-clib \ + --with-clpqr \ + --with-cpp \ + --with-cppproxy \ + $(use_with berkdb db) \ + --with-http \ + --without-jasmine \ + $(use_with java jpl) \ + $(use_with tetex ltx2htm) \ + --with-nlp \ + $(use_with odbc) \ + --with-pldoc \ + --with-plunit \ + --with-semweb \ + --with-sgml \ + --with-sgml/RDF \ + $(use_with ssl) \ + --with-table \ + $(use_with X xpce) \ + $(use_with zlib) \ + || die "packages econf failed" + + emake || die "packages emake failed" + fi +} + +src_install() { + make -C src DESTDIR="${D}" install || die "install src failed" + + if ! use minimal ; then + make -C packages DESTDIR="${D}" install || die "install packages failed" + if use doc ; then + make -C packages DESTDIR="${D}" html-install || die "html-install failed" + make -C packages/cppproxy DESTDIR="${D}" install-examples || die "install-examples failed" + fi + fi + + dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README README.GUI VERSION +} + +src_test() { + cd "${S}/src" + make check || die "make check failed. See above for details." + + if ! use minimal ; then + cd "${S}/packages" + make check || die "make check failed. See above for details." + fi +}