Created
May 14, 2018 16:30
-
-
Save asergi/1048db72e70a4a187bafa17e3e06fde5 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template | |
index 7b995ba0b9..59321da2f0 100644 | |
--- a/srcpkgs/nss/template | |
+++ b/srcpkgs/nss/template | |
@@ -27,17 +27,17 @@ do_build() { | |
export FREEBL_NO_DEPEND=1 | |
case "$XBPS_MACHINE" in | |
- aarch64*|x86_64*) _use64="USE_64=1";; | |
+ aarch64*|x86_64*) _native_use64="USE_64=1";; | |
esac | |
cd nss | |
# Build nsinstall for host. | |
make CC=$BUILD_CC LD=$BUILD_LD CFLAGS=$BUILD_CFLAGS LDFLAGS=$BUILD_LDFLAGS \ | |
- ${_use64} -C coreconf | |
+ ${_native_use64} -C coreconf | |
if [ "$CROSS_BUILD" ]; then | |
case "$XBPS_TARGET_MACHINE" in | |
- aarch64*) _ARCH="aarch64"; CFLAGS+=" -DNS_PTR_GT_32";; | |
+ aarch64*) _ARCH="aarch64"; _target_use64="USE_64=1"; CFLAGS+=" -DNS_PTR_GT_32";; | |
arm*) _ARCH="arm";; | |
mips*) _ARCH="mips";; | |
*) msg_error "$pkgver: unknown target machine\n";; | |
@@ -51,17 +51,17 @@ do_build() { | |
export XCFLAGS="${CFLAGS}" | |
make CROSS_COMPILE=1 OS_TEST="${_ARCH}" NSINSTALL="${wrksrc}/nsinstall" \ | |
- CC="$CC" CCC="$CXX" RANLIB="$RANLIB" -C lib/dbm | |
+ CC="$CC" CCC="$CXX" RANLIB="$RANLIB" ${_target_use64} -C lib/dbm | |
make CROSS_COMPILE=1 OS_TEST="${_ARCH}" NSINSTALL="${wrksrc}/nsinstall" \ | |
- CC="$CC" CCC="$CXX" RANLIB="$RANLIB" | |
+ CC="$CC" CCC="$CXX" RANLIB="$RANLIB" ${_target_use64} | |
else | |
# native build | |
export NSPR_INCLUDE_DIR=/usr/include/nspr | |
export NSPR_LIB_DIR=/usr/lib | |
export XCFLAGS="${CFLAGS}" | |
- make ${_use64} -C lib/dbm | |
- make ${_use64} | |
+ make ${_native_use64} -C lib/dbm | |
+ make ${_native_use64} | |
fi | |
} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment