Permalink
Browse files

nrelease - try to workaround a problem with ./bootstrap

* setenv share_dir during the bootstrap build to try to work around a
  problem where recent changes in the build cause bmake to try to access
  the system mk files in /usr/share/mk.
  • Loading branch information...
1 parent 1696176 commit de863bf0ab0f0d379140b82c2b4b1301f80361b8 Matthew Dillon committed Apr 30, 2010
Showing with 4 additions and 1 deletion.
  1. +4 −1 nrelease/Makefile
View
@@ -339,6 +339,7 @@ customizeiso:
${ISOROOT}/var/db/pkg.refcount
test -e ${ISODIR}/.didbootstrap || \
${CHROOT_CMD} "cd /usr/pkgsrc/bootstrap; \
+ export share_dir=/usr/pkgobj/bootstrap/work/share; \
./bootstrap --workdir /usr/pkgobj/bootstrap/work"
.if make(gui)
test -e ${ISODIR}/.didbootstrap || \
@@ -458,7 +459,9 @@ realclean: clean
pkgsrc_bootstrap:
mkdir -p /usr/release/bootstrap
- (cd ${PKGSRC_PATH}/bootstrap; ./bootstrap --workdir /usr/release/bootstrap)
+ (cd ${PKGSRC_PATH}/bootstrap; \
+ export share_dir=/usr/release/bootstrap/share; \
+ ./bootstrap --workdir /usr/release/bootstrap)
pkgsrc_cdrecord:
.if !exists (${PKGBIN_MKISOFS})

0 comments on commit de863bf

Please sign in to comment.