diff options
-rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/redland/ExternalPackage_raptor.mk (renamed from redland/ExternalPackage_raptor.mk) | 0 | ||||
-rw-r--r-- | external/redland/ExternalPackage_rasqal.mk (renamed from redland/ExternalPackage_rasqal.mk) | 0 | ||||
-rw-r--r-- | external/redland/ExternalPackage_redland.mk (renamed from redland/ExternalPackage_redland.mk) | 0 | ||||
-rw-r--r-- | external/redland/ExternalProject_raptor.mk (renamed from redland/ExternalProject_raptor.mk) | 0 | ||||
-rw-r--r-- | external/redland/ExternalProject_rasqal.mk (renamed from redland/ExternalProject_rasqal.mk) | 0 | ||||
-rw-r--r-- | external/redland/ExternalProject_redland.mk (renamed from redland/ExternalProject_redland.mk) | 0 | ||||
-rw-r--r-- | external/redland/Library_raptor.mk (renamed from redland/Library_raptor.mk) | 0 | ||||
-rw-r--r-- | external/redland/Library_rasqal.mk (renamed from redland/Library_rasqal.mk) | 0 | ||||
-rw-r--r-- | external/redland/Library_rdf.mk (renamed from redland/Library_rdf.mk) | 0 | ||||
-rw-r--r-- | external/redland/Makefile (renamed from redland/Makefile) | 2 | ||||
-rw-r--r-- | external/redland/Module_redland.mk (renamed from redland/Module_redland.mk) | 0 | ||||
-rw-r--r-- | external/redland/README (renamed from redland/README) | 0 | ||||
-rw-r--r-- | external/redland/UnpackedTarball_raptor.mk (renamed from redland/UnpackedTarball_raptor.mk) | 12 | ||||
-rw-r--r-- | external/redland/UnpackedTarball_rasqal.mk | 28 | ||||
-rw-r--r-- | external/redland/UnpackedTarball_redland.mk | 28 | ||||
-rw-r--r-- | external/redland/raptor/raptor-android.patch.1 (renamed from redland/raptor/raptor-android.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/raptor/raptor-bundled-soname.patch.1 (renamed from redland/raptor/raptor-bundled-soname.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/raptor/raptor-freebsd.patch.1 (renamed from redland/raptor/raptor-freebsd.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/raptor/raptor-mingw.patch.1 (renamed from redland/raptor/raptor-mingw.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/raptor/raptor2.h (renamed from redland/raptor/raptor2.h) | 0 | ||||
-rw-r--r-- | external/redland/raptor/raptor_config.h (renamed from redland/raptor/raptor_config.h) | 0 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal-aix.patch.1 (renamed from redland/rasqal/rasqal-aix.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal-android.patch.1 (renamed from redland/rasqal/rasqal-android.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal-bundled-soname.patch.1 (renamed from redland/rasqal/rasqal-bundled-soname.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal-freebsd.patch.1 (renamed from redland/rasqal/rasqal-freebsd.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal-mingw.patch.1 (renamed from redland/rasqal/rasqal-mingw.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal-msvc.patch.1 (renamed from redland/rasqal/rasqal-msvc.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal-pkgconfig.patch.1 (renamed from redland/rasqal/rasqal-pkgconfig.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal-xcompile.patch.1 (renamed from redland/rasqal/rasqal-xcompile.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal.h (renamed from redland/rasqal/rasqal.h) | 0 | ||||
-rw-r--r-- | external/redland/redland/librdf.h (renamed from redland/redland/librdf.h) | 0 | ||||
-rw-r--r-- | external/redland/redland/redland-android.patch.1 (renamed from redland/redland/redland-android.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/redland/redland-bundled-soname.patch.1 (renamed from redland/redland/redland-bundled-soname.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/redland/redland-freebsd.patch.1 (renamed from redland/redland/redland-freebsd.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/redland/redland-mingw.patch.1 (renamed from redland/redland/redland-mingw.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/redland/redland-msvc.patch.1 (renamed from redland/redland/redland-msvc.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/redland/redland-pkgconfig.patch.1 (renamed from redland/redland/redland-pkgconfig.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 (renamed from redland/redland/redland-query-rasqal-avoid-assert.patch.1) | 0 | ||||
-rw-r--r-- | external/redland/redland/redland-xcompile.patch.1 (renamed from redland/redland/redland-xcompile.patch.1) | 0 | ||||
-rw-r--r-- | redland/UnpackedTarball_rasqal.mk | 28 | ||||
-rw-r--r-- | redland/UnpackedTarball_redland.mk | 28 |
43 files changed, 64 insertions, 64 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index cf4d8c3d00a3..1f60a3031695 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -90,7 +90,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ readlicense_oo \ - $(call gb_Helper_optional,REDLAND,redland) \ registry \ remotebridges \ reportbuilder \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 45f0ba26ae59..aeba824032e7 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -71,6 +71,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,POPPLER,poppler) \ $(call gb_Helper_optional,POSTGRESQL,postgresql) \ $(call gb_Helper_optional,PYTHON,python3) \ + $(call gb_Helper_optional,REDLAND,redland) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPG,libwpg) \ diff --git a/redland/ExternalPackage_raptor.mk b/external/redland/ExternalPackage_raptor.mk index c355105b51dc..c355105b51dc 100644 --- a/redland/ExternalPackage_raptor.mk +++ b/external/redland/ExternalPackage_raptor.mk diff --git a/redland/ExternalPackage_rasqal.mk b/external/redland/ExternalPackage_rasqal.mk index 85b47a17045d..85b47a17045d 100644 --- a/redland/ExternalPackage_rasqal.mk +++ b/external/redland/ExternalPackage_rasqal.mk diff --git a/redland/ExternalPackage_redland.mk b/external/redland/ExternalPackage_redland.mk index eb20b75e929e..eb20b75e929e 100644 --- a/redland/ExternalPackage_redland.mk +++ b/external/redland/ExternalPackage_redland.mk diff --git a/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk index 70d6fe7bf7a6..70d6fe7bf7a6 100644 --- a/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk diff --git a/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk index 6b695de2ead3..6b695de2ead3 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/external/redland/ExternalProject_rasqal.mk diff --git a/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk index 9b96c9cfbfa6..9b96c9cfbfa6 100644 --- a/redland/ExternalProject_redland.mk +++ b/external/redland/ExternalProject_redland.mk diff --git a/redland/Library_raptor.mk b/external/redland/Library_raptor.mk index a7f5af57ebfb..a7f5af57ebfb 100644 --- a/redland/Library_raptor.mk +++ b/external/redland/Library_raptor.mk diff --git a/redland/Library_rasqal.mk b/external/redland/Library_rasqal.mk index 3534f683d946..3534f683d946 100644 --- a/redland/Library_rasqal.mk +++ b/external/redland/Library_rasqal.mk diff --git a/redland/Library_rdf.mk b/external/redland/Library_rdf.mk index 6ce13e38d351..6ce13e38d351 100644 --- a/redland/Library_rdf.mk +++ b/external/redland/Library_rdf.mk diff --git a/redland/Makefile b/external/redland/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/redland/Makefile +++ b/external/redland/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/redland/Module_redland.mk b/external/redland/Module_redland.mk index 431a66da5323..431a66da5323 100644 --- a/redland/Module_redland.mk +++ b/external/redland/Module_redland.mk diff --git a/redland/README b/external/redland/README index 591e93398726..591e93398726 100644 --- a/redland/README +++ b/external/redland/README diff --git a/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk index e2d2252f06e6..90a179983959 100644 --- a/redland/UnpackedTarball_raptor.mk +++ b/external/redland/UnpackedTarball_raptor.mk @@ -12,14 +12,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,raptor)) $(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL),,redland)) # configure generated files for MSVC -$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,redland/raptor/raptor2.h)) -$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,redland/raptor/raptor_config.h)) +$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor2.h,external/redland/raptor/raptor2.h)) +$(eval $(call gb_UnpackedTarball_add_file,raptor,src/raptor_config.h,external/redland/raptor/raptor_config.h)) $(eval $(call gb_UnpackedTarball_add_patches,raptor,\ - redland/raptor/raptor-freebsd.patch.1 \ - $(if $(filter WNTGCC,$(OS)$(COM)),redland/raptor/raptor-mingw.patch.1) \ - $(if $(filter-out WNT,$(OS)),redland/raptor/raptor-bundled-soname.patch.1) \ - $(if $(filter ANDROID,$(OS)),redland/raptor/raptor-android.patch.1) \ + external/redland/raptor/raptor-freebsd.patch.1 \ + $(if $(filter WNTGCC,$(OS)$(COM)),external/redland/raptor/raptor-mingw.patch.1) \ + $(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \ + $(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk new file mode 100644 index 000000000000..0017fac8d660 --- /dev/null +++ b/external/redland/UnpackedTarball_rasqal.mk @@ -0,0 +1,28 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,rasqal)) + +$(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL),,redland)) + +# configure generated files for MSVC +$(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,external/redland/rasqal/rasqal.h)) + +$(eval $(call gb_UnpackedTarball_add_patches,rasqal,\ + external/redland/rasqal/rasqal-pkgconfig.patch.1 \ + external/redland/rasqal/rasqal-freebsd.patch.1 \ + external/redland/rasqal/rasqal-msvc.patch.1 \ + external/redland/rasqal/rasqal-aix.patch.1 \ + $(if $(filter-out WNT,$(OS)),external/redland/rasqal/rasqal-bundled-soname.patch.1) \ + $(if $(filter ANDROID,$(OS)),external/redland/rasqal/rasqal-android.patch.1) \ + $(if $(filter WNTGCC,$(OS)$(COM)),external/redland/rasqal/rasqal-mingw.patch.1) \ + $(if $(filter YES,$(CROSS_COMPILING)),external/redland/rasqal/rasqal-xcompile.patch.1) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk new file mode 100644 index 000000000000..8fb1258bbf7b --- /dev/null +++ b/external/redland/UnpackedTarball_redland.mk @@ -0,0 +1,28 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,redland)) + +$(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL),,redland)) + +# configure generated files for MSVC +$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,external/redland/redland/librdf.h)) + +$(eval $(call gb_UnpackedTarball_add_patches,redland,\ + external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 \ + external/redland/redland/redland-pkgconfig.patch.1 \ + external/redland/redland/redland-freebsd.patch.1 \ + external/redland/redland/redland-msvc.patch.1 \ + $(if $(filter-out WNT,$(OS)),external/redland/redland/redland-bundled-soname.patch.1) \ + $(if $(filter ANDROID,$(OS)),external/redland/redland/redland-android.patch.1) \ + $(if $(filter WNTGCC,$(OS)$(COM)),external/redland/redland/redland-mingw.patch.1) \ + $(if $(filter YES,$(CROSS_COMPILING)),external/redland/redland/redland-xcompile.patch.1) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/redland/raptor/raptor-android.patch.1 b/external/redland/raptor/raptor-android.patch.1 index cb843839c848..cb843839c848 100644 --- a/redland/raptor/raptor-android.patch.1 +++ b/external/redland/raptor/raptor-android.patch.1 diff --git a/redland/raptor/raptor-bundled-soname.patch.1 b/external/redland/raptor/raptor-bundled-soname.patch.1 index 59d27b875966..59d27b875966 100644 --- a/redland/raptor/raptor-bundled-soname.patch.1 +++ b/external/redland/raptor/raptor-bundled-soname.patch.1 diff --git a/redland/raptor/raptor-freebsd.patch.1 b/external/redland/raptor/raptor-freebsd.patch.1 index 349f3a197b8a..349f3a197b8a 100644 --- a/redland/raptor/raptor-freebsd.patch.1 +++ b/external/redland/raptor/raptor-freebsd.patch.1 diff --git a/redland/raptor/raptor-mingw.patch.1 b/external/redland/raptor/raptor-mingw.patch.1 index b70e4f86a72e..b70e4f86a72e 100644 --- a/redland/raptor/raptor-mingw.patch.1 +++ b/external/redland/raptor/raptor-mingw.patch.1 diff --git a/redland/raptor/raptor2.h b/external/redland/raptor/raptor2.h index 4d0291bb6dfa..4d0291bb6dfa 100644 --- a/redland/raptor/raptor2.h +++ b/external/redland/raptor/raptor2.h diff --git a/redland/raptor/raptor_config.h b/external/redland/raptor/raptor_config.h index 22462ff55f38..22462ff55f38 100644 --- a/redland/raptor/raptor_config.h +++ b/external/redland/raptor/raptor_config.h diff --git a/redland/rasqal/rasqal-aix.patch.1 b/external/redland/rasqal/rasqal-aix.patch.1 index d755aa2e568e..d755aa2e568e 100644 --- a/redland/rasqal/rasqal-aix.patch.1 +++ b/external/redland/rasqal/rasqal-aix.patch.1 diff --git a/redland/rasqal/rasqal-android.patch.1 b/external/redland/rasqal/rasqal-android.patch.1 index b14aa5758079..b14aa5758079 100644 --- a/redland/rasqal/rasqal-android.patch.1 +++ b/external/redland/rasqal/rasqal-android.patch.1 diff --git a/redland/rasqal/rasqal-bundled-soname.patch.1 b/external/redland/rasqal/rasqal-bundled-soname.patch.1 index 81585cfbeb32..81585cfbeb32 100644 --- a/redland/rasqal/rasqal-bundled-soname.patch.1 +++ b/external/redland/rasqal/rasqal-bundled-soname.patch.1 diff --git a/redland/rasqal/rasqal-freebsd.patch.1 b/external/redland/rasqal/rasqal-freebsd.patch.1 index 349f3a197b8a..349f3a197b8a 100644 --- a/redland/rasqal/rasqal-freebsd.patch.1 +++ b/external/redland/rasqal/rasqal-freebsd.patch.1 diff --git a/redland/rasqal/rasqal-mingw.patch.1 b/external/redland/rasqal/rasqal-mingw.patch.1 index 5d8a5e497450..5d8a5e497450 100644 --- a/redland/rasqal/rasqal-mingw.patch.1 +++ b/external/redland/rasqal/rasqal-mingw.patch.1 diff --git a/redland/rasqal/rasqal-msvc.patch.1 b/external/redland/rasqal/rasqal-msvc.patch.1 index f6d312d4ba60..f6d312d4ba60 100644 --- a/redland/rasqal/rasqal-msvc.patch.1 +++ b/external/redland/rasqal/rasqal-msvc.patch.1 diff --git a/redland/rasqal/rasqal-pkgconfig.patch.1 b/external/redland/rasqal/rasqal-pkgconfig.patch.1 index 154b1e6b9d77..154b1e6b9d77 100644 --- a/redland/rasqal/rasqal-pkgconfig.patch.1 +++ b/external/redland/rasqal/rasqal-pkgconfig.patch.1 diff --git a/redland/rasqal/rasqal-xcompile.patch.1 b/external/redland/rasqal/rasqal-xcompile.patch.1 index 546975ca7b87..546975ca7b87 100644 --- a/redland/rasqal/rasqal-xcompile.patch.1 +++ b/external/redland/rasqal/rasqal-xcompile.patch.1 diff --git a/redland/rasqal/rasqal.h b/external/redland/rasqal/rasqal.h index 331532d9cb2d..331532d9cb2d 100644 --- a/redland/rasqal/rasqal.h +++ b/external/redland/rasqal/rasqal.h diff --git a/redland/redland/librdf.h b/external/redland/redland/librdf.h index 1650f66f998d..1650f66f998d 100644 --- a/redland/redland/librdf.h +++ b/external/redland/redland/librdf.h diff --git a/redland/redland/redland-android.patch.1 b/external/redland/redland/redland-android.patch.1 index c28fa19fff58..c28fa19fff58 100644 --- a/redland/redland/redland-android.patch.1 +++ b/external/redland/redland/redland-android.patch.1 diff --git a/redland/redland/redland-bundled-soname.patch.1 b/external/redland/redland/redland-bundled-soname.patch.1 index 867cd81e2bd5..867cd81e2bd5 100644 --- a/redland/redland/redland-bundled-soname.patch.1 +++ b/external/redland/redland/redland-bundled-soname.patch.1 diff --git a/redland/redland/redland-freebsd.patch.1 b/external/redland/redland/redland-freebsd.patch.1 index 349f3a197b8a..349f3a197b8a 100644 --- a/redland/redland/redland-freebsd.patch.1 +++ b/external/redland/redland/redland-freebsd.patch.1 diff --git a/redland/redland/redland-mingw.patch.1 b/external/redland/redland/redland-mingw.patch.1 index 358633d247b6..358633d247b6 100644 --- a/redland/redland/redland-mingw.patch.1 +++ b/external/redland/redland/redland-mingw.patch.1 diff --git a/redland/redland/redland-msvc.patch.1 b/external/redland/redland/redland-msvc.patch.1 index 50585017e431..50585017e431 100644 --- a/redland/redland/redland-msvc.patch.1 +++ b/external/redland/redland/redland-msvc.patch.1 diff --git a/redland/redland/redland-pkgconfig.patch.1 b/external/redland/redland/redland-pkgconfig.patch.1 index dbd285a1ceb0..dbd285a1ceb0 100644 --- a/redland/redland/redland-pkgconfig.patch.1 +++ b/external/redland/redland/redland-pkgconfig.patch.1 diff --git a/redland/redland/redland-query-rasqal-avoid-assert.patch.1 b/external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 index f21906064237..f21906064237 100644 --- a/redland/redland/redland-query-rasqal-avoid-assert.patch.1 +++ b/external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 diff --git a/redland/redland/redland-xcompile.patch.1 b/external/redland/redland/redland-xcompile.patch.1 index 2635359e7e1a..2635359e7e1a 100644 --- a/redland/redland/redland-xcompile.patch.1 +++ b/external/redland/redland/redland-xcompile.patch.1 diff --git a/redland/UnpackedTarball_rasqal.mk b/redland/UnpackedTarball_rasqal.mk deleted file mode 100644 index feb5fcfc95a5..000000000000 --- a/redland/UnpackedTarball_rasqal.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,rasqal)) - -$(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL),,redland)) - -# configure generated files for MSVC -$(eval $(call gb_UnpackedTarball_add_file,rasqal,src/rasqal.h,redland/rasqal/rasqal.h)) - -$(eval $(call gb_UnpackedTarball_add_patches,rasqal,\ - redland/rasqal/rasqal-pkgconfig.patch.1 \ - redland/rasqal/rasqal-freebsd.patch.1 \ - redland/rasqal/rasqal-msvc.patch.1 \ - redland/rasqal/rasqal-aix.patch.1 \ - $(if $(filter-out WNT,$(OS)),redland/rasqal/rasqal-bundled-soname.patch.1) \ - $(if $(filter ANDROID,$(OS)),redland/rasqal/rasqal-android.patch.1) \ - $(if $(filter WNTGCC,$(OS)$(COM)),redland/rasqal/rasqal-mingw.patch.1) \ - $(if $(filter YES,$(CROSS_COMPILING)),redland/rasqal/rasqal-xcompile.patch.1) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/redland/UnpackedTarball_redland.mk b/redland/UnpackedTarball_redland.mk deleted file mode 100644 index 8ad2b638f90d..000000000000 --- a/redland/UnpackedTarball_redland.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,redland)) - -$(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL),,redland)) - -# configure generated files for MSVC -$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,redland/redland/librdf.h)) - -$(eval $(call gb_UnpackedTarball_add_patches,redland,\ - redland/redland/redland-query-rasqal-avoid-assert.patch.1 \ - redland/redland/redland-pkgconfig.patch.1 \ - redland/redland/redland-freebsd.patch.1 \ - redland/redland/redland-msvc.patch.1 \ - $(if $(filter-out WNT,$(OS)),redland/redland/redland-bundled-soname.patch.1) \ - $(if $(filter ANDROID,$(OS)),redland/redland/redland-android.patch.1) \ - $(if $(filter WNTGCC,$(OS)$(COM)),redland/redland/redland-mingw.patch.1) \ - $(if $(filter YES,$(CROSS_COMPILING)),redland/redland/redland-xcompile.patch.1) \ -)) - -# vim: set noet sw=4 ts=4: |