sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (680364ac850348b373c668d650aad2afceef07b7)
- From: Remko van der Vossen <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (680364ac850348b373c668d650aad2afceef07b7)
- Date: Tue, 19 Feb 2013 07:18:12 -0600
GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:
crypto/nss/HISTORY | 3 +++
crypto/nss/PRE_BUILD | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 680364ac850348b373c668d650aad2afceef07b7
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>
nss: fix patch apply if statement
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 12f3f16..7e3e899 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2013-02-19 Remko van der Vossen <wich AT sourcemage.org>
+ * PRE_BUILD: fix patch apply if statement
+
2013-02-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* INSTALL: don't overwrite OpenSSL's libssl.a static library; renamed
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 22d9c9f..9828554 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -2,7 +2,7 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [[ $NSS_BRANCH == "3.14" ]]; then
+if [[ $NSS_BRANCH == "3.14" || $NSS_BRANCH == "DEFAULT" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.14-config-1.patch
else
patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
- [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (680364ac850348b373c668d650aad2afceef07b7), Remko van der Vossen, 02/19/2013
Archive powered by MHonArc 2.6.24.