wok-6.x annotate nss/stuff/nss-3.14.1-standalone-1.patch @ rev 18991

Up firefox-official(45.0.1)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Mar 18 10:58:08 2016 +0200 (2016-03-18)
parents
children
rev   line source
domcox@14158 1 Submitted By: Armin K. <krejzi at email dot com>
domcox@14158 2 Date: 2012-12-31
domcox@14158 3 Initial Package Version: 3.14.1
domcox@14158 4 Upstream Status: Not applicable
domcox@14158 5 Origin: Based on dj's original patch, rediffed for 3.14.1
domcox@14158 6 Description: Adds auto-generated nss.pc and nss-config script, and allows
domcox@14158 7 building without nspr in the source tree.
domcox@14158 8
domcox@14158 9 --- nss.orig/mozilla/security/nss/config/Makefile 1970-01-01 01:00:00.000000000 +0100
domcox@14158 10 +++ nss/mozilla/security/nss/config/Makefile 2012-12-31 13:27:51.694572567 +0100
domcox@14158 11 @@ -0,0 +1,40 @@
domcox@14158 12 +CORE_DEPTH = ../..
domcox@14158 13 +DEPTH = ../..
domcox@14158 14 +
domcox@14158 15 +include $(CORE_DEPTH)/coreconf/config.mk
domcox@14158 16 +
domcox@14158 17 +NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
domcox@14158 18 +NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
domcox@14158 19 +NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
domcox@14158 20 +PREFIX = /usr
domcox@14158 21 +
domcox@14158 22 +all: export libs
domcox@14158 23 +
domcox@14158 24 +export:
domcox@14158 25 + # Create the nss.pc file
domcox@14158 26 + mkdir -p $(DIST)/lib/pkgconfig
domcox@14158 27 + sed -e "s,@prefix@,$(PREFIX)," \
domcox@14158 28 + -e "s,@exec_prefix@,\$${prefix}," \
domcox@14158 29 + -e "s,@libdir@,\$${prefix}/lib," \
domcox@14158 30 + -e "s,@includedir@,\$${prefix}/include/nss," \
domcox@14158 31 + -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
domcox@14158 32 + -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
domcox@14158 33 + -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
domcox@14158 34 + nss.pc.in > nss.pc
domcox@14158 35 + chmod 0644 nss.pc
domcox@14158 36 + ln -sf ../../../../security/nss/config/nss.pc $(DIST)/lib/pkgconfig
domcox@14158 37 +
domcox@14158 38 + # Create the nss-config script
domcox@14158 39 + mkdir -p $(DIST)/bin
domcox@14158 40 + sed -e "s,@prefix@,$(PREFIX)," \
domcox@14158 41 + -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
domcox@14158 42 + -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
domcox@14158 43 + -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
domcox@14158 44 + nss-config.in > nss-config
domcox@14158 45 + chmod 0755 nss-config
domcox@14158 46 + ln -sf ../../../security/nss/config/nss-config $(DIST)/bin
domcox@14158 47 +
domcox@14158 48 +libs:
domcox@14158 49 +
domcox@14158 50 +dummy: all export libs
domcox@14158 51 +
domcox@14158 52 --- nss.orig/mozilla/security/nss/config/nss-config.in 1970-01-01 01:00:00.000000000 +0100
domcox@14158 53 +++ nss/mozilla/security/nss/config/nss-config.in 2012-12-31 13:27:51.695572567 +0100
domcox@14158 54 @@ -0,0 +1,153 @@
domcox@14158 55 +#!/bin/sh
domcox@14158 56 +
domcox@14158 57 +prefix=@prefix@
domcox@14158 58 +
domcox@14158 59 +major_version=@NSS_MAJOR_VERSION@
domcox@14158 60 +minor_version=@NSS_MINOR_VERSION@
domcox@14158 61 +patch_version=@NSS_PATCH_VERSION@
domcox@14158 62 +
domcox@14158 63 +usage()
domcox@14158 64 +{
domcox@14158 65 + cat <<EOF
domcox@14158 66 +Usage: nss-config [OPTIONS] [LIBRARIES]
domcox@14158 67 +Options:
domcox@14158 68 + [--prefix[=DIR]]
domcox@14158 69 + [--exec-prefix[=DIR]]
domcox@14158 70 + [--includedir[=DIR]]
domcox@14158 71 + [--libdir[=DIR]]
domcox@14158 72 + [--version]
domcox@14158 73 + [--libs]
domcox@14158 74 + [--cflags]
domcox@14158 75 +Dynamic Libraries:
domcox@14158 76 + nss
domcox@14158 77 + nssutil
domcox@14158 78 + smime
domcox@14158 79 + ssl
domcox@14158 80 + softokn
domcox@14158 81 +EOF
domcox@14158 82 + exit $1
domcox@14158 83 +}
domcox@14158 84 +
domcox@14158 85 +if test $# -eq 0; then
domcox@14158 86 + usage 1 1>&2
domcox@14158 87 +fi
domcox@14158 88 +
domcox@14158 89 +lib_nss=yes
domcox@14158 90 +lib_nssutil=yes
domcox@14158 91 +lib_smime=yes
domcox@14158 92 +lib_ssl=yes
domcox@14158 93 +lib_softokn=yes
domcox@14158 94 +
domcox@14158 95 +while test $# -gt 0; do
domcox@14158 96 + case "$1" in
domcox@14158 97 + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
domcox@14158 98 + *) optarg= ;;
domcox@14158 99 + esac
domcox@14158 100 +
domcox@14158 101 + case $1 in
domcox@14158 102 + --prefix=*)
domcox@14158 103 + prefix=$optarg
domcox@14158 104 + ;;
domcox@14158 105 + --prefix)
domcox@14158 106 + echo_prefix=yes
domcox@14158 107 + ;;
domcox@14158 108 + --exec-prefix=*)
domcox@14158 109 + exec_prefix=$optarg
domcox@14158 110 + ;;
domcox@14158 111 + --exec-prefix)
domcox@14158 112 + echo_exec_prefix=yes
domcox@14158 113 + ;;
domcox@14158 114 + --includedir=*)
domcox@14158 115 + includedir=$optarg
domcox@14158 116 + ;;
domcox@14158 117 + --includedir)
domcox@14158 118 + echo_includedir=yes
domcox@14158 119 + ;;
domcox@14158 120 + --libdir=*)
domcox@14158 121 + libdir=$optarg
domcox@14158 122 + ;;
domcox@14158 123 + --libdir)
domcox@14158 124 + echo_libdir=yes
domcox@14158 125 + ;;
domcox@14158 126 + --version)
domcox@14158 127 + echo ${major_version}.${minor_version}.${patch_version}
domcox@14158 128 + ;;
domcox@14158 129 + --cflags)
domcox@14158 130 + echo_cflags=yes
domcox@14158 131 + ;;
domcox@14158 132 + --libs)
domcox@14158 133 + echo_libs=yes
domcox@14158 134 + ;;
domcox@14158 135 + nss)
domcox@14158 136 + lib_nss=yes
domcox@14158 137 + ;;
domcox@14158 138 + nssutil)
domcox@14158 139 + lib_nssutil=yes
domcox@14158 140 + ;;
domcox@14158 141 + smime)
domcox@14158 142 + lib_smime=yes
domcox@14158 143 + ;;
domcox@14158 144 + ssl)
domcox@14158 145 + lib_ssl=yes
domcox@14158 146 + ;;
domcox@14158 147 + softokn)
domcox@14158 148 + lib_softokn=yes
domcox@14158 149 + ;;
domcox@14158 150 + *)
domcox@14158 151 + usage 1 1>&2
domcox@14158 152 + ;;
domcox@14158 153 + esac
domcox@14158 154 + shift
domcox@14158 155 +done
domcox@14158 156 +
domcox@14158 157 +# Set variables that may be dependent upon other variables
domcox@14158 158 +if test -z "$exec_prefix"; then
domcox@14158 159 + exec_prefix=`pkg-config --variable=exec_prefix nss`
domcox@14158 160 +fi
domcox@14158 161 +if test -z "$includedir"; then
domcox@14158 162 + includedir=`pkg-config --variable=includedir nss`
domcox@14158 163 +fi
domcox@14158 164 +if test -z "$libdir"; then
domcox@14158 165 + libdir=`pkg-config --variable=libdir nss`
domcox@14158 166 +fi
domcox@14158 167 +
domcox@14158 168 +if test "$echo_prefix" = "yes"; then
domcox@14158 169 + echo $prefix
domcox@14158 170 +fi
domcox@14158 171 +
domcox@14158 172 +if test "$echo_exec_prefix" = "yes"; then
domcox@14158 173 + echo $exec_prefix
domcox@14158 174 +fi
domcox@14158 175 +
domcox@14158 176 +if test "$echo_includedir" = "yes"; then
domcox@14158 177 + echo $includedir
domcox@14158 178 +fi
domcox@14158 179 +
domcox@14158 180 +if test "$echo_libdir" = "yes"; then
domcox@14158 181 + echo $libdir
domcox@14158 182 +fi
domcox@14158 183 +
domcox@14158 184 +if test "$echo_cflags" = "yes"; then
domcox@14158 185 + echo -I$includedir
domcox@14158 186 +fi
domcox@14158 187 +
domcox@14158 188 +if test "$echo_libs" = "yes"; then
domcox@14158 189 + libdirs="-L$libdir"
domcox@14158 190 + if test -n "$lib_nss"; then
domcox@14158 191 + libdirs="$libdirs -lnss${major_version}"
domcox@14158 192 + fi
domcox@14158 193 + if test -n "$lib_nssutil"; then
domcox@14158 194 + libdirs="$libdirs -lnssutil${major_version}"
domcox@14158 195 + fi
domcox@14158 196 + if test -n "$lib_smime"; then
domcox@14158 197 + libdirs="$libdirs -lsmime${major_version}"
domcox@14158 198 + fi
domcox@14158 199 + if test -n "$lib_ssl"; then
domcox@14158 200 + libdirs="$libdirs -lssl${major_version}"
domcox@14158 201 + fi
domcox@14158 202 + if test -n "$lib_softokn"; then
domcox@14158 203 + libdirs="$libdirs -lsoftokn${major_version}"
domcox@14158 204 + fi
domcox@14158 205 + echo $libdirs
domcox@14158 206 +fi
domcox@14158 207 +
domcox@14158 208 --- nss.orig/mozilla/security/nss/config/nss.pc.in 1970-01-01 01:00:00.000000000 +0100
domcox@14158 209 +++ nss/mozilla/security/nss/config/nss.pc.in 2012-12-31 13:27:51.695572567 +0100
domcox@14158 210 @@ -0,0 +1,12 @@
domcox@14158 211 +prefix=@prefix@
domcox@14158 212 +exec_prefix=@exec_prefix@
domcox@14158 213 +libdir=@libdir@
domcox@14158 214 +includedir=@includedir@
domcox@14158 215 +
domcox@14158 216 +Name: NSS
domcox@14158 217 +Description: Network Security Services
domcox@14158 218 +Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@
domcox@14158 219 +Requires: nspr >= 4.8
domcox@14158 220 +Libs: -L@libdir@ -lnss@NSS_MAJOR_VERSION@ -lnssutil@NSS_MAJOR_VERSION@ -lsmime@NSS_MAJOR_VERSION@ -lssl@NSS_MAJOR_VERSION@ -lsoftokn@NSS_MAJOR_VERSION@
domcox@14158 221 +Cflags: -I${includedir}
domcox@14158 222 +
domcox@14158 223 --- nss.orig/mozilla/security/nss/Makefile 2012-11-14 02:14:07.000000000 +0100
domcox@14158 224 +++ nss/mozilla/security/nss/Makefile 2012-12-31 13:27:51.696572567 +0100
domcox@14158 225 @@ -44,7 +44,7 @@
domcox@14158 226 # (7) Execute "local" rules. (OPTIONAL). #
domcox@14158 227 #######################################################################
domcox@14158 228
domcox@14158 229 -nss_build_all: build_coreconf build_nspr build_dbm all
domcox@14158 230 +nss_build_all: build_coreconf build_dbm all
domcox@14158 231
domcox@14158 232 nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
domcox@14158 233
domcox@14158 234 --- nss.orig/mozilla/security/nss/manifest.mn 2012-03-20 15:46:49.000000000 +0100
domcox@14158 235 +++ nss/mozilla/security/nss/manifest.mn 2012-12-31 13:27:51.696572567 +0100
domcox@14158 236 @@ -10,6 +10,6 @@
domcox@14158 237
domcox@14158 238 RELEASE = nss
domcox@14158 239
domcox@14158 240 -DIRS = lib cmd
domcox@14158 241 +DIRS = lib cmd config
domcox@14158 242
domcox@14158 243