OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Jun-2004 17:33:46
Branch: HEAD Handle: 2004060516334600
Added files:
openpkg-src/glib2 glib2.patch
Modified files:
openpkg-src/glib2 glib2.spec
Log:
repair flawed configure script test for C++ preprocessor using a
substitution instead of a patch for future maintenance
Summary:
Revision Changes Path
1.1 +20 -0 openpkg-src/glib2/glib2.patch
1.37 +2 -1 openpkg-src/glib2/glib2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/glib2/glib2.patch
============================================================================
$ cvs diff -u -r0 -r1.1 glib2.patch
--- /dev/null 2004-06-05 17:33:46.000000000 +0200
+++ glib2.patch 2004-06-05 17:33:46.000000000 +0200
@@ -0,0 +1,20 @@
+--- gmodule/gmodule-dl.c.orig Sat Feb 17 08:28:07 2001
++++ gmodule/gmodule-dl.c Fri Jan 18 09:48:45 2002
+@@ -104,6 +104,7 @@
+ static gpointer
+ _g_module_self (void)
+ {
++#ifndef __FreeBSD__
+ gpointer handle;
+
+ /* to query symbols from the program itself, special link options
+@@ -115,6 +116,9 @@
+ g_module_set_error (fetch_dlerror (TRUE));
+
+ return handle;
++#else
++ return RTLD_DEFAULT;
++#endif
+ }
+
+ static void
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/glib2/glib2.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 glib2.spec
--- openpkg-src/glib2/glib2.spec 4 Jun 2004 17:40:00 -0000 1.36
+++ openpkg-src/glib2/glib2.spec 5 Jun 2004 15:33:46 -0000 1.37
@@ -38,7 +38,7 @@
Group: Algorithm
License: GPL
Version: %{V_glib2_major}.%{V_glib2_minor}
-Release: 20040604
+Release: 20040605
# package options
%option with_threads no
@@ -78,6 +78,7 @@
%{l_shtool} subst \
-e 's;\$export_dynamic_flag_spec;;g' \
-e 's;eval echo \\\\;eval echo ;' \
+ -e '/LINENO: error: C\+\+ preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
%{l_shtool} subst \
-e 's;/glib-2\.0;/glib2;g' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
