CVS log for pkgsrc/converters/libiconv/buildlink3.mk

Up to [cvs.NetBSD.org] / pkgsrc / converters / libiconv

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

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.

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.

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.

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"

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

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.

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).

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.

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)

Garbage collect BUILDLINK_PKGBASE.<pkg> from buildlink3: it is not anymore
used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk.

Add ${BUILDLINK_LDADD.iconv} to BUILDLINK_LDFLAGS.iconv.

If the ${PKGBASE} of a package doesn't match the token passed to
BUILDLINK_PACKAGES, then set BUILDLINK_PKGBASE.<pkg> explicitly so that
we can map from <pkg> to BUILDLINK_PKGBASE.<pkg>.

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.<pkg> that is used by bsd.buildlink3.mk to decide whether
to use the built-in software or to use the pkgsrc software.

Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.

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.

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.

Replace ICONV_IS_GNU with ICONV_TYPE, which can be checked to be either
"gnu" or "native".

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.

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.

Make PREFER_PKGSRC just yes/no or a list of packages.  This makes it
simpler to understand.

Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its
value outside of buildlink-related files.

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.

Support BUILDLINK_DEPENDS.<pkg> being a list of values.

Use l:foo: instead of S:...: to remove a library.

Use S/+$// instead of C/\+$// to save a backslash.  Very highly
recommended by seb :)

Sow BUILDLINK_USE_BUILTIN.<pkg> and reap _NEED_<PKG> variables.

Re-arrange to match example buildlink3.mk file in bsd.buildlink3.mk.

Initial sprinkling of work-in-progress buildlink3.mk files for using the
buildlink3 framework.