summaryrefslogtreecommitdiff
path: root/libre/icecat/no-crmf.diff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-01-31 15:49:19 -0500
committerLuke Shumaker <lukeshu@lukeshu.com>2018-01-31 15:49:19 -0500
commit320e5c95cef052fcdd748ec2e754c323d105e2b9 (patch)
tree420552fab6dadb874ade8985717c87ee73e3ef81 /libre/icecat/no-crmf.diff
parenta80abeba36bce17de2737abeae0c0615ad3bb82e (diff)
parent7fa2c6d6c49f60c10722ab498ec2f9bd7818f1f8 (diff)
downloadabslibre-320e5c95cef052fcdd748ec2e754c323d105e2b9.tar.gz
abslibre-320e5c95cef052fcdd748ec2e754c323d105e2b9.tar.bz2
abslibre-320e5c95cef052fcdd748ec2e754c323d105e2b9.zip
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
Diffstat (limited to 'libre/icecat/no-crmf.diff')
-rw-r--r--libre/icecat/no-crmf.diff28
1 files changed, 28 insertions, 0 deletions
diff --git a/libre/icecat/no-crmf.diff b/libre/icecat/no-crmf.diff
new file mode 100644
index 000000000..3edb053ef
--- /dev/null
+++ b/libre/icecat/no-crmf.diff
@@ -0,0 +1,28 @@
+diff --git i/old-configure.in w/old-configure.in
+index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
+--- i/old-configure.in
++++ w/old-configure.in
+@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
+ AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+ fi
+
+-if test -n "$MOZ_SYSTEM_NSS"; then
+- NSS_LIBS="$NSS_LIBS -lcrmf"
+-else
++if test -z "$MOZ_SYSTEM_NSS"; then
+ NSS_CFLAGS="-I${DIST}/include/nss"
+ case "${OS_ARCH}" in
+ # Only few platforms have been tested with GYP
+diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build
+index 9b8005f..4bfcc81 100644
+--- a/config/external/nss/crmf/moz.build
++++ b/config/external/nss/crmf/moz.build
+@@ -8,7 +8,6 @@ Library('crmf')
+
+ if CONFIG['MOZ_NATIVE_NSS']:
+ OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
+- OS_LIBS += ['-lcrmf']
+ else:
+ USE_LIBS += [
+ # The dependency on nss is not real, but is required to force the
+