Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
|
|
contains the pkgviews migration plan as well as any other
buildlink3/pkgviews ideas that we may have.
|
|
to do, rewrite the package removal as a loop over ${PKG_DBDIR} then
${DEPOTBASE}. This causes all "overwrite" and package instances in the
default view to be removed first, followed by any depoted packages. Since
removing a depoted package triggers removing package instances in all
other views, this should guarantee that all traces of pkgviews packages are
removed from the system.
|
|
source directory.
|
|
|
|
Also restore USE_X11_LINKS=NO to mean "don't add a build dependency on
x11-links even though I define USE_X11".
|
|
first time around.
|
|
|
|
|
|
|
|
|
|
FOO_BUILDLINK_MK -> FOO_BUILDLINK3_MK
Thanks, seb!
|
|
that we don't accidentally run VIEW-INSTALL with a broken package.
|
|
cache to speed things up:
passthru automatically accept certain options without
further checking
transform change -[IL]{${X11BASE},${LOCALBASE},${DEPOTBASE}/*}
to the correct ${BUILDLINK_DIR} reference
block block certain options without further checking
Seeding the cache appropriately lets us handle large classes of options
without having to go through the wrapper logic file, which generates
a cache hit for every single option and bloats the cache quite bit more.
The implementation is at the bottom of bsd.buildlink3.mk where
${_BLNK_WRAP_CACHE_ADD_TRANSFORM} is generated.
For now, only do the passthru stuff, since I'm not sure of the correctness
of the other two phases. "transform" is probably okay, but "block" may be
a tad too aggressive.
|
|
removed when unbuildlinkifying files.
Also properly convert -[IL]${DEPOTBASE}/<pkg>/path to
-[IL]${BUILDLINK_DIR}/path in the seeded cache so that we can properly
use pkgviews packages as dependencies for overwrite packages.
|
|
|
|
|
|
|
|
differentiate between the start and end of the mangled name.
* Change references to ${DEPOTBASE}/<pkg> into ${LOCALBASE} so that
"overwrite" packages think headers and libraries for "pkgviews" packages
are just found in the default view.
* Remove extra bit of _UNBUILDLINK_SED that duplicates sed commands that
are added by the depot:...:... command.
|
|
Also be more strict about matching either non-separators or separators that
can appear after a directory name.
|
|
|
|
${DEPOTBASE}/<pkg>, not just ${DEPOTBASE}, into ${BUILDLINK_DIR}.
|
|
use a new variable _PLIST_SRC that's ${PLIST_SRC} if static PLISTs and is
empty for dynamic PLISTs.
|
|
PKG_INSTALLATION_PREFS?= overwrite pkgviews
# This is a whitespace-separated list of installation types to try when
# building a package, in order of preference.
# Possible: any of: overwrite, pkgviews
# Default: overwrite pkgviews
PKG_INSTALLATION_TYPES?= overwrite
# This is a whitespace-separated list of installation types supported
# by the package.
#
# *NOTE*: This variable *must* be set in the package Makefile *before*
# the inclusion of bsd.prefs.mk.
#
# Possible: any of: overwrite, pkgviews
# Default: overwrite
|
|
|
|
argument "-Wl,--rpath,/path/to/dir". This makes the cache-lookup much
easier.
|
|
the option flag and the directory that follows it.
|
|
|
|
drags in most of the functionality present in buildlink2. We try
something new to prevent libtool from looking in ${LOCALBASE}/lib
for more libtool archives. Also, modify the cache-seeding to occur
in stages and allow for a way to specify which stages we want.
Currently, we seed with only the passthru and transforming bits.
|
|
if they're defined, to the CPPFLAGS and LDFLAGS passed to the build.
(*) Fix a silly error that stopped files for "overwrite" packages from
being symlinked into ${BUILDLINK_DIR} -- a "$" was used instead of "$$".
(*) Normalize a few status messages (printed by ${ECHO_BUILDLINK_MSG}) so
that they match formats with the rest of pkgsrc. By default, these
messages are suppressed.
|
|
-L${BUILDLINK_X11_DIR} and discard them.
|
|
discard them.
|
|
|
|
|
|
|
|
|
|
|
|
USE_BUILDLINK3 in a package Makefile (not that this works, yet).
|
|
what we'll be using the variable for.
|
|
views listed in ${PKGVIEWS}.
|
|
|
|
set via != for every sub-make process.
|
|
|
|
|
|
bsd.prefs.mk so that PKG_{INFO,ADD,ADMIN,etc.} all use the correct
package database directory and are set correctly before bsd.pkg.mk is
included. This is needed since some buildlink2.mk files use these
variables in != variable settings, and the buildlink2.mk files are included
before bsd.pkg.mk.
As a side effect of this change, we now require PKG_INSTALLATION_TYPE to be
defined *before* bsd.prefs.mk is included, so stick the definition near the
top of package Makefile.
|
|
where the actual files for a depoted package are.
|
|
|
|
|