Commit graph

17 commits

Author SHA1 Message Date
jlam
19b3f5309e Add note explaining when x11.buildlink.mk should be used. 2002-04-12 14:06:46 +00:00
jlam
28ea07c164 When replacing for ${BUILDLINK_X11_DIR}, just replace it directly with
${X11BASE} instead of checking for -I or -L in front of it.  This is okay
because ${BUILDLINK_X11_DIR} should just never appear in any installed
files regardless of its prefix.  Problem noted in private email by Mark
Davies <mark@mcs.vuw.ac.nz>.
2002-03-19 15:54:17 +00:00
markd
e176c1be82 x11-links version updated. 2002-01-27 10:33:46 +00:00
jlam
ee5329b301 Explicitly set BUILDLINK_DIR and BUILDLINK_X11_DIR with = instead of ?=.
We really don't want these to change from the correct values (within
${WRKDIR}).
2002-01-03 20:00:06 +00:00
kristerw
4b3a1baa04 pkgtools/x11-links has been updated. 2001-12-08 23:17:18 +00:00
jlam
e29d306201 The *_POST_SED variables became private in bsd.buildlink.mk. 2001-12-02 02:58:35 +00:00
jlam
a4bc16d30c I am a triple idiot. The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use.  Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
2001-10-24 22:10:43 +00:00
jlam
dff59f9ec3 x11.buildlink.mk needs to be included before any buildlink.mk files that
use X11_BUILDLINK_MK as a test value.  Generally just reordering the
inclusions so that x11.buildlink.mk comes before the other buildlink.mk
files will make everthing work.
2001-10-23 13:14:43 +00:00
jlam
82ac6112bb Some Makefiles separate -R and the rpath directory with whitespace, so
handle that case.
2001-10-20 03:00:16 +00:00
jlam
7ab75bcd3e Make BUILDLINK_X11_{CPPFLAGS,LDFLAGS} private by prepending an underscore
to their names.  These values shouldn't be changed by Makefiles or
buildlink.mk files; rather, they're convenience variables used exclusively
within x11.buildlink.mk.
2001-10-09 18:18:52 +00:00
veego
cced4fab8d Update the x11-links BUILD_DEPENDS to 0.4. 2001-10-07 20:19:00 +00:00
jlam
5ec5047fda Substitute for rpath references to buildlink directories in Makefiles
after the configure step.  There's a growing number of GNU configure
scripts that find a library in -L/path and automatically add -R/path to
the linker flags.  We need to make sure this doesn't happen to buildlink
directories.
2001-10-05 02:31:18 +00:00
jlam
bc6321a5e2 Replace -R${BUILDLINK_DIR}/lib with -R${LOCALBASE}/lib on all the
REPLACE_BUILDLINK files to prevent rpath references to ${BUILDLINK_DIR}
from getting into things like config scripts.
2001-10-05 00:08:17 +00:00
jlam
b66ae413cf Try not to have BUILDLINK_X11_*FLAGS be added multiple times to CFLAGS,
CPPFLAGS, CXXFLAGS, or LDFLAGS.
2001-10-04 08:00:13 +00:00
jlam
3ad1fec0e7 Have x11.buildlink.mk add -Wl,-R${X11BASE}/lib to LDFLAGS directly, instead
of relying on bsd.pkg.mk to do it.  This change just makes x11.buildlink.mk
more self-sufficient.  Also add a warning that x11.buildlink.mk shouldn't
be included in any buildlink.mk files since what it appends to *_POST_SED
variables must come last.
2001-10-01 17:14:40 +00:00
jlam
962986af46 Require at least x11-links-0.3 to get latest round of fixes. 2001-09-25 23:49:57 +00:00
jlam
70004632b2 Buildlink glue to provide strong-buildlinking for packages that use X11
(not counting packages using imake) whether or not xpkgwedge is installed.
2001-08-29 22:33:38 +00:00