diff options
27 files changed, 28 insertions, 28 deletions
diff --git a/apache-commons/Module_apache-commons.mk b/apache-commons/Module_apache-commons.mk index 4bb62cbc6451..b58834414147 100644 --- a/apache-commons/Module_apache-commons.mk +++ b/apache-commons/Module_apache-commons.mk @@ -7,11 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Module_Module,apache_commons)) +$(eval $(call gb_Module_Module,apache-commons)) ifneq ($(SOLAR_JAVA),) ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),) -$(eval $(call gb_Module_add_targets,apache_commons,\ +$(eval $(call gb_Module_add_targets,apache-commons,\ ExternalPackage_apache_commons_logging \ ExternalProject_apache_commons_codec \ ExternalProject_apache_commons_httpclient \ diff --git a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk b/apache-commons/UnpackedTarball_apache_commons_httpclient.mk index 6139a94f0d91..c5279e8161ef 100644 --- a/apache-commons/UnpackedTarball_apache_commons_httpclient.mk +++ b/apache-commons/UnpackedTarball_apache_commons_httpclient.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_httpclient)) -$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_httpclient,$(APACHE_COMMONS_HTTPCLIENT_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_httpclient,$(APACHE_COMMONS_HTTPCLIENT_TARBALL),,apache-commons)) $(eval $(call gb_UnpackedTarball_add_patches,apache_commons_httpclient,\ apache-commons/patches/httpclient.patch \ diff --git a/apache-commons/UnpackedTarball_apache_commons_lang.mk b/apache-commons/UnpackedTarball_apache_commons_lang.mk index ade8fe43a7fe..9b9f077b5fea 100644 --- a/apache-commons/UnpackedTarball_apache_commons_lang.mk +++ b/apache-commons/UnpackedTarball_apache_commons_lang.mk @@ -9,6 +9,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_lang)) -$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_lang,$(APACHE_COMMONS_LANG_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_lang,$(APACHE_COMMONS_LANG_TARBALL),,apache-commons)) # vim: set noet sw=4 ts=4: diff --git a/apache-commons/UnpackedTarball_apache_commons_logging.mk b/apache-commons/UnpackedTarball_apache_commons_logging.mk index 27fe272e202b..8d725ff7c4d4 100644 --- a/apache-commons/UnpackedTarball_apache_commons_logging.mk +++ b/apache-commons/UnpackedTarball_apache_commons_logging.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,apache_commons_logging)) -$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_logging,$(APACHE_COMMONS_LOGGING_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,apache_commons_logging,$(APACHE_COMMONS_LOGGING_TARBALL),,apache-commons)) $(eval $(call gb_UnpackedTarball_fix_end_of_line,apache_commons_logging,\ build.xml \ diff --git a/beanshell/UnpackedTarball_beanshell.mk b/beanshell/UnpackedTarball_beanshell.mk index 6e798ae01929..b22cbcef101f 100644 --- a/beanshell/UnpackedTarball_beanshell.mk +++ b/beanshell/UnpackedTarball_beanshell.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,beanshell)) -$(eval $(call gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,beanshell,$(BSH_TARBALL),,beanshell)) $(eval $(call gb_UnpackedTarball_add_patches,beanshell,\ beanshell/bsh-2.0b1-src.patch \ diff --git a/cairo/UnpackedTarball_cairo.mk b/cairo/UnpackedTarball_cairo.mk index 93cd015bca8e..a6c1a365f5df 100644 --- a/cairo/UnpackedTarball_cairo.mk +++ b/cairo/UnpackedTarball_cairo.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cairo)) -$(eval $(call gb_UnpackedTarball_set_tarball,cairo,$(CAIRO_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,cairo,$(CAIRO_TARBALL),,cairo)) $(eval $(call gb_UnpackedTarball_add_patches,cairo,\ cairo/cairo/cairo-1.10.2.patch \ diff --git a/cairo/UnpackedTarball_pixman.mk b/cairo/UnpackedTarball_pixman.mk index 3e44bc97c5ba..85a79ad947e9 100644 --- a/cairo/UnpackedTarball_pixman.mk +++ b/cairo/UnpackedTarball_pixman.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,pixman)) -$(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo)) $(eval $(call gb_UnpackedTarball_add_patches,pixman,\ cairo/pixman/pixman-0.24.4.patch \ diff --git a/cppunit/UnpackedTarball_cppunit.mk b/cppunit/UnpackedTarball_cppunit.mk index 733a30228b93..0a5f64939319 100644 --- a/cppunit/UnpackedTarball_cppunit.mk +++ b/cppunit/UnpackedTarball_cppunit.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cppunit)) -$(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,cppunit,$(CPPUNIT_TARBALL),,cppunit)) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ cppunit/windows.patch \ diff --git a/curl/UnpackedTarball_curl.mk b/curl/UnpackedTarball_curl.mk index e6a8cacb0717..70ac67090c7f 100644 --- a/curl/UnpackedTarball_curl.mk +++ b/curl/UnpackedTarball_curl.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,curl)) -$(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,curl,$(CURL_TARBALL),,curl)) $(eval $(call gb_UnpackedTarball_set_patchlevel,curl,1)) diff --git a/epm/UnpackedTarball_epm.mk b/epm/UnpackedTarball_epm.mk index b9e7e3bcce1a..3902317264fa 100644 --- a/epm/UnpackedTarball_epm.mk +++ b/epm/UnpackedTarball_epm.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,epm)) -$(eval $(call gb_UnpackedTarball_set_tarball,epm,$(EPM_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,epm,$(EPM_TARBALL),,epm)) $(eval $(call gb_UnpackedTarball_add_patches,epm,\ epm/epm-3.7.patch \ diff --git a/fontconfig/UnpackedTarball_fontconfig.mk b/fontconfig/UnpackedTarball_fontconfig.mk index 7a6cfcbcf6b6..fc2be74be632 100644 --- a/fontconfig/UnpackedTarball_fontconfig.mk +++ b/fontconfig/UnpackedTarball_fontconfig.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,fontconfig)) -$(eval $(call gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,fontconfig,$(FONTCONFIG_TARBALL),,fontconfig)) $(eval $(call gb_UnpackedTarball_set_patchlevel,fontconfig,3)) diff --git a/freetype/UnpackedTarball_freetype.mk b/freetype/UnpackedTarball_freetype.mk index a1060adbf335..c1ba0ae8a003 100644 --- a/freetype/UnpackedTarball_freetype.mk +++ b/freetype/UnpackedTarball_freetype.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,freetype)) -$(eval $(call gb_UnpackedTarball_set_tarball,freetype,$(FREETYPE_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,freetype,$(FREETYPE_TARBALL),,freetype)) $(eval $(call gb_UnpackedTarball_set_patchlevel,freetype,3)) diff --git a/harfbuzz/UnpackedTarball_harfbuzz.mk b/harfbuzz/UnpackedTarball_harfbuzz.mk index f87519077ba0..9c6d81f592eb 100644 --- a/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,harfbuzz)) -$(eval $(call gb_UnpackedTarball_set_tarball,harfbuzz,$(HARFBUZZ_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,harfbuzz,$(HARFBUZZ_TARBALL),,harfbuzz)) $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ harfbuzz/harfbuzz.configure.patch.1 \ diff --git a/hsqldb/UnpackedTarball_hsqldb.mk b/hsqldb/UnpackedTarball_hsqldb.mk index 271f692b9af0..fc31af5464f3 100644 --- a/hsqldb/UnpackedTarball_hsqldb.mk +++ b/hsqldb/UnpackedTarball_hsqldb.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hsqldb)) -$(eval $(call gb_UnpackedTarball_set_tarball,hsqldb,$(HSQLDB_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,hsqldb,$(HSQLDB_TARBALL),,hsqldb)) $(eval $(call gb_UnpackedTarball_fix_end_of_line,hsqldb,\ build/build.xml \ diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk index 8594707ca0aa..b7c80b091a35 100644 --- a/liblangtag/UnpackedTarball_langtag.mk +++ b/liblangtag/UnpackedTarball_langtag.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,langtag)) -$(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag)) $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ liblangtag/liblangtag-0.5.1-msvc-warning.patch \ diff --git a/libxml2/UnpackedTarball_xml2.mk b/libxml2/UnpackedTarball_xml2.mk index a417111dc84c..b0a80d627d28 100644 --- a/libxml2/UnpackedTarball_xml2.mk +++ b/libxml2/UnpackedTarball_xml2.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xml2)) -$(eval $(call gb_UnpackedTarball_set_tarball,xml2,$(LIBXML_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,xml2,$(LIBXML_TARBALL),,libxml2)) $(eval $(call gb_UnpackedTarball_add_patches,xml2,\ libxml2/libxml2-configure.patch \ diff --git a/libxmlsec/UnpackedTarball_xmlsec.mk b/libxmlsec/UnpackedTarball_xmlsec.mk index 7860295c4e68..57008e757fb5 100644 --- a/libxmlsec/UnpackedTarball_xmlsec.mk +++ b/libxmlsec/UnpackedTarball_xmlsec.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec)) -$(eval $(call gb_UnpackedTarball_set_tarball,xmlsec,$(LIBXMLSEC_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,xmlsec,$(LIBXMLSEC_TARBALL),,libxmlsec)) $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\ libxmlsec/xmlsec1-configure.patch \ diff --git a/openldap/UnpackedTarball_openldap.mk b/openldap/UnpackedTarball_openldap.mk index 44db53090086..43e3e2a225ed 100644 --- a/openldap/UnpackedTarball_openldap.mk +++ b/openldap/UnpackedTarball_openldap.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap)) -$(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap)) $(eval $(call gb_UnpackedTarball_add_patches,openldap,\ openldap/openldap-2.4.31.patch \ diff --git a/openssl/UnpackedTarball_openssl.mk b/openssl/UnpackedTarball_openssl.mk index bb5e77115d21..92ce3da1ccba 100644 --- a/openssl/UnpackedTarball_openssl.mk +++ b/openssl/UnpackedTarball_openssl.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openssl)) -$(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl)) # hack to fix symlinks with MSVC $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\ diff --git a/poppler/UnpackedTarball_poppler.mk b/poppler/UnpackedTarball_poppler.mk index 9e756acc8712..35ecaf140fee 100644 --- a/poppler/UnpackedTarball_poppler.mk +++ b/poppler/UnpackedTarball_poppler.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,poppler)) -$(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler)) $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ poppler/poppler-notests.patch.1 \ diff --git a/postgresql/UnpackedTarball_postgresql.mk b/postgresql/UnpackedTarball_postgresql.mk index 3409a021504c..c7e17045a43b 100644 --- a/postgresql/UnpackedTarball_postgresql.mk +++ b/postgresql/UnpackedTarball_postgresql.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,postgresql)) -$(eval $(call gb_UnpackedTarball_set_tarball,postgresql,$(POSTGRESQL_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,postgresql,$(POSTGRESQL_TARBALL),,postgresql)) $(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3)) diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index 0d5fce5e6236..08d3283b39f6 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,python3)) -$(eval $(call gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL),,python3)) $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\ PCbuild/pcbuild.sln \ diff --git a/redland/UnpackedTarball_raptor.mk b/redland/UnpackedTarball_raptor.mk index 08f8b67a0264..e2d2252f06e6 100644 --- a/redland/UnpackedTarball_raptor.mk +++ b/redland/UnpackedTarball_raptor.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,raptor)) -$(eval $(call gb_UnpackedTarball_set_tarball,raptor,$(RAPTOR_TARBALL))) +$(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)) diff --git a/redland/UnpackedTarball_rasqal.mk b/redland/UnpackedTarball_rasqal.mk index ef28ea7a27e5..feb5fcfc95a5 100644 --- a/redland/UnpackedTarball_rasqal.mk +++ b/redland/UnpackedTarball_rasqal.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,rasqal)) -$(eval $(call gb_UnpackedTarball_set_tarball,rasqal,$(RASQAL_TARBALL))) +$(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)) diff --git a/redland/UnpackedTarball_redland.mk b/redland/UnpackedTarball_redland.mk index f90702d80fff..8ad2b638f90d 100644 --- a/redland/UnpackedTarball_redland.mk +++ b/redland/UnpackedTarball_redland.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,redland)) -$(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL))) +$(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)) diff --git a/rhino/UnpackedTarball_rhino.mk b/rhino/UnpackedTarball_rhino.mk index 32c64573cd12..4ee92d2bade9 100644 --- a/rhino/UnpackedTarball_rhino.mk +++ b/rhino/UnpackedTarball_rhino.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,rhino)) -$(eval $(call gb_UnpackedTarball_set_tarball,rhino,$(RHINO_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,rhino,$(RHINO_TARBALL),,rhino)) $(eval $(call gb_UnpackedTarball_set_patchlevel,rhino,2)) diff --git a/tomcat/UnpackedTarball_tomcat.mk b/tomcat/UnpackedTarball_tomcat.mk index ed408f19fc32..88b806304470 100644 --- a/tomcat/UnpackedTarball_tomcat.mk +++ b/tomcat/UnpackedTarball_tomcat.mk @@ -9,7 +9,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,tomcat)) -$(eval $(call gb_UnpackedTarball_set_tarball,tomcat,$(TOMCAT_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_tarball,tomcat,$(TOMCAT_TARBALL),,tomcat)) $(eval $(call gb_UnpackedTarball_add_file,tomcat,servletapi/build.xml,tomcat/build.xml)) |