diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-06-09 06:39:32 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-06-09 09:50:46 +0200 |
| commit | 136fac12eb9752f1072f852cc193d6a9accdc4a7 (patch) | |
| tree | 8e153bd1ebf44bd30474b6ceffbd4bfa98b29e85 /external | |
| parent | 64b5eb228625f4da6368be3e7ec93e68cf74605d (diff) | |
redland WASM: add Emscripten flags to fix NEH build
Change-Id: I4ed242e774e1ce2ac05dabb9fc657329dc4a63c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135519
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'external')
| -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 324d231c5073..b3ae74c10b61 100644 --- a/external/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk @@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): LDFLAGS=" \ $(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)" \ + CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include) $(gb_EMSCRIPTEN_CPPFLAGS)" \ $(gb_RUN_CONFIGURE) ./configure --disable-gtk-doc \ --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ --with-www=xml \ diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk index dd8887c669c8..e7d1fdb1195d 100644 --- a/external/redland/ExternalProject_rasqal.mk +++ b/external/redland/ExternalProject_rasqal.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\ $(call gb_ExternalProject_get_state_target,rasqal,build): $(call gb_Trace_StartRange,rasqal,EXTERNAL) $(call gb_ExternalProject_run,build,\ - CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(call gb_ExternalProject_get_build_flags,rasqal)" \ + CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(call gb_ExternalProject_get_build_flags,rasqal) $(gb_EMSCRIPTEN_CPPFLAGS)" \ LDFLAGS=" \ $(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))" \ diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk index d4dd34519670..d92c642b9cd1 100644 --- a/external/redland/ExternalProject_redland.mk +++ b/external/redland/ExternalProject_redland.mk @@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\ $(call gb_ExternalProject_get_state_target,redland,build): $(call gb_Trace_StartRange,redland,EXTERNAL) $(call gb_ExternalProject_run,build,\ - CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(call gb_ExternalProject_get_build_flags,redland)" \ + CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(call gb_ExternalProject_get_build_flags,redland) $(gb_EMSCRIPTEN_CPPFLAGS)" \ LDFLAGS=" \ $(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))" \ |