Age | Commit message (Collapse) | Author | Files | Lines |
|
Idea from Dan McMahill <dmcmahill@netbsd.org>.
|
|
problems linking against libintl in the base system (pkg/15964).
|
|
$${file} is a libtool archive (*.la). It allows libtool to properly
interact with buildlink at link time by linking against the libraries
pointed to by symlinks in ${BUILDLINK_DIR}.
This change has been tested by me on NetBSD-1.5ZA/i386 and by Mark
Davies <mark@mcs.vuw.ac.nz> on Solaris.
|
|
|
|
FOO_SED is user-appendable.
_FOO_SED = ${_FOO_PRE_SED} ${FOO_SED} ${_FOO_POST_SED}
_FOO_SED is used when actually making sed(1) substitutions.
This allows tweaking _FOO_{PRE,POST}_SED to alter the total sed expression.
|
|
of the horrendous (non-portable) sed statement that did the same thing.
|
|
shell scripts under Solaris.
|
|
We really don't want these to change from the correct values (within
${WRKDIR}).
|
|
chokes on the construct. This was a pasto that's been there for a while
but was uncaught. Thanks for David Brownlee <abs@netbsd.org> for noting
the problem and the solution.
|
|
set to '${ECHO_MSG} "=>"' for now.
|
|
Less cut-and-paste, more code sharing. Also comment the file a bit more.
|
|
|
|
implicit `-print' action is performed on bar and not on foo. Surround
the search pattern in \( ... \) and add an explict -print so that all of
the results of the find are printed.
Problem noted and patch to fix this received in private email from Stoned
Elipot <seb@netbsd.org>.
|
|
|
|
Also name the replace-libnames-configure as part of ${_CONFIGURE_PREREQ}
instead of as a prerequisite to pre-configure. This is needed so that the
replacement occurs _after_ pre-configure target is run, which may call
autoconf/automake to regenerate the configure scripts. Before this change,
the replacement would be overwritten when the configure scripts were
regenerated. This should fix a problem first noticed by Alistair Crooks
<agc@netbsd.org> in the net/mtr package.
|
|
|
|
Solaris find. The latter work across Solaris/NetBSD/Linux. Patch
received in private e-mail from Stoned Elipot <seb@netbsd.org>.
|
|
handle that case.
|
|
prepending an underscore to their names. The values are not meant to be
set by Makefiles or buildlink.mk files. However, the values are exported
through CONFIGURE_ENV and MAKE_ENV so that they may be used during the
respective processes.
|
|
BUILDLINK_LDFLAGS to CFLAGS, CPPFLAGS, CXXFLAGS, LDFLAGS from
bsd.buildlink.mk to bsd.pkg.mk. They're unnecessary after the recent
changes to bonobo/buildlink.mk and to libglade/buildlink.mk that removed
their settings of BUILDLINK_CPPFLAGS.
|
|
"${CPPFLAGS}", "${CXXFLAGS}" respectively "${LDFLAGS}" in "bsd.pkg.mk" and
not in "bsd.buildlink.mk" because "${BUILDLINK_CPPFLAGS}" and
"${BUILDLINK_LDFLAGS}" might get changed several times by the
"buildlink.mk" files of various packages.
|
|
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.
|
|
expanded from some expensive operation, it isn't evaluated if it's not
needed. Also fix the replace-buildlink target where we were potentially
evaluating ${REPLACE_BUILDLINK} twice when only once was enough.
|
|
out some common code, and this is a start to make different code pieces
look more alike.
|
|
MAKEFILE_PATTERNS. Also 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.
|
|
REPLACE_BUILDLINK
REPLACE_BUILDLINK_PATTERNS
REPLACE_BUILDLINK_SED
REPLACE_LIBNAMES
REPLACE_LIBNAMES_PATTERNS
REPLACE_LIBNAMES_SED
BUILDLINK_CONFIG_WRAPPER_SED
Also prepend an underscore to REPLACE_LIBNAME_SCRIPT as it's not a variable
we're exporting.
|
|
|
|
is supposed to do: filter out libtool archives from the list of files
to link into ${BUILDLINK_DIR}.
|
|
REPLACE_LIBNAMES_PATTERNS
REPLACE_BUILDLINK_PATTERNS
They are space-separated lists of shell glob patterns representing files
in which we substitute with REPLACE_LIBNAMES_SED (for replacing buildlink
library names with the true library names) and REPLACE_BUILDLINK_SED (for
replacing references to buildlink directories with the true install
locations). This generalizes the variables (which may still be used):
REPLACE_LIBNAMES, REPLACE_BUILDLINK,
that contained the actual filenames.
REPLACE_BUILDLINK_PATTERNS contains *.lai, *-config, *Conf.sh, and *.pc.
|
|
and use it instead. Also subsititute for library names in the installed
libtool archives. This last bit is to fix instances where "-lncurses" has
been hard-coded into *.lai files, but we are actually using -lcurses in
reality (devel/tvision is one example). Problem noted by Thomas Klausner
(hi wiz!).
|
|
BUILDLINK_CONFIG_WRAPPER_POST_SED. Also some minor formatting changes.
|
|
|
|
post-configure. Also make sure ${BUILDLINK_DIR} is created prior to
trying to create the cookie files.
|
|
place in the linked object, so even if the library is a symlink with a
different name from the true library, the correct soname is recorded in
the object. On a.out, there is no soname, so the linker just records the
specified library name + major number into the object, which can cause the
incorrect library name to be recorded. Fix this problem on a.out by
replacing the specified library names with the true library names in all of
the Makefiles in a post-configure step. Additional files may be added to
the list of files on which replacement is done by setting REPLACE_LIBNAMES
in each package that needs it.
This should fix pkg/13402 by John Klos <john@sixgirls.org>.
|
|
|
|
to aid in debugging problems.
|
|
dependencies on the package are added through buildlink. Also show how
to use EVAL_PREFIX to set BUILDLINK_PREFIX.foo.
|
|
|
|
|
|
into one target: replace-buildlink. Get rid of BUILDLINK_FIX_LIBTOOL_SED
as it can be handled with REPLACE_BUILDLINK_SED.
|
|
package buildlink.mk file. Also change
BUILDLINK_CONFIG_WRAPPER_SED.<pkgname> to BUILDLINK_CONFIG_WRAPPER_SED.
|
|
automatically.
|
|
to the sed expression used in the generated config script wrappers.
|
|
|
|
mangling "lib/libaviplay.so.0.0" to "y.so.0.0". Thanks to Tomasz Luchowski
<zuntum@netbsd.org> for finding this.
|
|
replace ${BUILDLINK_DIR} in config scripts.
|
|
BUILDLINK_FIX_LIBTOOL_SED, that may be appended to.
|
|
into ${LOCALBASE} in libtool archives if USE_LIBTOOL is defined.
|
|
|
|
as they often add extra -L options to the compiler flags, which goes
against the buildlink.mk philosophy.
|