head 1.28; access; symbols pkgsrc-2023Q4:1.28.0.12 pkgsrc-2023Q4-base:1.28 pkgsrc-2023Q3:1.28.0.10 pkgsrc-2023Q3-base:1.28 pkgsrc-2023Q2:1.28.0.8 pkgsrc-2023Q2-base:1.28 pkgsrc-2023Q1:1.28.0.6 pkgsrc-2023Q1-base:1.28 pkgsrc-2022Q4:1.28.0.4 pkgsrc-2022Q4-base:1.28 pkgsrc-2022Q3:1.28.0.2 pkgsrc-2022Q3-base:1.28 pkgsrc-2022Q2:1.26.0.108 pkgsrc-2022Q2-base:1.26 pkgsrc-2022Q1:1.26.0.106 pkgsrc-2022Q1-base:1.26 pkgsrc-2021Q4:1.26.0.104 pkgsrc-2021Q4-base:1.26 pkgsrc-2021Q3:1.26.0.102 pkgsrc-2021Q3-base:1.26 pkgsrc-2021Q2:1.26.0.100 pkgsrc-2021Q2-base:1.26 pkgsrc-2021Q1:1.26.0.98 pkgsrc-2021Q1-base:1.26 pkgsrc-2020Q4:1.26.0.96 pkgsrc-2020Q4-base:1.26 pkgsrc-2020Q3:1.26.0.94 pkgsrc-2020Q3-base:1.26 pkgsrc-2020Q2:1.26.0.90 pkgsrc-2020Q2-base:1.26 pkgsrc-2020Q1:1.26.0.70 pkgsrc-2020Q1-base:1.26 pkgsrc-2019Q4:1.26.0.92 pkgsrc-2019Q4-base:1.26 pkgsrc-2019Q3:1.26.0.88 pkgsrc-2019Q3-base:1.26 pkgsrc-2019Q2:1.26.0.86 pkgsrc-2019Q2-base:1.26 pkgsrc-2019Q1:1.26.0.84 pkgsrc-2019Q1-base:1.26 pkgsrc-2018Q4:1.26.0.82 pkgsrc-2018Q4-base:1.26 pkgsrc-2018Q3:1.26.0.80 pkgsrc-2018Q3-base:1.26 pkgsrc-2018Q2:1.26.0.78 pkgsrc-2018Q2-base:1.26 pkgsrc-2018Q1:1.26.0.76 pkgsrc-2018Q1-base:1.26 pkgsrc-2017Q4:1.26.0.74 pkgsrc-2017Q4-base:1.26 pkgsrc-2017Q3:1.26.0.72 pkgsrc-2017Q3-base:1.26 pkgsrc-2017Q2:1.26.0.68 pkgsrc-2017Q2-base:1.26 pkgsrc-2017Q1:1.26.0.66 pkgsrc-2017Q1-base:1.26 pkgsrc-2016Q4:1.26.0.64 pkgsrc-2016Q4-base:1.26 pkgsrc-2016Q3:1.26.0.62 pkgsrc-2016Q3-base:1.26 pkgsrc-2016Q2:1.26.0.60 pkgsrc-2016Q2-base:1.26 pkgsrc-2016Q1:1.26.0.58 pkgsrc-2016Q1-base:1.26 pkgsrc-2015Q4:1.26.0.56 pkgsrc-2015Q4-base:1.26 pkgsrc-2015Q3:1.26.0.54 pkgsrc-2015Q3-base:1.26 pkgsrc-2015Q2:1.26.0.52 pkgsrc-2015Q2-base:1.26 pkgsrc-2015Q1:1.26.0.50 pkgsrc-2015Q1-base:1.26 pkgsrc-2014Q4:1.26.0.48 pkgsrc-2014Q4-base:1.26 pkgsrc-2014Q3:1.26.0.46 pkgsrc-2014Q3-base:1.26 pkgsrc-2014Q2:1.26.0.44 pkgsrc-2014Q2-base:1.26 pkgsrc-2014Q1:1.26.0.42 pkgsrc-2014Q1-base:1.26 pkgsrc-2013Q4:1.26.0.40 pkgsrc-2013Q4-base:1.26 pkgsrc-2013Q3:1.26.0.38 pkgsrc-2013Q3-base:1.26 pkgsrc-2013Q2:1.26.0.36 pkgsrc-2013Q2-base:1.26 pkgsrc-2013Q1:1.26.0.34 pkgsrc-2013Q1-base:1.26 pkgsrc-2012Q4:1.26.0.32 pkgsrc-2012Q4-base:1.26 pkgsrc-2012Q3:1.26.0.30 pkgsrc-2012Q3-base:1.26 pkgsrc-2012Q2:1.26.0.28 pkgsrc-2012Q2-base:1.26 pkgsrc-2012Q1:1.26.0.26 pkgsrc-2012Q1-base:1.26 pkgsrc-2011Q4:1.26.0.24 pkgsrc-2011Q4-base:1.26 pkgsrc-2011Q3:1.26.0.22 pkgsrc-2011Q3-base:1.26 pkgsrc-2011Q2:1.26.0.20 pkgsrc-2011Q2-base:1.26 pkgsrc-2011Q1:1.26.0.18 pkgsrc-2011Q1-base:1.26 pkgsrc-2010Q4:1.26.0.16 pkgsrc-2010Q4-base:1.26 pkgsrc-2010Q3:1.26.0.14 pkgsrc-2010Q3-base:1.26 pkgsrc-2010Q2:1.26.0.12 pkgsrc-2010Q2-base:1.26 pkgsrc-2010Q1:1.26.0.10 pkgsrc-2010Q1-base:1.26 pkgsrc-2009Q4:1.26.0.8 pkgsrc-2009Q4-base:1.26 pkgsrc-2009Q3:1.26.0.6 pkgsrc-2009Q3-base:1.26 pkgsrc-2009Q2:1.26.0.4 pkgsrc-2009Q2-base:1.26 pkgsrc-2009Q1:1.26.0.2 pkgsrc-2009Q1-base:1.26 pkgsrc-2008Q4:1.25.0.12 pkgsrc-2008Q4-base:1.25 pkgsrc-2008Q3:1.25.0.10 pkgsrc-2008Q3-base:1.25 cube-native-xorg:1.25.0.8 cube-native-xorg-base:1.25 pkgsrc-2008Q2:1.25.0.6 pkgsrc-2008Q2-base:1.25 cwrapper:1.25.0.4 pkgsrc-2008Q1:1.25.0.2 pkgsrc-2008Q1-base:1.25 pkgsrc-2007Q4:1.24.0.12 pkgsrc-2007Q4-base:1.24 pkgsrc-2007Q3:1.24.0.10 pkgsrc-2007Q3-base:1.24 pkgsrc-2007Q2:1.24.0.8 pkgsrc-2007Q2-base:1.24 pkgsrc-2007Q1:1.24.0.6 pkgsrc-2007Q1-base:1.24 pkgsrc-2006Q4:1.24.0.4 pkgsrc-2006Q4-base:1.24 pkgsrc-2006Q3:1.24.0.2 pkgsrc-2006Q3-base:1.24 pkgsrc-2006Q2:1.22.0.2 pkgsrc-2006Q2-base:1.22 pkgsrc-2006Q1:1.21.0.12 pkgsrc-2006Q1-base:1.21 pkgsrc-2005Q4:1.21.0.10 pkgsrc-2005Q4-base:1.21 pkgsrc-2005Q3:1.21.0.8 pkgsrc-2005Q3-base:1.21 pkgsrc-2005Q2:1.21.0.6 pkgsrc-2005Q2-base:1.21 pkgsrc-2005Q1:1.21.0.4 pkgsrc-2005Q1-base:1.21 pkgsrc-2004Q4:1.21.0.2 pkgsrc-2004Q4-base:1.21 pkgsrc-2004Q3:1.20.0.4 pkgsrc-2004Q3-base:1.20 pkgsrc-2004Q2:1.20.0.2 pkgsrc-2004Q2-base:1.20 pkgsrc-2004Q1:1.17.0.2 pkgsrc-2004Q1-base:1.17; locks; strict; comment @# @; 1.28 date 2022.08.11.13.37.24; author jperkin; state Exp; branches; next 1.27; commitid EkmJMxvjS1F2SsPD; 1.27 date 2022.08.09.11.31.14; author jperkin; state Exp; branches; next 1.26; commitid 980oE3Rd12LIbcPD; 1.26 date 2009.03.20.19.24.03; author joerg; state Exp; branches; next 1.25; 1.25 date 2008.02.27.22.10.34; author jlam; state Exp; branches; next 1.24; 1.24 date 2006.07.08.23.10.39; author jlam; state Exp; branches; next 1.23; 1.23 date 2006.07.08.22.39.03; author jlam; state Exp; branches; next 1.22; 1.22 date 2006.04.06.06.21.40; author reed; state Exp; branches; next 1.21; 1.21 date 2004.10.03.00.13.17; author tv; state Exp; branches; next 1.20; 1.20 date 2004.05.20.16.13.05; author danw; state Exp; branches; next 1.19; 1.19 date 2004.05.17.21.32.34; author seb; state Exp; branches; next 1.18; 1.18 date 2004.05.03.02.22.24; author snj; state Exp; branches; next 1.17; 1.17 date 2004.03.16.18.23.27; author jlam; state Exp; branches; next 1.16; 1.16 date 2004.03.10.17.57.14; author jlam; state Exp; branches; next 1.15; 1.15 date 2004.02.18.16.35.27; author jlam; state Exp; branches; next 1.14; 1.14 date 2004.02.12.02.35.06; author jlam; state Exp; branches; next 1.13; 1.13 date 2004.02.12.01.59.37; author jlam; state Exp; branches; next 1.12; 1.12 date 2004.02.11.12.17.58; author jlam; state Exp; branches; next 1.11; 1.11 date 2004.02.11.11.30.49; author jlam; state Exp; branches; next 1.10; 1.10 date 2004.02.06.19.04.24; author jlam; state Exp; branches; next 1.9; 1.9 date 2004.02.05.07.17.14; author jlam; state Exp; branches; next 1.8; 1.8 date 2004.02.05.07.06.15; author jlam; state Exp; branches; next 1.7; 1.7 date 2004.02.05.06.58.02; author jlam; state Exp; branches; next 1.6; 1.6 date 2004.01.24.03.12.31; author jlam; state Exp; branches; next 1.5; 1.5 date 2004.01.06.19.13.13; author jlam; state Exp; branches; next 1.4; 1.4 date 2004.01.05.11.05.44; author jlam; state Exp; branches; next 1.3; 1.3 date 2004.01.05.09.31.31; author jlam; state Exp; branches; next 1.2; 1.2 date 2004.01.04.23.34.05; author jlam; state Exp; branches; next 1.1; 1.1 date 2004.01.03.23.06.43; author jlam; state Exp; branches; next ; desc @@ 1.28 log @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. @ text @# $NetBSD: buildlink3.mk,v 1.27 2022/08/09 11:31:14 jperkin Exp $ BUILDLINK_TREE+= iconv .if !defined(ICONV_BUILDLINK3_MK) ICONV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.iconv+= libiconv>=1.9.1 BUILDLINK_ABI_DEPENDS.iconv+= libiconv>=1.9.1nb4 BUILDLINK_PKGSRCDIR.iconv?= ../../converters/libiconv BUILDLINK_LIBNAME.iconv= iconv BUILDLINK_LDADD.iconv= ${BUILDLINK_LIBNAME.iconv:S/^/-l/:S/^-l$//} .include "../../mk/bsd.fast.prefs.mk" # # Due to Linux shipping libiconv in libc, third-party software often forgets to # explicitly look for and add -liconv when required. On systems that use GNU # ld this isn't always an issue as it will often be pulled in via an explicit # library, but some systems have a stricter linker that will not pull in # symbols via implicit dependencies, and so we need to explicitly link here. # # Ideally this would be done via CWRAPPERS_LDADD to avoid leaking into LDFLAGS # but there is no concensus on that yet. # # 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 .endif # ICONV_BUILDLINK3_MK BUILDLINK_TREE+= -iconv @ 1.27 log @mk: Add OPSYS_EXPLICIT_LIBDEPS and enable on SunOS. Most systems use GNU ld, which will happily pull in symbols required by a program even if they are only available via implicit library dependencies. The SunOS linker is stricter, and if a program uses a symbol then the library that defines that symbol must be an explicit dependency. This mostly causes problems with libiconv and libintl, both of which Linux bundles in its C library, so a lot of third-party software does not correctly check for them. Until now we've had to add many, many overrides, along with variables such as BROKEN_GETTEXT_DETECTION which nowadays only has limited effectiveness. The situation appears to be getting worse, especially with software built with meson, and so both libiconv and gettext-lib will now automatically add the correct LDFLAGS if the OPSYS sets OPSYS_EXPLICIT_LIBDEPS=yes. This isn't perfect. For one it isn't really an OPSYS setting as you can try to use GNU ld on SunOS, it just doesn't work very well. It should also really be done via the wrappers rather than exposing LDFLAGS, but we do not yet have an approved patch for doing this. However it does improve the current situation. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.26 2009/03/20 19:24:03 joerg Exp $ d26 4 a29 1 .if ${OPSYS_EXPLICIT_LIBDEPS:Uno:tl} == "yes" @ 1.26 log @Simply and speed up buildlink3.mk files and processing. This changes the buildlink3.mk files to use an include guard for the recursive include. The use of BUILDLINK_DEPTH, BUILDLINK_DEPENDS, BUILDLINK_PACKAGES and BUILDLINK_ORDER is handled by a single new variable BUILDLINK_TREE. Each buildlink3.mk file adds a pair of enter/exit marker, which can be used to reconstruct the tree and to determine first level includes. Avoiding := for large variables (BUILDLINK_ORDER) speeds up parse time as += has linear complexity. The include guard reduces system time by avoiding reading files over and over again. For complex packages this reduces both %user and %sys time to half of the former time. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.25 2008/02/27 22:10:34 jlam Exp $ d13 18 @ 1.25 log @Greatly simplify the logic that tries to determine whether -lintl needs -liconv in order to satisfy linkage requirements. This is now patterned after the approach taken with readline and termlib. Examples on NetBSD for a package that includes only gettext-lib/buildlink3.mk: PREFER_NATIVE= yes PREFER_PKGSRC= # empty # This uses the native gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= yes PREFER_PKGSRC= iconv # This uses the native gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= yes PREFER_PKGSRC= gettext # This uses the pkgsrc gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= yes PREFER_PKGSRC= gettext iconv # This uses the pkgsrc gettext and pkgsrc iconv, with: # BUILDLINK_LDADD.gettext == "-lintl -liconv" PREFER_NATIVE= # empty PREFER_PKGSRC= yes # This uses the pkgsrc gettext and pkgsrc iconv, with: # BUILDLINK_LDADD.gettext == "-lintl -liconv" PREFER_NATIVE= iconv PREFER_PKGSRC= yes # This uses the pkgsrc gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= gettext PREFER_PKGSRC= yes # This uses the native gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" PREFER_NATIVE= gettext iconv PREFER_PKGSRC= yes # This uses the native gettext and native iconv, with: # BUILDLINK_LDADD.gettext == "-lintl" @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.24 2006/07/08 23:10:39 jlam Exp $ d3 1 a3 2 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ d5 2 a6 3 .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= iconv .endif a7 5 BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Niconv} BUILDLINK_PACKAGES+= iconv BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}iconv .if !empty(ICONV_BUILDLINK3_MK:M+) d13 1 a13 1 .endif # ICONV_BUILDLINK3_MK d15 1 a15 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} @ 1.24 log @Change the format of BUILDLINK_ORDER to contain depth information as well, and add a new helper target and script, "show-buildlink3", that outputs a listing of the buildlink3.mk files included as well as the depth at which they are included. For example, "make show-buildlink3" in fonts/Xft2 displays: zlib fontconfig iconv zlib freetype2 expat freetype2 Xrender renderproto @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.23 2006/07/08 22:39:03 jlam Exp $ d18 2 @ 1.23 log @Track information in a new variable BUILDLINK_ORDER that informs us of the order in which buildlink3.mk files are (recursively) included by a package Makefile. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.22 2006/04/06 06:21:40 reed Exp $ d12 1 a12 1 BUILDLINK_ORDER+= iconv @ 1.22 log @Over 1200 files touched but no revisions bumped :) RECOMMENDED is removed. It becomes ABI_DEPENDS. BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo. BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo. BUILDLINK_DEPENDS does not change. IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS which defaults to "yes". Added to obsolete.mk checking for IGNORE_RECOMMENDED. I did not manually go through and fix any aesthetic tab/spacing issues. I have tested the above patch on DragonFly building and packaging subversion and pkglint and their many dependencies. I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I have used IGNORE_RECOMMENDED for a long time). I have been an active user of IGNORE_RECOMMENDED since it was available. As suggested, I removed the documentation sentences suggesting bumping for "security" issues. As discussed on tech-pkg. I will commit to revbump, pkglint, pkg_install, createbuildlink separately. Note that if you use wip, it will fail! I will commit to pkgsrc-wip later (within day). @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.21 2004/10/03 00:13:17 tv Exp $ d12 1 @ 1.21 log @Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10 in the process. (More information on tech-pkg.) Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and installing .la files. Bump PKGREVISION (only) of all packages depending directly on the above via a buildlink3 include. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.20 2004/05/20 16:13:05 danw Exp $ d14 2 a15 2 BUILDLINK_DEPENDS.iconv+= libiconv>=1.9.1 BUILDLINK_RECOMMENDED.iconv+= libiconv>=1.9.1nb4 @ 1.20 log @Revert the change to put -liconv into BUILDLINK_LDFLAGS.iconv (which breaks some things on Darwin) and fix audio/musicpd so it doesn't need it (by faking out a configure check that gets confused by the iconv_open -> libiconv_open renaming) @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.19 2004/05/17 21:32:34 seb Exp $ d15 1 @ 1.19 log @Garbage collect BUILDLINK_PKGBASE. from buildlink3: it is not anymore used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.18 2004/05/03 02:22:24 snj Exp $ a15 1 BUILDLINK_LDFLAGS.iconv= ${BUILDLINK_LDADD.iconv} @ 1.18 log @Add ${BUILDLINK_LDADD.iconv} to BUILDLINK_LDFLAGS.iconv. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.17 2004/03/16 18:23:27 jlam Exp $ a13 1 BUILDLINK_PKGBASE.iconv?= libiconv @ 1.17 log @If the ${PKGBASE} of a package doesn't match the token passed to BUILDLINK_PACKAGES, then set BUILDLINK_PKGBASE. explicitly so that we can map from to BUILDLINK_PKGBASE.. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.16 2004/03/10 17:57:14 jlam Exp $ d17 1 @ 1.16 log @Split out the code that deals with checking whether the software is built-in or not into a separate builtin.mk file. The code to deal checking for built-in software is much simpler to deal with in pkgsrc. The buildlink3.mk file for a package will be of the usual format regardless of the package, which makes it simpler for packagers to update a package. The builtin.mk file for a package must define a single yes/no variable USE_BUILTIN. that is used by bsd.buildlink3.mk to decide whether to use the built-in software or to use the pkgsrc software. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $ d14 1 @ 1.15 log @Reorder some lines so that BUILDLINK_USE_BUILTIN. set in the environment overrides all other settings. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $ d6 6 a11 1 .include "../../mk/bsd.prefs.mk" a13 1 BUILDLINK_PACKAGES+= iconv a17 101 BUILDLINK_CHECK_BUILTIN.iconv?= NO _ICONV_H= /usr/include/iconv.h .if !defined(BUILDLINK_IS_BUILTIN.iconv) BUILDLINK_IS_BUILTIN.iconv= NO . if exists(${_ICONV_H}) BUILDLINK_IS_BUILTIN.iconv= YES . endif . if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[nN][oO]) _INCOMPAT_ICONV?= # should be set from defs.${OPSYS}.mk . for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} . if !empty(MACHINE_PLATFORM:M${_pattern_}) BUILDLINK_IS_BUILTIN.iconv= NO . endif . endfor . endif .endif .if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.iconv= YES .endif .if !defined(BUILDLINK_USE_BUILTIN.iconv) . if !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.iconv= YES . else BUILDLINK_USE_BUILTIN.iconv= NO . endif . if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.iconv= YES . endif . if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.iconv= NO . endif . if !empty(PREFER_NATIVE:Miconv) && \ !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.iconv= YES . endif . if !empty(PREFER_PKGSRC:Miconv) BUILDLINK_USE_BUILTIN.iconv= NO . endif . if defined(USE_GNU_ICONV) BUILDLINK_USE_BUILTIN.iconv= NO . endif .endif .if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO]) . if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= iconv . endif .endif .if !empty(ICONV_BUILDLINK3_MK:M+) . if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO]) _BLNK_LIBICONV= -liconv . else . if !defined(_BLNK_LIBICONV_FOUND) _BLNK_LIBICONV_FOUND!= \ if [ "`${ECHO} /usr/lib/libiconv.*`" = "/usr/lib/libiconv.*" ]; then \ ${ECHO} NO; \ else \ ${ECHO} YES; \ fi MAKEFLAGS+= _BLNK_LIBICONV_FOUND=${_BLNK_LIBICONV_FOUND} . endif . if ${_BLNK_LIBICONV_FOUND} == "YES" _BLNK_LIBICONV= -liconv . else _BLNK_LIBICONV= # empty BUILDLINK_TRANSFORM+= l:iconv: . endif BUILDLINK_LDADD.iconv?= ${_BLNK_LIBICONV} . endif .if !defined(ICONV_TYPE) ICONV_TYPE?= gnu . if !empty(BUILDLINK_USE_BUILTIN.iconv:M[yY][eE][sS]) && \ exists(${_ICONV_H}) ICONV_TYPE!= \ if ${GREP} -q "GNU LIBICONV Library" ${_ICONV_H}; then \ ${ECHO} "gnu"; \ else \ ${ECHO} "native"; \ fi . endif MAKEFLAGS+= ICONV_TYPE=${ICONV_TYPE} .endif . if defined(GNU_CONFIGURE) . if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO]) CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} . else CONFIGURE_ARGS+= --without-libiconv-prefix . endif . endif .endif # ICONV_BUILDLINK3_MK @ 1.14 log @Create a new variable PREFER_NATIVE that has the opposite semantics as PREFER_PKGSRC. Preferences are determined by the most specific instance of the package in either PREFER_PKGSRC or PREFER_NATIVE. If a package is specified in neither or in both variables, then PREFER_PKGSRC has precedence over PREFER_NATIVE. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:37 jlam Exp $ d33 1 a33 1 .if !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) d35 6 a40 1 .else d42 1 a42 1 .endif d44 2 a45 2 .if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) d47 2 a48 2 .endif .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) d50 3 a52 3 .endif .if !empty(PREFER_NATIVE:Miconv) && \ !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS]) d54 2 a55 2 .endif .if !empty(PREFER_PKGSRC:Miconv) d57 1 a57 1 .endif d59 1 a59 1 .if defined(USE_GNU_ICONV) d61 1 a61 4 .endif .if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.iconv= YES @ 1.13 log @Reorganize code so that any dependencies are checked as part of deciding whether the software is built-in or not. This facilitates implementing the forthcoming PKGSRC_NATIVE variable. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.12 2004/02/11 12:17:58 jlam Exp $ d39 12 a50 2 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ !empty(PREFER_PKGSRC:Miconv) @ 1.12 log @Replace ICONV_IS_GNU with ICONV_TYPE, which can be checked to be either "gnu" or "native". @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.11 2004/02/11 11:30:49 jlam Exp $ d23 1 d25 2 a26 2 . for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} . if !empty(MACHINE_PLATFORM:M${_pattern_}) d28 9 a36 2 . endif . endfor a51 9 .if !defined(BUILDLINK_USE_BUILTIN.iconv) . if !empty(BUILDLINK_IS_BUILTIN.iconv:M[nN][oO]) BUILDLINK_USE_BUILTIN.iconv= NO . else BUILDLINK_USE_BUILTIN.iconv= YES . endif MAKEFLAGS+= BUILDLINK_USE_BUILTIN.iconv=${BUILDLINK_USE_BUILTIN.iconv} .endif @ 1.11 log @Move the INCOMPAT_FOO checks to a more natural location within the block that decides whether package FOO is built-in or not. If the platform is listed in IMCOMPAT_FOO, then treat FOO as being not built-in. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $ d16 2 d20 1 a20 1 . if exists(/usr/include/iconv.h) d81 14 @ 1.10 log @If we're passing through MAKEFLAGS variables whose values may contain spaces, use the :Q modifier instead of double-quoting the value. This avoids breakage when executing the just-in-time su targets. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $ d21 6 a46 7 _INCOMPAT_ICONV?= # should be set from defs.${OPSYS}.mk INCOMPAT_ICONV?= # empty . for _pattern_ in ${_INCOMPAT_ICONV} ${INCOMPAT_ICONV} . if !empty(MACHINE_PLATFORM:M${_pattern_}) BUILDLINK_USE_BUILTIN.iconv= NO . endif . endfor @ 1.9 log @Make PREFER_PKGSRC just yes/no or a list of packages. This makes it simpler to understand. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $ d49 1 a49 1 MAKEFLAGS+= BUILDLINK_USE_BUILTIN.iconv="${BUILDLINK_USE_BUILTIN.iconv}" @ 1.8 log @Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its value outside of buildlink-related files. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $ d23 2 a24 3 .if defined(PREFER_PKGSRC) . if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ !empty(PREFER_PKGSRC:Miconv) a25 1 . endif @ 1.7 log @Support a new global variable: BUILDLINK_PREFER_PKGSRC This variable determines whether or not to prefer the pkgsrc versions of software that is also present in the base system. This variable is multi-state: defined, or "yes" always prefer the pkgsrc versions not defined, or "no" only use the pkgsrc versions if needed by dependency requirements This can also take a list of packages for which to prefer the pkgsrc-installed software. The package names may be found by consulting the value added to BUILDLINK_PACKAGES in the buildlink[23].mk files for that package. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.6 2004/01/24 03:12:31 jlam Exp $ d23 3 a25 4 .if defined(BUILDLINK_PREFER_PKGSRC) . if empty(BUILDLINK_PREFER_PKGSRC) || \ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ !empty(BUILDLINK_PREFER_PKGSRC:Miconv) @ 1.6 log @Support BUILDLINK_DEPENDS. being a list of values. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.5 2004/01/06 19:13:13 jlam Exp $ d23 8 @ 1.5 log @Use l:foo: instead of S:...: to remove a library. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.4 2004/01/05 11:05:44 jlam Exp $ d10 1 a10 1 BUILDLINK_DEPENDS.iconv?= libiconv>=1.9.1 @ 1.4 log @Use S/+$// instead of C/\+$// to save a backslash. Very highly recommended by seb :) @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.3 2004/01/05 09:31:31 jlam Exp $ d70 1 a70 1 BUILDLINK_TRANSFORM+= S:-liconv: @ 1.3 log @Sow BUILDLINK_USE_BUILTIN. and reap _NEED_ variables. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $ d84 1 a84 1 BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//} @ 1.2 log @Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk. @ text @d1 1 a1 1 # $NetBSD: buildlink3.mk,v 1.1 2004/01/03 23:06:43 jlam Exp $ d6 2 d9 1 a9 2 . include "../../mk/bsd.prefs.mk" d23 4 d28 1 a28 1 _NEED_GNU_ICONV= NO d31 1 a31 1 .if !defined(_NEED_GNU_ICONV) d33 1 a33 1 _NEED_GNU_ICONV= YES d35 1 a35 1 _NEED_GNU_ICONV= NO d40 1 a40 1 _NEED_GNU_ICONV= YES d44 1 a44 4 . if defined(USE_GNU_ICONV) _NEED_GNU_ICONV= YES . endif MAKEFLAGS+= _NEED_GNU_ICONV=${_NEED_GNU_ICONV} d47 1 a47 1 .if ${_NEED_GNU_ICONV} == "YES" d54 1 a54 2 . if ${_NEED_GNU_ICONV} == "YES" BUILDLINK_PACKAGES+= iconv a72 1 BUILDLINK_PREFIX.iconv= /usr d76 1 a76 1 . if ${_NEED_GNU_ICONV} == "YES" @ 1.1 log @Initial sprinkling of work-in-progress buildlink3.mk files for using the buildlink3 framework. @ text @d1 1 a1 1 # $NetBSD$ d6 1 a6 1 .if !empty(ICONV_BUILDLINK3_MK:M\+) d46 1 a46 1 . if !empty(BUILDLINK_DEPTH:M\+) d51 1 a51 1 .if !empty(ICONV_BUILDLINK3_MK:M\+) @