diff options
| author | jperkin <jperkin@pkgsrc.org> | 2022-08-11 13:37:24 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2022-08-11 13:37:24 +0000 |
| commit | 4eabed2ba5a848b36cd035b1420b19dd3776cef7 (patch) | |
| tree | e78222f9aff053d771442af049ab909b142a0f44 | |
| parent | 869430587e12effe234f276f348e5e94acbdce3a (diff) | |
| download | pkgsrc-4eabed2ba5a848b36cd035b1420b19dd3776cef7.tar.gz | |
libXpm: Add USE_EXPLICIT_LIBDEPS, set to no.
This variable controls whether we add the explicit library dependencies from
libiconv and gettext-lib, required by this package as it's a bit special in how
it handles libintl.
| -rw-r--r-- | converters/libiconv/buildlink3.mk | 7 | ||||
| -rw-r--r-- | devel/gettext-lib/buildlink3.mk | 7 | ||||
| -rw-r--r-- | x11/libXpm/Makefile | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index 98e732f49ed..1f9af186ddb 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2022/08/09 11:31:14 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2022/08/11 13:37:24 jperkin Exp $ BUILDLINK_TREE+= iconv @@ -23,7 +23,10 @@ BUILDLINK_LDADD.iconv= ${BUILDLINK_LIBNAME.iconv:S/^/-l/:S/^-l$//} # Ideally this would be done via CWRAPPERS_LDADD to avoid leaking into LDFLAGS # but there is no concensus on that yet. # -.if ${OPSYS_EXPLICIT_LIBDEPS:Uno:tl} == "yes" +# USE_EXPLICIT_LIBDEPS is a package-settable variable for rare cases where the +# libraries need to be pulled in but we do not want to expose them by default. +# +.if ${OPSYS_EXPLICIT_LIBDEPS:Uno:tl} == "yes" && ${USE_EXPLICIT_LIBDEPS:Uyes:tl} != "no" BUILDLINK_LDFLAGS.iconv+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib BUILDLINK_LDFLAGS.iconv+= ${BUILDLINK_LDADD.iconv} .endif diff --git a/devel/gettext-lib/buildlink3.mk b/devel/gettext-lib/buildlink3.mk index 79ddc36fc36..718277cba2d 100644 --- a/devel/gettext-lib/buildlink3.mk +++ b/devel/gettext-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.41 2022/08/09 11:31:14 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.42 2022/08/11 13:37:24 jperkin Exp $ BUILDLINK_TREE+= gettext @@ -37,7 +37,10 @@ CONFIGURE_ENV+= INTLLIBS="${BUILDLINK_LDADD.gettext}" # Ideally this would be done via CWRAPPERS_LDADD to avoid leaking into LDFLAGS # but there is no concensus on that yet. # -.if ${OPSYS_EXPLICIT_LIBDEPS:Uno:tl} == "yes" +# USE_EXPLICIT_LIBDEPS is a package-settable variable for rare cases where the +# libraries need to be pulled in but we do not want to expose them by default. +# +.if ${OPSYS_EXPLICIT_LIBDEPS:Uno:tl} == "yes" && ${USE_EXPLICIT_LIBDEPS:Uyes:tl} != "no" BUILDLINK_LDFLAGS.gettext+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gettext}/lib BUILDLINK_LDFLAGS.gettext+= ${BUILDLINK_LDADD.gettext} .endif diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile index 658ef84ffa6..e4bf20e473e 100644 --- a/x11/libXpm/Makefile +++ b/x11/libXpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2022/04/10 08:53:16 nia Exp $ +# $NetBSD: Makefile,v 1.24 2022/08/11 13:37:24 jperkin Exp $ DISTNAME= libXpm-3.5.13 CATEGORIES= graphics x11 @@ -22,6 +22,7 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1 # pass down INTLLIBS in the build environment for use by the [cs]xpm # Makefiles. # +USE_EXPLICIT_LIBDEPS= no CONFIGURE_ENV+= ac_cv_search_gettext=no MAKE_ENV+= INTLLIBS=${BUILDLINK_LDADD.gettext:Q} |