diff options
| author | jlam <jlam> | 2003-08-18 15:37:36 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-08-18 15:37:36 +0000 |
| commit | 7aeb31bec207b307a866c0fdd74615f86e6d2192 (patch) | |
| tree | d39386fe33ad378fcd13e88a7131516f81935231 | |
| parent | 605fd90eb72993e1a952b893240c4355c41b123e (diff) | |
| download | pkgsrc-7aeb31bec207b307a866c0fdd74615f86e6d2192.tar.gz | |
Change references to -[IL]${DEPOTBASE}/* into -[IL]${LOCALBASE} so that
"overwrite" packages think headers and libraries for "pkgviews" packages
are just found in the default view.
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 611f29fdaf3..7da9ae41ecd 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.90.4.10 2003/08/16 17:17:11 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.90.4.11 2003/08/18 15:37:36 jlam Exp $ # # An example package buildlink2.mk file: # @@ -325,6 +325,12 @@ _BLNK_UNPROTECT+= s:${_BLNK_MANGLE_DIR.${_dir_}}:${${_dir_}} _BLNK_TRANSFORM+= ${_BLNK_PROTECT} # +# Change references to -[IL]${DEPOTBASE}/* into -[IL]${LOCALBASE} so that +# "overwrite" packages think headers and libraries for "pkgviews" packages +# are just found in the default view. +# +_BLNK_TRANSFORM+= s:${DEPOTBASE}/[^/]*/:${LOCALBASE}/ +# # Convert direct paths to shared libraries into "-Ldir -llib" equivalents. # _BLNK_TRANSFORM+= p:${X11BASE} @@ -441,14 +447,13 @@ _REPLACE_BUILDLINK= \ # buildlink directories and change any -llib to the proper replacement # libraries (-lreadline -> -ledit, etc.). Redundant -Idir and -Ldir # options are removed to optimize the resulting file. Also, prefer the -# .la files in ${LOCALBASE}/lib over the ones in -# ${LOCALBASE}/${DEPOT_SUBDIR}/*/lib when creating new .la files. This -# makes "overwrite" packages look and feel more like they would without -# the pkgviews integration. +# .la files in ${LOCALBASE}/lib over the ones in ${DEPOTBASE}/*/lib when +# creating new .la files. This makes "overwrite" packages look and feel +# more like they would without the pkgviews integration. # LIBTOOL_ARCHIVE_UNTRANSFORM_SED?= # empty _LIBTOOL_ARCHIVE_UNTRANSFORM_SED= \ - -e "s|${LOCALBASE}/${DEPOT_SUBDIR}/[^/]*/|${LOCALBASE}/|g" + -e "s|${DEPOTBASE}/[^/]*/|${LOCALBASE}/|g" _LIBTOOL_ARCHIVE_UNTRANSFORM_SED+= ${LIBTOOL_ARCHIVE_UNTRANSFORM_SED} REPLACE_BUILDLINK_SED?= # empty _REPLACE_BUILDLINK_SED= ${REPLACE_BUILDLINK_SED} |