summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarino <marino@pkgsrc.org>2012-07-17 16:01:10 +0000
committermarino <marino@pkgsrc.org>2012-07-17 16:01:10 +0000
commitaeba6e83564710e9370eb93cb955b61ad6795ac1 (patch)
tree74efa1216e58b7eae1b1a8d4bc4ed907f94255d8
parentf5acfbc0f1a61eb40b20b74b11e08ccd2160819c (diff)
downloadpkgsrc-aeba6e83564710e9370eb93cb955b61ad6795ac1.tar.gz
security/libgpg-error: Disable NLS on i386-DragonFly
It seems that I386 DragonFly (x86_64 is okay), invoking libintl's bindtextdomain causes pkgsrc's libintl to segfault on a thread locking operation. Anything linking with libgpg-error on i386 will consequently core dump. Recognizing this treating the symptom, this patch disabled NLS on I386 DragonFly.
-rw-r--r--security/libgpg-error/Makefile14
-rw-r--r--security/libgpg-error/PLIST22
2 files changed, 23 insertions, 13 deletions
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 46df24f9277..e5b1f078dae 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2011/04/22 13:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.34 2012/07/17 16:01:10 marino Exp $
DISTNAME= libgpg-error-1.10
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
ftp://ftp.ring.gr.jp/pub/net/gnupg/libgpg-error/ \
@@ -34,6 +34,16 @@ USE_TOOLS+= nawk
USE_TOOLS+= gawk
.endif
+# On Dragonfly i386, Pkgsrc libintl segfaults on bindtextdomain function
+# while locking a thread. Until that's resolved, stop libgpg-error from
+# using NLS which invokes that function during initialization.
+PLIST_VARS+= nls
+.if ${OPSYS} == "DragonFly" && ${MACHINE} == "i386"
+CONFIGURE_ARGS+= --disable-nls
+.else
+PLIST.nls= yes
+.endif
+
TEST_TARGET= check
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/security/libgpg-error/PLIST b/security/libgpg-error/PLIST
index 0cc66267862..7ccc5e950bf 100644
--- a/security/libgpg-error/PLIST
+++ b/security/libgpg-error/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2010/06/08 10:15:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/07/17 16:01:10 marino Exp $
bin/gpg-error
bin/gpg-error-config
include/gpg-error.h
@@ -8,13 +8,13 @@ share/common-lisp/source/gpg-error/gpg-error-codes.lisp
share/common-lisp/source/gpg-error/gpg-error-package.lisp
share/common-lisp/source/gpg-error/gpg-error.asd
share/common-lisp/source/gpg-error/gpg-error.lisp
-share/locale/cs/LC_MESSAGES/libgpg-error.mo
-share/locale/de/LC_MESSAGES/libgpg-error.mo
-share/locale/fr/LC_MESSAGES/libgpg-error.mo
-share/locale/it/LC_MESSAGES/libgpg-error.mo
-share/locale/nl/LC_MESSAGES/libgpg-error.mo
-share/locale/pl/LC_MESSAGES/libgpg-error.mo
-share/locale/ro/LC_MESSAGES/libgpg-error.mo
-share/locale/sv/LC_MESSAGES/libgpg-error.mo
-share/locale/vi/LC_MESSAGES/libgpg-error.mo
-share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/nl/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/libgpg-error.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo