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.
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
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).
Several changes are involved since they are all interrelated. These
changes affect about 1000 files.
The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files. Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred. This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.
The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.
The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc. The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.
The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files. Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories. These files are used as input
to imake since imake can't use stdin for that purpose.
The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead. This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed. Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries. Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
its presence. Bump BUILDLINK_DEPENDS to the latest version.
Evaluate the contents of buildlink3.mk only if we're on Darwin,
which lets us simply .include "../../devel/dlcompat/buildlink3.mk"
anywhere we might need it without affecting other platforms.
the normal case when BUILDLINK_DEPENDS.<pkg> isn't specified, it receives
a value only once due to the multiple inclusion protection in the
bulldlink3.mk files. In the case where a package includes several
buildlink3.mk files that each want a slightly different version of another
dependency, having BUILDLINK_DEPENDS.<pkg> be a list allows for the
strictest <pkg> dependency to be matched.
* dlfcn.c, spec_notes.txt, dladdr.3, Makefile.in, dlopen.3.in:
reformat ascii diagram, cleanup, avoid a deadlock if _init or _fini
routines attempt to call dl* functions, just exits the app right
now. Update the manpages. Finally made the decision to keep dlfunc
out until I see a port which needs it, or it becomes part of the
spec. Removed RTLD_SELF for similar reasons.
* dlfcn.c, spec_notes.txt: small changes to dlfcn.c, added some
notes about spec compliance.
* dlfcn.c, dlfcn.h: Readded dlfunc, implemented RTLD_NEXT, RTLD_SELF
and RTLD_DEFAULT for dlsym. Compiles against the freebsd 5.0 header,
but I can't grab that because it would break binary compat, reran
indent to fix problems with my use of a multitude of editors (if
only they would stop crashing).
* Makefile.in,configure.in,README,dlfcn.c,dlfnc.h,dlfcn_simple.c,dlopen.3.in:
dlopen.3 should is generated by the makefile, not configure,
dlfcn_simple.c some rewrite of the error code, preparation for
release, remove the dlfunc I added on the 20th, I need to convince
myself that it is worthwhile.
* dlfcn.c, dlfcn.h: dynamically allocate space for all needed paths,
add dlfunc, use the restric keyword for gcc >3, fix dladdr for
MH_SPLIT_SEGS, use our own NSAddImage for the search linked libs
case, as NSAddImage is stupid, and does not search DYLD_LIBRARY_PATH
or match install_names. Use NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES
for ppc in dlclose, and NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED
if the object has any __mod_term_func's to avoid the bus error in
atexit(3) with c++ static destructors.
* dlfcn.c: reset the error string when an exported function is
called. Do not write off the end of the search_paths array, increase
MAX_SEARCH_PATHS to 128. This needs to be looked at again, the
search paths array should be allocated dynamically so all the paths
can be included.
* dlfcn.c: Patch from Ben Hines for better error reporting in
dlclose a non bundle.
* dlfcn.c: Checking some code that has been sitting here for months.
thread safe, removed crap code for c++ static initializer calling.
Need to add something back later.
* dlfcn_simple.c: Cleanup.
* dlfcn.c: Quick hack to get sound working in artsd.
* dlfcn.c: Patch from Max Horn applied. Fixes some path issues,
and code cleanup.
* dlfcn.c: Lookup the NSAddImage etc stuff that was added in OS
10.1, so that the binary can be used on 10.0. It may or may not
work, don't have a 10.0 system to try it.
* dlfcn.c: Moving things around.
* dlfcn.c: bugfixes
* Makefile, README: Removed any and all finkisms.
* dlfcn.c, Makefile: Prepend the underscore by default for dlsym.
* Makefile: Made Makefile bsdmake compatible.
* dlfcn.c dlfcn.h: First attempt at adding dladdr
Not in the changelog:
* added configure script
* added manual pages
* dlfcn.c: I broke finks xemacs, now fixed.
* dlfcn.c: I really should read specs instead of making assumptions.
dlopen(NULL,x) opens the _global_ context, not the application context.
Fixed. Made dlsym_prepend_underscore work with stupidly long
symbol names.
* dlfcn.c: When opening a bundle for the second time, reuse the
dlstatus struct from the previously closed version. Removed some
debugging routines.
* README: Minor update
* dlfcn.c: Fixed my last "fix". Thanks to Darin Ohashi again.
* dlfcn.c: Fixed bug reported by Darin Ohashi. dlopen a bundle
close it, and dlopen same bundle again fails.
Changes to the package itself:
* USE_GMAKE is free on Darwin, so don't bother patching to avoid it.
pkg/16104, with a few tweaks. This package is for Darwin/Mac OS X
systems only.
dlcompat provides the dlopen() interface for dynamic loading of
modules for applications that need it. It is based on Apple code
that was only released via Darwin CVS.
This version comes from the Fink project.
