diff options
| -rw-r--r-- | patches/bmake.local.patch | 19 | ||||
| -rw-r--r-- | vars/build.vars | 21 |
2 files changed, 32 insertions, 8 deletions
diff --git a/patches/bmake.local.patch b/patches/bmake.local.patch new file mode 100644 index 00000000..0b8eb731 --- /dev/null +++ b/patches/bmake.local.patch @@ -0,0 +1,19 @@ +--- bmake/boot-strap.orig 2020-02-08 19:30:56.653565539 +0000 ++++ bmake/boot-strap 2020-02-11 11:45:44.426114614 +0000 +@@ -202,7 +202,6 @@ + fi + + op=all +-BMAKE= + + while : + do +@@ -391,7 +390,7 @@ + cd $Mydir && + MAKESYSPATH=$mksrc SRCTOP=$Mydir OBJTOP=$objdir \ + MAKEOBJDIR='${.CURDIR:S,${SRCTOP:tA},${OBJTOP:tA},}' \ +- ${BMAKE:-$objdir/bmake} -f $Mydir/Makefile "$@" ++ ${BMAKE} -f $Mydir/Makefile TEST_MAKE="${BMAKE}" "$@" + ) + } + diff --git a/vars/build.vars b/vars/build.vars index 530b3428..fac64b1e 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -753,16 +753,21 @@ NATIVE_PACKAGES_DEPS_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} - NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix="; NATIVE_PACKAGES_DEPS_PACKAGES=" -libasr libatomic_ops bdwgc clzip expat xz libxml2 alsa_lib apr apr_util -bzip2 libdmtx libressl libnettle libunistring gnutls lmdb libpcap libpng -libjpeg_turbo tiff giflib lcms2 openjpeg libedit libffi gdbm geoip pcre -gettext_tiny glib gzip musl_compat musl_fts libzip libpipeline libtelnet -libevent libfetch libogg libvorbis libflac libtheora libsasl2 libshine -libsndfile libgpg_error libassuan libfirm libgcrypt libksba libudns lua -libxslt libtirpc npth popt file zstd dbus rpm libsolv tdnf shared_mime_info -sqlite3 w32api w32lib cmake qrencode tcl util_linux slang utf8proc"; +bmake libasr libatomic_ops bdwgc clzip expat xz libxml2 alsa_lib +apr apr_util bzip2 libdmtx libressl libnettle libunistring gnutls +lmdb libpcap libpng libjpeg_turbo tiff giflib lcms2 openjpeg libedit +libffi gdbm geoip pcre gettext_tiny glib gzip musl_compat musl_fts +libzip libpipeline libtelnet libevent libfetch libogg libvorbis libflac +libtheora libsasl2 libshine libsndfile libgpg_error libassuan libfirm +libgcrypt libksba libudns lua libxslt libtirpc npth popt file zstd dbus +rpm libsolv tdnf shared_mime_info sqlite3 w32api w32lib cmake qrencode +tcl util_linux slang utf8proc"; NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}"; NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2"; +: ${PKG_BMAKE_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"}; +: ${PKG_BMAKE_CONFIGURE_ARGS="-C --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET}"}; +: ${PKG_BMAKE_ENV_VARS_EXTRA:="BMAKE=${PREFIX}/bin/bmake"}; +: ${PKG_BMAKE_MAKEFLAGS_BUILD:=-j1}; : ${PKG_LIBASR_SHA256SUM:=9cd88e0172e6d426438875e09229d1d473d56db546d02b630f9dd14db226d68d}; : ${PKG_LIBASR_VERSION:=1.0.3}; : ${PKG_LIBASR_URL:=https://www.opensmtpd.org/archives/libasr-${PKG_LIBASR_VERSION}.tar.gz}; |