| 1 |
markusle 09/08/26 02:46:16 |
| 2 |
|
| 3 |
Added: gdl-0.9_rc2-gcc4.4.patch gdl-0.9_rc2-antlr.patch |
| 4 |
Log: |
| 5 |
Version bump and fixed hdf5 issue (#275388) as well as collision with antlr (#267671). |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-lang/gdl/files/gdl-0.9_rc2-gcc4.4.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc2-gcc4.4.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc2-gcc4.4.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gdl-0.9_rc2-gcc4.4.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur gdl-0.9rc2/src/envt.hpp gdl-0.9rc2.new/src/envt.hpp |
| 17 |
--- gdl-0.9rc2/src/envt.hpp 2009-01-20 14:33:56.000000000 -0500 |
| 18 |
+++ gdl-0.9rc2.new/src/envt.hpp 2009-08-25 22:18:44.000000000 -0400 |
| 19 |
@@ -508,6 +508,8 @@ |
| 20 |
void AssureStringScalarPar( SizeT ix, DString& scalar); |
| 21 |
|
| 22 |
// to be extended on demand for other data types |
| 23 |
+ |
| 24 |
+ friend class DInterpreter; |
| 25 |
}; |
| 26 |
|
| 27 |
|
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
1.1 dev-lang/gdl/files/gdl-0.9_rc2-antlr.patch |
| 32 |
|
| 33 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc2-antlr.patch?rev=1.1&view=markup |
| 34 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/gdl/files/gdl-0.9_rc2-antlr.patch?rev=1.1&content-type=text/plain |
| 35 |
|
| 36 |
Index: gdl-0.9_rc2-antlr.patch |
| 37 |
=================================================================== |
| 38 |
diff -Naur gdl-0.9rc2/configure.in gdl-0.9rc2.new/configure.in |
| 39 |
--- gdl-0.9rc2/configure.in 2009-01-22 17:31:48.000000000 -0500 |
| 40 |
+++ gdl-0.9rc2.new/configure.in 2009-08-25 18:38:10.000000000 -0400 |
| 41 |
@@ -755,7 +755,7 @@ |
| 42 |
dnl perform program name transformation |
| 43 |
dnl AC_ARG_PROGRAM |
| 44 |
|
| 45 |
-AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile) |
| 46 |
+AC_CONFIG_FILES(Makefile src/Makefile) |
| 47 |
|
| 48 |
AC_OUTPUT |
| 49 |
|
| 50 |
diff -Naur gdl-0.9rc2/src/Makefile.am gdl-0.9rc2.new/src/Makefile.am |
| 51 |
--- gdl-0.9rc2/src/Makefile.am 2009-01-20 14:33:56.000000000 -0500 |
| 52 |
+++ gdl-0.9rc2.new/src/Makefile.am 2009-08-25 21:36:55.000000000 -0400 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# set the include path found by configure |
| 55 |
INCLUDES = $(EXT_INCLUDES) $(all_includes) |
| 56 |
-SUBDIRS = antlr |
| 57 |
+SUBDIRS = |
| 58 |
noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp |
| 59 |
|
| 60 |
cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \ |
| 61 |
@@ -53,7 +53,7 @@ |
| 62 |
gdl_CXXFLAGS = $(AM_CXXFLAGS) |
| 63 |
# the library search path. |
| 64 |
gdl_LDFLAGS = $(all_libraries) |
| 65 |
-gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 |
| 66 |
+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 |
| 67 |
endif |
| 68 |
|
| 69 |
# build as library (for python module) |
| 70 |
@@ -69,6 +69,6 @@ |
| 71 |
libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs |
| 72 |
endif |
| 73 |
|
| 74 |
-libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 |
| 75 |
+libgdl_la_LIBADD = -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 |
| 76 |
endif |
Archives