cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

nss: update to 3.60

Browse Source 
Added patch to fix compilation with musl 1.2.x.

Install nss-config file and fix it up. Might help some packages...

Refreshed others.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2020-12-15 19:30:41 -08:00
parent 24002cdc38
commit beac69b7a5
6 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/nss/patches/001-nss_standalone.patch
+11 -17
View File
@@ -10,9 +10,8 @@ Description: Adds auto-generated nss.pc and nss-config script, and
For 3.48, Requires: updated to nspr >= 4.24.
For 3.51.1, Requires: updated to nspr >= 4.25.
diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
--- nss-3.28-orig/nss/Makefile 2016-12-21 05:56:27.000000000 -0600
+++ nss-3.28/nss/Makefile 2016-12-26 22:24:52.695146032 -0600
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -48,7 +48,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
#######################################################################
@@ -21,9 +20,8 @@ diff -Naurp nss-3.28-orig/nss/Makefile nss-3.28/nss/Makefile
$(MAKE) all
$(MAKE) latest
diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
--- nss-3.28-orig/nss/config/Makefile 1969-12-31 18:00:00.000000000 -0600
+++ nss-3.28/nss/config/Makefile 2016-12-26 22:20:40.008205774 -0600
--- /dev/null
+++ b/nss/config/Makefile
@@ -0,0 +1,40 @@
+CORE_DEPTH = ..
+DEPTH = ..
@@ -65,9 +63,8 @@ diff -Naurp nss-3.28-orig/nss/config/Makefile nss-3.28/nss/config/Makefile
+
+dummy: all export libs
+
diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-config.in
--- nss-3.28-orig/nss/config/nss-config.in 1969-12-31 18:00:00.000000000 -0600
+++ nss-3.28/nss/config/nss-config.in 2016-12-26 22:20:40.008205774 -0600
--- /dev/null
+++ b/nss/config/nss-config.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+
@@ -222,9 +219,8 @@ diff -Naurp nss-3.28-orig/nss/config/nss-config.in nss-3.28/nss/config/nss-confi
+ echo $libdirs
+fi
+
diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in
--- nss-3.28-orig/nss/config/nss.pc.in 1969-12-31 18:00:00.000000000 -0600
+++ nss-3.28/nss/config/nss.pc.in 2016-12-26 22:22:53.300694346 -0600
--- /dev/null
+++ b/nss/config/nss.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
@@ -238,9 +234,8 @@ diff -Naurp nss-3.28-orig/nss/config/nss.pc.in nss-3.28/nss/config/nss.pc.in
+Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
+Cflags: -I${includedir}
+
diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn
--- nss-3.28-orig/nss/manifest.mn 2016-12-21 05:56:27.000000000 -0600
+++ nss-3.28/nss/manifest.mn 2016-12-26 22:24:12.278991843 -0600
--- a/nss/manifest.mn
+++ b/nss/manifest.mn
@@ -10,7 +10,7 @@ IMPORTS = nspr20/v4.8 \
RELEASE = nss
@@ -248,6 +243,5 @@ diff -Naurp nss-3.28-orig/nss/manifest.mn nss-3.28/nss/manifest.mn
-DIRS = coreconf lib cmd cpputil gtests
+DIRS = coreconf lib cmd cpputil config
lib: coreconf
cmd: lib
HAVE_ALL_TARGET := 1