summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeri Harris <keri@gentoo.org>2010-10-23 20:55:08 +0000
committerKeri Harris <keri@gentoo.org>2010-10-23 20:55:08 +0000
commit20c941ef0349d1d581d00828cbddb0d380c67e34 (patch)
treea73cb47dd013e250d173905ed2174983d6031e84 /dev-lang/yap
parentDEPEND on font-util in fonts. That should fix bugs #338411 and #313595. (diff)
downloadgentoo-2-20c941ef0349d1d581d00828cbddb0d380c67e34.tar.gz
gentoo-2-20c941ef0349d1d581d00828cbddb0d380c67e34.tar.bz2
gentoo-2-20c941ef0349d1d581d00828cbddb0d380c67e34.zip
Enable Prolog engine to bootstrap with gcc-4.5; QA tidyup - include config.h when compiling SWI packages
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/yap')
-rw-r--r--dev-lang/yap/ChangeLog7
-rw-r--r--dev-lang/yap/files/yap-6.2.0-have-config.patch36
-rw-r--r--dev-lang/yap/yap-6.2.0.ebuild7
3 files changed, 47 insertions, 3 deletions
diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index aa22b1f9c6fe..ca3c50ed62ed 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/yap
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.41 2010/10/19 06:50:34 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/ChangeLog,v 1.42 2010/10/23 20:55:08 keri Exp $
+
+ 23 Oct 2010; <keri@gentoo.org> yap-6.2.0.ebuild,
+ +files/yap-6.2.0-have-config.patch:
+ Enable Prolog engine to bootstrap with gcc-4.5; QA tidyup - include
+ config.h when compiling SWI packages
*yap-6.2.0 (19 Oct 2010)
diff --git a/dev-lang/yap/files/yap-6.2.0-have-config.patch b/dev-lang/yap/files/yap-6.2.0-have-config.patch
new file mode 100644
index 000000000000..56433d6bf551
--- /dev/null
+++ b/dev-lang/yap/files/yap-6.2.0-have-config.patch
@@ -0,0 +1,36 @@
+diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in
+--- yap-6.orig/packages/PLStream/Makefile.in 2010-10-19 20:40:59.000000000 +1300
++++ yap-6/packages/PLStream/Makefile.in 2010-10-19 20:40:04.000000000 +1300
+@@ -20,7 +20,7 @@
+ #
+ #
+ CC=@CC@
+-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
++CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -DHAVE_CONFIG_H=1 -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+ LDFLAGS=@LDFLAGS@
+ #
+ #
+diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in
+--- yap-6.orig/packages/semweb/Makefile.in 2010-10-19 20:40:59.000000000 +1300
++++ yap-6/packages/semweb/Makefile.in 2010-10-19 20:40:24.000000000 +1300
+@@ -37,7 +37,7 @@
+ #
+ #
+ CC=@CC@
+-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
++CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -DHAVE_CONFIG_H=1 -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+ MKINDEX=true
+
+
+diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in
+--- yap-6.orig/packages/sgml/Makefile.in 2010-10-19 20:40:59.000000000 +1300
++++ yap-6/packages/sgml/Makefile.in 2010-10-19 20:40:45.000000000 +1300
+@@ -29,7 +29,7 @@
+ #
+ #
+ CC=@CC@
+-CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
++CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -DHAVE_CONFIG_H=1 -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+ LDFLAGS=@LDFLAGS@
+ MKINDEX=true
+
diff --git a/dev-lang/yap/yap-6.2.0.ebuild b/dev-lang/yap/yap-6.2.0.ebuild
index c0ed81d5ab18..95074786b5e9 100644
--- a/dev-lang/yap/yap-6.2.0.ebuild
+++ b/dev-lang/yap/yap-6.2.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0.ebuild,v 1.1 2010/10/19 06:50:34 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yap/yap-6.2.0.ebuild,v 1.2 2010/10/23 20:55:08 keri Exp $
-inherit eutils java-pkg-opt-2
+inherit eutils flag-o-matic java-pkg-opt-2
DESCRIPTION="YAP is a high-performance Prolog compiler."
HOMEPAGE="http://www.ncc.up.pt/~vsc/Yap/"
@@ -33,10 +33,13 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-yapsharedir.patch
epatch "${FILESDIR}"/${P}-ldflags.patch
+ epatch "${FILESDIR}"/${P}-have-config.patch
epatch "${FILESDIR}"/${P}-chr-sublist.patch
}
src_compile() {
+ append-flags -fno-strict-aliasing
+
local myddas_conf
if use mysql || use odbc; then
myddas_conf="--enable-myddas \