Fix gmodule issues on fbsd; bug #184301

Package-Manager: portage-2.1.3_rc6

4 files changed, 45 insertions, 13 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 12ba85159bd0..eb5ffa19cf80 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.267 2007/06/27 15:28:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.268 2007/07/06 00:31:30 dang Exp $
+
+  06 Jul 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/glib-2.12.12-fbsd.patch, glib-2.12.12.ebuild:
+  Fix gmodule issues on fbsd; bug #184301
 
   27 Jun 2007; Mike Frysinger <vapier@gentoo.org>
   +files/glib-1.2.10-automake.patch, glib-1.2.10-r5.ebuild:
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 750b72a7e044..d32b8f2305e8 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -21,6 +21,10 @@ AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f7731183
 MD5 e6b77b46d340163d9b2efa6a8cb38dde files/glib-2.10.3-ia64-atomic-ops.patch 1058
 RMD160 066e63a99739dc412fbed7f773118323f53ea774 files/glib-2.10.3-ia64-atomic-ops.patch 1058
 SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8 files/glib-2.10.3-ia64-atomic-ops.patch 1058
+AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d
+MD5 831dac56c783b4a1aa762e5e1a5e1f52 files/glib-2.12.12-fbsd.patch 668
+RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 files/glib-2.12.12-fbsd.patch 668
+SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d files/glib-2.12.12-fbsd.patch 668
 AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
 MD5 7fec226893c96f1126810906e2fb3e5b files/glib-2.6.3-testglib-ssp.patch 344
 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 files/glib-2.6.3-testglib-ssp.patch 344
@@ -52,10 +56,10 @@ EBUILD glib-2.12.11.ebuild 2074 RMD160 888b2dfa68f5d1e2d67f0f67d162deb7510bac50
 MD5 8d8717a2ae903d355c0327566c0dc9ca glib-2.12.11.ebuild 2074
 RMD160 888b2dfa68f5d1e2d67f0f67d162deb7510bac50 glib-2.12.11.ebuild 2074
 SHA256 b5c9db1e1a0300ed2d29291dfba85c305e3d7acd5cc9bdb67c424ee7c17c78d5 glib-2.12.11.ebuild 2074
-EBUILD glib-2.12.12.ebuild 2129 RMD160 d8868ac99f7e21b5b21bde224044baded812bf78 SHA1 645c11ec7b8d5971735f93c651c0fd0fb25976cb SHA256 d1c5a8510e242edb742e512c0ac7dc0c0e24dd95e11b0d05cd8ff6eea94bbbcc
-MD5 3f0d1720ce2870eb3acf59186e480188 glib-2.12.12.ebuild 2129
-RMD160 d8868ac99f7e21b5b21bde224044baded812bf78 glib-2.12.12.ebuild 2129
-SHA256 d1c5a8510e242edb742e512c0ac7dc0c0e24dd95e11b0d05cd8ff6eea94bbbcc glib-2.12.12.ebuild 2129
+EBUILD glib-2.12.12.ebuild 2211 RMD160 d30d0ea79edb4c861607b48649408b061d18e969 SHA1 90e6e28d7d3d7ec654fa8422fc8273baf29ab559 SHA256 11e8ee9ac3860e68bed4475b844dec657e471b5b55ffc924b665b8f53dc35f27
+MD5 5c9e63def13b442b1287ec7421d4b0a4 glib-2.12.12.ebuild 2211
+RMD160 d30d0ea79edb4c861607b48649408b061d18e969 glib-2.12.12.ebuild 2211
+SHA256 11e8ee9ac3860e68bed4475b844dec657e471b5b55ffc924b665b8f53dc35f27 glib-2.12.12.ebuild 2211
 EBUILD glib-2.12.9.ebuild 2072 RMD160 f961e74a9e8cdb272c84b7c9edec176d7bfee5c3 SHA1 2c7df6129387f286b7dca57236107f7911651d39 SHA256 11397dc08a8abcd765c6ceeb64d320eb151b5facb4f68859393fcf51fe6ecbb0
 MD5 ee1215cfbe188f97d11aa86bbb32fd16 glib-2.12.9.ebuild 2072
 RMD160 f961e74a9e8cdb272c84b7c9edec176d7bfee5c3 glib-2.12.9.ebuild 2072
@@ -64,10 +68,10 @@ EBUILD glib-2.8.6.ebuild 1586 RMD160 5f33daf4eb864f33d091baa7e9eb038a4ced9705 SH
 MD5 86a8a7a320663e2e62d3e5d655caa664 glib-2.8.6.ebuild 1586
 RMD160 5f33daf4eb864f33d091baa7e9eb038a4ced9705 glib-2.8.6.ebuild 1586
 SHA256 0e8d42185e9bbee3008004bd262ca31e98b69a150a455a3a1c52ad227d95d584 glib-2.8.6.ebuild 1586
-MISC ChangeLog 31977 RMD160 ed0cb0e0953248633a98b50a938d71e3d6cbbba2 SHA1 5596dfcbbf7052852fbfcd3a6a6fcedb2e7d8d67 SHA256 d8e8cea65e956e02e26182df2ec121c5c3720a9ac2da616fb17224dd0110ed44
-MD5 d4856cda94ce6f501c1df3c899714bc2 ChangeLog 31977
-RMD160 ed0cb0e0953248633a98b50a938d71e3d6cbbba2 ChangeLog 31977
-SHA256 d8e8cea65e956e02e26182df2ec121c5c3720a9ac2da616fb17224dd0110ed44 ChangeLog 31977
+MISC ChangeLog 32124 RMD160 09da0f8e8b4435631dd3c95c1a7a9932cb61cd76 SHA1 3625aff4fdb10bd746a23ea4a6c4109fd032f1cf SHA256 c097558a250783802ee7608c872a52991f9f31ba0ae4996171450072631135d9
+MD5 bb9df8a2e68a802b5978b3e41b3b77ff ChangeLog 32124
+RMD160 09da0f8e8b4435631dd3c95c1a7a9932cb61cd76 ChangeLog 32124
+SHA256 c097558a250783802ee7608c872a52991f9f31ba0ae4996171450072631135d9 ChangeLog 32124
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -96,7 +100,7 @@ SHA256 30e7d4f7ac387cfa98e6c775cf1888a204523c609bc32d90ff24b7ff0900efc3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGgoJZp/wUKkr7RBoRAk6xAJ4tvILZMOcnpq5kLMbmR3UzAzCoKACdFzMa
-5b/f2kiF4I+EHf0tpPyez/w=
-=P4Ec
+iD8DBQFGjY1yomPajV0RnrERAneHAJ9xMbq1TNhJcDqL4qfBNLKOfYdPrgCfT+Jf
+u5DI/AfCZJ9WKNM5T1zEsDs=
+=aD5I
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
new file mode 100644
index 000000000000..bba632964ede
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
@@ -0,0 +1,21 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c
+--- glib-2.12.12.orig/gmodule/gmodule-dl.c	2007-05-01 19:12:40.000000000 -0400
++++ glib-2.12.12/gmodule/gmodule-dl.c	2007-07-05 20:10:51.000000000 -0400
+@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name,
+ static gpointer
+ _g_module_self (void)
+ {
++#ifndef __FreeBSD__
+   gpointer handle;
+   
+   /* to query symbols from the program itself, special link options
+@@ -117,6 +118,9 @@ _g_module_self (void)
+     g_module_set_error (fetch_dlerror (TRUE));
+   
+   return handle;
++#else
++  return RTLD_DEFAULT;
++#endif
+ }
+ 
+ static void
diff --git a/dev-libs/glib/glib-2.12.12.ebuild b/dev-libs/glib/glib-2.12.12.ebuild
index 2ec63e78c444..1180ff873dea 100644
--- a/dev-libs/glib/glib-2.12.12.ebuild
+++ b/dev-libs/glib/glib-2.12.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.12.ebuild,v 1.2 2007/06/05 19:06:25 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.12.12.ebuild,v 1.3 2007/07/06 00:31:30 dang Exp $
 
 inherit gnome.org libtool eutils flag-o-matic
 
@@ -42,6 +42,9 @@ src_unpack() {
 		fi
 	fi
 
+	# Fix gmodule issues on fbsd; bug #184301
+	epatch "${FILESDIR}"/${P}-fbsd.patch
+
 	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
 }