Author: dj
Date: 2009-09-01 06:58:48 -0600 (Tue, 01 Sep 2009)
New Revision: 2109
Added:
trunk/nss/nss-3.12.4-standalone-2.patch
Removed:
trunk/nss/nss-3.12.4-standalone-1.patch
Log:
updated nss-standalone patch
Deleted: trunk/nss/nss-3.12.4-standalone-1.patch
===================================================================
--- trunk/nss/nss-3.12.4-standalone-1.patch 2009-08-28 20:46:45 UTC (rev
2108)
+++ trunk/nss/nss-3.12.4-standalone-1.patch 2009-09-01 12:58:48 UTC (rev
2109)
@@ -1,245 +0,0 @@
-Submitted By: DJ Lucas <dj at linuxfromscratch dot org>
-Date: 2009-08-28
-Initial Package Version: 3.12.4
-Upstream Status: not applicable
-Origin: self
-Description: Adds auto-generated nss.pc and nss-config script, and allows
- building without nspr in the source tree.
-
-diff -Naur nss-3.12.4-orig/mozilla/security/nss/config/Makefile
nss-3.12.4/mozilla/security/nss/config/Makefile
---- nss-3.12.4-orig/mozilla/security/nss/config/Makefile 1969-12-31
18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/Makefile 2009-08-28
15:29:42.000000000 -0500
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ../..
-+DEPTH = ../..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+ # Create the nss.pc file
-+ mkdir -p $(DIST)/lib/pkgconfig
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@exec_prefix@,\$${prefix}," \
-+ -e "s,@libdir@,\$${prefix}/lib," \
-+ -e "s,@includedir@,\$${prefix}/include/nss," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss.pc.in > nss.pc
-+ chmod 0644 nss.pc
-+ ln -sf ../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
-+
-+ # Create the nss-config script
-+ mkdir -p $(DIST)/bin
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss-config.in > nss-config
-+ chmod 0755 nss-config
-+ ln -sf ../../../security/nss/config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff -Naur nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in
nss-3.12.4/mozilla/security/nss/config/nss-config.in
---- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in 1969-12-31
18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/nss-config.in 2009-08-28
15:29:30.000000000 -0500
-@@ -0,0 +1,137 @@
-+#!/bin/sh
-+
-+pref...@prefix@
-+
-+major_versi...@nss_major_version@
-+minor_versi...@nss_minor_version@
-+patch_versi...@nss_patch_version@
-+
-+usage()
-+{
-+ cat <<EOF
-+Usage: nss-config [OPTIONS] [LIBRARIES]
-+Options:
-+ [--prefix[=DIR]]
-+ [--exec-prefix[=DIR]]
-+ [--includedir[=DIR]]
-+ [--libdir[=DIR]]
-+ [--version]
-+ [--libs]
-+ [--cflags]
-+Dynamic Libraries:
-+ nss
-+ ssl
-+ smime
-+EOF
-+ exit $1
-+}
-+
-+if test $# -eq 0; then
-+ usage 1 1>&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-+ *) optarg= ;;
-+ esac
-+
-+ case $1 in
-+ --prefix=*)
-+ prefix=$optarg
-+ ;;
-+ --prefix)
-+ echo_prefix=yes
-+ ;;
-+ --exec-prefix=*)
-+ exec_prefix=$optarg
-+ ;;
-+ --exec-prefix)
-+ echo_exec_prefix=yes
-+ ;;
-+ --includedir=*)
-+ includedir=$optarg
-+ ;;
-+ --includedir)
-+ echo_includedir=yes
-+ ;;
-+ --libdir=*)
-+ libdir=$optarg
-+ ;;
-+ --libdir)
-+ echo_libdir=yes
-+ ;;
-+ --version)
-+ echo ${major_version}.${minor_version}.${patch_version}
-+ ;;
-+ --cflags)
-+ echo_cflags=yes
-+ ;;
-+ --libs)
-+ echo_libs=yes
-+ ;;
-+ ssl)
-+ lib_ssl=yes
-+ ;;
-+ smime)
-+ lib_smime=yes
-+ ;;
-+ nss)
-+ lib_nss=yes
-+ ;;
-+ *)
-+ usage 1 1>&2
-+ ;;
-+ esac
-+ shift
-+done
-+
-+# Set variables that may be dependent upon other variables
-+if test -z "$exec_prefix"; then
-+ exec_prefix=`pkg-config --variable=exec_prefix nss`
-+fi
-+if test -z "$includedir"; then
-+ includedir=`pkg-config --variable=includedir nss`
-+fi
-+if test -z "$libdir"; then
-+ libdir=`pkg-config --variable=libdir nss`
-+fi
-+
-+if test "$echo_prefix" = "yes"; then
-+ echo $prefix
-+fi
-+
-+if test "$echo_exec_prefix" = "yes"; then
-+ echo $exec_prefix
-+fi
-+
-+if test "$echo_includedir" = "yes"; then
-+ echo $includedir
-+fi
-+
-+if test "$echo_libdir" = "yes"; then
-+ echo $libdir
-+fi
-+
-+if test "$echo_cflags" = "yes"; then
-+ echo -I$includedir
-+fi
-+
-+if test "$echo_libs" = "yes"; then
-+ libdirs="-Wl,-rpath-link,$libdir -L$libdir"
-+ if test -n "$lib_ssl"; then
-+ libdirs="$libdirs -lssl${major_version}"
-+ fi
-+ if test -n "$lib_smime"; then
-+ libdirs="$libdirs -lsmime${major_version}"
-+ fi
-+ if test -n "$lib_nss"; then
-+ libdirs="$libdirs -lnss${major_version}"
-+ fi
-+ echo $libdirs
-+fi
-+
-diff -Naur nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in
nss-3.12.4/mozilla/security/nss/config/nss.pc.in
---- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31
18:00:00.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in 2009-08-28
15:29:30.000000000 -0500
-@@ -0,0 +1,12 @@
-+pref...@prefix@
-+exec_pref...@exec_prefix@
-+libd...@libdir@
-+included...@includedir@
-+
-+Name: NSS
-+Description: Network Security Services
-+Version: @nss_major_vers...@.@nss_minor_vers...@.@NSS_PATCH_VERSION@
-+Requires: nspr >= 4.8
-+Libs: -l...@nss_major_version@ -lsm...@nss_major_version@
-l...@nss_major_version@ -lsoft...@nss_major_version@
-+Cflags: -I${includedir}
-+
-diff -Naur nss-3.12.4-orig/mozilla/security/nss/Makefile
nss-3.12.4/mozilla/security/nss/Makefile
---- nss-3.12.4-orig/mozilla/security/nss/Makefile 2008-12-02
17:24:39.000000000 -0600
-+++ nss-3.12.4/mozilla/security/nss/Makefile 2009-08-28 15:29:47.000000000
-0500
-@@ -78,7 +78,7 @@
- # (7) Execute "local" rules. (OPTIONAL). #
- #######################################################################
-
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
-
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
-
-@@ -140,12 +140,6 @@
- --with-dist-prefix='$(NSPR_PREFIX)' \
- --with-dist-includedir='$(NSPR_PREFIX)/include'
-
--build_nspr: $(NSPR_CONFIG_STATUS)
-- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
-- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
--
- build_dbm:
- ifndef NSS_DISABLE_DBM
- cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
-diff -Naur nss-3.12.4-orig/mozilla/security/nss/manifest.mn
nss-3.12.4/mozilla/security/nss/manifest.mn
---- nss-3.12.4-orig/mozilla/security/nss/manifest.mn 2008-04-04
15:36:59.000000000 -0500
-+++ nss-3.12.4/mozilla/security/nss/manifest.mn 2009-08-28
15:29:30.000000000 -0500
-@@ -42,6 +42,6 @@
-
- RELEASE = nss
-
--DIRS = lib cmd
-+DIRS = lib cmd config
-
-
Added: trunk/nss/nss-3.12.4-standalone-2.patch
===================================================================
--- trunk/nss/nss-3.12.4-standalone-2.patch (rev 0)
+++ trunk/nss/nss-3.12.4-standalone-2.patch 2009-09-01 12:58:48 UTC (rev
2109)
@@ -0,0 +1,261 @@
+Submitted By: DJ Lucas <dj at linuxfromscratch dot org>
+Date: 2009-09-01
+Initial Package Version: 3.12.4
+Upstream Status: not applicable
+Origin: self
+Description: Adds auto-generated nss.pc and nss-config script, and allows
+ building without nspr in the source tree.
+
+diff -Naur nss-3.12.4-orig/mozilla/security/nss/config/Makefile
nss-3.12.4/mozilla/security/nss/config/Makefile
+--- nss-3.12.4-orig/mozilla/security/nss/config/Makefile 1969-12-31
18:00:00.000000000 -0600
++++ nss-3.12.4/mozilla/security/nss/config/Makefile 2009-08-31
19:15:20.000000000 -0500
+@@ -0,0 +1,40 @@
++CORE_DEPTH = ../..
++DEPTH = ../..
++
++include $(CORE_DEPTH)/coreconf/config.mk
++
++NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
++NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
++PREFIX = /usr
++
++all: export libs
++
++export:
++ # Create the nss.pc file
++ mkdir -p $(DIST)/lib/pkgconfig
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@exec_prefix@,\$${prefix}," \
++ -e "s,@libdir@,\$${prefix}/lib," \
++ -e "s,@includedir@,\$${prefix}/include/nss," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss.pc.in > nss.pc
++ chmod 0644 nss.pc
++ ln -sf ../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
++
++ # Create the nss-config script
++ mkdir -p $(DIST)/bin
++ sed -e "s,@prefix@,$(PREFIX)," \
++ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
++ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
++ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
++ nss-config.in > nss-config
++ chmod 0755 nss-config
++ ln -sf ../../../security/nss/config/nss-config $(DIST)/bin
++
++libs:
++
++dummy: all export libs
++
+diff -Naur nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in
nss-3.12.4/mozilla/security/nss/config/nss-config.in
+--- nss-3.12.4-orig/mozilla/security/nss/config/nss-config.in 1969-12-31
18:00:00.000000000 -0600
++++ nss-3.12.4/mozilla/security/nss/config/nss-config.in 2009-08-31
19:16:56.000000000 -0500
+@@ -0,0 +1,153 @@
++#!/bin/sh
++
++pref...@prefix@
++
++major_versi...@nss_major_version@
++minor_versi...@nss_minor_version@
++patch_versi...@nss_patch_version@
++
++usage()
++{
++ cat <<EOF
++Usage: nss-config [OPTIONS] [LIBRARIES]
++Options:
++ [--prefix[=DIR]]
++ [--exec-prefix[=DIR]]
++ [--includedir[=DIR]]
++ [--libdir[=DIR]]
++ [--version]
++ [--libs]
++ [--cflags]
++Dynamic Libraries:
++ nss
++ nssutil
++ smime
++ ssl
++ softokn
++EOF
++ exit $1
++}
++
++if test $# -eq 0; then
++ usage 1 1>&2
++fi
++
++lib_nss=yes
++lib_nssutil=yes
++lib_smime=yes
++lib_ssl=yes
++lib_softokn=yes
++
++while test $# -gt 0; do
++ case "$1" in
++ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
++ *) optarg= ;;
++ esac
++
++ case $1 in
++ --prefix=*)
++ prefix=$optarg
++ ;;
++ --prefix)
++ echo_prefix=yes
++ ;;
++ --exec-prefix=*)
++ exec_prefix=$optarg
++ ;;
++ --exec-prefix)
++ echo_exec_prefix=yes
++ ;;
++ --includedir=*)
++ includedir=$optarg
++ ;;
++ --includedir)
++ echo_includedir=yes
++ ;;
++ --libdir=*)
++ libdir=$optarg
++ ;;
++ --libdir)
++ echo_libdir=yes
++ ;;
++ --version)
++ echo ${major_version}.${minor_version}.${patch_version}
++ ;;
++ --cflags)
++ echo_cflags=yes
++ ;;
++ --libs)
++ echo_libs=yes
++ ;;
++ nss)
++ lib_nss=yes
++ ;;
++ nssutil)
++ lib_nssutil=yes
++ ;;
++ smime)
++ lib_smime=yes
++ ;;
++ ssl)
++ lib_ssl=yes
++ ;;
++ softokn)
++ lib_softokn=yes
++ ;;
++ *)
++ usage 1 1>&2
++ ;;
++ esac
++ shift
++done
++
++# Set variables that may be dependent upon other variables
++if test -z "$exec_prefix"; then
++ exec_prefix=`pkg-config --variable=exec_prefix nss`
++fi
++if test -z "$includedir"; then
++ includedir=`pkg-config --variable=includedir nss`
++fi
++if test -z "$libdir"; then
++ libdir=`pkg-config --variable=libdir nss`
++fi
++
++if test "$echo_prefix" = "yes"; then
++ echo $prefix
++fi
++
++if test "$echo_exec_prefix" = "yes"; then
++ echo $exec_prefix
++fi
++
++if test "$echo_includedir" = "yes"; then
++ echo $includedir
++fi
++
++if test "$echo_libdir" = "yes"; then
++ echo $libdir
++fi
++
++if test "$echo_cflags" = "yes"; then
++ echo -I$includedir
++fi
++
++if test "$echo_libs" = "yes"; then
++ libdirs="-L$libdir"
++ if test -n "$lib_nss"; then
++ libdirs="$libdirs -lnss${major_version}"
++ fi
++ if test -n "$lib_nssutil"; then
++ libdirs="$libdirs -lnssutil${major_version}"
++ fi
++ if test -n "$lib_smime"; then
++ libdirs="$libdirs -lsmime${major_version}"
++ fi
++ if test -n "$lib_ssl"; then
++ libdirs="$libdirs -lssl${major_version}"
++ fi
++ if test -n "$lib_softokn"; then
++ libdirs="$libdirs -lsoftokn${major_version}"
++ fi
++ echo $libdirs
++fi
++
+diff -Naur nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in
nss-3.12.4/mozilla/security/nss/config/nss.pc.in
+--- nss-3.12.4-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31
18:00:00.000000000 -0600
++++ nss-3.12.4/mozilla/security/nss/config/nss.pc.in 2009-08-31
19:15:20.000000000 -0500
+@@ -0,0 +1,12 @@
++pref...@prefix@
++exec_pref...@exec_prefix@
++libd...@libdir@
++included...@includedir@
++
++Name: NSS
++Description: Network Security Services
++Version: @nss_major_vers...@.@nss_minor_vers...@.@NSS_PATCH_VERSION@
++Requires: nspr >= 4.8
++Libs: -...@libdir@ -ln...@nss_major_version@ -lnssu...@nss_major_version@
-lsm...@nss_major_version@ -l...@nss_major_version@ -lsoft...@nss_major_version@
++Cflags: -I${includedir}
++
+diff -Naur nss-3.12.4-orig/mozilla/security/nss/Makefile
nss-3.12.4/mozilla/security/nss/Makefile
+--- nss-3.12.4-orig/mozilla/security/nss/Makefile 2008-12-02
17:24:39.000000000 -0600
++++ nss-3.12.4/mozilla/security/nss/Makefile 2009-08-31 19:15:20.000000000
-0500
+@@ -78,7 +78,7 @@
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
+-nss_build_all: build_coreconf build_nspr build_dbm all
++nss_build_all: build_coreconf build_dbm all
+
+ nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+
+@@ -140,12 +140,6 @@
+ --with-dist-prefix='$(NSPR_PREFIX)' \
+ --with-dist-includedir='$(NSPR_PREFIX)/include'
+
+-build_nspr: $(NSPR_CONFIG_STATUS)
+- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE)
+-
+-clobber_nspr: $(NSPR_CONFIG_STATUS)
+- cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; $(MAKE) clobber
+-
+ build_dbm:
+ ifndef NSS_DISABLE_DBM
+ cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs
+diff -Naur nss-3.12.4-orig/mozilla/security/nss/manifest.mn
nss-3.12.4/mozilla/security/nss/manifest.mn
+--- nss-3.12.4-orig/mozilla/security/nss/manifest.mn 2008-04-04
15:36:59.000000000 -0500
++++ nss-3.12.4/mozilla/security/nss/manifest.mn 2009-08-31
19:15:20.000000000 -0500
+@@ -42,6 +42,6 @@
+
+ RELEASE = nss
+
+-DIRS = lib cmd
++DIRS = lib cmd config
+
+
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
