Commit 3af9d39c authored by Timo Teräs's avatar Timo Teräs

main/nss: use system sqlite and fix musl build

parent b907c8b1
......@@ -2,7 +2,7 @@
pkgname=nss
pkgver=3.15.1
_ver=${pkgver//./_}
pkgrel=1
pkgrel=2
pkgdesc="Mozilla Network Security Services"
url="http://www.mozilla.org/projects/security/pki/nss/"
arch="all"
......@@ -15,6 +15,8 @@ source="ftp://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/src
nss-config.in
add_spi+cacert_ca_certs.patch
ssl-renegotiate-transitional.patch
fix-cdefs_h.patch
fix-mpi-x86.patch
"
depends_dev="nspr-dev"
......@@ -30,7 +32,6 @@ prepare() {
# Respect LDFLAGS
sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
nss/coreconf/rules.mk
}
build() {
......@@ -41,9 +42,9 @@ build() {
export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export FREEBL_NO_DEPEND=0
export NSS_USE_SYSTEM_SQLITE=1
export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
export XCFLAGS="${CFLAGS}"
if [ "$CARCH" = "x86_64" ]; then
export USE_64=1
fi
......@@ -143,14 +144,20 @@ md5sums="fb68f4d210ac9397dd0d3c39c4f938eb nss-3.15.1.tar.gz
c547b030c57fe1ed8b77c73bf52b3ded nss.pc.in
46bee81908f1e5b26d6a7a2e14c64d9f nss-config.in
981e0df9e9cb7a9426b316f68911fb17 add_spi+cacert_ca_certs.patch
2412ff2e97b3ec452cb016f2506a0e08 ssl-renegotiate-transitional.patch"
2412ff2e97b3ec452cb016f2506a0e08 ssl-renegotiate-transitional.patch
1f83bc41ffe34190bcc27d146c479772 fix-cdefs_h.patch
09925cb6a92e1e4dfca6340a2236269e fix-mpi-x86.patch"
sha256sums="f994106a33d1f3210f4151bbb3419a1c28fd1cb545caa7dc9afdebd6da626284 nss-3.15.1.tar.gz
b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd nss.pc.in
e44ac5095b4d88f24ec7b2e6a9f1581560bd3ad41a3d198596d67ef22f67adb9 nss-config.in
592aa85184c5edb076c3355f85e50373a59dfcd06a4f4a79621f43df19404c1e add_spi+cacert_ca_certs.patch
1a49be9d7f835be737825252f50e4ee2869228eb303a087dde7fb81794b92ebd ssl-renegotiate-transitional.patch"
1a49be9d7f835be737825252f50e4ee2869228eb303a087dde7fb81794b92ebd ssl-renegotiate-transitional.patch
41866089e3d085f05bc4a7e337f2f5740da4eef9021366a450a8fd111f24975c fix-cdefs_h.patch
51c02b1d98ce956463f7b8bb5751f4c0cd3f1d79a620d67db93f5977e4879525 fix-mpi-x86.patch"
sha512sums="173bd80771c9a64307750733a6aa2f716e61d4b060cc61d11ec741b0b214a33b188d3e23924c062f28587785077902266f3d30e60d2c141dc54d2679736f88ec nss-3.15.1.tar.gz
75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531 nss.pc.in
2971669e128f06a9af40a5ba88218fa7c9eecfeeae8b0cf42e14f31ed12bf6fa4c5ce60289e078f50e2669a9376b56b45d7c29d726a7eac69ebe1d1e22dc710b nss-config.in
6e04556858499aec465d6670818465327ba2cb099061c2afee4b5cac8aa61938e0095906acfb38df6a1b70a6bde6dd69f08bb4c00a9d188e4cb3131b26c1bc16 add_spi+cacert_ca_certs.patch
c21a82247d87d74cb27575efc517a6771476320ce412cd444e83d0782e29f82552676247da093518b07d3eb7dc67c53cd1901ee8d6f59b342d02e47784c39192 ssl-renegotiate-transitional.patch"
c21a82247d87d74cb27575efc517a6771476320ce412cd444e83d0782e29f82552676247da093518b07d3eb7dc67c53cd1901ee8d6f59b342d02e47784c39192 ssl-renegotiate-transitional.patch
54080ed5e66185bfb9fae6518b8f898213a00a2803900ee13a958664a7e60aee60b51f0c27176344ebf49e9c671f1f62f56280ab9e8c7f206c5df143c3a7d24c fix-cdefs_h.patch
5999ed85ea5b747de6c81f07fa29bff625e553593be012465b1d4a4cbe1a9afbb839b363c18977d1664186906b63037b57b19a98799258ffe45a5f85d3fcd4ba fix-mpi-x86.patch"
--- nss-3.15.1/nss/lib/dbm/config/config.mk.orig
+++ nss-3.15.1/nss/lib/dbm/config/config.mk
@@ -25,7 +25,7 @@
DEFINES += -DHAVE_SNPRINTF
endif
-ifeq (,$(filter-out IRIX Linux,$(OS_TARGET)))
+ifneq ($(wildcard /usr/include/sys/cdefs.h),)
DEFINES += -DHAVE_SYS_CDEFS_H
endif
--- nss-3.15.1/nss/lib/freebl/Makefile
+++ nss-3.15.1.new/nss/lib/freebl/Makefile
@@ -196,6 +196,7 @@
ASFILES = mpi_x86.s
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
+ DEFINES += -DMP_USE_UINT_DIGIT
DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
# The floating point ECC code doesn't work on Linux x86 (bug 311432).
#ECL_USE_FP = 1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment