diff options
| author | rillig <rillig> | 2007-08-11 21:15:22 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-08-11 21:15:22 +0000 |
| commit | f256d822679600b1f57f55e5bf0ace985c01acce (patch) | |
| tree | bc4e4ffa66f1eeb94e456081a5af4a48504d5a3e /mk | |
| parent | e0533d044e90d076150f4d4f5a317d7bb7804052 (diff) | |
| download | pkgsrc-f256d822679600b1f57f55e5bf0ace985c01acce.tar.gz | |
Reverted everything that had not been mentioned in the previous commit
message. Related to PR 36588.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pkg-build-options.mk | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/mk/pkg-build-options.mk b/mk/pkg-build-options.mk index a143bfc9c91..cddd73d083e 100644 --- a/mk/pkg-build-options.mk +++ b/mk/pkg-build-options.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-build-options.mk,v 1.4 2007/08/11 16:25:16 rillig Exp $ +# $NetBSD: pkg-build-options.mk,v 1.5 2007/08/11 21:15:22 rillig Exp $ # # This procedure determines the PKG_OPTIONS that have been in effect # when the package ${pkgbase} has been built. When the package is not @@ -7,8 +7,6 @@ # Parameters: # pkgbase # The basename of the package. -# pkgpath -# The directory in which the source package lives. # # Returns: # PKG_BUILD_OPTIONS.${pkgbase} @@ -35,25 +33,6 @@ MAKEFLAGS+= PKG_BUILD_OPTIONS.${b}=${PKG_BUILD_OPTIONS.${b}:Q} MAKEVARS+= PKG_BUILD_OPTIONS.${b} . endfor - -.elif defined(bl4_package) && defined(pkgpath) -. for b in ${bl4_package} -. if !defined(PKG_BUILD_OPTIONS.${b}) -. if ${pkgpath} == ${PKGPATH} -PKG_BUILD_OPTIONS.${b} = ${PKG_OPTIONS} -. else -PKG_BUILD_OPTIONS.${b} != \ - ${PKG_INFO} -Q PKG_OPTIONS ${b} 2>/dev/null \ - || { cd ${PKGSRCDIR}/${pkgpath} \ - && ${MAKE} ${MAKEFLAGS} show-var VARNAME=PKG_OPTIONS; } - -MAKEFLAGS+= PKG_BUILD_OPTIONS.${b}=${PKG_BUILD_OPTIONS.${b}:Q} -. endif -. endif - -MAKEVARS+= PKG_BUILD_OPTIONS.${b} -. endfor - .else . for b in ${pkgbase} PKG_FAIL_REASON+= "[pkg-build-options.mk] This file may only be included from a buildlink3.mk file (pkgbase=${b})." |