API tools faq
paste
gautamp8

Untitled

gautamp8
Jul 18th, 2017
57
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 8.19 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/Repository.mk b/Repository.mk
  2. index 6329a4e..60f515b 100644
  3. --- a/Repository.mk
  4. +++ b/Repository.mk
  5. @@ -1109,7 +1109,7 @@ $(eval $(call gb_Helper_register_resources,\
  6.         uui \
  7.         vcl \
  8.         writerperfect \
  9. -       $(if $(ENABLE_NSS),xmlsec) \
  10. +       $(if $(filter-out ANDROID,$(OS)),xmlsec) \
  11.         xsltdlg \
  12.  ))
  13.  
  14. @@ -1156,7 +1156,7 @@ $(eval $(call gb_Helper_register_uiconfigs,\
  15.         uui \
  16.         vcl \
  17.         writerperfect \
  18. -       $(if $(ENABLE_NSS),xmlsec) \
  19. +       $(if $(filter-out ANDROID,$(OS)),xmlsec) \
  20.  ))
  21.  
  22.  ifeq ($(gb_GBUILDSELFTEST),t)
  23. diff --git a/configure.ac b/configure.ac
  24. index 6344d6e..3d905cb 100644
  25. --- a/configure.ac
  26. +++ b/configure.ac
  27. @@ -8780,7 +8780,7 @@ AC_SUBST(SYSTEM_OPENLDAP)
  28.  dnl ===================================================================
  29.  dnl Check for system NSS
  30.  dnl ===================================================================
  31. -if test $_os != iOS -a $_os != Android -a "$enable_fuzzers" != "yes"; then
  32. +if test $_os != iOS -a $_os = Android -a "$enable_fuzzers" != "yes"; then
  33.      libo_CHECK_SYSTEM_MODULE([nss],[NSS],[nss >= 3.9.3 nspr >= 4.8])
  34.      AC_DEFINE(HAVE_FEATURE_NSS)
  35.      ENABLE_NSS="TRUE"
  36. diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
  37. index 70de689..6dc1550 100644
  38. --- a/external/curl/ExternalProject_curl.mk
  39. +++ b/external/curl/ExternalProject_curl.mk
  40. @@ -10,7 +10,7 @@
  41.  $(eval $(call gb_ExternalProject_ExternalProject,curl))
  42.  
  43.  $(eval $(call gb_ExternalProject_use_externals,curl,\
  44. -       $(if $(ENABLE_NSS),nss3) \
  45. +       $(if $(filter-out ANDROID,$(OS)),nss3) \
  46.         zlib \
  47.  ))
  48.  
  49. @@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
  50.                 ./configure \
  51.                         $(if $(filter IOS MACOSX,$(OS)),\
  52.                                 --with-darwinssl,\
  53. -                               $(if $(ENABLE_NSS),--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \
  54. +                               $(if $(filter-out ANDROID,$(OS)),--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"),--without-nss)) \
  55.                         --without-ssl --without-gnutls --without-polarssl --without-cyassl --without-axtls \
  56.                         --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
  57.                         --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
  58. diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
  59. index f555975..2eb4a61 100644
  60. --- a/external/nss/ExternalProject_nss.mk
  61. +++ b/external/nss/ExternalProject_nss.mk
  62. @@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
  63.                 $(if $(CROSS_COMPILING),\
  64.                         NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \
  65.                 nspr/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
  66. -                       $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
  67. +                       $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-android-ndk="/home/brainbreaker/android-sdk-linux/android-ndk-r15" --with-android-toolchain="/home/brainbreaker/android-sdk-linux/android-ndk-r15/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64" --with-android-platform="/home/brainbreaker/android-sdk-linux/android-ndk-r15/platforms/android-15/arch-arm") \
  68.                         $(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
  69.                         $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)),--host=i686-pc-cygwin) \
  70.         ,,nss_configure.log)
  71. @@ -57,7 +57,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
  72.                         RANLIB="$(RANLIB)" \
  73.                         NMEDIT="$(NM)edit" \
  74.                         CCC="$(CXX)" \
  75. -                       $(if $(CROSS_COMPILING),NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \
  76. +                       $(if $(CROSS_COMPILING),NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-android-ndk=/home/brainbreaker/android-sdk-linux/android-ndk-r15 --with-android-toolchain=/home/brainbreaker/android-sdk-linux/android-ndk-r15/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64 --with-android-platform=/home/brainbreaker/android-sdk-linux/android-ndk-r15/platforms/android-15/arch-arm") \
  77.                         nss_build_all \
  78.                 && rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
  79.                 $(if $(filter MACOSX,$(OS)),\
  80. diff --git a/external/nss/Module_nss.mk b/external/nss/Module_nss.mk
  81. index 69b39f5..eae9e95 100644
  82. index 69b39f5..eae9e95 100644
  83. --- a/external/nss/Module_nss.mk
  84. +++ b/external/nss/Module_nss.mk
  85. @@ -9,12 +9,10 @@
  86.  
  87.  $(eval $(call gb_Module_Module,nss))
  88.  
  89. -ifeq ($(filter ANDROID,$(OS)),)
  90.  $(eval $(call gb_Module_add_targets,nss,\
  91.         UnpackedTarball_nss \
  92.         ExternalPackage_nss \
  93.         ExternalProject_nss \
  94.  ))
  95. -endif
  96.  
  97.  # vim: set noet sw=4 ts=4:
  98. diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
  99. index 487d7e3..20cb115 100644
  100. --- a/postprocess/Rdb_services.mk
  101. diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
  102. index 487d7e3..20cb115 100644
  103. --- a/postprocess/Rdb_services.mk
  104. +++ b/postprocess/Rdb_services.mk
  105. @@ -109,7 +109,7 @@ $(eval $(call gb_Rdb_add_components,services,\
  106.         xmloff/source/transform/xof \
  107.         xmloff/util/xo \
  108.         xmlscript/util/xmlscript \
  109. -       $(if $(ENABLE_NSS), \
  110. +       $(if $(filter-out ANDROID,$(OS)), \
  111. -endif
  112.  
  113.  # vim: set noet sw=4 ts=4:
  114. diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
  115. index 487d7e3..20cb115 100644
  116. --- a/postprocess/Rdb_services.mk
  117. +++ b/postprocess/Rdb_services.mk
  118. @@ -109,7 +109,7 @@ $(eval $(call gb_Rdb_add_components,services,\
  119.         xmloff/source/transform/xof \
  120.         xmloff/util/xo \
  121.         xmlscript/util/xmlscript \
  122. -       $(if $(ENABLE_NSS), \
  123. +       $(if $(filter-out ANDROID,$(OS)), \
  124.                 xmlsecurity/util/xmlsecurity \
  125.                 xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) \
  126.         $(if $(ENABLE_COINMP), \
  127. diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
  128. index 683da42..d5c6e38 100644
  129. --- a/sd/Library_sd.mk
  130. +++ b/sd/Library_sd.mk
  131. @@ -94,7 +94,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
  132.         ucbhelper \
  133.         utl \
  134.         vcl \
  135. -       $(if $(ENABLE_NSS),xmlsecurity) \
  136. +       $(if $(filter-out ANDROID,$(OS)),xmlsecurity) \
  137.  ))
  138.  
  139.  $(eval $(call gb_Library_use_externals,sd,\
  140. diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
  141. index b14729f..f0a9023 100644
  142. --- a/xmlsecurity/Module_xmlsecurity.mk
  143. +++ b/xmlsecurity/Module_xmlsecurity.mk
  144. --- a/postprocess/Rdb_services.mk
  145. +++ b/postprocess/Rdb_services.mk
  146. @@ -109,7 +109,7 @@ $(eval $(call gb_Rdb_add_components,services,\
  147.         xmloff/source/transform/xof \
  148.         xmloff/util/xo \
  149.         xmlscript/util/xmlscript \
  150. -       $(if $(ENABLE_NSS), \
  151. +       $(if $(filter-out ANDROID,$(OS)), \
  152.                 xmlsecurity/util/xmlsecurity \
  153.                 xmlsecurity/util/xsec_xmlsec$(if $(filter WNT,$(OS)),.windows)) \
  154.         $(if $(ENABLE_COINMP), \
  155. diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
  156. index 683da42..d5c6e38 100644
  157. --- a/sd/Library_sd.mk
  158. +++ b/sd/Library_sd.mk
  159. @@ -94,7 +94,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
  160.         ucbhelper \
  161.         utl \
  162.         vcl \
  163. -       $(if $(ENABLE_NSS),xmlsecurity) \
  164. +       $(if $(filter-out ANDROID,$(OS)),xmlsecurity) \
  165.  ))
  166.  
  167.  $(eval $(call gb_Library_use_externals,sd,\
  168. diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
  169. index b14729f..f0a9023 100644
  170. --- a/xmlsecurity/Module_xmlsecurity.mk
  171. +++ b/xmlsecurity/Module_xmlsecurity.mk
  172. @@ -9,7 +9,9 @@
  173.  
  174.  $(eval $(call gb_Module_Module,xmlsecurity))
  175.  
  176. +ifneq ($(filter-out ANDROID,$(OS)),)
  177.  ifeq ($(ENABLE_NSS),TRUE)
  178. +endif
  179.  #FIXME: ^^^, get nss&libxmlsec building on ios and android
  180.  #chromium has patches to build statically FWIW
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!