pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/gsharutils Make this (allegedly) build again...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f96c6b462e60
branches:  trunk
changeset: 489758:f96c6b462e60
user:      tv <tv%pkgsrc.org@localhost>
date:      Sat Feb 26 04:42:50 2005 +0000

description:
Make this (allegedly) build again on Linux, whose glibc-internalized
gettext doesn't use the renamed symbols.

Problem noticed by <minskim%NetBSD.org@localhost>.

diffstat:

 archivers/gsharutils/Makefile |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 65a60b98bda0 -r f96c6b462e60 archivers/gsharutils/Makefile
--- a/archivers/gsharutils/Makefile     Sat Feb 26 02:07:19 2005 +0000
+++ b/archivers/gsharutils/Makefile     Sat Feb 26 04:42:50 2005 +0000
@@ -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 @@
 
 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}



Home | Main Index | Thread Index | Old Index