Commit graph

218 commits

Author SHA1 Message Date
jlam
08ffe1eca5 Update documentation for the current state of buildlink3. 2004-07-30 20:52:44 +00:00
xtraeme
9f3bfb4a8f Enable X11_TYPE=xorg now that we have the X.org packages on pkgsrc. 2004-07-29 05:09:29 +00:00
grant
1d8168af4e explicitly don't transform "-Wl,*", fixing a bug that meant we were
throwing away all -W arguments that weren't -Wl,-R.

fixes building of a number of packages on Solaris.
2004-07-10 12:55:08 +00:00
wiz
36ccfca825 Handle --execute the same way as --install (not modifying the arguments).
Needed to convert inputmethods/xcin to bl3. Idea from jlam.
2004-07-04 09:52:04 +00:00
grant
4b6f21b903 transform --export-dynamic to -G and strip -fstrict-prototypes. 2004-07-04 08:30:46 +00:00
grant
ca57d6e396 update the cache for -static 2004-07-03 20:53:59 +00:00
grant
456c546037 fix typo and slight botch up in last 2004-07-03 20:53:47 +00:00
salo
61d3b15bc9 Convert -static to -Bstatic. 2004-07-03 20:39:26 +00:00
xtraeme
d8d555b461 Remove references about BUILDLINK_UPDATE_CACHE in the configure stage,
you could build packages faster right now (yay), I'm using this way
around +2 months ago without any problem.

Ok'ed by jlam@.
2004-06-22 23:23:36 +00:00
grant
9bc788ad87 strip -fno-gnu-keywords argument to SunPro, and munge -pthread into
-lpthread. ok'd by jlam.

addresses PR pkg/24966 from Charlie Allom.
2004-06-13 08:50:15 +00:00
tv
b04b3d3ba0 A couple packages (including the new boost) use "libfoo.so" as a directory
name -- this seems to be common among Jam-using packages.  So, make sure
to do the -L -l transform only if at the end of a word.  This unfortunately
doubles the number of regexes needed to match (one with $_sep, one with $).

While here, though, the expressions for .so, .so.X, .so.X.Y, and .so.X.Y.Z
can all be collapsed into only one set with the use of \(\.[0-9]\)*, so we
actually end up with *less* regexes than before.  :)
2004-06-04 19:21:23 +00:00
jschauma
8196789a05 Append ${ABI} to some lib-dirs. This is a no-op on systems that do not
use ABI, but allows IRIX and particularly IRIX64 to find the correct libraries
especially when linking against X11 libs.  Tested over several months and
multiple bulk-builds.
2004-06-04 15:00:14 +00:00
seb
00cc0486ea Garbage collect BUILDLINK_PKGBASE.<pkg> from buildlink3: it is not anymore
used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk.
2004-05-17 21:32:33 +00:00
jlam
9dc812c039 libtool archives don't start with '-', so don't match those, which are
probably options to the compiler.
2004-05-17 10:37:57 +00:00
grant
f8cbf47c3e remove a word which shouldn't be there. 2004-05-08 23:46:20 +00:00
minskim
228608ef83 Define BLNK_RECMETHOD.${_pkg_} not only for full dependency but also
for build dependency.  Also fix a related pasto.  This fixes a
malformed conditional error that occurs when a package in build
dependency has BUILDLINK_RECOMMENDED.*.

OK'ed by jmmv@.
2004-04-26 16:27:36 +00:00
jlam
419a7941e9 Don't treat ${BUILDLINK_DIR} like a local directory in the "${WRKSRC} ==
${WRKDIR}" case when converting references to local libtool archives into
the full paths.
2004-04-24 22:04:46 +00:00
minskim
a6b771c787 Create links to .pc files in BUILDLINK_DIR when building a pkgviews
package.  OK'ed by jmmv@.
2004-04-24 15:49:42 +00:00
snj
961fd1293d When substituting the location of a libtool archive, check to make sure
that the new one actually exists.  Fixes PR pkg/25054.
2004-04-22 22:28:19 +00:00
snj
34fe1cb3c3 Symlink *.idl into ${BUILDLINK_DIR}. This is needed for various gnome
packages.
2004-04-18 22:33:06 +00:00
jmmv
ed73278ee0 Let -D flags be passed through the transformation script, so that they
can be easily suppressed/modified from package Makefiles; this is needed
to fix some programs to build against GTK+ 2.4 without having to patch
the sources.
2004-04-15 09:31:48 +00:00
tv
237bbc5d95 Revert the uberdependencies introduced when originally intending to
fix a bug in the way gnome-libs's dependencies work.  This should be
fixed by a mechanism that takes into account exactly how the API
dependencies are structured.

fixes PR pkg/25088 -- and reopens PR pkg/24799
2004-04-12 19:37:03 +00:00
xtraeme
b15072fe03 err BUILDLINK_UPDATE_CACHE should be no for now... sorry I had this change
in my local tree.
2004-04-06 04:39:00 +00:00
xtraeme
703534638e Ensure USE_BUILTIN.<pkg> is defined before checking its value, fixes
last problems seen when using X11_TYPE=XFree86.
2004-04-05 17:00:12 +00:00
jlam
c7be0d97cf Be robust against the possibility that buildlibdir isn't defined. 2004-04-01 21:21:13 +00:00
jlam
ce7bf9c372 Move the check for USE_X11 after bsd.builtin.mk included since that file
may indirectly set USE_X11.  This should fix using some of the builtin
X11 software to build non-X11 packages.
2004-03-31 07:12:31 +00:00
jlam
a87ac65a40 There is no "heimdal-libs" package. 2004-03-30 20:29:54 +00:00
jlam
7783b66d89 Extend the capabilities of buildlink3's libtool wrapper a bit compared
to the stock libtool: you can now copy or symlink an uninstalled
libtool archive file somewhere else than its build directory, and you
can still link against it.  This allows us to more easily bolt libtool
build machinery onto packages that have unusual(ly crappy) build
systems that rely on installing libraries to some common build directory
after they're built.

We do this by adding a "buildlibdir" variable to the uninstalled
libtool archive that points to the build directory of the archive.
Whenever we link against this archive, we rewrite the path to archive
on the libtool command line so that it points to the true archive.
This allows the real libtool to find the files under $buildlibdir/.libs.
2004-03-30 17:25:19 +00:00
jlam
474598e164 Allow setting BUILDLINK_WRAPPER_LOG in /etc/mk.conf and using that as the
log file used by all of the wrapper scripts.
2004-03-29 06:05:10 +00:00
jlam
a0923cb1cf Handle "-Xlinker" being equivalent to "-Wl," when passing arguments
to the linker.  This fixes a bug building Emacs on Linux.
2004-03-29 06:02:53 +00:00
jlam
82cd68d38a Look at the list of run-time dependencies for the package (gleaned
from BUILDLINK_PACKAGES, which is built up by including buildlink[23].mk
files in the package's Makefile), and for each dependency, if it's
already installed, then automatically include the buildlink[23].mk
file for that dependency.

This means that for any package, the dependencies are taken to be the
union of the dependency information as laid out in /usr/pkgsrc and
the dependency information of installed packages stored in /var/db/pkg.

This handle situations where an installed package has _more_ dependencies
than the package as it exists in pkgsrc.  This can occur, e.g., if
you build databases/gnome-libs with BDB_DEFAULT=db4, and then you
decide that you'd rather build other packages using the native Berkeley
DB, so you remove that setting from your environment.  You'd still
like for your packages that depend on gnome-libs to also depend on
db4, but the pkgsrc Makefiles no longer reflect that dependency.
2004-03-29 05:42:58 +00:00
jlam
020b3ec3e2 Make the list of files "buildlinked" be unique for cleanliness' sake. 2004-03-29 05:27:42 +00:00
jlam
d1b4206bba Instead of saving all of the buildlink3 variables into the command-line
environment, it creates a Makefile fragment that is included within
bsd.buildlink3.mk that contains all of the buildlink3 variable
definitions that we want to pass to make(1) invocations on the same
package Makefile.  Change the make variables that are only relevant
for the current package to use BUILDLINK_VARS instead of MAKEFLAGS.
This avoids overflowing the command line with lots of extra arguments.
2004-03-29 05:21:17 +00:00
xtraeme
18a3083bd9 Enable X11_TYPE=XFree86. 2004-03-28 22:25:35 +00:00
jlam
e237ad11d0 Ensure that ${LOCALBASE}/lib is always in the runtime library search path,
even for packages that have no dependencies.
2004-03-26 08:53:01 +00:00
jlam
aa26ea0b16 Move the code that includes the package builtin.mk files into a separate
file, bsd.builtin.mk.  Document the requirements and the recommended
structure of a builtin.mk file in the comments at the top of
bsd.builtin.mk.
2004-03-21 00:03:32 +00:00
jlam
725855d095 Don't match "bin/libtool" and symlink into the buildlink directory if
libtool/buildlink3.mk is included by a package Makefile, as that symlink
overwrites the libtool wrapper script.  This fixes pkg/24851.
2004-03-19 20:27:44 +00:00
danw
bf0551245e add another darwin linker option that needs to be protected from
path munging
2004-03-19 00:04:42 +00:00
jlam
27336df716 Back out part of previous that was an unrelated change accidentally
committed.
2004-03-18 09:22:34 +00:00
jlam
7db11b582a Fix serious bug where BUILDLINK_PACKAGES wasn't being ordered properly
by moving the inclusion of buildlink3.mk files outside of the protected
region.  This bug would be seen by users that have set PREFER_PKGSRC
or PREFER_NATIVE to non-default values.

BUILDLINK_PACKAGES should be ordered so that for any package in the
list, that package doesn't depend on any packages to the left of it
in the list.  This ordering property is used to check for builtin
packages in the correct order.  The problem was that including a
buildlink3.mk file for <pkg> correctly ensured that <pkg> was removed
from BUILDLINK_PACKAGES and appended to the end.  However, since the
inclusion of any other buildlink3.mk files within that buildlink3.mk
was in a region that was protected against multiple inclusion, those
dependencies weren't also moved to the end of BUILDLINK_PACKAGES.
2004-03-18 09:12:08 +00:00
jlam
59bdf89739 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>.
2004-03-16 18:23:26 +00:00
jlam
fb92616cec Be more permissive in finding libraries to symlink into the buildlink
directory as libraries may be found outside of ${PREFIX}/lib.  We now
match anything that looks like "/lib[^/]*$".
2004-03-16 16:19:37 +00:00
jlam
dbe375ec88 Some of the builtin.mk files append more values to BUILDLINK_PACKAGES, so
make a separate loop to set the default value of USE_BUILTIN.<pkg>.
2004-03-16 02:03:31 +00:00
jlam
62bd2cd672 Add -L${X11BASE}/lib for the benefit of any *-config scripts on
use-xpkgwedge systems.  Not needed when building within pkgsrc, but useful
if you want to link outside 3rd-party software against pkgsrc-controlled
libraries.
2004-03-15 17:55:31 +00:00
jlam
8a2b888017 Back out previous and remove an extra ")" that was causing "malformed
conditional" problems.
2004-03-14 20:27:17 +00:00
jlam
e506d614ce Apparently, some pre-conditions aren't true, so set a default USE_BUILTIN
value before checking it.
2004-03-14 19:04:01 +00:00
jlam
86bb0a15b8 Don't bother checking whether a package is actually built-in or not
in the fall-through code for setting a default value for USE_BUILTIN.<pkg>.
This provides ensures that USE_BUILTIN.<pkg> is always set for every
package listed in BUILDLINK_PACKAGES.  Back out previous as it's now
unneeded.
2004-03-14 18:57:04 +00:00
jmmv
14aa52924a Fix a 'malformed conditional' error. 2004-03-14 12:15:19 +00:00
uebayasi
ac4027935c Indent. 2004-03-13 03:41:13 +00:00
jlam
277b3e1dbb During the "extract" phase (which is when "install-depends" is invoked),
add all of the direct _and_ indirect dependencies to the DEPENDS list.
This causes "install-depends" to check that every dependency, whether
it be direct or indirect, is up-to-date.  This fixes PR 24721 by Jeremy
Reed.
2004-03-13 03:33:31 +00:00