diff options
| author | jperkin <jperkin@pkgsrc.org> | 2019-06-18 10:36:04 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2019-06-18 10:36:04 +0000 |
| commit | aa69ff46deb8bf6f562478593a87c737c990f7fd (patch) | |
| tree | bc884b1d15b1a97a75c09228d8ec0681dd3e477c /devel | |
| parent | 35618142e1a33decfb02fe1d056cee6a21c7597e (diff) | |
| download | pkgsrc-aa69ff46deb8bf6f562478593a87c737c990f7fd.tar.gz | |
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 (limited to 'devel')
| -rw-r--r-- | devel/gettext-lib/buildlink3.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index 1424d388534..d8550227764 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -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_LDADD.iconv} # "-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 |