| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
of the order in which buildlink3.mk files are (recursively) included
by a package Makefile.
|
|
Dar is built by default with an arbitrary-size-integer library for managing
all file length/timestamp details. If 32-bit or 64-bit integers (with
overflow protection) are sufficient for requirements, the dar-int32 and
dar-int64 options can significantly reduce the run-time memory and CPU
overheads of Dar.
|
|
|
|
variables so there are no user-visible changes. This change just makes
it a little easier to write for loops.
|
|
didn't exist. Those commands were never run anyway, but moving the
.MAIN target exposed these commands as unassociated.
|
|
semantics in pkgsrc. Because libtool-override is run by default
whenever USE_LIBTOOL is specified, LIBTOOL_OVERRIDE never needs to be
defined, and some packages set it to nothing to avoid running
libtool-override. However, shlibtool-override is only run if
SHLIBTOOL_OVERRIDE is defined and non-empty.
Split the code for libtool-override and shlibtool-override to reflect
these differing semantics. This should make the PHP packages build
again by not overriding libtool.
|
|
will search for libtool scripts up to ${OVERRIDE_DIRDEPTH} below
${WRKSRC} already.
|
|
|
|
overwritten in the case where LTCONFIG_OVERRIDE was defined.
As a side note, after analyzing the way that the original code in
bsd.pkg.mk worked, I think we can nuke LTCONFIG_OVERRIDE completely,
but we'll need a bulk build to verify this. The original code always
replaced the libtool scripts because LIBTOOL_OVERRIDE is always defined
in bsd.pkg.use.mk, so LTCONFIG_OVERRIDE essentially had no effect.
|
|
NO_INSTALL, or NO_PACKAGE are defined.
|
|
Without this a straight make fails in pkgsrc/pkgtools/pkg_comp.
|
|
that they are never being created more than once by inserting a check
into the *-cookie targets.
|
|
so it might as well be the target name.
|
|
target in that it installs the currently-built software into the
filesystem. In that case where "replace" is specified as a target on
the command line, make "replace" and not "install" be the source target
for "package".
Also, place the "replace" target between the "install" and "package"
targets in _BARRIER_POST_TARGETS as it should be legal to do those
steps in that order (but not in another order).
These changes make the following work:
make replace package
In this example, the currently installed package will be replaced and
the newly-installed software will be packaged, all within the same
make process.
|
|
quotes.
|
|
bsd.pkg.readme.mk and document the public targets and variables for this
new file.
|
|
that invoke the compiler in either the configure or install steps that
we still need to guard against.
|
|
|
|
|
|
move .MAIN all the way to the top of the file. bsd.pkg.barrier.mk
(currently) needs to be included before bsd.wrapper.mk since it defines
_BARRIER_COOKIE, which is expanded and used in place within bsd.wrapper.mk.
This makes the "wrapper" phase run again.
|
|
bsd.pkg.barrier.mk uses the "make()" test expression. Also, include
"all" as a post-barrier target since it is implicitly the ".MAIN" target
when a user just types "make" in a package directory.
|
|
the command-line, then we don't invoke make once for each target, and
pass them to the sub-make in a sensible order.
|
|
|
|
settings.
|
|
|
|
output of PKG_SKIP_REASON, since the plain message does not say where it
comes from.
|
|
introducing the concept of a "barrier". We separate the user-invokable
targets into ones that must happen before the barrier, and ones that
must happen after the barrier. The ones that happen after the barrier
are run in a sub-make process. In this case, the targets that must
be run after the barrier are from the "wrapper" step and beyond. We
rewrite the various "flow" targets, e.g. wrapper, configure, build,
etc., so that they of the right form to use the barrier target.
This now completely removes the concept of PKG_PHASE from pkgsrc. It
is replaced with the concept of "before" and "after" the barrier, and
this state can be checked by testing for the existence of the barrier
cookie file. Because we've removed most of the recursive makes, there
is now nowhere to hook the PKG_ERROR_HANDLER.* commands, so remove
them for now.
As part of this commit, put back the logic that conditionalized the
sources for the various cookie files. Because the sources are all
"phony" targets, they were always run, regardless of whether or not
the cookie file already existed. Now, if a cookie file exists, then
that entire phase associated with that cookie file is skipped.
Lastly, fix a thinko in configure/bsd.configure.mk where setting
NO_CONFIGURE in a package Makefile would manage to skip the "wrapper"
step altogether. Fix this by correctly noting "wrapper" and not
"patch" as the preceding step to "configure".
|
|
|
|
|
|
of the logic from fetch/fetch.mk into flavor/pkg/check.mk, so that
check-vulnerable can be used as a source target.
Make check-vulnerable a source target for every phase of the build
workflow, which ensures that it is always run if the user starts a
new phase from the command line.
Fix the cookie-generation targets so that they don't append, only
overwrite to the cookie file. This works around potential problems
due to recursive makes.
Move the cookie checks so that they surround the corresponding phase
target. The presence of the cookie should now inform the make process
to avoid doing any processing of phases that occur before the phase
corresponding to the cookie.
|
|
and into their own directories. Also do some cleanups with build/_build
and pkginstall -- we get rid of _build and simply run pkginstall as
part of the "build" target.
Introduce a new mechanism to handle varying directory depths under
${WRKSRC} in which we find files to override, e.g. configure, config.*,
libtool, etc. OVERRIDE_DIRDEPTH is a package-settable variable that
specifies how far under ${WRKSRC} the various targets should look,
and it defaults to "2". We preserve the
meaning of the various *_OVERRIDE variables, so if they are defined,
then their values supersede the OVERRIDE_DIRDEPTH mechanism.
devel/tla will need to specially set OVERRIDE_DIRDEPTH to 3 (see log
for revision 1.1857 for bsd.pkg.mk -- to be done in a separate commit.
|
|
version by default.
|
|
itools, intltool, diff3, sdiff, msgmerge
* Adding USE_TOOLS+=itools to a package Makefile will cause the
tool-directory versions of imake, makedepend, mkdirhier and xmkmf
to point to the ones from the devel/nbitools package.
This change will remove the need for nbitools/buildlink3.mk, which
currently does a bit of hackery to force the "right" imake tools to
be used by packages that need it.
* Adding USE_TOOLS+=intltool to a package Makefile will cause the
local versions of intltool-* inside ${WRKSRC} to be replaced by
copies from the textproc/intltool package. If "intltool" is not
specified as a tool, then we create "broken" intltool-* tools in
the tools directory to help highlight hidden dependencies on the
intltool package.
In addition, modify the tools framework so that if "perl" is not
specified as a tool, then we create a "broken" perl tool in the
tools directory for the same reason as for "intltool".
These two changes together will remove the need for
intltools/buildlink3.mk and should also catch all cases where the
sources' intltools may have been silently used because perl was
found on the system.
* Adding USE_TOOLS+=diff3, USE_TOOLS+=sdiff, or USE_TOOLS+=msgmerge
to a package Makefile will cause the corresponding tool to be pulled
into the tools directory.
These are convenience tools to help simplify dependencies for some
packages.
|
|
so it can be overridden on the command line. This allows to check for
example ${WRKSRC} instead of the installed files. Of course, since the
variable starts with an underscore, this feature is not meant to be
official.
|
|
anymore.
|
|
user-settable variables come first.
|
|
dollar character before the opening parenthesis. This should really have
been detected by bmake, but somehow the parser seems to be tolerant with
respect to syntax errors.
|
|
are automatically excluded from the checks, since those files are not
intended to be executed directly.
|
|
run-time for loop is used, which allows for white-space in
CHECK_INTERPRETER_SKIP.
|
|
expression, but a list of sed expressions.
|
|
the cache files left by the README.html generation. This is indended
to be used to monitor a ftp server, not for generating a file list for
uploading to a ftp server.
|
|
|
|
9.1 as legacy option.
SUSE 10.0 supports more architectures (i386, powerpc, x86_64) and is
already required for some packages (e.g., acroread7). It will help to
get more testing so we can phase out 9.1 before the next stable branch.
|
|
|
|
see \c, where c is anything but a legal character as defined by
msgfmt-0.10.35, then replace the backslash with a '?'. Yes, this is
a hack, but it works around a bug in the way that older msgfmt
mis-identifies some "control" sequences. This fixes building of
zh_TW.po in x11/matchbox-panel as noted in the bulk build results:
http://mail-index.netbsd.org/pkgsrc-bulk/2006/06/20/0000.html
While here, note in a header comment which packages' *.po files to
use for regression tests whenever changes to this file are made.
|
|
needed by files in a package. Noted and fix suggested by <taca> in
private email.
|
|
to new version) from the list of Apache master sites.
|
|
PKG_FAIL_REASON in that case. It didn't have an effect anyway for normal
builds, since subst.mk is included after checking PKG_FAIL_REASON.
Discussed with jlam.
|
|
argument list on at least on OS.
|
|
some extra processing to ensure that we have a list of unique directories.
Otherwise we end up with two problems:
- cache files get rebuilt all the time because they get built once for each
path to the directory in question and since the path ends up in the cache,
it is always declared out of date.
- we end up with multiple links to the same binary package in the README.html
files.
Committed during the freeze becuase this is a real bug which is encountered
daily.
|
