diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 09:06:44 +0000 |
commit | ed5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch) | |
tree | 7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/nss/nss.cygwin64.in32bit.patch | |
parent | Initial commit. (diff) | |
download | libreoffice-upstream/4%7.4.7.tar.xz libreoffice-upstream/4%7.4.7.zip |
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/nss/nss.cygwin64.in32bit.patch')
-rw-r--r-- | external/nss/nss.cygwin64.in32bit.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/external/nss/nss.cygwin64.in32bit.patch b/external/nss/nss.cygwin64.in32bit.patch new file mode 100644 index 000000000..bce0f1d09 --- /dev/null +++ b/external/nss/nss.cygwin64.in32bit.patch @@ -0,0 +1,14 @@ +This fixes architecture mismatch, when building +on Cygwin 64bit and in 32bit mode +diff -ru nss.orig/nss/Makefile nss/nss/Makefile +--- a/nss.orig/nss/Makefile 2016-02-26 01:00:52.146713100 +0100 ++++ b/nss/nss/Makefile 2016-02-26 01:02:05.303560100 +0100 +@@ -63,6 +63,8 @@ + # Translate coreconf build options to NSPR configure options. + # + ++NSPR_CONFIGURE_OPTS += --host=i686-pc-cygwin ++ + ifeq ($(OS_TARGET),Android) + NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \ + --target=$(ANDROID_PREFIX) \ |