diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2010-02-27 05:28:17 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2010-02-27 05:28:17 +0000 |
| commit | 8ccbe9f1fbee8b01556ae551fa6f874c7e6b3e54 (patch) | |
| tree | 5ffa3b5380fa833aac8ab20466532c03a91ce4e5 /dev-lang/gdl | |
| parent | Added patch for missing gcc headers (fixes #306437). (diff) | |
| download | gentoo-2-8ccbe9f1fbee8b01556ae551fa6f874c7e6b3e54.tar.gz gentoo-2-8ccbe9f1fbee8b01556ae551fa6f874c7e6b3e54.tar.bz2 gentoo-2-8ccbe9f1fbee8b01556ae551fa6f874c7e6b3e54.zip | |
Fixed libantlr issue (see bug #286630).
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/gdl')
| -rw-r--r-- | dev-lang/gdl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch | 4 | ||||
| -rw-r--r-- | dev-lang/gdl/gdl-0.9_rc4.ebuild | 10 |
3 files changed, 16 insertions, 5 deletions
diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog index 1cad2f639b75..dde2e615399d 100644 --- a/dev-lang/gdl/ChangeLog +++ b/dev-lang/gdl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/gdl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.18 2010/02/27 05:03:45 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.19 2010/02/27 05:28:16 markusle Exp $ + + 27 Feb 2010; Markus Dittrich <markusle@gentoo.org> gdl-0.9_rc4.ebuild, + files/gdl-0.9_rc4-antlr.patch: + Fixed libantlr issue (see bug #286630). + Thanks much to Jan Kohnert for tracking this down. 27 Feb 2010; Markus Dittrich <markusle@gentoo.org> gdl-0.9_rc4.ebuild, +files/gdl-0.9_rc4-gcc4.3.patch: diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch b/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch index 47baaebd8cac..ab1ba5ee5431 100644 --- a/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch +++ b/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch @@ -26,7 +26,7 @@ diff -Naur gdl-0.9rc4/src/Makefile.am gdl-0.9rc4.new/src/Makefile.am # the library search path. gdl_LDFLAGS = $(all_libraries) -gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ++gdl_LDADD = ANTLR_LIB -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 endif # build as library (for python module) @@ -35,6 +35,6 @@ diff -Naur gdl-0.9rc4/src/Makefile.am gdl-0.9rc4.new/src/Makefile.am endif -libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 -+libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 ++libgdl_la_LIBADD = ANTLR_LIB -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 endif diff --git a/dev-lang/gdl/gdl-0.9_rc4.ebuild b/dev-lang/gdl/gdl-0.9_rc4.ebuild index c501e307a012..d71db6298153 100644 --- a/dev-lang/gdl/gdl-0.9_rc4.ebuild +++ b/dev-lang/gdl/gdl-0.9_rc4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.4 2010/02/27 05:03:45 markusle Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.5 2010/02/27 05:28:16 markusle Exp $ EAPI="2" -inherit eutils flag-o-matic autotools +inherit eutils flag-o-matic autotools multilib MYP=${P/_/} DESCRIPTION="An Interactive Data Language compatible incremental compiler" @@ -46,6 +46,12 @@ src_prepare() { # adjust the *.pro file install path sed -i -e "s:datasubdir=.*$:datasubdir=\"${PN}\":" configure.in \ || die "Failed to fix *.pro install patch." + + # set path to libantlr. Note that we need to explicitly link against + # libantlr.a since kde-sdk provides libantlr.so which we can not + # use (see bug #286630). + sed -i -e "s:ANTLR_LIB:/usr/$(get_libdir)/libantlr.a:" src/Makefile.am \ + || die "Failed to adjust link to libantlr." eautoreconf } |