Permalink
Commits on Sep 2, 2003
  1. Sync to HEAD before merging back.

    jlam committed Sep 2, 2003
Commits on Aug 31, 2003
  1. Move the PKGVIEWS file into buildlink3 and rename it "TODO". This file

    contains the pkgviews migration plan as well as any other
    buildlink3/pkgviews ideas that we may have.
    jlam committed Aug 31, 2003
  2. Okay, now that I've read the file and actually understand what it's t…

    …rying
    
    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.
    jlam committed Aug 31, 2003
  3. Also strip out -L@WRKSRC@ since the libraries may be in the top-level

    source directory.
    jlam committed Aug 31, 2003
  4. Pull in "depot" command from buildlink3 and use it consistently.

    Also restore USE_X11_LINKS=NO to mean "don't add a build dependency on
    x11-links even though I define USE_X11".
    jlam committed Aug 31, 2003
  5. Actually, make sure that we don't try to remove broken packages on the

    first time around.
    jlam committed Aug 31, 2003
Commits on Aug 30, 2003
  1. Sync to HEAD.

    jlam committed Aug 30, 2003
  2. Missed one more.

    jlam committed Aug 30, 2003
  3. The comment in the example buildlink3.mk file in the comments had a t…

    …ypo:
    
    	FOO_BUILDLINK_MK -> FOO_BUILDLINK3_MK
    
    Thanks, seb!
    jlam committed Aug 30, 2003
  4. Require 20030823 of the pkg_install tools to get fixes in pkg_add(1) so

    that we don't accidentally run VIEW-INSTALL with a broken package.
    jlam committed Aug 30, 2003
  5. There are three different parts we can add to the common transforming

    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.
    jlam committed Aug 30, 2003
  6. Protect references to ${PREFIX} and ${X11BASE} directories from being

    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.
    jlam committed Aug 30, 2003
  7. Sync to HEAD.

    jlam committed Aug 30, 2003
  8. * Change the mangled directory name style so that it's possible to

      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.
    jlam committed Aug 30, 2003
  9. Add a new command "depot:src:dst" that translates "src/<dir>/" into "…

    …dst/".
    
    Also be more strict about matching either non-separators or separators that
    can appear after a directory name.
    jlam committed Aug 30, 2003
Commits on Aug 29, 2003
  1. Fix up building X11 packages and fix _BLNK_LT_ARCHIVE_FILTER to trans…

    …late
    
    ${DEPOTBASE}/<pkg>, not just ${DEPOTBASE}, into ${BUILDLINK_DIR}.
    jlam committed Aug 29, 2003
  2. Don't stomp on PLIST_SRC if using dynamic PLISTs. Instead, make bsd.p…

    …kg.mk
    
    use a new variable _PLIST_SRC that's ${PLIST_SRC} if static PLISTs and is
    empty for dynamic PLISTs.
    jlam committed Aug 29, 2003
  3. Support two new variables:

    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
    jlam committed Aug 29, 2003
Commits on Aug 28, 2003
  1. Deal with "-Wl,--rpath -Wl,/path/to/dir" by compressing it into a single

    argument "-Wl,--rpath,/path/to/dir".  This makes the cache-lookup much
    easier.
    jlam committed Aug 28, 2003
  2. Avoid removing bare -[ILR], etc. You're allowed to put a space between

    the option flag and the directory that follows it.
    jlam committed Aug 28, 2003
  3. Second pass at making buildink3 usable by overwrite packages. This

    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.
    jlam committed Aug 28, 2003
Commits on Aug 27, 2003
  1. (*) Automatically add BUILDLINK_CPPFLAGS.<pkg> and BUILDLINK_LDFLAGS.…

    …<pkg>,
    
        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.
    jlam committed Aug 27, 2003
  2. Correct the glob so that we actually match -L${BUILDLINK_DIR}/* and

    -L${BUILDLINK_X11_DIR} and discard them.
    jlam committed Aug 27, 2003
  3. Correct the glob so that we actually match -L${BUILDLINK_DIR}/* and

    discard them.
    jlam committed Aug 27, 2003