summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>2005-02-26 04:42:50 +0000
committertv <tv@pkgsrc.org>2005-02-26 04:42:50 +0000
commit1849e2cd38a12ac9d62af0b6bda9768018833a50 (patch)
tree3d003e8dcd8495a978edb61a6689f746c9141fef
parent689cd641fe3b19e008bff569ec14c0f39a416920 (diff)
downloadpkgsrc-1849e2cd38a12ac9d62af0b6bda9768018833a50.tar.gz
Make this (allegedly) build again on Linux, whose glibc-internalized
gettext doesn't use the renamed symbols. Problem noticed by <minskim@NetBSD.org>.
-rw-r--r--archivers/gsharutils/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index f2e6a3cd835..880c2239db1 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/01/24 20:15:58 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/02/26 04:42:50 tv Exp $
DISTNAME= sharutils-4.2.1
PKGNAME= g${DISTNAME}
@@ -24,14 +24,19 @@ INFO_FILES= remsync.info sharutils.info
CONFIGURE_ARGS+= --disable-uucode
+.include "../../mk/bsd.prefs.mk"
+
# gettext 0.11+ has renamed internal symbols, and gsharutils is
# being a very bad neighbor by using them directly. To fix, force
# use of gettext >= 0.11, and rename the symbol in gsharutils. -tv
#
+.if ${OPSYS} != "Linux"
+# XXX ...but don't do this on Linux, where glibc-internalized gettext
+# always uses the non-prefixed symbols.
+#
BUILDLINK_DEPENDS.gettext+= gettext-lib>=0.11
CPPFLAGS+= -D_nl_default_dirname=libintl_nl_default_dirname
-
-.include "../../mk/bsd.prefs.mk"
+.endif
.if defined(GNU_PROGRAM_PREFIX)
CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX}