diff options
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 455 |
1 files changed, 259 insertions, 196 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e63ab24dba27..60499758de40 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -128,6 +128,7 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,skia)/include/gpu \ -I$(call gb_UnpackedTarball_get_dir,skia)/include/config \ -I$(call gb_UnpackedTarball_get_dir,skia)/include/ports \ + -I$(call gb_UnpackedTarball_get_dir,skia)/include/private \ -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan \ -I$(call gb_UnpackedTarball_get_dir,skia)/tools/gpu \ -I$(call gb_UnpackedTarball_get_dir,skia) \ @@ -223,7 +224,9 @@ endef endif # SYSTEM_CPPUNIT -ifneq ($(SYSTEM_EPOXY),) + +ifeq ($(ENABLE_EPOXY),TRUE) +ifeq ($(SYSTEM_EPOXY),TRUE) define gb_LinkTarget__use_epoxy $(call gb_LinkTarget_set_include,$(1),\ @@ -259,7 +262,14 @@ $(call gb_ExternalProject_use_external_project,$(1),epoxy) endef -endif # SYSTEM_EPOXY +endif # !SYSTEM_EPOXY +else # !ENABLE_EPOXY + +gb_LinkTarget__use_epoxy := +gb_ExternalProject__use_epoxy := + +endif # !ENABLE_EPOXY + define gb_LinkTarget__use_iconv ifeq ($(COM),MSC) @@ -302,6 +312,7 @@ $(call gb_LinkTarget_use_system_win32_libs,$(1),\ kernel32 \ shlwapi \ crypt32 \ + bcrypt \ ) endef @@ -418,7 +429,6 @@ gb_ExternalProject__use_libjpeg := else define gb_LinkTarget__use_libjpeg -$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libjpeg-turbo) \ $$(INCLUDE) \ @@ -428,7 +438,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),libjpeg-turbo) endef define gb_ExternalProject__use_libjpeg -$(call gb_ExternalProject_use_external_project,$(1),libjpeg-turbo) +$(call gb_ExternalProject_use_static_libraries,$(1),libjpeg-turbo) endef @@ -558,6 +568,7 @@ endef gb_ExternalProject__use_hunspell := else # !SYSTEM_HUNSPELL +ifneq ($(ENABLE_WASM_STRIP_HUNSPELL),TRUE) define gb_LinkTarget__use_hunspell $(call gb_LinkTarget_add_defs,$(1),\ @@ -585,6 +596,7 @@ $(call gb_ExternalProject_use_external_project,$(1),hunspell) endef +endif # ENABLE_WASM_STRIP_HUNSPELL endif # SYSTEM_HUNSPELL @@ -1079,117 +1091,6 @@ endef endif # SYSTEM_LIBLANGTAG -gb_ExternalProject__use_apr := - -ifeq ($(WITH_WEBDAV),serf) - -define gb_LinkTarget__use_apr -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(APR_CFLAGS) \ -) -$(call gb_LinkTarget_add_libs,$(1),\ - $(APR_LIBS) \ - $(if $(filter $(OS),LINUX),-lpthread) \ - $(if $(filter $(OS),MACOSX),-liconv) \ -) - -ifeq ($(SYSTEM_APR),) -$(call gb_LinkTarget_use_system_win32_libs,$(1),\ - mswsock \ - rpcrt4 \ - shell32 \ -) -$(call gb_LinkTarget_add_defs,$(1),\ - -DAPR_DECLARE_STATIC \ - -DAPU_DECLARE_STATIC \ -) -$(call gb_LinkTarget_use_external_project,$(1),apr_util,full) -endif - -endef - -define gb_ExternalProject__use_apr -ifeq ($(SYSTEM_APR),) -$(call gb_ExternalProject_use_external_project,$(1),apr_util,full) -endif - -endef - -ifneq ($(SYSTEM_SERF),) - -define gb_LinkTarget__use_serf -$(call gb_LinkTarget_add_defs,$(1),\ - $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(SERF_CFLAGS))) \ -) - -$(call gb_LinkTarget_set_include,$(1),\ - $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(SERF_CFLAGS)))) \ - $$(INCLUDE) \ -) - -$(call gb_LinkTarget_add_libs,$(1),\ - $(SERF_LIBS) \ -) - -endef - -else # !SYSTEM_SERF - -define gb_LinkTarget__use_serf -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,serf) \ - $$(INCLUDE) \ -) - -$(call gb_LinkTarget_use_static_libraries,$(1),\ - serf \ -) - -endef - -endif # SYSTEM_SERF - -else ifeq ($(WITH_WEBDAV),neon) - -ifneq ($(SYSTEM_NEON),) - -define gb_LinkTarget__use_neon -$(call gb_LinkTarget_add_defs,$(1),\ - -DNEON_VERSION=0x$(NEON_VERSION) \ - -DSYSTEM_NEON \ -) -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(NEON_CFLAGS) \ -) - -$(call gb_LinkTarget_add_libs,$(1),$(NEON_LIBS)) - -endef - -else # !SYSTEM_NEON - -$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ - neon \ -)) - -define gb_LinkTarget__use_neon -$(call gb_LinkTarget_use_unpacked,$(1),neon) -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,neon/src) \ - $$(INCLUDE) \ -) -$(call gb_LinkTarget_use_libraries,$(1),\ - neon \ -) - -endef - -endif # SYSTEM_NEON - -endif # WITH_WEBDAV - ifneq ($(SYSTEM_REDLAND),) define gb_LinkTarget__use_librdf @@ -1313,8 +1214,11 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \ - -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1 \ + $(if $(filter EMSCRIPTEN,$(OS)), \ + $(call gb_UnpackedTarball_get_dir,cairo)/src/.libs/libcairo.a \ + $(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs/libpixman-1.a, \ + -L$(call gb_UnpackedTarball_get_dir,cairo)/src/.libs -lcairo \ + -L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1) \ ) endef @@ -1371,12 +1275,30 @@ $(call gb_LinkTarget_add_libs,$(1),$(FONTCONFIG_LIBS)) endef +ifeq ($(OS),EMSCRIPTEN) +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + libfontconfig_data \ +)) +endif + gb_ExternalProject__use_fontconfig := -else +else # SYSTEM_FONTCONFIG + +ifneq ($(filter-out MACOSX WNT,$(OS)),) + +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + fontconfig \ +)) + +endif define gb_LinkTarget__use_fontconfig +ifeq ($(OS),LINUX) +$(call gb_LinkTarget_use_package,$(1),fontconfig) +else $(call gb_LinkTarget_use_external_project,$(1),fontconfig) +endif $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,fontconfig) \ $$(INCLUDE) \ @@ -1631,38 +1553,33 @@ endif # SYSTEM_OPENSSL endif # ENABLE_OPENSSL -ifneq ($(ENABLE_OPENSSL),TRUE) +ifneq ($(SYSTEM_ARGON2),) -define gb_LinkTarget__use_gnutls +define gb_LinkTarget__use_argon2 $(call gb_LinkTarget_set_include,$(1),\ + $(ARGON2_CFLAGS) \ $$(INCLUDE) \ - $(GNUTLS_CFLAGS) \ ) +$(call gb_LinkTarget_add_libs,$(1),$(ARGON2_LIBS)) -$(call gb_LinkTarget_add_defs,$(1),\ - -DDISABLE_OPENSSL \ -) +endef -$(call gb_LinkTarget_add_libs,$(1),$(GNUTLS_LIBS)) +else # !SYSTEM_ARGON2 -endef +$(eval $(call gb_Helper_register_packages_for_install,ooo, \ + argon2 \ +)) -define gb_LinkTarget__use_libgcrypt +define gb_LinkTarget__use_argon2 $(call gb_LinkTarget_set_include,$(1),\ + $(ARGON2_CFLAGS) \ $$(INCLUDE) \ - $(LIBGCRYPT_CFLAGS) \ ) - -$(call gb_LinkTarget_add_libs,$(1),$(LIBGCRYPT_LIBS)) - +$(call gb_LinkTarget_add_libs,$(1),$(ARGON2_LIBS)) +$(call gb_LinkTarget_use_package,$(1),argon2) endef -else # ENABLE_OPENSSL - -gb_LinkTarget__use_gnutls:= -gb_LinkTarget__use_libgcrypt:= - -endif # ENABLE_OPENSSL +endif # SYSTEM_ARGON2 ifneq ($(SYSTEM_CDR),) @@ -1892,6 +1809,7 @@ endef gb_ExternalProject__use_epubgen := else # !SYSTEM_EPUBGEN +ifneq ($(ENABLE_WASM_STRIP_EPUB),TRUE) define gb_LinkTarget__use_epubgen $(call gb_LinkTarget_set_include,$(1),\ @@ -1909,6 +1827,7 @@ $(call gb_ExternalProject_use_external_project,$(1),libepubgen) endef +endif # ENABLE_WASM_STRIP_EPUB endif # SYSTEM_EPUBGEN ifneq ($(SYSTEM_REVENGE),) @@ -2733,6 +2652,103 @@ endef endif # !SYSTEM_LIBPNG +ifneq ($(SYSTEM_LIBTIFF),) + +define gb_LinkTarget__use_libtiff +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBTIFF_CFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(LIBTIFF_LIBS) \ +) + +endef + +gb_ExternalProject__use_libtiff := + +else # !SYSTEM_LIBTIFF + +define gb_LinkTarget__use_libtiff +$(call gb_LinkTarget_set_include,$(1),\ + $(LIBTIFF_CFLAGS) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff \ + $$(INCLUDE) \ +) +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,libtiff)/libtiff/.libs/libtiff$(gb_StaticLibrary_PLAINEXT) \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,libtiff)/libtiff/.libs -ltiff \ +) +endif +$(call gb_LinkTarget_use_external_project,$(1),libtiff,full) + +endef + +define gb_ExternalProject__use_libtiff +$(call gb_ExternalProject_use_external_project,$(1),libtiff) + +endef + +endif # !SYSTEM_LIBTIFF + +ifneq ($(SYSTEM_LIBWEBP),) + +define gb_LinkTarget__use_libwebp +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(LIBWEBP_CFLAGS) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(LIBWEBP_LIBS) \ +) + +endef + +gb_ExternalProject__use_libwebp := + +else # !SYSTEM_LIBWEBP + +define gb_LinkTarget__use_libwebp +$(call gb_LinkTarget_set_include,$(1),\ + $(LIBWEBP_CFLAGS) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libwebp)/src \ + $$(INCLUDE) \ +) +ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,libwebp)/output/lib/libwebp$(if $(MSVC_USE_DEBUG_RUNTIME),_debug)$(gb_StaticLibrary_PLAINEXT) \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,libwebp)/src/.libs -lwebp \ + -L$(call gb_UnpackedTarball_get_dir,libwebp)/sharpyuv/.libs -lsharpyuv \ +) +endif +$(call gb_LinkTarget_use_external_project,$(1),libwebp) + +endef + +define gb_ExternalProject__use_libwebp +$(call gb_ExternalProject_use_external_project,$(1),libwebp) + +endef + +endif # !SYSTEM_LIBWEBP + ifneq ($(SYSTEM_CURL),) @@ -2750,9 +2766,10 @@ endef else # !SYSTEM_CURL +$(if $(ENABLE_CURL),\ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ curl \ -)) +))) define gb_LinkTarget__use_curl $(call gb_LinkTarget_use_package,$(1),curl) @@ -2859,6 +2876,7 @@ ifneq ($(SYSTEM_CLUCENE),) define gb_LinkTarget__use_clucene $(call gb_LinkTarget_add_defs,$(1),\ $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(CLUCENE_CFLAGS))) \ + -DSYSTEM_CLUCENE \ ) $(call gb_LinkTarget_set_include,$(1),\ @@ -2889,7 +2907,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\ endef $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\ - clucene \ + $(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,clucene) \ )) endif # SYSTEM_CLUCENE @@ -3069,9 +3087,10 @@ endef else # !SYSTEM_POSTGRESQL ifeq ($(OS),WNT) +$(if $(MPL_SUBSET),,\ $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ postgresql \ -)) +))) endif # WNT define gb_LinkTarget__use_postgresql @@ -3105,7 +3124,7 @@ endef # gb_LinkTarget__use_postgresql endif # !SYSTEM_POSTGRESQL -ifeq ($(ENABLE_KF5),TRUE) +ifneq (,$(filter TRUE,$(ENABLE_KF5) $(ENABLE_GTK3_KDE5))) define gb_LinkTarget__use_kf5 $(call gb_LinkTarget_set_include,$(1),\ @@ -3131,9 +3150,33 @@ endef endif # ENABLE_KF5 +ifneq (,$(filter TRUE,$(ENABLE_KF6))) +define gb_LinkTarget__use_kf6 +$(call gb_LinkTarget_set_include,$(1),\ + $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem /,-isystem/,$(KF6_CFLAGS)))) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_add_cxxflags,$(1),\ + $(filter-out -I% -isystem%,$(subst -isystem /,-isystem/,$(KF6_CFLAGS))) \ +) -ifeq ($(ENABLE_QT5),TRUE) +$(call gb_LinkTarget_add_libs,$(1),\ + $(KF6_LIBS) \ +) + +endef + +else # !ENABLE_KF6 + +define gb_LinkTarget__use_kf6 + +endef + +endif # ENABLE_KF6 + +ifneq (,$(filter TRUE,$(ENABLE_QT5) $(ENABLE_GTK3_KDE5))) define gb_LinkTarget__use_qt5 $(call gb_LinkTarget_set_include,$(1),\ @@ -3239,14 +3282,14 @@ endif ifeq ($(OS),WNT) ifeq ($(CPUNAME),X86_64) -python_arch_subdir=amd64 +python_arch_subdir=amd64/ else ifeq ($(CPUNAME),AARCH64) -python_arch_subdir=arm64 +python_arch_subdir=arm64/ else -python_arch_subdir=win32 +python_arch_subdir=win32/ endif $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(python_arch_subdir)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ + $(call gb_UnpackedTarball_get_dir,python3)/PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).lib \ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ @@ -3332,7 +3375,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.17 \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs -lorcus-0.18 \ ) $(if $(SYSTEM_BOOST), \ @@ -3351,7 +3394,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.17 \ + -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs -lorcus-parser-0.18 \ ) endef @@ -3905,12 +3948,23 @@ endef endif # SYSTEM_JFREEREPORT +# no known distro packaged Java-Websocket at present + +ifeq ($(ENABLE_JAVA),TRUE) +$(eval $(call gb_Helper_register_jars_for_install,URE,ure, \ + java_websocket \ +)) +endif + +define gb_Jar__use_java_websocket +$(call gb_Jar_use_jar,$(1),java_websocket) +endef # Executables define gb_Executable__register_bestreversemap $(call gb_Executable_add_runtime_dependencies,bestreversemap,\ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target_for_build,sal_textenc))) \ + $(call gb_CondLibSalTextenc,$(call gb_Library_get_target_for_build,sal_textenc)) \ ) endef @@ -3927,7 +3981,7 @@ endef define gb_Executable__register_cppumaker $(call gb_Executable_add_runtime_dependencies,cppumaker,\ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,$(call gb_Library_get_target,sal_textenc))) \ + $(call gb_CondLibSalTextenc,$(call gb_Library_get_target,sal_textenc)) \ ) endef @@ -3961,12 +4015,6 @@ endef endif -define gb_Executable__register_idlc -$(call gb_Executable_add_runtime_dependencies,idlc,\ - $(call gb_ExternalExecutable_get_dependencies,ucpp) \ -) -endef - define gb_Executable__register_localize $(call gb_Executable_add_runtime_dependencies,localize,\ $(foreach exec,cfgex helpex propex treex ulfex xrmex,\ @@ -4037,19 +4085,6 @@ endef endif # SYSTEM_LIBXSLT_FOR_BUILD -ifneq (,$(SYSTEM_UCPP)) - -gb_ExternalExecutable__register_ucpp := - -else # ! SYSTEM_UCPP - -define gb_ExternalExecutable__register_ucpp -$(call gb_ExternalExecutable_set_internal,ucpp,$(INSTDIR_FOR_BUILD)/$(SDKDIRNAME)/bin/ucpp$(gb_Executable_EXT_for_build)) - -endef - -endif # SYSTEM_UCPP - ifeq (,$(PYTHON_FOR_BUILD)) define gb_ExternalExecutable__register_python @@ -4145,7 +4180,6 @@ endef endif -ifneq ($(ENABLE_ONLINE_UPDATE_MAR),) ifneq ($(SYSTEM_BZIP2),) define gb_LinkTarget__use_bzip2 @@ -4184,8 +4218,7 @@ define gb_ExternalProject__use_bzip2 $(call gb_ExternalProject_use_external_project,$(1),bzip2) endef -endif -endif +endif # SYSTEM_BZIP2 define gb_LinkTarget__use_clew $(call gb_LinkTarget_set_include,$(1), \ @@ -4209,6 +4242,27 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ )) endif +ifneq ($(SYSTEM_DRAGONBOX),) + +define gb_LinkTarget__use_dragonbox +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $$(DRAGONBOX_CFLAGS) \ +) +endef + +else + +define gb_LinkTarget__use_dragonbox +$(call gb_LinkTarget_use_unpacked,$(1),dragonbox) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,dragonbox/include/)\ + $$(INCLUDE) \ +) +endef + +endif + define gb_LinkTarget__use_dtoa $(call gb_LinkTarget_use_unpacked,$(1),dtoa) $(call gb_LinkTarget_set_include,$(1),\ @@ -4249,7 +4303,7 @@ else # !SYSTEM_BOX2D define gb_LinkTarget__use_box2d $(call gb_LinkTarget_use_unpacked,$(1),box2d) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,box2d/Box2D/)\ + -I$(call gb_UnpackedTarball_get_dir,box2d/include/)\ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -4265,6 +4319,30 @@ endef endif # SYSTEM_BOX2D +ifneq ($(SYSTEM_ZXCVBN),) +define gb_LinkTarget__use_zxcvbn-c +$(call gb_LinkTarget_set_include,$(1),\ + -DSYSTEM_ZXCVBN \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_add_libs,$(1),-lzxcvbn) +endef + +else + +define gb_LinkTarget__use_zxcvbn-c +$(call gb_LinkTarget_use_unpacked,$(1),zxcvbn-c) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,zxcvbn-c)\ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_use_static_libraries,$(1),\ + zxcvbn-c \ +) +endef +endif + + ifneq ($(SYSTEM_ZXING),) define gb_LinkTarget__use_zxing @@ -4310,36 +4388,21 @@ endif # ENABLE_ZXING endif # SYSTEM_ZXING - -ifneq ($(SYSTEM_CUCKOO),) - -gb_ExternalProject__use_cuckoo_headers := - -define gb_LinkTarget__use_cuckoo_headers +ifneq ($(SYSTEM_FROZEN),) +define gb_LinkTarget__use_frozen $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,cuckoo) \ $$(INCLUDE) \ + $(FROZEN_CFLAGS) ) - endef - -else # !SYSTEM_CUCKOO - -define gb_ExternalProject__use_cuckoo_headers -$(call gb_ExternalProject_use_unpacked,$(1),cuckoo) - -endef - -define gb_LinkTarget__use_cuckoo_headers -$(call gb_LinkTarget_use_unpacked,$(1),cuckoo) +else +define gb_LinkTarget__use_frozen +$(call gb_LinkTarget_use_unpacked,$(1),frozen) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,cuckoo) \ + -I$(call gb_UnpackedTarball_get_dir,frozen/include/)\ $$(INCLUDE) \ ) - endef - -endif # SYSTEM_CUCKOO - +endif # vim: set noet sw=4 ts=4: |