Skip to content

Commit

Permalink
Regression fix: Don't use -lthread or -lrt/-lposix4 any more.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan McDonald authored and Dan McDonald committed May 23, 2014
1 parent 8678d24 commit 50365b9
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
21 changes: 21 additions & 0 deletions build/mozilla-nss-nspr/patches/nss-modernize.patch
@@ -0,0 +1,21 @@
diff -ur pristine/nspr/configure nss-3.16.1/nspr/configure
--- pristine/nspr/configure Thu May 1 18:27:29 2014
+++ nss-3.16.1/nspr/configure Thu May 22 20:57:50 2014
@@ -7627,7 +7627,7 @@
# be linked against -lrt (or -lposix4) so add it to OS_LIBS
_rev=`uname -r`
_librt=`echo $_rev 5.6 | awk '{ if ($1 > $2) print "-lrt"; else print "-lposix4" }'`
- OS_LIBS="$OS_LIBS $_librt"
+ # OS_LIBS="$OS_LIBS $_librt"
;;

*-sco-sysv5*)
diff -ur pristine/nss/coreconf/SunOS5.mk nss-3.16.1/nss/coreconf/SunOS5.mk
--- pristine/nss/coreconf/SunOS5.mk Fri May 2 03:27:18 2014
+++ nss-3.16.1/nss/coreconf/SunOS5.mk Thu May 22 20:54:20 2014
@@ -141,4 +141,4 @@
RPATH = -R '$$ORIGIN'
endif

-OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc
+OS_LIBS += -lnsl -lsocket -ldl -lc
1 change: 1 addition & 0 deletions build/mozilla-nss-nspr/patches/series
@@ -0,0 +1 @@
nss-modernize.patch

0 comments on commit 50365b9

Please sign in to comment.