diff options
| author | drochner <drochner@pkgsrc.org> | 2007-10-29 19:15:24 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2007-10-29 19:15:24 +0000 |
| commit | 0477d0493e8ffb78a1f6f71331f218f94227103a (patch) | |
| tree | ea9542535b1c1bdca3d74258cd9a00b7db553a1c /devel | |
| parent | 8a6f2cd900a7e6aefb206df25768a4edde967be9 (diff) | |
| download | pkgsrc-0477d0493e8ffb78a1f6f71331f218f94227103a.tar.gz | |
fix the check for NetBSD's broken dlopen(NULL):
-"configure" decided to add libintl to LDFLAGS per default, this made
the test for libintl.so/gettext always succeed. Use libm.so/sin
for the test instead.
-Fix a trivial typo introduced recently which caused the test result
to be ignored.
Now some applications behave better, but not perfect because jmmv's
workaround can't deal with libraries loaded by dlopen'd objects.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib2/distinfo | 4 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-aa | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 91b1ce6fc94..88b61668c9f 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.86 2007/10/26 16:08:43 wiz Exp $ +$NetBSD: distinfo,v 1.87 2007/10/29 19:15:24 drochner Exp $ SHA1 (glib-2.14.2.tar.bz2) = 0711f1e8abf6a052aa298bcb1350bcf2195da6e4 RMD160 (glib-2.14.2.tar.bz2) = 23a1f83abdd7de9863bd02e4a75396ea75918810 Size (glib-2.14.2.tar.bz2) = 3340273 bytes -SHA1 (patch-aa) = 8acedc299708d0640959840be0b435daa62e292c +SHA1 (patch-aa) = 92c69cf8dbe064ef40a4022415b1d8e44f4aac73 SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa index 4e525680f8e..a46f57b4ff7 100644 --- a/devel/glib2/patches/patch-aa +++ b/devel/glib2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.35 2007/09/18 17:37:02 tnn Exp $ +$NetBSD: patch-aa,v 1.36 2007/10/29 19:15:24 drochner Exp $ --- configure.orig 2007-09-16 18:29:44.000000000 +0200 +++ configure @@ -49,11 +49,11 @@ $NetBSD: patch-aa,v 1.35 2007/09/18 17:37:02 tnn Exp $ +int gettext; +int main () { + void *handle; -+ handle = dlopen ("libintl.so", RTLD_GLOBAL | RTLD_LAZY); ++ handle = dlopen ("libm.so", RTLD_GLOBAL | RTLD_LAZY); + if (!handle) return 0; + handle = dlopen (NULL, 0); + if (!handle) return 0; -+ handle = dlsym (handle, "gettext"); ++ handle = dlsym (handle, "sin"); + return handle == NULL; +} + @@ -95,7 +95,7 @@ $NetBSD: patch-aa,v 1.35 2007/09/18 17:37:02 tnn Exp $ +fi +{ echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5 +echo "${ECHO_T}$glib_cv_dlopennull_broken" >&6; } -+ if test "xglib_cv_dlopennull_broken$" = "xyes"; then ++ if test "x$glib_cv_dlopennull_broken" = "xyes"; then + G_MODULE_BROKEN_DLOPEN_NULL=1 + else + G_MODULE_BROKEN_DLOPEN_NULL=0 |