* [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: gdl-0.9_rc4-antlr.patch
@ 2010-02-05 4:22 Markus Dittrich (markusle)
0 siblings, 0 replies; 2+ messages in thread
From: Markus Dittrich (markusle) @ 2010-02-05 4:22 UTC (permalink / raw
To: gentoo-commits
markusle 10/02/05 04:22:46
Added: gdl-0.9_rc4-antlr.patch
Log:
Version bump.
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch?rev=1.1&content-type=text/plain
Index: gdl-0.9_rc4-antlr.patch
===================================================================
diff -Naur gdl-0.9rc4/configure.in gdl-0.9rc4.new/configure.in
--- gdl-0.9rc4/configure.in 2010-02-02 13:13:51.000000000 -0500
+++ gdl-0.9rc4.new/configure.in 2010-02-04 22:39:56.000000000 -0500
@@ -989,7 +989,7 @@
dnl perform program name transformation
dnl AC_ARG_PROGRAM
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
AC_OUTPUT
dnl == summary table =======================================
diff -Naur gdl-0.9rc4/src/Makefile.am gdl-0.9rc4.new/src/Makefile.am
--- gdl-0.9rc4/src/Makefile.am 2010-02-02 13:13:51.000000000 -0500
+++ gdl-0.9rc4.new/src/Makefile.am 2010-02-04 22:40:42.000000000 -0500
@@ -1,6 +1,6 @@
# set the include path found by configure
INCLUDES = $(EXT_INCLUDES) $(all_includes)
-SUBDIRS = antlr pro
+SUBDIRS = pro
noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
@@ -56,7 +56,7 @@
gdl_CXXFLAGS = $(AM_CXXFLAGS)
# 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
endif
# build as library (for python module)
@@ -72,6 +72,6 @@
libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
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
endif
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: gdl-0.9_rc4-antlr.patch
@ 2010-02-27 5:28 Markus Dittrich (markusle)
0 siblings, 0 replies; 2+ messages in thread
From: Markus Dittrich (markusle) @ 2010-02-27 5:28 UTC (permalink / raw
To: gentoo-commits
markusle 10/02/27 05:28:18
Modified: gdl-0.9_rc4-antlr.patch
Log:
Fixed libantlr issue (see bug #286630).
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch?r1=1.1&r2=1.2
Index: gdl-0.9_rc4-antlr.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdl-0.9_rc4-antlr.patch 5 Feb 2010 04:22:46 -0000 1.1
+++ gdl-0.9_rc4-antlr.patch 27 Feb 2010 05:28:17 -0000 1.2
@@ -26,7 +26,7 @@
# 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 @@
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-27 5:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-27 5:28 [gentoo-commits] gentoo-x86 commit in dev-lang/gdl/files: gdl-0.9_rc4-antlr.patch Markus Dittrich (markusle)
-- strict thread matches above, loose matches on Subject: below --
2010-02-05 4:22 Markus Dittrich (markusle)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox