diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-11-26 15:21:06 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-18 17:43:03 +0200 |
| commit | 6576d4d25742d12f5ac05f6ae6f8de9e71712487 (patch) | |
| tree | 7ea2b0868b5b79fcbc1a635cd4bfa545efb639e9 /external | |
| parent | 613bfa0d7609f049dde02d8f7f7b5472c56ff4be (diff) | |
nss: fix Android build
By not building some of the test code.
The first hunk is necessary to avoid:
/home/vmiklos/git/libreoffice/master-android/external/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error: cannot find -lpthread
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make[3]: *** [Makefile:379: abstract] Error 1
make[2]: *** [Makefile:143: build_nspr] Error 2
make[1]: *** [/home/vmiklos/git/libreoffice/master-android/external/nss/ExternalProject_nss.mk:35: /home/vmiklos/git/libreoffice/master-android/workdir/ExternalProject/nss/build] Error 1
make: *** [Makefile:120: nss] Error 2
The second hunk avoids:
cd testlib; make libs
Traceback (most recent call last):
File "/home/vmiklos/git/libreoffice/master-android/external/nss/nsinstall.py", line 164, in <module>
sys.exit(nsinstall(sys.argv[1:]))
File "/home/vmiklos/git/libreoffice/master-android/external/nss/nsinstall.py", line 112, in nsinstall
os.makedirs(args[0])
File "/usr/lib64/python2.7/os.py", line 157, in makedirs
mkdir(name, mode)
OSError: [Errno 17] File exists: 'out/..'
make[6]: *** [../../../../coreconf/rules.mk:392: out/../anchor.o] Error 1
make[5]: *** [../../../coreconf/rules.mk:81: libs] Error 2
make[4]: *** [../../coreconf/rules.mk:78: libs] Error 2
make[3]: *** [../coreconf/rules.mk:101: libs] Error 2
make[2]: *** [coreconf/rules.mk:101: libs] Error 2
make[1]: *** [/home/vmiklos/git/libreoffice/master-android/external/nss/ExternalProject_nss.mk:35: /home/vmiklos/git/libreoffice/master-android/workdir/ExternalProject/nss/build] Error 1
make: *** [Makefile:120: nss] Error 2
Change-Id: I11906f56ef717842778e14edf4037bd92e42cd86
Reviewed-on: https://gerrit.libreoffice.org/83775
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/nss/nss-android.patch.1 | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1 index f8b4cdaf3753..40478d34ddbf 100644 --- a/external/nss/nss-android.patch.1 +++ b/external/nss/nss-android.patch.1 @@ -48,3 +48,24 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile --with-android-version=$(OS_TARGET_RELEASE) \ --with-android-toolchain=$(ANDROID_TOOLCHAIN) \ --with-android-platform=$(ANDROID_SYSROOT) +--- nss/nss/Makefile.orig 2019-11-26 14:52:15.934561202 +0100 ++++ nss/nss/Makefile 2019-11-26 14:52:20.538559612 +0100 +@@ -140,7 +140,6 @@ + + build_nspr: $(NSPR_CONFIG_STATUS) + $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) +- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests + + install_nspr: build_nspr + $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install +--- nss/nss/lib/ckfw/builtins/manifest.mn.orig 2019-11-26 15:18:22.185985193 +0100 ++++ nss/nss/lib/ckfw/builtins/manifest.mn 2019-11-26 15:18:29.281982387 +0100 +@@ -5,7 +5,7 @@ + + CORE_DEPTH = ../../.. + +-DIRS = testlib ++DIRS = + + MODULE = nss + MAPFILE = $(OBJDIR)/nssckbi.def |