summaryrefslogtreecommitdiff
path: root/package/nspr
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-03-09 20:59:00 +0100
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-03-09 20:59:00 +0100
commit7744992874e623136797febd669b5b40e0a18178 (patch)
tree39bb948e06271e76586906c60466be421120ff55 /package/nspr
parent4a619c92b7a63e852a019186ece93a76eeea4acf (diff)
parent2261e8e2b3cda815ac79bd934756b94a3fa67fe5 (diff)
Merge branch 'master' of git://www.openadk.org/git/openadk
Diffstat (limited to 'package/nspr')
-rw-r--r--package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in6
-rw-r--r--package/nspr/patches/patch-mozilla_nsprpub_configure11
2 files changed, 14 insertions, 3 deletions
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
index f667eeb61..9e925158b 100644
--- a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
+++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
@@ -1,6 +1,6 @@
---- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in 2009-03-03 23:04:23.000000000 +0100
-+++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in 2010-05-02 12:25:27.673464050 +0200
-@@ -145,7 +145,7 @@ endif
+--- nspr-4.9.5.orig/mozilla/nsprpub/config/Makefile.in 2012-11-14 00:17:57.000000000 +0100
++++ nspr-4.9.5/mozilla/nsprpub/config/Makefile.in 2013-02-27 16:29:38.000000000 +0100
+@@ -113,7 +113,7 @@ endif
$(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
@$(MAKE_OBJDIR)
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_configure b/package/nspr/patches/patch-mozilla_nsprpub_configure
new file mode 100644
index 000000000..70465b40f
--- /dev/null
+++ b/package/nspr/patches/patch-mozilla_nsprpub_configure
@@ -0,0 +1,11 @@
+--- nspr-4.9.5.orig/mozilla/nsprpub/configure 2012-12-19 20:21:31.000000000 +0100
++++ nspr-4.9.5/mozilla/nsprpub/configure 2013-02-27 16:43:20.000000000 +0100
+@@ -2848,7 +2849,7 @@ esac
+ if test "$cross_compiling" = "yes"; then
+ CROSS_COMPILE=1
+ else
+- CROSS_COMPILE=
++ CROSS_COMPILE=1
+ fi
+
+ echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6