* [PR PATCH] nss: update to 3.68.
@ 2021-07-21 15:31 sgn
2021-07-22 2:24 ` [PR PATCH] [Updated] " sgn
2021-07-22 14:29 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2021-07-21 15:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1615 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages nss-update
https://github.com/void-linux/void-packages/pull/32101
nss: update to 3.68.
Also unify native and cross build.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32101.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-32101.patch --]
[-- Type: text/x-diff, Size: 5402 bytes --]
From 2f9010276d0d00f3e49e0c6ecb3a3a566228e537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 21 Jul 2021 11:24:36 +0700
Subject: [PATCH] nss: update to 3.68.
Also unify native and cross build.
---
.../nss/patches/native-nsinstall-cflags.patch | 11 +++
srcpkgs/nss/patches/respect-ldflags.patch | 11 +++
srcpkgs/nss/template | 86 ++++++-------------
3 files changed, 48 insertions(+), 60 deletions(-)
create mode 100644 srcpkgs/nss/patches/native-nsinstall-cflags.patch
create mode 100644 srcpkgs/nss/patches/respect-ldflags.patch
diff --git a/srcpkgs/nss/patches/native-nsinstall-cflags.patch b/srcpkgs/nss/patches/native-nsinstall-cflags.patch
new file mode 100644
index 000000000000..e2734e700d4d
--- /dev/null
+++ b/srcpkgs/nss/patches/native-nsinstall-cflags.patch
@@ -0,0 +1,11 @@
+--- nss-3.68.orig/nss/coreconf/nsinstall/Makefile
++++ nss-3.68/nss/coreconf/nsinstall/Makefile
+@@ -32,6 +32,8 @@ endif
+
+ ifdef NATIVE_FLAGS
+ OS_CFLAGS=$(NATIVE_FLAGS)
++XCFLAGS = $(NATIVE_FLAGS)
++LDFLAGS = $(LDFLAGS_FOR_BUILD)
+ endif
+
+ include $(DEPTH)/coreconf/rules.mk
diff --git a/srcpkgs/nss/patches/respect-ldflags.patch b/srcpkgs/nss/patches/respect-ldflags.patch
new file mode 100644
index 000000000000..14d59c600566
--- /dev/null
+++ b/srcpkgs/nss/patches/respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- nss-3.67.orig/nss/coreconf/rules.mk
++++ nss-3.67/nss/coreconf/rules.mk
+@@ -223,7 +223,7 @@ ifdef MT
+ endif # MSVC with manifest tool
+ endif
+ else
+- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++ $(MKSHLIB) $(LDFLAGS) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ chmod +x $@
+ endif
+ endif
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 38d6468473a0..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -1,10 +1,10 @@
# Template file for 'nss'
-_nsprver=4.30
+_nsprver=4.32
pkgname=nss
-version=3.67
-revision=2
+version=3.68
+revision=1
hostmakedepends="perl"
makedepends="nspr-devel sqlite-devel zlib-devel"
depends="nspr>=${_nsprver}"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=f6549a9148cd27b394b40c77fa73111d5ea23cdb51d796665de1b7458f88ce7f
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
export NS_USE_GCC=1
export LIBRUNPATH=
@@ -22,20 +22,11 @@ export NSS_USE_SYSTEM_SQLITE=1
export NSS_ENABLE_WERROR=0
export NSS_ENABLE_ECC=1
export FREEBL_NO_DEPEND=1
+export NSPR_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/nspr
+export NSPR_LIB_DIR=${XBPS_CROSS_BASE}/usr/lib
do_build() {
- local _native_use64 _target_use64
-
- # Respect LDFLAGS
- vsed -e 's/[$](MKSHLIB) /&$(LDFLAGS) /g' \
- -i nss/coreconf/rules.mk
-
- export NATIVE_CC="$BUILD_CC"
- export NATIVE_FLAGS="$BUILD_CFLAGS"
-
- if [ "$XBPS_WORDSIZE" = "64" ]; then
- _native_use64="USE_64=1"
- fi
+ local _use64 _ARCH
# Build System can detect this just fine,
# but I don't like to see useless warning barf for every line.
@@ -53,56 +44,31 @@ do_build() {
;;
esac
- cd nss
- # Build nsinstall for host.
- make ${makejobs} LD=$BUILD_LD LDFLAGS="$BUILD_LDFLAGS" ${_native_use64} -C coreconf
-
- if [ "$CROSS_BUILD" ]; then
- # We don't run test in cross build
- export NSS_DISABLE_GTESTS=1
- if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
- CFLAGS+=" -DNS_PTR_GT_32"
- _target_use64="USE_64=1"
- fi
-
- case "$XBPS_TARGET_MACHINE" in
- aarch64*|ppc*|x86_64*)
- _ARCH="${XBPS_TARGET_MACHINE%-*}"
- ;;
- arm*) _ARCH="arm";;
- mips*) _ARCH="mips";;
- *) msg_error "$pkgver: unknown target machine\n";;
- esac
- # ... and then copy it to $wrksrc.
- find ${wrksrc} -type f -name nsinstall -exec cp {} ${wrksrc} \;
- make clean
-
- export NSPR_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/nspr
- export NSPR_LIB_DIR=${XBPS_CROSS_BASE}/usr/lib
- export XCFLAGS="${CFLAGS}"
-
- make ${makejobs} \
- CROSS_COMPILE=1 OS_TEST="${_ARCH}" \
- NSINSTALL="${wrksrc}/nsinstall" \
- CC="$CC" CCC="$CXX" RANLIB="$RANLIB" ${_target_use64} \
- all
- else
- # native build
- export NSPR_INCLUDE_DIR=/usr/include/nspr
- export NSPR_LIB_DIR=/usr/lib
- export XCFLAGS="${CFLAGS}"
-
- make ${makejobs} ${_native_use64} all
+ if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+ CFLAGS+=" -DNS_PTR_GT_32"
+ _use64="USE_64=1"
fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ aarch64*|ppc*|x86_64*|i?86*)
+ _ARCH="${XBPS_TARGET_MACHINE%-*}"
+ ;;
+ arm*) _ARCH="arm";;
+ mips*) _ARCH="mips";;
+ *) msg_error "$pkgver: unknown target machine\n";;
+ esac
+ export XCFLAGS="${CFLAGS}"
+ make -C nss ${makejobs} \
+ ${CROSS_BUILD:+CROSS_COMPILE=1} OS_TEST="${_ARCH}" \
+ NATIVE_CC="${BUILD_CC}" NATIVE_FLAGS="${BUILD_CFLAGS}" \
+ CCC="$CXX" ${_use64} \
+ all
}
do_check() {
local _use_64
- # We couldn't run test in cross compile!
- export NSPR_INCLUDE_DIR=/usr/include/nspr
- export NSPR_LIB_DIR=/usr/lib
export XCFLAGS="${CFLAGS}"
- if [ "$XBPS_WORDSIZE" = "64" ]; then
+ if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
_use_64="USE_64=1"
fi
cd nss/tests
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] nss: update to 3.68.
2021-07-21 15:31 [PR PATCH] nss: update to 3.68 sgn
@ 2021-07-22 2:24 ` sgn
2021-07-22 14:29 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-07-22 2:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages nss-update
https://github.com/void-linux/void-packages/pull/32101
nss: update to 3.68.
Also unify native and cross build.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32101.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-update-32101.patch --]
[-- Type: text/x-diff, Size: 5402 bytes --]
From b6b78ad719882f07ab5b803561bece1211ce8b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 21 Jul 2021 11:24:36 +0700
Subject: [PATCH] nss: update to 3.68.
Also unify native and cross build.
---
.../nss/patches/native-nsinstall-cflags.patch | 11 +++
srcpkgs/nss/patches/respect-ldflags.patch | 11 +++
srcpkgs/nss/template | 86 ++++++-------------
3 files changed, 48 insertions(+), 60 deletions(-)
create mode 100644 srcpkgs/nss/patches/native-nsinstall-cflags.patch
create mode 100644 srcpkgs/nss/patches/respect-ldflags.patch
diff --git a/srcpkgs/nss/patches/native-nsinstall-cflags.patch b/srcpkgs/nss/patches/native-nsinstall-cflags.patch
new file mode 100644
index 000000000000..e2734e700d4d
--- /dev/null
+++ b/srcpkgs/nss/patches/native-nsinstall-cflags.patch
@@ -0,0 +1,11 @@
+--- nss-3.68.orig/nss/coreconf/nsinstall/Makefile
++++ nss-3.68/nss/coreconf/nsinstall/Makefile
+@@ -32,6 +32,8 @@ endif
+
+ ifdef NATIVE_FLAGS
+ OS_CFLAGS=$(NATIVE_FLAGS)
++XCFLAGS = $(NATIVE_FLAGS)
++LDFLAGS = $(LDFLAGS_FOR_BUILD)
+ endif
+
+ include $(DEPTH)/coreconf/rules.mk
diff --git a/srcpkgs/nss/patches/respect-ldflags.patch b/srcpkgs/nss/patches/respect-ldflags.patch
new file mode 100644
index 000000000000..14d59c600566
--- /dev/null
+++ b/srcpkgs/nss/patches/respect-ldflags.patch
@@ -0,0 +1,11 @@
+--- nss-3.67.orig/nss/coreconf/rules.mk
++++ nss-3.67/nss/coreconf/rules.mk
+@@ -223,7 +223,7 @@ ifdef MT
+ endif # MSVC with manifest tool
+ endif
+ else
+- $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++ $(MKSHLIB) $(LDFLAGS) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ chmod +x $@
+ endif
+ endif
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 38d6468473a0..c1568b0a3c28 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -1,10 +1,10 @@
# Template file for 'nss'
-_nsprver=4.30
+_nsprver=4.32
pkgname=nss
-version=3.67
-revision=2
+version=3.68
+revision=1
hostmakedepends="perl"
makedepends="nspr-devel sqlite-devel zlib-devel"
depends="nspr>=${_nsprver}"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="MPL-2.0"
homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=f6549a9148cd27b394b40c77fa73111d5ea23cdb51d796665de1b7458f88ce7f
+checksum=c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b
export NS_USE_GCC=1
export LIBRUNPATH=
@@ -22,20 +22,11 @@ export NSS_USE_SYSTEM_SQLITE=1
export NSS_ENABLE_WERROR=0
export NSS_ENABLE_ECC=1
export FREEBL_NO_DEPEND=1
+export NSPR_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/nspr
+export NSPR_LIB_DIR=${XBPS_CROSS_BASE}/usr/lib
do_build() {
- local _native_use64 _target_use64
-
- # Respect LDFLAGS
- vsed -e 's/[$](MKSHLIB) /&$(LDFLAGS) /g' \
- -i nss/coreconf/rules.mk
-
- export NATIVE_CC="$BUILD_CC"
- export NATIVE_FLAGS="$BUILD_CFLAGS"
-
- if [ "$XBPS_WORDSIZE" = "64" ]; then
- _native_use64="USE_64=1"
- fi
+ local _use64 _ARCH
# Build System can detect this just fine,
# but I don't like to see useless warning barf for every line.
@@ -53,56 +44,31 @@ do_build() {
;;
esac
- cd nss
- # Build nsinstall for host.
- make ${makejobs} LD=$BUILD_LD LDFLAGS="$BUILD_LDFLAGS" ${_native_use64} -C coreconf
-
- if [ "$CROSS_BUILD" ]; then
- # We don't run test in cross build
- export NSS_DISABLE_GTESTS=1
- if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
- CFLAGS+=" -DNS_PTR_GT_32"
- _target_use64="USE_64=1"
- fi
-
- case "$XBPS_TARGET_MACHINE" in
- aarch64*|ppc*|x86_64*)
- _ARCH="${XBPS_TARGET_MACHINE%-*}"
- ;;
- arm*) _ARCH="arm";;
- mips*) _ARCH="mips";;
- *) msg_error "$pkgver: unknown target machine\n";;
- esac
- # ... and then copy it to $wrksrc.
- find ${wrksrc} -type f -name nsinstall -exec cp {} ${wrksrc} \;
- make clean
-
- export NSPR_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include/nspr
- export NSPR_LIB_DIR=${XBPS_CROSS_BASE}/usr/lib
- export XCFLAGS="${CFLAGS}"
-
- make ${makejobs} \
- CROSS_COMPILE=1 OS_TEST="${_ARCH}" \
- NSINSTALL="${wrksrc}/nsinstall" \
- CC="$CC" CCC="$CXX" RANLIB="$RANLIB" ${_target_use64} \
- all
- else
- # native build
- export NSPR_INCLUDE_DIR=/usr/include/nspr
- export NSPR_LIB_DIR=/usr/lib
- export XCFLAGS="${CFLAGS}"
-
- make ${makejobs} ${_native_use64} all
+ if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+ CFLAGS+=" -DNS_PTR_GT_32"
+ _use64="USE_64=1"
fi
+
+ case "$XBPS_TARGET_MACHINE" in
+ aarch64*|ppc*|x86_64*|i?86*)
+ _ARCH="${XBPS_TARGET_MACHINE%-*}"
+ ;;
+ arm*) _ARCH="arm";;
+ mips*) _ARCH="mips";;
+ *) msg_error "$pkgver: unknown target machine\n";;
+ esac
+ export XCFLAGS="${CFLAGS}"
+ make -C nss ${makejobs} \
+ ${CROSS_BUILD:+CROSS_COMPILE=1} OS_TEST="${_ARCH}" \
+ NATIVE_CC="${BUILD_CC}" NATIVE_FLAGS="${BUILD_CFLAGS}" \
+ CCC="$CXX" ${_use64} \
+ all
}
do_check() {
local _use_64
- # We couldn't run test in cross compile!
- export NSPR_INCLUDE_DIR=/usr/include/nspr
- export NSPR_LIB_DIR=/usr/lib
export XCFLAGS="${CFLAGS}"
- if [ "$XBPS_WORDSIZE" = "64" ]; then
+ if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
_use_64="USE_64=1"
fi
cd nss/tests
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: nss: update to 3.68.
2021-07-21 15:31 [PR PATCH] nss: update to 3.68 sgn
2021-07-22 2:24 ` [PR PATCH] [Updated] " sgn
@ 2021-07-22 14:29 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-07-22 14:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1469 bytes --]
There's a merged pull request on the void-packages repository
nss: update to 3.68.
https://github.com/void-linux/void-packages/pull/32101
Description:
Also unify native and cross build.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-07-22 14:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-21 15:31 [PR PATCH] nss: update to 3.68 sgn
2021-07-22 2:24 ` [PR PATCH] [Updated] " sgn
2021-07-22 14:29 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).