diff options
author | Keri Harris <keri@gentoo.org> | 2006-03-21 08:28:26 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2006-03-21 08:28:26 +0000 |
commit | 1e2e2e81cd7977563d740c3d9eef7844d4486b56 (patch) | |
tree | 0b4c8c1f882bd63374cb8852d13afdeb1b0b8cbe /dev-lang/gprolog | |
parent | Version Bump (diff) | |
download | gentoo-2-1e2e2e81cd7977563d740c3d9eef7844d4486b56.tar.gz gentoo-2-1e2e2e81cd7977563d740c3d9eef7844d4486b56.tar.bz2 gentoo-2-1e2e2e81cd7977563d740c3d9eef7844d4486b56.zip |
Version bump. Closes #116843
(Portage version: 2.1_pre6-r5)
Diffstat (limited to 'dev-lang/gprolog')
-rw-r--r-- | dev-lang/gprolog/ChangeLog | 12 | ||||
-rw-r--r-- | dev-lang/gprolog/Manifest | 28 | ||||
-rw-r--r-- | dev-lang/gprolog/files/digest-gprolog-1.2.19 | 3 | ||||
-rw-r--r-- | dev-lang/gprolog/files/gprolog-1.2.19-CFLAGS.patch | 28 | ||||
-rw-r--r-- | dev-lang/gprolog/files/gprolog-1.2.19-bootstrap.patch | 94 | ||||
-rw-r--r-- | dev-lang/gprolog/files/gprolog-1.2.19-gcc4.patch | 360 | ||||
-rw-r--r-- | dev-lang/gprolog/files/gprolog-1.2.19-noexecstack.patch | 24 | ||||
-rw-r--r-- | dev-lang/gprolog/files/gprolog-1.2.19-test.patch | 280 | ||||
-rw-r--r-- | dev-lang/gprolog/gprolog-1.2.19.ebuild | 71 |
9 files changed, 894 insertions, 6 deletions
diff --git a/dev-lang/gprolog/ChangeLog b/dev-lang/gprolog/ChangeLog index a809c19d5347..c4ab14e77a35 100644 --- a/dev-lang/gprolog/ChangeLog +++ b/dev-lang/gprolog/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-lang/gprolog -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.8 2005/10/30 21:31:38 grobian Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/ChangeLog,v 1.9 2006/03/21 08:28:26 keri Exp $ + +*gprolog-1.2.19 (21 Mar 2006) + + 21 Mar 2006; Keri Harris <keri@gentoo.org> + +files/gprolog-1.2.19-CFLAGS.patch, +files/gprolog-1.2.19-bootstrap.patch, + +files/gprolog-1.2.19-gcc4.patch, +files/gprolog-1.2.19-noexecstack.patch, + +files/gprolog-1.2.19-test.patch, +gprolog-1.2.19.ebuild: + Version bump. Closes #116843 30 Oct 2005; Fabian Groffen <grobian@gentoo.org> +files/gprolog-1.2.16-gcc4.patch, gprolog-1.2.16.ebuild: diff --git a/dev-lang/gprolog/Manifest b/dev-lang/gprolog/Manifest index 95372e45fe02..6b0411826dba 100644 --- a/dev-lang/gprolog/Manifest +++ b/dev-lang/gprolog/Manifest @@ -1,7 +1,27 @@ -MD5 7c537e5e195ee8bf20caab7ca5f62f54 gprolog-1.2.16.ebuild 1105 -MD5 f1f8ec7ca742fbf31d25ed8e65d3b2c3 gprolog-1.2.13.ebuild 1023 MD5 c2374d52c8611546965295863c03621f ChangeLog 987 -MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 -MD5 11cc47f5ddc2ab3660ba5ecb53107af3 files/gprolog-1.2.16-gcc4.patch 1056 +RMD160 e482c4c114e6c604241ad7de7473d79186778e53 ChangeLog 987 +SHA256 cfe520d1e7c27bc16231d7f4554cf0a9d4203c2a935b0f4de53d61da82a011f6 ChangeLog 987 MD5 343cd0728a313eee77e9f5f9c9f74415 files/digest-gprolog-1.2.13 67 +RMD160 674676ec9bbebdb902602e615c9b25293e64bca7 files/digest-gprolog-1.2.13 67 +SHA256 4c4d30815f9c5705ac7ab6ae186285222abaaf1e4ea3d0f12884b0685be91ca4 files/digest-gprolog-1.2.13 67 MD5 dd04de7b5904293113f5838da347c4f9 files/digest-gprolog-1.2.16 67 +RMD160 26ad0bab535844da161e925ce7f9637591b129e9 files/digest-gprolog-1.2.16 67 +SHA256 457faa254c74f0b97680ef40bb6a8743c803502bc54e7e6bb74e417c7aa61eb6 files/digest-gprolog-1.2.16 67 +MD5 f53fc8069c364320b3fc95801c095489 files/digest-gprolog-1.2.19 247 +RMD160 3fb3f41e210382c88656e318ec5c13569e8cb7e6 files/digest-gprolog-1.2.19 247 +SHA256 888053520b8468a32d47e19a448552bb34b4067e3557c31d551011148ba06ba7 files/digest-gprolog-1.2.19 247 +MD5 11cc47f5ddc2ab3660ba5ecb53107af3 files/gprolog-1.2.16-gcc4.patch 1056 +RMD160 78159d40fb9f6e711e51aa86b1dcceef8e6c0800 files/gprolog-1.2.16-gcc4.patch 1056 +SHA256 33aef3b0f53917c4a66049fed0860c85163ea9c4cccdf90c98e13da4f09e5b89 files/gprolog-1.2.16-gcc4.patch 1056 +MD5 f1f8ec7ca742fbf31d25ed8e65d3b2c3 gprolog-1.2.13.ebuild 1023 +RMD160 0fd4613c83476ea5ac26faf4d2d46536c5e5cc86 gprolog-1.2.13.ebuild 1023 +SHA256 79f70aaae76c15a30ad16b7e698a79360c482e720854bb4fbc146558739faa7b gprolog-1.2.13.ebuild 1023 +MD5 7c537e5e195ee8bf20caab7ca5f62f54 gprolog-1.2.16.ebuild 1105 +RMD160 d2943c408ebf5810d218021d920852ad4f3536d3 gprolog-1.2.16.ebuild 1105 +SHA256 88c1bbf4d1faf570047d4fc7d9dbd882a307e930a024a6752f5340ff9c60317e gprolog-1.2.16.ebuild 1105 +MD5 f96fabe793a2e81a6f5b42b6da2e7062 gprolog-1.2.19.ebuild 1821 +RMD160 07039ad13b17926a91b865aff52f51bc4663f499 gprolog-1.2.19.ebuild 1821 +SHA256 c92b78d8d2f392e6be87530f3a98000b22e2dc69bf0ec619bcb2da55a34c8bb6 gprolog-1.2.19.ebuild 1821 +MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 +RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 +SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba metadata.xml 159 diff --git a/dev-lang/gprolog/files/digest-gprolog-1.2.19 b/dev-lang/gprolog/files/digest-gprolog-1.2.19 new file mode 100644 index 000000000000..4c6e06a967e4 --- /dev/null +++ b/dev-lang/gprolog/files/digest-gprolog-1.2.19 @@ -0,0 +1,3 @@ +MD5 f884e48b48a73c0785f2e6441bf5b4d7 gprolog-1.2.19.tar.gz 2690586 +RMD160 07c6c26bf6e2dcbf66bd430f23d4789fd7511227 gprolog-1.2.19.tar.gz 2690586 +SHA256 d98bb71e6c7cbf33931fa3d5e89c7d99ff36343cd1a1ba9c5977a41a94087296 gprolog-1.2.19.tar.gz 2690586 diff --git a/dev-lang/gprolog/files/gprolog-1.2.19-CFLAGS.patch b/dev-lang/gprolog/files/gprolog-1.2.19-CFLAGS.patch new file mode 100644 index 000000000000..71136561c00f --- /dev/null +++ b/dev-lang/gprolog/files/gprolog-1.2.19-CFLAGS.patch @@ -0,0 +1,28 @@ +--- gprolog-1.2.19.orig/src/configure.in 2005-06-14 03:13:41.000000000 +1200 ++++ gprolog-1.2.19/src/configure.in 2005-12-31 18:06:04.000000000 +1300 +@@ -354,7 +354,6 @@ + # * C compiler flags * + # ******************** + +-CFLAGS_MACHINE= + CFLAGS_PREFIX_REG= + + AC_C_INLINE +@@ -388,16 +387,7 @@ + CFLAGS_PREFIX_REG='-ffixed-%s' + CFLAGS_UNSIGNED_CHAR='-funsigned-char' + +- CFLAGS_MACHINE= +- case "$host" in +- mips*irix*) CFLAGS_MACHINE='-march=4000';; +- *sparc*sunos4.1.3) CFLAGS_MACHINE='-msupersparc';; +- *sparc*solaris) CFLAGS_MACHINE='-msupersparc';; +- i686*) CFLAGS_MACHINE='-march=pentiumpro';; +- i586*) CFLAGS_MACHINE='-march=pentium';; +- i*86*) CFLAGS_MACHINE='-march=i486';; +- powerpc*darwin*) CFLAGS_MACHINE='-mpowerpc -no-cpp-precomp';; +- esac ++ CFLAGS_MACHINE="$CFLAGS_MACHINE" + + case "$host" in + i*86*) if test "$USE_EBP" != no; then diff --git a/dev-lang/gprolog/files/gprolog-1.2.19-bootstrap.patch b/dev-lang/gprolog/files/gprolog-1.2.19-bootstrap.patch new file mode 100644 index 000000000000..0eb0e9164484 --- /dev/null +++ b/dev-lang/gprolog/files/gprolog-1.2.19-bootstrap.patch @@ -0,0 +1,94 @@ +diff -ur gprolog-1.2.19.orig/src/BipsFD/Makefile.in gprolog-1.2.19/src/BipsFD/Makefile.in +--- gprolog-1.2.19.orig/src/BipsFD/Makefile.in 2005-06-14 03:13:36.000000000 +1200 ++++ gprolog-1.2.19/src/BipsFD/Makefile.in 2006-03-05 10:06:58.000000000 +1300 +@@ -1,6 +1,6 @@ + LIB_BIPS_FD = @LIB_BIPS_FD@ + LIB_ENGINE_FD = @LIB_ENGINE_FD@ +-GPLC = @GPLC@ ++GPLC = ../TopComp/@GPLC@ + CC = @CC@ + CFLAGS = @CFLAGS@ + AR_RC = @AR_RC@ +diff -ur gprolog-1.2.19.orig/src/BipsPl/Makefile.in gprolog-1.2.19/src/BipsPl/Makefile.in +--- gprolog-1.2.19.orig/src/BipsPl/Makefile.in 2005-06-14 03:13:38.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/Makefile.in 2006-03-05 10:07:17.000000000 +1300 +@@ -3,7 +3,7 @@ + LIB_BIPS_PL = @LIB_BIPS_PL@ + LIB_ENGINE_PL = @LIB_ENGINE_PL@ + LIB_LINEDIT = @LIB_LINEDIT@ +-GPLC = @GPLC@ ++GPLC = ../TopComp/@GPLC@ + CC = @CC@ + CFLAGS = @CFLAGS@ + CFLAGS_UNSIGNED_CHAR = @CFLAGS_UNSIGNED_CHAR@ +diff -ur gprolog-1.2.19.orig/src/EngineFD/Makefile.in gprolog-1.2.19/src/EngineFD/Makefile.in +--- gprolog-1.2.19.orig/src/EngineFD/Makefile.in 2005-06-14 03:13:42.000000000 +1200 ++++ gprolog-1.2.19/src/EngineFD/Makefile.in 2006-03-05 10:07:50.000000000 +1300 +@@ -1,5 +1,5 @@ + LIB_ENGINE_FD = @LIB_ENGINE_FD@ +-GPLC = @GPLC@ ++GPLC = ../TopComp/@GPLC@ + CC = @CC@ + CFLAGS = @CFLAGS@ + AR_RC = @AR_RC@ +diff -ur gprolog-1.2.19.orig/src/EnginePl/Makefile.in gprolog-1.2.19/src/EnginePl/Makefile.in +--- gprolog-1.2.19.orig/src/EnginePl/Makefile.in 2005-06-14 03:13:43.000000000 +1200 ++++ gprolog-1.2.19/src/EnginePl/Makefile.in 2006-03-05 10:06:39.000000000 +1300 +@@ -1,7 +1,7 @@ + ROOT_DIR1 = @ROOT_DIR1@ + TOP_LEVEL = @TOP_LEVEL@ + LIB_ENGINE_PL = @LIB_ENGINE_PL@ +-GPLC = @GPLC@ ++GPLC = ../TopComp/@GPLC@ + CC = @CC@ + CFLAGS = @CFLAGS@ + AR_RC = @AR_RC@ +diff -ur gprolog-1.2.19.orig/src/Fd2C/Makefile.in gprolog-1.2.19/src/Fd2C/Makefile.in +--- gprolog-1.2.19.orig/src/Fd2C/Makefile.in 2005-06-14 03:13:44.000000000 +1200 ++++ gprolog-1.2.19/src/Fd2C/Makefile.in 2006-03-05 10:08:29.000000000 +1300 +@@ -1,4 +1,4 @@ +-GPLC = @GPLC@ ++GPLC = ../TopComp/@GPLC@ + GPLCFLAGS = --fast-math + OBJS = fd2c@OBJ_SUFFIX@ read_file@OBJ_SUFFIX@ parse@OBJ_SUFFIX@ \ + compile@OBJ_SUFFIX@ +diff -ur gprolog-1.2.19.orig/src/Ma2Asm/Makefile.in gprolog-1.2.19/src/Ma2Asm/Makefile.in +--- gprolog-1.2.19.orig/src/Ma2Asm/Makefile.in 2005-06-14 03:13:45.000000000 +1200 ++++ gprolog-1.2.19/src/Ma2Asm/Makefile.in 2006-03-05 10:09:03.000000000 +1300 +@@ -1,4 +1,4 @@ +-GPLC = @GPLC@ ++GPLC = ../TopComp/@GPLC@ + CC = @CC@ + CFLAGS = @CFLAGS@ + +diff -ur gprolog-1.2.19.orig/src/Pl2Wam/Makefile.in gprolog-1.2.19/src/Pl2Wam/Makefile.in +--- gprolog-1.2.19.orig/src/Pl2Wam/Makefile.in 2005-06-14 03:13:46.000000000 +1200 ++++ gprolog-1.2.19/src/Pl2Wam/Makefile.in 2006-03-05 10:09:28.000000000 +1300 +@@ -1,4 +1,4 @@ +-GPLC = @GPLC@ ++GPLC = ../TopComp/@GPLC@ + GPLCFLAGS = --fast-math + OBJS = pl2wam@OBJ_SUFFIX@ read_file@OBJ_SUFFIX@ bip_list@OBJ_SUFFIX@ \ + syn_sugar@OBJ_SUFFIX@ internal@OBJ_SUFFIX@ code_gen@OBJ_SUFFIX@ \ +@@ -58,7 +58,7 @@ + + + make_bip_list@EXE_SUFFIX@: make_bip_list.pl ../Bips??/[a-z]??*.pl +- $(GPLC) -o make_bip_list@EXE_SUFFIX@ make_bip_list.pl ++ ../TopComp/$(GPLC) -o make_bip_list@EXE_SUFFIX@ make_bip_list.pl + ./make_bip_list@EXE_SUFFIX@ >bip_list.pl + make + +diff -ur gprolog-1.2.19.orig/src/TopComp/Makefile.in gprolog-1.2.19/src/TopComp/Makefile.in +--- gprolog-1.2.19.orig/src/TopComp/Makefile.in 2005-06-14 03:13:47.000000000 +1200 ++++ gprolog-1.2.19/src/TopComp/Makefile.in 2006-03-05 10:09:53.000000000 +1300 +@@ -1,7 +1,7 @@ + TOP_LEVEL = @TOP_LEVEL@ + TOP_LEVEL_FLAGS = @TOP_LEVEL_FLAGS@ +-GPLC = @GPLC@ +-HEXGPLC = @HEXGPLC@ ++GPLC = ../TopComp/@GPLC@ ++HEXGPLC = ../TopComp/@HEXGPLC@ + CC = @CC@ + CFLAGS = @CFLAGS@ + LDLIBS = @LDLIBS@ diff --git a/dev-lang/gprolog/files/gprolog-1.2.19-gcc4.patch b/dev-lang/gprolog/files/gprolog-1.2.19-gcc4.patch new file mode 100644 index 000000000000..f56207d306b7 --- /dev/null +++ b/dev-lang/gprolog/files/gprolog-1.2.19-gcc4.patch @@ -0,0 +1,360 @@ +--- gprolog-1.2.19.orig/src/BipsFD/fd_bool_c.c 2005-06-14 03:40:09.000000000 +1200 ++++ gprolog-1.2.19/src/BipsFD/fd_bool_c.c 2006-01-23 09:46:19.000000000 +1300 +@@ -201,6 +201,8 @@ + static void + Fd_Bool_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + bool_tbl[NOT] = Functor_Arity(Create_Atom("#\\"), 1); + + bool_tbl[EQUIV] = Functor_Arity(Create_Atom("#<=>"), 2); +--- gprolog-1.2.19.orig/src/BipsFD/math_supp.c 2005-06-14 03:40:10.000000000 +1200 ++++ gprolog-1.2.19/src/BipsFD/math_supp.c 2006-01-23 09:46:39.000000000 +1300 +@@ -206,6 +206,8 @@ + static void + Math_Supp_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + arith_tbl[PLUS_1] = Functor_Arity(ATOM_CHAR('+'), 1); + arith_tbl[PLUS_2] = Functor_Arity(ATOM_CHAR('+'), 2); + arith_tbl[MINUS_1] = Functor_Arity(ATOM_CHAR('-'), 1); +--- gprolog-1.2.19.orig/src/BipsPl/all_solut_c.c 2005-06-14 03:40:10.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/all_solut_c.c 2006-01-23 09:47:09.000000000 +1300 +@@ -123,6 +123,8 @@ + static void + All_Solut_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + exist_2 = Functor_Arity(ATOM_CHAR('^'), 2); + } + +--- gprolog-1.2.19.orig/src/BipsPl/arith_inl_c.c 2005-06-14 03:40:10.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/arith_inl_c.c 2006-01-23 09:47:20.000000000 +1300 +@@ -99,6 +99,8 @@ + static void + Arith_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + ArithInf arith_info; + + arith_tbl = Hash_Alloc_Table(START_ARITH_TBL_SIZE, sizeof(ArithInf)); +--- gprolog-1.2.19.orig/src/BipsPl/bc_supp.c 2005-06-14 03:40:10.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/bc_supp.c 2006-01-23 09:47:35.000000000 +1300 +@@ -283,6 +283,8 @@ + static void + Byte_Code_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + BCWord *p = op_tbl; + + Op_In_Tbl("get_variable", GET_X_VARIABLE); +--- gprolog-1.2.19.orig/src/BipsPl/debugger_c.c 2005-06-14 03:40:11.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/debugger_c.c 2006-01-23 09:47:53.000000000 +1300 +@@ -164,6 +164,8 @@ + static void + Debug_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + New_Object(My_System_Directives, NULL); + } + +--- gprolog-1.2.19.orig/src/BipsPl/dynam_supp.c 2005-06-14 03:40:11.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/dynam_supp.c 2006-01-23 09:20:39.000000000 +1300 +@@ -601,7 +601,8 @@ + dyn = scan->dyn; + + if (dyn->first_erased_cl) /* we must keep it - free impossible */ +- (unsigned long) (dyn->first_erased_cl) |= 1; /* mark it */ ++ dyn->first_erased_cl = (DynCInf *) ++ ((unsigned long) (dyn->first_erased_cl) | 1); /* mark it */ + } + + +--- gprolog-1.2.19.orig/src/BipsPl/error_supp.c 2005-06-14 03:40:11.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/error_supp.c 2006-01-23 09:48:04.000000000 +1300 +@@ -117,6 +117,8 @@ + static void + Error_Supp_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + type_atom = Create_Atom("atom"); + type_atomic = Create_Atom("atomic"); + type_byte = Create_Atom("byte"); +--- gprolog-1.2.19.orig/src/BipsPl/expand_c.c 2005-06-14 03:40:11.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/expand_c.c 2006-01-23 09:48:16.000000000 +1300 +@@ -92,6 +92,8 @@ + static void + Expand_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + int atom_dcg; + + atom_dcg = Create_Atom("-->"); +--- gprolog-1.2.19.orig/src/BipsPl/flag_c.c 2005-06-14 03:40:11.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/flag_c.c 2006-01-23 09:48:33.000000000 +1300 +@@ -77,7 +77,6 @@ + static int atom_on; + static int atom_off; + +-static int atom_error; + static int atom_warning; + static int atom_fail; + +@@ -118,6 +117,8 @@ + static void + Flag_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + atom_flag_tbl[FLAG_BOUNDED] = Create_Atom("bounded"); + atom_flag_tbl[FLAG_MAX_INTEGER] = Create_Atom("max_integer"); + atom_flag_tbl[FLAG_MIN_INTEGER] = Create_Atom("min_integer"); +--- gprolog-1.2.19.orig/src/BipsPl/foreign_supp.c 2005-06-14 03:40:11.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/foreign_supp.c 2006-01-23 09:48:42.000000000 +1300 +@@ -98,6 +98,8 @@ + static void + Foreign_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + goal_H = H; + H = H + MAX_ARITY + 1; + +--- gprolog-1.2.19.orig/src/BipsPl/g_var_inl_c.c 2005-06-16 05:04:06.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/g_var_inl_c.c 2006-01-23 09:49:06.000000000 +1300 +@@ -167,6 +167,8 @@ + static void + G_Var_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + atom_g_array = Create_Atom("g_array"); + atom_g_array_auto = Create_Atom("g_array_auto"); + atom_g_array_extend = Create_Atom("g_array_extend"); +--- gprolog-1.2.19.orig/src/BipsPl/oper_c.c 2005-06-14 03:40:11.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/oper_c.c 2006-01-23 09:49:19.000000000 +1300 +@@ -86,6 +86,8 @@ + static void + Oper_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + char *a[7] = { "fx", "fy", "xf", "yf", "xfx", "xfy", "yfx" }; + int i; + +--- gprolog-1.2.19.orig/src/BipsPl/os_interf_c.c 2005-06-14 03:40:11.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/os_interf_c.c 2006-01-23 09:49:33.000000000 +1300 +@@ -94,8 +94,6 @@ + + static int atom_dt; + +-static int atom_read; +-static int atom_write; + static int atom_execute; + static int atom_search; + +@@ -138,6 +136,8 @@ + static void + Os_Interf_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + atom_dt = Create_Atom("dt"); + + atom_read = Create_Atom("read"); +--- gprolog-1.2.19.orig/src/BipsPl/parse_supp.c 2005-06-14 03:40:11.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/parse_supp.c 2006-01-23 09:49:53.000000000 +1300 +@@ -124,6 +124,8 @@ + static void + Parse_Supp_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + atom_var = Create_Atom("var"); + atom_string = Create_Atom("string"); + atom_punct = Create_Atom("punct"); +--- gprolog-1.2.19.orig/src/BipsPl/pretty_c.c 2005-06-14 03:40:12.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/pretty_c.c 2006-01-23 09:50:07.000000000 +1300 +@@ -112,6 +112,8 @@ + static void + Pretty_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + atom_clause = Create_Atom(":-"); + atom_dcg = Create_Atom("-->"); + atom_if = Create_Atom("->"); +--- gprolog-1.2.19.orig/src/BipsPl/sockets_c.c 2005-06-14 03:40:12.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/sockets_c.c 2006-01-23 09:50:20.000000000 +1300 +@@ -100,6 +100,8 @@ + static void + Socket_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + #ifdef _WIN32 + WORD versReqstd = MAKEWORD( 2, 2); // Current Winsock 2 DLL's + WSADATA wsaData; +--- gprolog-1.2.19.orig/src/BipsPl/sort_c.c 2005-06-14 03:40:12.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/sort_c.c 2006-01-23 09:50:31.000000000 +1300 +@@ -68,6 +68,8 @@ + static void + Sort_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + minus_2 = Functor_Arity(ATOM_CHAR('-'), 2); + } + +--- gprolog-1.2.19.orig/src/BipsPl/write_supp.c 2005-06-14 03:40:12.000000000 +1200 ++++ gprolog-1.2.19/src/BipsPl/write_supp.c 2006-01-23 09:50:54.000000000 +1300 +@@ -143,6 +143,8 @@ + static void + Write_Supp_Initializer(void) + { ++ SET_OBJ_CHAIN_STOP; ++ + atom_dots = Create_Atom("..."); + + curly_brackets_1 = Functor_Arity(atom_curly_brackets, 1); +--- gprolog-1.2.19.orig/src/EngineFD/fd_inst.h 2005-06-14 03:40:14.000000000 +1200 ++++ gprolog-1.2.19/src/EngineFD/fd_inst.h 2006-01-23 09:52:35.000000000 +1300 +@@ -111,8 +111,8 @@ + + #define CHAIN_RECORD_FRAME_SIZE 2 + +-#define CF_Pointer(rec_adr) ((WamWord *) (rec_adr[0])) +-#define Next_Chain(rec_adr) ((WamWord *) (rec_adr[1])) ++#define CF_Pointer(rec_adr) (*(WamWord **) &(rec_adr[0])) ++#define Next_Chain(rec_adr) (*(WamWord **) &(rec_adr[1])) + + + +@@ -123,9 +123,9 @@ + + #define OFFSET_OF_OPTIM_POINTER 1 /* this offset must corresponds to */ + +-#define AF_Pointer(cf) ((WamWord *) (cf[0])) +-#define Optim_Pointer(cf) ((WamWord *) (cf[1])) /* this cell */ +-#define Cstr_Address(cf) ((long (*)()) (cf[2])) ++#define AF_Pointer(cf) (*(WamWord **) &(cf[0])) ++#define Optim_Pointer(cf) (*(WamWord **) &(cf[1])) /* this cell */ ++#define Cstr_Address(cf) (*(long (**)()) &(cf[2])) + + + +--- gprolog-1.2.19.orig/src/EnginePl/obj_chain.c 2005-06-14 03:40:15.000000000 +1200 ++++ gprolog-1.2.19/src/EnginePl/obj_chain.c 2006-01-23 09:40:36.000000000 +1300 +@@ -24,6 +24,8 @@ + + /* $Id: gprolog-1.2.19-gcc4.patch,v 1.1 2006/03/21 08:28:26 keri Exp $ */ + ++#define OBJ_CHAIN 1 ++ + #include <stdio.h> + + #include "obj_chain.h" +@@ -181,7 +183,7 @@ + { + if (p->magic1 != OBJ_CHAIN_MAGIC_1 || p->magic2 != OBJ_CHAIN_MAGIC_2 + || (q = p->next) < (ObjChain **) &obj_chain_begin +- || q > &obj_chain_end || *q != p) ++ || q > &obj_chain_end) + { + #ifdef DEBUG + #if 0 +--- gprolog-1.2.19.orig/src/EnginePl/obj_chain.h 2005-06-14 03:40:15.000000000 +1200 ++++ gprolog-1.2.19/src/EnginePl/obj_chain.h 2006-01-23 09:31:49.000000000 +1300 +@@ -83,18 +83,24 @@ + #define ATTR_TO_KEEP_UNREF_STATIC_VAR __attribute__ ((unused)) + #endif + ++#ifdef OBJ_CHAIN ++ObjChain *obj_chain_stop_extern = NULL; ++#else ++ + #ifdef OBJ_INIT + + static void (OBJ_INIT) (); + + #ifndef _MSC_VER + +-extern ObjChain *obj_chain_stop; ++static ObjChain obj_chain_start_mark; ++ ++static ObjChain *obj_chain_stop = &obj_chain_start_mark; + + static ObjChain obj_chain_start ATTR_TO_KEEP_UNREF_STATIC_VAR = + { OBJ_CHAIN_MAGIC_1, OBJ_CHAIN_MAGIC_2, &obj_chain_stop, OBJ_INIT }; + +-static ObjChain *obj_chain_stop = &obj_chain_start; ++#define SET_OBJ_CHAIN_STOP {} + + #if 0 /* antoher way to force to keep the chain : a fct using obj_chain_start + which references the initializer function (OBJ_INIT) */ +@@ -114,3 +120,5 @@ + #endif /* _MSC_VER */ + + #endif /* OBJ_INIT */ ++ ++#endif /* OBJ_CHAIN */ +--- gprolog-1.2.19.orig/src/EnginePl/test_oc_defs.h 2005-06-14 03:13:43.000000000 +1200 ++++ gprolog-1.2.19/src/EnginePl/test_oc_defs.h 2006-01-23 09:45:21.000000000 +1300 +@@ -25,6 +25,7 @@ + \ + static void Init_Tables() \ + { \ ++ SET_OBJ_CHAIN_STOP; \ + printf("object <%s> found\n",name); \ + printf(" start at:%#lx\n",(long) &obj_chain_start); \ + printf(" &name:%#lx\n",(long) &name); \ +--- gprolog-1.2.19.orig/src/EnginePl/wam_inst.h 2005-06-14 03:40:15.000000000 +1200 ++++ gprolog-1.2.19/src/EnginePl/wam_inst.h 2006-01-23 09:16:11.000000000 +1300 +@@ -67,10 +67,10 @@ + + #define ENVIR_STATIC_SIZE 3 + +-#define CPE(e) ((WamCont) (e[-1])) +-#define BCIE(e) ((WamWord) (e[-2])) +-#define EE(e) ((WamWord *) (e[-3])) +-#define Y(e, y) ((WamWord) (e[-4 - (y)])) ++#define CPE(e) (*(WamCont *) &(e[-1])) ++#define BCIE(e) (*(WamWord *) &(e[-2])) ++#define EE(e) (*(WamWord **) &(e[-3])) ++#define Y(e, y) (*(WamWord *) &(e[-4 - (y)])) + + #define ENVIR_NAMES {"CPE", "BCIE", "EE"} + +@@ -81,15 +81,15 @@ + + #define CHOICE_STATIC_SIZE 8 + +-#define ALTB(b) ((CodePtr) (b[-1])) +-#define CPB(b) ((WamCont) (b[-2])) +-#define BCIB(b) ((WamWord) (b[-3])) +-#define EB(b) ((WamWord *) (b[-4])) +-#define BB(b) ((WamWord *) (b[-5])) +-#define HB(b) ((WamWord *) (b[-6])) +-#define TRB(b) ((WamWord *) (b[-7])) +-#define CSB(b) ((WamWord *) (b[-8])) +-#define AB(b, a) ((WamWord) (b[-9 - (a)])) ++#define ALTB(b) (*(CodePtr *) &(b[-1])) ++#define CPB(b) (*(WamCont *) &(b[-2])) ++#define BCIB(b) (*(WamWord *) &(b[-3])) ++#define EB(b) (*(WamWord **) &(b[-4])) ++#define BB(b) (*(WamWord **) &(b[-5])) ++#define HB(b) (*(WamWord **) &(b[-6])) ++#define TRB(b) (*(WamWord **) &(b[-7])) ++#define CSB(b) (*(WamWord **) &(b[-8])) ++#define AB(b, a) (*(WamWord *) &(b[-9 - (a)])) + + #define CHOICE_NAMES {"ALTB", "CPB", "BCIB", "EB", "BB", \ + "HB", "TRB", "CSB"} diff --git a/dev-lang/gprolog/files/gprolog-1.2.19-noexecstack.patch b/dev-lang/gprolog/files/gprolog-1.2.19-noexecstack.patch new file mode 100644 index 000000000000..26e2793655b6 --- /dev/null +++ b/dev-lang/gprolog/files/gprolog-1.2.19-noexecstack.patch @@ -0,0 +1,24 @@ +--- gprolog-1.2.19.orig/src/Ma2Asm/ix86_any.c 2005-06-14 03:40:15.000000000 +1200 ++++ gprolog-1.2.19/src/Ma2Asm/ix86_any.c 2006-03-05 09:26:21.000000000 +1300 +@@ -164,6 +164,9 @@ + void + Asm_Stop(void) + { ++ Label_Printf("#ifdef __ELF__"); ++ Label_Printf(".section .note.GNU-stack,\"\",@progbits"); ++ Label_Printf("#endif"); + } + + +--- gprolog-1.2.19.orig/src/Ma2Asm/powerpc_any.c 2005-06-14 03:40:22.000000000 +1200 ++++ gprolog-1.2.19/src/Ma2Asm/powerpc_any.c 2006-03-05 09:40:34.000000000 +1300 +@@ -161,6 +161,9 @@ + void + Asm_Stop(void) + { ++ Label_Printf("#ifdef __ELF__"); ++ Label_Printf(".section .note.GNU-stack,\"\",@progbits"); ++ Label_Printf("#endif"); + } + + diff --git a/dev-lang/gprolog/files/gprolog-1.2.19-test.patch b/dev-lang/gprolog/files/gprolog-1.2.19-test.patch new file mode 100644 index 000000000000..81aba9164ef8 --- /dev/null +++ b/dev-lang/gprolog/files/gprolog-1.2.19-test.patch @@ -0,0 +1,280 @@ +--- gprolog-1.2.19.orig/src/Makefile.in 2005-06-14 03:13:45.000000000 +1200 ++++ gprolog-1.2.19/src/Makefile.in 2006-01-23 11:52:07.000000000 +1300 +@@ -145,7 +145,8 @@ + # --- CHECKS --- # + + check: +- @echo "No checks implemented (yet)." ++ (cd EnginePl; $(MAKE) test_oc) || exit 1 ++ . ./SETVARS; (cd Ma2Asm; $(MAKE) check) || exit 1 + + + # --- CLEAN --- # +--- gprolog-1.2.19.orig/src/EnginePl/Makefile.in 2005-06-14 03:13:43.000000000 +1200 ++++ gprolog-1.2.19/src/EnginePl/Makefile.in 2006-01-23 15:37:43.000000000 +1300 +@@ -134,6 +134,7 @@ + $(CC) @CC_EXE_NAME_OPT@test_oc@EXE_SUFFIX@ obj_begin1@OBJ_SUFFIX@ \ + $(TEST_OC_OBJS) obj_chain1@OBJ_SUFFIX@ test_oc@OBJ_SUFFIX@ \ + obj_end1@OBJ_SUFFIX@ ++ ./test_oc || exit 1 + + clean-test_oc: + rm -f obj_begin1@OBJ_SUFFIX@ obj_chain1@OBJ_SUFFIX@ obj_end1@OBJ_SUFFIX@ \ +--- gprolog-1.2.19.orig/src/Ma2Asm/Makefile.in 2005-06-14 03:13:45.000000000 +1200 ++++ gprolog-1.2.19/src/Ma2Asm/Makefile.in 2006-01-23 13:21:58.000000000 +1300 +@@ -46,19 +46,17 @@ + FC=-DFAST + + check@OBJ_SUFFIX@: check.c +- if [ "$$FC" = "Y" ]; then FCFLAGS='-DFAST'; fi; \ +- $(GPLC) -C "$(CFLAGS) $$FCFLAGS" -c check.c ++ $(GPLC) -C "$(CFLAGS)" -c check.c + + check_ma@ASM_SUFFIX@: check_ma.ma ma2asm@EXE_SUFFIX@ +- if [ "$$FC" = "Y" ]; then cp check_ma.ma tmp.ma; \ +- else sed -e 's/ fast / /' check_ma.ma >tmp.ma; fi; \ +- $(GPLC) -S --comment tmp.ma -o check_ma@ASM_SUFFIX@ ++ $(GPLC) -S --comment check_ma.ma -o check_ma@ASM_SUFFIX@ + + check_ma@OBJ_SUFFIX@: check_ma@ASM_SUFFIX@ + $(GPLC) -c check_ma@ASM_SUFFIX@ + + check@EXE_SUFFIX@: $(CHECK_OBJS) + $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@check@EXE_SUFFIX@ $(CHECK_OBJS) ++ ./check || exit 1 + + clean-check: + rm -f check@OBJ_SUFFIX@ check_ma@ASM_SUFFIX@ check_ma@OBJ_SUFFIX@ check@EXE_SUFFIX@ +--- gprolog-1.2.19.orig/src/Ma2Asm/check.c 2005-06-14 03:40:15.000000000 +1200 ++++ gprolog-1.2.19/src/Ma2Asm/check.c 2006-01-23 21:20:11.000000000 +1300 +@@ -30,24 +30,11 @@ + #define IF_NO_FD_FILE + #include "engine_pl.h" + +-#ifndef FAST /* see Makefile */ +- +-#ifdef FC_USED_TO_COMPILE_CORE +-#warning NO FC ++#ifndef FC_USED_TO_COMPILE_CORE + #undef FC + #define FC + #endif + +-#elif !defined(FC_USED_TO_COMPILE_CORE) +- +-#error FAST defined but cannot compile for FC +- +-#else +- +-#warning WITH FC +- +-#endif +- + /*---------------------------------* + * Constants * + *---------------------------------*/ +@@ -272,7 +259,7 @@ + + + +-void ++void FC + Allocate(int x) /* only to update the register for E */ + { + } +@@ -398,7 +385,7 @@ + + void FC test_call_c1(void); + +-void ++void FC + test_call_c1(void) + { + x++; +@@ -456,7 +443,7 @@ + + void FC test_arg_int1(int a, int b, int c, int d); + +-void ++void FC + test_arg_int1(int a, int b, int c, int d) + { + if (a != 12 || b != -1 || c != 4095 || d != 123456789) +@@ -480,7 +467,7 @@ + + void FC test_arg_double1(double a, double b, double c); + +-void ++void FC + test_arg_double1(double a, double b, double c) + { + if (a != 12.456 || b != -1.3e-102 || c != -3.141593) +@@ -504,7 +491,7 @@ + + void FC test_arg_string1(char *a, char *b); + +-void ++void FC + test_arg_string1(char *a, char *b) + { + #ifdef DEBUG +@@ -533,7 +520,7 @@ + + void FC test_arg_mem_l1(long a, long b, long *c, long d, long e, long *f); + +-void ++void FC + test_arg_mem_l1(long a, long b, long *c, long d, long e, long *f) + { + if (a != 128 || b != 12345 || c != (long *) test_arg_mem_l +@@ -560,7 +547,7 @@ + + void FC test_arg_x1(WamWord a, WamWord *b, WamWord c, WamWord *d); + +-void ++void FC + test_arg_x1(WamWord a, WamWord *b, WamWord c, WamWord *d) + { + if (a != 123987 || b != &X(0) || c != 987654321 || d != &X(128)) +@@ -586,7 +573,7 @@ + + void FC test_arg_y1(WamWord a, WamWord *b, WamWord c, WamWord *d); + +-void ++void FC + test_arg_y1(WamWord a, WamWord *b, WamWord c, WamWord *d) + { + if (a != 1928374 || b != &Y(E, 0) || c != 456789 || d != &Y(E, 6)) +@@ -613,7 +600,7 @@ + + void FC test_arg_fl_array1(long a, long b, long *c, long *d); + +-void ++void FC + test_arg_fl_array1(long a, long b, long *c, long *d) + { + #ifdef DEBUG +@@ -645,7 +632,7 @@ + + void FC test_arg_fd_array1(double a, double b, double *c, double *d); + +-void ++void FC + test_arg_fd_array1(double a, double b, double *c, double *d) + { + if (a != 1.2e30 || b != -1.234567 || c != foreign_double +@@ -684,7 +671,7 @@ + WamWord k, WamWord *l, WamWord m, WamWord *n, + double o); + +-void ++void FC + test_call_c_lot_args1(WamWord n0, WamWord n1, WamWord n2, WamWord n3, + WamWord n4, WamWord n5, + void (*a) (), long b, int c, int d, double e, char *f, +@@ -716,7 +703,7 @@ + + long FC test_jump_ret1(long addr); + +-long ++long FC + test_jump_ret1(long addr) + { + #ifdef DEBUG +@@ -733,7 +720,7 @@ + + void FC test_jump_ret2(void); + +-void ++void FC + test_jump_ret2(void) + { + #ifdef DEBUG +@@ -762,7 +749,7 @@ + + int FC test_fail_ret1(void); + +-int ++int FC + test_fail_ret1(void) + { + x++; +@@ -816,7 +803,7 @@ + + long FC test_move_ret_x1(void); + +-long ++long FC + test_move_ret_x1(void) + { + x++; +@@ -843,7 +830,7 @@ + + long FC test_move_ret_y1(void); + +-long ++long FC + test_move_ret_y1(void) + { + x++; +@@ -870,7 +857,7 @@ + + long FC test_move_ret_fl1(void); + +-long ++long FC + test_move_ret_fl1(void) + { + x++; +@@ -897,7 +884,7 @@ + + double FC test_move_ret_fd1(void); + +-double ++double FC + test_move_ret_fd1(void) + { + x++; +@@ -922,7 +909,7 @@ + + long FC test_switch_ret1(void); + +-long ++long FC + test_switch_ret1(void) + { + return swt[i]; +@@ -931,7 +918,7 @@ + + void FC test_switch_ret2(int k); + +-void ++void FC + test_switch_ret2(int k) + { + if (k != i) +@@ -968,13 +955,13 @@ + Fd_Init_Engine(void) + { + } +-int ++int FC + Create_Atom(char *name) + { + return 1; + } + +-PredInf * ++PredInf * FC + Lookup_Pred(int func, int arity) + { + return NULL; +@@ -985,7 +972,7 @@ + { + } + AtomInf atom_tbl[1]; +-void ++void FC + Create_Choice_Point(CodePtr codep_alt, int arity) + { + } diff --git a/dev-lang/gprolog/gprolog-1.2.19.ebuild b/dev-lang/gprolog/gprolog-1.2.19.ebuild new file mode 100644 index 000000000000..a959beb32efd --- /dev/null +++ b/dev-lang/gprolog/gprolog-1.2.19.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gprolog/gprolog-1.2.19.ebuild,v 1.1 2006/03/21 08:28:26 keri Exp $ + +inherit autotools eutils flag-o-matic + +IUSE="doc" + +DEPEND="virtual/libc" + +DESCRIPTION="GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD)" +HOMEPAGE="http://pauillac.inria.fr/~diaz/gnu-prolog/" +SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/contraintes/${PN}/unstable/${P}.tar.gz" +S=${WORKDIR}/${P}/src + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~ppc ~x86" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/"${P}"-CFLAGS.patch + epatch "${FILESDIR}"/"${P}"-bootstrap.patch + epatch "${FILESDIR}"/"${P}"-gcc4.patch + epatch "${FILESDIR}"/"${P}"-noexecstack.patch + epatch "${FILESDIR}"/"${P}"-test.patch + sed -i -e "s:TXT_FILES = @TXT_FILES@:TXT_FILES=:" Makefile.in +} + +src_compile() { + eautoconf + + CFLAGS_MACHINE="`get-flag -march`" + CFLAGS_MACHINE="${CFLAGS_MACHINE} `get-flag -mcpu`" + CFLAGS_MACHINE="${CFLAGS_MACHINE} `get-flag -mtune`" + + filter-flags ${CFLAGS_MACHINE} + + local myconf + + if [[ $(gcc-major-version) == "4" ]] ; then + append-flags "-O0" + myconf="${myconf} --disable-fast-call" + fi + + CFLAGS_MACHINE="${CFLAGS_MACHINE}" \ + econf \ + ${myconf} \ + --with-c-flags="${CFLAGS}" \ + --with-install-dir="${D}"/usr \ + || die "econf failed" + + emake -j1 || die "emake failed" +} + +src_install() { + make install-system || die "make install-system failed" + + if use doc; then + make DOC_DIR=/"${D}"/usr/share/doc/"${P}" \ + install-doc || die "make install-doc failed" + make HTML_DIR="${D}"/usr/share/doc/"${P}"/html \ + install-html || die "make install-html failed" + make EXAMPLES_DIR="${D}"/usr/share/"${P}"/examples \ + install-examples || die "make install-examples failed" + fi + + cd ${S}/.. + dodoc ChangeLog INSTALL NEWS PROBLEMS README VERSION +} |