001-lfs-nss-config+nss_pc.patch 6.2 KB

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