From 01c01a6a743ef0f04f9a4127b630073bf6c6e335 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Wed, 15 Nov 2006 07:01:49 +0000 Subject: [PATCH] Add missing patch file. Package-Manager: portage-2.1.2_rc1-r3 --- dev-lang/swi-prolog/ChangeLog | 5 +- dev-lang/swi-prolog/Manifest | 12 +- .../files/swi-prolog-CFLAGS-r3.patch | 337 ++++++++++++++++++ 3 files changed, 349 insertions(+), 5 deletions(-) create mode 100644 dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r3.patch diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index 4a3d1362d759..872ded4daf30 100644 --- a/dev-lang/swi-prolog/ChangeLog +++ b/dev-lang/swi-prolog/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/swi-prolog # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.50 2006/11/14 19:18:38 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.51 2006/11/15 07:01:49 keri Exp $ + + 15 Nov 2006; keri +files/swi-prolog-CFLAGS-r3.patch: + Add missing patch file. Thanks to fmccor@gentoo.org in #155150. 14 Nov 2006; Ferris McCormick swi-prolog-5.6.17-r1.ebuild: diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index 5c1c8655c11a..387c12b7a11d 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -18,6 +18,10 @@ AUX swi-prolog-CFLAGS-r2.patch 10475 RMD160 ee1ee90d4542de168787a1a98b1bcca6451f MD5 433655357c83157d2fb532efd135d7f5 files/swi-prolog-CFLAGS-r2.patch 10475 RMD160 ee1ee90d4542de168787a1a98b1bcca6451f5760 files/swi-prolog-CFLAGS-r2.patch 10475 SHA256 85051afdbe983622900b9b3692acfb08da338da8ade1be296992ab78f8391986 files/swi-prolog-CFLAGS-r2.patch 10475 +AUX swi-prolog-CFLAGS-r3.patch 10489 RMD160 77f5dd4c064959dcb37d166a8bc3e0faff64e7c5 SHA1 ccda1971b83ecddd5eb2cd13ce997b490e74bd78 SHA256 ee0ea29de8262b6b4b127ab6c5640fe230c8f84884b52ca96db6c57eaa04f5ac +MD5 b77625cf1d09c3c7531b042772776eeb files/swi-prolog-CFLAGS-r3.patch 10489 +RMD160 77f5dd4c064959dcb37d166a8bc3e0faff64e7c5 files/swi-prolog-CFLAGS-r3.patch 10489 +SHA256 ee0ea29de8262b6b4b127ab6c5640fe230c8f84884b52ca96db6c57eaa04f5ac files/swi-prolog-CFLAGS-r3.patch 10489 AUX swi-prolog-PLBASE-r1.patch 2612 RMD160 98a2aec985aa0bc38e5a76d460dd724ab199b442 SHA1 9fa1e995a30d93be737a5883779dba3f3128c006 SHA256 91b090d1c5ddd14f24671d43d0f021e47d1fd6652f1dd518f1889052c0e601d8 MD5 5735709fce96aead1b7ba6c23bd83ba6 files/swi-prolog-PLBASE-r1.patch 2612 RMD160 98a2aec985aa0bc38e5a76d460dd724ab199b442 files/swi-prolog-PLBASE-r1.patch 2612 @@ -149,10 +153,10 @@ EBUILD swi-prolog-5.6.23.ebuild 3360 RMD160 f43eccc97bcb82c1733ac82b3f00edc0cbfb MD5 ae74fa01053eb293dd714337fc78ac5c swi-prolog-5.6.23.ebuild 3360 RMD160 f43eccc97bcb82c1733ac82b3f00edc0cbfbc69d swi-prolog-5.6.23.ebuild 3360 SHA256 2650f7044558eeea71962fb52e2b12220d6605b95b0abb788b5770daa7d31eea swi-prolog-5.6.23.ebuild 3360 -MISC ChangeLog 9918 RMD160 2fbd084bdeedbc759520967f77056760aa758213 SHA1 fac482c7bd2163988d2ecd19dbabd40d0587db0f SHA256 24fe1918250eb9b2fda8e8d96076e8e7793304e9a4b539e4f725e6b86b5fde40 -MD5 35164856f7c8ee3672c135efd2179bd7 ChangeLog 9918 -RMD160 2fbd084bdeedbc759520967f77056760aa758213 ChangeLog 9918 -SHA256 24fe1918250eb9b2fda8e8d96076e8e7793304e9a4b539e4f725e6b86b5fde40 ChangeLog 9918 +MISC ChangeLog 10056 RMD160 81febf3e0f5c23735cde57e0bc8f1b40fc30471b SHA1 d52cec20d973f02f01c803cb0c804fe3bb27d3cc SHA256 94863fb0bf30afe05eb29552508a2234c7b56fce73af646e70dc17accb27b4ca +MD5 033ce5205d70f9cc3d0e1be38e3e86f8 ChangeLog 10056 +RMD160 81febf3e0f5c23735cde57e0bc8f1b40fc30471b ChangeLog 10056 +SHA256 94863fb0bf30afe05eb29552508a2234c7b56fce73af646e70dc17accb27b4ca ChangeLog 10056 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r3.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r3.patch new file mode 100644 index 000000000000..7207431626c3 --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r3.patch @@ -0,0 +1,337 @@ +diff -ur pl-5.6.18.orig/packages/clib/configure pl-5.6.18/packages/clib/configure +--- pl-5.6.18.orig/packages/clib/configure 2006-01-11 09:41:55.000000000 +1300 ++++ pl-5.6.18/packages/clib/configure 2006-09-01 19:39:18.000000000 +1200 +@@ -3117,7 +3117,7 @@ + + fi + +-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="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=-Wall + else + COFLAGS=-O +diff -ur pl-5.6.18.orig/packages/clib/maildrop/rfc2045/configure pl-5.6.18/packages/clib/maildrop/rfc2045/configure +--- pl-5.6.18.orig/packages/clib/maildrop/rfc2045/configure 2005-07-25 02:37:57.000000000 +1200 ++++ pl-5.6.18/packages/clib/maildrop/rfc2045/configure 2006-09-01 19:40:33.000000000 +1200 +@@ -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.18.orig/packages/clib/maildrop/rfc822/configure pl-5.6.18/packages/clib/maildrop/rfc822/configure +--- pl-5.6.18.orig/packages/clib/maildrop/rfc822/configure 2005-07-25 02:37:57.000000000 +1200 ++++ pl-5.6.18/packages/clib/maildrop/rfc822/configure 2006-09-01 19:41:37.000000000 +1200 +@@ -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.18.orig/packages/cppproxy/configure pl-5.6.18/packages/cppproxy/configure +--- pl-5.6.18.orig/packages/cppproxy/configure 2006-01-23 22:29:29.000000000 +1300 ++++ pl-5.6.18/packages/cppproxy/configure 2006-09-01 19:42:51.000000000 +1200 +@@ -3111,7 +3111,7 @@ + + fi + +-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=-Wall + else + COFLAGS=-O +diff -ur pl-5.6.18.orig/packages/db/configure pl-5.6.18/packages/db/configure +--- pl-5.6.18.orig/packages/db/configure 2006-07-31 19:54:07.000000000 +1200 ++++ pl-5.6.18/packages/db/configure 2006-09-01 19:44:12.000000000 +1200 +@@ -3139,13 +3139,13 @@ + fi + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=-Wall + else + COFLAGS=-O + CWFLAGS= + fi +-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.18.orig/packages/jpl/configure pl-5.6.18/packages/jpl/configure +--- pl-5.6.18.orig/packages/jpl/configure 2006-08-09 19:58:24.000000000 +1200 ++++ pl-5.6.18/packages/jpl/configure 2006-09-01 19:45:49.000000000 +1200 +@@ -3077,11 +3077,11 @@ + + fi + +-CFLAGS="$CMFLAGS" ++ + + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -cc-options,-fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS="-Wall" + else + COFLAGS=-O +diff -ur pl-5.6.18.orig/packages/ltx2htm/configure pl-5.6.18/packages/ltx2htm/configure +--- pl-5.6.18.orig/packages/ltx2htm/configure 2004-09-22 02:28:17.000000000 +1200 ++++ pl-5.6.18/packages/ltx2htm/configure 2006-09-01 19:49:17.000000000 +1200 +@@ -1351,7 +1351,7 @@ + CC=$PLLD + LD=$PLLD + LDSOFLAGS=-shared +- ++CMFLAGS=-fpic + SO="$PLSOEXT" + + TARGETS="unix.$SO socket.$SO cgi.$SO memfile.$SO" +@@ -2925,7 +2925,7 @@ + + fi + +-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 +@@ -3455,7 +3455,7 @@ + + + if test ! -z "$GCC"; then +- COFLAGS=-O2 ++ COFLAGS="$CFLAGS" + CWFLAGS=-Wall + else + COFLAGS=-O +diff -ur pl-5.6.18.orig/packages/nlp/configure pl-5.6.18/packages/nlp/configure +--- pl-5.6.18.orig/packages/nlp/configure 2005-11-26 23:54:48.000000000 +1300 ++++ pl-5.6.18/packages/nlp/configure 2006-09-01 19:50:31.000000000 +1200 +@@ -3111,7 +3111,7 @@ + + fi + +-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=-Wall + else + COFLAGS=-O +diff -ur pl-5.6.18.orig/packages/odbc/configure pl-5.6.18/packages/odbc/configure +--- pl-5.6.18.orig/packages/odbc/configure 2006-02-16 09:48:34.000000000 +1300 ++++ pl-5.6.18/packages/odbc/configure 2006-09-01 19:52:33.000000000 +1200 +@@ -3147,7 +3147,7 @@ + + fi + +-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=-Wall + else + COFLAGS=-O +diff -ur pl-5.6.18.orig/packages/semweb/configure pl-5.6.18/packages/semweb/configure +--- pl-5.6.18.orig/packages/semweb/configure 2006-03-08 03:43:04.000000000 +1300 ++++ pl-5.6.18/packages/semweb/configure 2006-09-01 19:53:47.000000000 +1200 +@@ -3145,7 +3145,7 @@ + + fi + +-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="-O3 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS=-Wall + else + COFLAGS=-O +diff -ur pl-5.6.18.orig/packages/sgml/configure pl-5.6.18/packages/sgml/configure +--- pl-5.6.18.orig/packages/sgml/configure 2006-02-04 04:38:50.000000000 +1300 ++++ pl-5.6.18/packages/sgml/configure 2006-09-01 19:55:24.000000000 +1200 +@@ -3184,16 +3184,12 @@ + fi + + if test ! -z "$GCC"; then +- if test $gmake = yes; then +- COFLAGS='$(shell if test -r .coflags; then cat .coflags; else echo "-O2"; fi)' +- else +- COFLAGS="-O2 -fno-strict-aliasing" +- fi ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + CWFLAGS="$CWFLAGS -Wall" + else + COFLAGS=-O + fi +-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.18.orig/packages/ssl/configure pl-5.6.18/packages/ssl/configure +--- pl-5.6.18.orig/packages/ssl/configure 2006-02-04 04:38:50.000000000 +1300 ++++ pl-5.6.18/packages/ssl/configure 2006-09-01 19:56:34.000000000 +1200 +@@ -3147,7 +3147,7 @@ + + fi + +-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=-Wall + else + COFLAGS=-O +diff -ur pl-5.6.18.orig/packages/table/configure pl-5.6.18/packages/table/configure +--- pl-5.6.18.orig/packages/table/configure 2005-01-31 23:47:37.000000000 +1300 ++++ pl-5.6.18/packages/table/configure 2006-09-01 19:58:05.000000000 +1200 +@@ -3112,7 +3112,7 @@ + + fi + +-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=-Wall + else + COFLAGS=-O +diff -ur pl-5.6.18.orig/packages/xpce/src/configure pl-5.6.18/packages/xpce/src/configure +--- pl-5.6.18.orig/packages/xpce/src/configure 2006-04-05 19:29:14.000000000 +1200 ++++ pl-5.6.18/packages/xpce/src/configure 2006-09-01 19:59:11.000000000 +1200 +@@ -4391,7 +4391,7 @@ + fi + + if test ! -z "$GCC"; then +- COFLAGS="-O2 -fno-strict-aliasing" ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + if test "$ac_cv_header_stdc" = "yes" || test "$syslibh" = "yes"; then + CWFLAGS=-Wall + else +@@ -4401,7 +4401,7 @@ + COFLAGS=-O + CWFLAGS= + fi +-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.18.orig/src/Makefile.in pl-5.6.18/src/Makefile.in +--- pl-5.6.18.orig/src/Makefile.in 2006-08-25 20:33:32.000000000 +1200 ++++ pl-5.6.18/src/Makefile.in 2006-09-01 19:36:22.000000000 +1200 +@@ -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.18.orig/src/configure pl-5.6.18/src/configure +--- pl-5.6.18.orig/src/configure 2006-08-07 20:21:19.000000000 +1200 ++++ pl-5.6.18/src/configure 2006-09-01 19:35:33.000000000 +1200 +@@ -3807,7 +3807,7 @@ + esac + fi + else +- COFLAGS=$CFLAGS ++ COFLAGS="$CFLAGS -fno-strict-aliasing" + fi + + +@@ -14816,7 +14816,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.18.orig/src/libtai/Makefile.in pl-5.6.18/src/libtai/Makefile.in +--- pl-5.6.18.orig/src/libtai/Makefile.in 2006-07-11 20:41:05.000000000 +1200 ++++ pl-5.6.18/src/libtai/Makefile.in 2006-09-01 19:37:28.000000000 +1200 +@@ -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.18.orig/src/rc/Makefile.in pl-5.6.18/src/rc/Makefile.in +--- pl-5.6.18.orig/src/rc/Makefile.in 2006-07-11 20:22:28.000000000 +1200 ++++ pl-5.6.18/src/rc/Makefile.in 2006-09-01 19:36:56.000000000 +1200 +@@ -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@ -- 2.26.2