CVS commit: pkgsrc/devel/gettext-lib

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat Jun  8 09:34:29 UTC 2019

Modified Files:
        pkgsrc/devel/gettext-lib: buildlink3.mk

Log Message:
gettext-lib: Always add -lintl on SunOS.

This effectively turns on BROKEN_GETTEXT_DETECTION=yes on SunOS and adds
-lintl whenever a package pulls in gettext-lib.  The SunOS linker is
more strict than others and will ensure that library dependencies are
explicit.  Recent changes to gettext-lib and glib made the dependency
implicit and caused a lot of fallout.

Use BUILDLINK_LDFLAGS instead of BUILDLINK_LIBS so that it actually gets
added through buildlink, not only when packages honour ${LIBS}.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/gettext-lib/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gettext-lib/buildlink3.mk
diff -u pkgsrc/devel/gettext-lib/buildlink3.mk:1.37 pkgsrc/devel/gettext-lib/buildlink3.mk:1.38
--- pkgsrc/devel/gettext-lib/buildlink3.mk:1.37 Sat Jan  4 11:14:37 2014
+++ pkgsrc/devel/gettext-lib/buildlink3.mk      Sat Jun  8 09:34:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.37 2014/01/04 11:14:37 richard Exp $
+# $NetBSD: buildlink3.mk,v 1.38 2019/06/08 09:34:29 jperkin Exp $
 
 BUILDLINK_TREE+=       gettext
 
@@ -19,11 +19,12 @@ BUILDLINK_LDADD.gettext+=   ${BUILDLINK_LD
 # "-lintl" to the linker command line.
 #
 # If BROKEN_GETTEXT_DETECTION is "yes", then automatically add "-lintl"
-# to LIBS to workaround this brokenness.
+# to LIBS to workaround this brokenness.  This is also the default on SunOS
+# due to stricter linker requirements for implicit libraries.
 #
 BROKEN_GETTEXT_DETECTION?=     no
-.if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS])
-BUILDLINK_LIBS.gettext+=       ${BUILDLINK_LDADD.gettext}
+.if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS]) || ${OPSYS} == "SunOS"
+BUILDLINK_LDFLAGS.gettext+=    ${BUILDLINK_LDADD.gettext}
 CONFIGURE_ENV+=                        INTLLIBS="${BUILDLINK_LDADD.gettext}"
 .endif