[pkgsrc/trunk]: pkgsrc/devel/gettext-lib gettext-lib: Revert previous.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cfb679ffc842
branches:  trunk
changeset: 335360:cfb679ffc842
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Jun 18 10:36:04 2019 +0000

description:
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.

diffstat:

 devel/gettext-lib/buildlink3.mk |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (25 lines):

diff -r 20adeda803b8 -r cfb679ffc842 devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Tue Jun 18 10:21:37 2019 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Tue Jun 18 10:36:04 2019 +0000
@@ -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 @@
 # "-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