diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-23 13:45:05 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-05-05 21:14:54 +0200 |
| commit | 8a4173987edfeeb7e49c70617d43e3adc911d333 (patch) | |
| tree | 24360e0c3fe2b2138f9a291f143f9a6667c53510 /external/redland | |
| parent | 013ddc4f5307df512767ca23b3922540b2b36d52 (diff) | |
WASM: add initial support for Emscripten cross build
- configure with:
- --host=wasm64-local-emscripten
- had to make a few externals optional, so adding:
- --disable-nss
- --disable-cmis
- --disable-curl
Change-Id: I48d1c73d2675ad2e2beaf2c341578199efbd24ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111130
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'external/redland')
| -rw-r--r-- | external/redland/ExternalProject_raptor.mk | 2 | ||||
| -rw-r--r-- | external/redland/ExternalProject_rasqal.mk | 2 | ||||
| -rw-r--r-- | external/redland/ExternalProject_redland.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk index 4bc91c375b85..ea14077f3029 100644 --- a/external/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk @@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ - ./configure --disable-gtk-doc \ + $(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \ --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ --with-www=xml \ --without-xslt-config \ diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk index 0e765e098eb9..5348e37294a9 100644 --- a/external/redland/ExternalProject_rasqal.mk +++ b/external/redland/ExternalProject_rasqal.mk @@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2" \ - ./configure --disable-gtk-doc \ + $(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \ --with-regex-library=posix \ --with-decimal=none \ --with-uuid-library=internal \ diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk index f6101f0d288e..f908b550625b 100644 --- a/external/redland/ExternalProject_redland.mk +++ b/external/redland/ExternalProject_redland.mk @@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 $(LIBXML_LIBS)" \ RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \ RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \ - ./configure --disable-gtk-doc \ + $(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \ --disable-modular \ --without-threads \ --without-bdb --without-sqlite --without-mysql \ |