summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2003-09-02Remove -R* options from the dependency_libs lines of *.la and *.lai files.pkgviews_mkjlam1-1/+10
2003-09-02Sync to HEAD before merging back.jlam4-14/+20
2003-08-31Add a README file that documents pkgviews and buildlink3.jlam1-0/+159
2003-08-31Move the PKGVIEWS file into buildlink3 and rename it "TODO". This filejlam1-6/+1
contains the pkgviews migration plan as well as any other buildlink3/pkgviews ideas that we may have.
2003-08-31Okay, now that I've read the file and actually understand what it's tryingjlam1-48/+25
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.
2003-08-31Also strip out -L@WRKSRC@ since the libraries may be in the top-leveljlam1-2/+2
source directory.
2003-08-31Make USE_X11_LINKS=NO mean "don't add a dependency on x11-links".jlam1-7/+14
2003-08-31Pull in "depot" command from buildlink3 and use it consistently.jlam2-6/+19
Also restore USE_X11_LINKS=NO to mean "don't add a build dependency on x11-links even though I define USE_X11".
2003-08-31Actually, make sure that we don't try to remove broken packages on thejlam1-9/+15
first time around.
2003-08-31Check to see if DEPOTBASE is different from PKG_DBDIR as an optimization.jlam1-9/+23
2003-08-31Fix some whitespace and remove a redundant ".PHONY: tags" target.jlam1-5/+4
2003-08-30Sync to HEAD.jlam3-11/+5
2003-08-30Missed one more.jlam1-2/+2
2003-08-30The comment in the example buildlink3.mk file in the comments had a typo:jlam1-2/+2
FOO_BUILDLINK_MK -> FOO_BUILDLINK3_MK Thanks, seb!
2003-08-30Require 20030823 of the pkg_install tools to get fixes in pkg_add(1) sojlam1-2/+2
that we don't accidentally run VIEW-INSTALL with a broken package.
2003-08-30There are three different parts we can add to the common transformingjlam1-2/+18
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.
2003-08-30Protect references to ${PREFIX} and ${X11BASE} directories from beingjlam1-2/+34
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.
2003-08-30Allow a transformation to be _only_ for either transform or untransform.jlam1-5/+23
2003-08-30_PKG_DBDIR is in fact set in this very file. Thanks, seb!jlam1-2/+2
2003-08-30Sync to HEAD.jlam2-3/+3
2003-08-30* Change the mangled directory name style so that it's possible tojlam1-7/+15
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.
2003-08-30Add a new command "depot:src:dst" that translates "src/<dir>/" into "dst/".jlam1-38/+51
Also be more strict about matching either non-separators or separators that can appear after a directory name.
2003-08-30Strip leading spaces from dependency_libs in the modified .lai file.jlam1-1/+2
2003-08-29Fix up building X11 packages and fix _BLNK_LT_ARCHIVE_FILTER to translatejlam1-26/+39
${DEPOTBASE}/<pkg>, not just ${DEPOTBASE}, into ${BUILDLINK_DIR}.
2003-08-29Don't stomp on PLIST_SRC if using dynamic PLISTs. Instead, make bsd.pkg.mkjlam1-6/+7
use a new variable _PLIST_SRC that's ${PLIST_SRC} if static PLISTs and is empty for dynamic PLISTs.
2003-08-29Support two new variables:jlam3-8/+34
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
2003-08-29buildlink2 no longer uses BUILDLINK_X11PKG_DIR, so reap it.jlam1-6/+4
2003-08-28Deal with "-Wl,--rpath -Wl,/path/to/dir" by compressing it into a singlejlam6-8/+48
argument "-Wl,--rpath,/path/to/dir". This makes the cache-lookup much easier.
2003-08-28Avoid removing bare -[ILR], etc. You're allowed to put a space betweenjlam1-7/+20
the option flag and the directory that follows it.
2003-08-28Properly preserve some whitespace during tranformations.jlam1-10/+10
2003-08-28Second pass at making buildink3 usable by overwrite packages. Thisjlam2-46/+106
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.
2003-08-27(*) Automatically add BUILDLINK_CPPFLAGS.<pkg> and BUILDLINK_LDFLAGS.<pkg>,jlam1-8/+32
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.
2003-08-27Correct the glob so that we actually match -L${BUILDLINK_DIR}/* andjlam1-2/+2
-L${BUILDLINK_X11_DIR} and discard them.
2003-08-27Correct the glob so that we actually match -L${BUILDLINK_DIR}/* andjlam1-2/+2
discard them.
2003-08-27Add code to unbuildlinkify files and libtool archives.jlam2-5/+46
2003-08-27Add some .PHONY targets for correctness.jlam1-1/+4
2003-08-27Sync to HEAD for subst.mkjlam17-119/+193
2003-08-27First pass at allowing overwrite packages to build using buildlink3.jlam1-45/+150
2003-08-27Remove spurious line that causes spewage for "static" action.jlam1-2/+1
2003-08-27Promote buildlink3 framework into something that can be chosen by settingjlam1-13/+10
USE_BUILDLINK3 in a package Makefile (not that this works, yet).
2003-08-27Rename BUILDLINK_DEPOT to BUILDLINK_PKG_DBDIR to more accurately reflectjlam1-13/+12
what we'll be using the variable for.
2003-08-27Add a new su-able target "remove-views" that removes a package from thejlam1-1/+30
views listed in ${PKGVIEWS}.
2003-08-27Cut-n-pasto: s/GREP/GMAKE/ in the GNU make section.jlam1-2/+2
2003-08-27Some speed optimizations so that we don't keep evaluating some variablesjlam2-17/+29
set via != for every sub-make process.
2003-08-27Forgot a USE_GMAKE => USE_GNU_TOOLS+=make.jlam1-5/+6
2003-08-26Sync to HEADjlam11-28/+91
2003-08-26Move the PKG_INSTALLATION_TYPE and _PKG_DBDIR definitions intojlam2-14/+19
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.
2003-08-26Separate the concepts of where the metadata for a depoted package are, andjlam1-6/+12
where the actual files for a depoted package are.
2003-08-26ename some private variables so that they begin with _BLNK.jlam1-4/+4
2003-08-26Avoid executing pkg_info when we don't have to.jlam1-15/+14