diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh | |
parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) |
resolve merge conflict
Diffstat (limited to 'package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh')
-rw-r--r-- | package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh b/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh index 326f958d8..3d993d247 100644 --- a/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh +++ b/package/nss/patches/patch-mozilla_security_nss_cmd_shlibsign_sign_sh @@ -1,11 +1,10 @@ ---- nss-3.12.4.orig/mozilla/security/nss/cmd/shlibsign/sign.sh 2009-06-05 04:30:52.000000000 +0200 -+++ nss-3.12.4/mozilla/security/nss/cmd/shlibsign/sign.sh 2009-11-20 18:51:43.000000000 +0100 -@@ -35,6 +35,7 @@ WIN*) +--- nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/sign.sh 2009-12-08 02:33:37.000000000 +0100 ++++ nss-3.12.6/mozilla/security/nss/cmd/shlibsign/sign.sh 2010-04-12 20:21:23.000000000 +0200 +@@ -35,6 +35,6 @@ WIN*) ADDON_PATH=${1}/lib:${4}:$ADDON_PATH export ADDON_PATH - echo ${2}/shlibsign -v -i ${5} -- ${2}/shlibsign -v -i ${5} -+ #disable for cross-compile -+ #${2}/shlibsign -v -i ${5} + echo "${2}"/shlibsign -v -i "${5}" +- "${2}"/shlibsign -v -i "${5}" ++ #"${2}"/shlibsign -v -i "${5}" ;; esac |