CVS commit: pkgsrc/devel/gettext-lib

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jun 18 10:36:04 UTC 2019

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

Log Message:
gettext-lib: Revert previous.

Adding gettext libraries unconditionally can cause issues in a small number of
packages which deliberately try to build multilib, where the non-default arch
ends up failing as the gettext libraries are the wrong ELF class.

This will instead be fixed directly in glib2 which appears to be the root cause
of the recent fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 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.38 pkgsrc/devel/gettext-lib/buildlink3.mk:1.39
--- pkgsrc/devel/gettext-lib/buildlink3.mk:1.38 Sat Jun  8 09:34:29 2019
+++ pkgsrc/devel/gettext-lib/buildlink3.mk      Tue Jun 18 10:36:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2019/06/08 09:34:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2019/06/18 10:36:04 jperkin Exp $
 
 BUILDLINK_TREE+=       gettext
 
@@ -19,12 +19,11 @@ 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.  This is also the default on SunOS
-# due to stricter linker requirements for implicit libraries.
+# to LIBS to workaround this brokenness.
 #
 BROKEN_GETTEXT_DETECTION?=     no
-.if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS]) || ${OPSYS} == "SunOS"
-BUILDLINK_LDFLAGS.gettext+=    ${BUILDLINK_LDADD.gettext}
+.if !empty(BROKEN_GETTEXT_DETECTION:M[yY][eE][sS])
+BUILDLINK_LIBS.gettext+=       ${BUILDLINK_LDADD.gettext}
 CONFIGURE_ENV+=                        INTLLIBS="${BUILDLINK_LDADD.gettext}"
 .endif