apache-commons/Module_apache-commons.mk | 4 ++--
apache-commons/UnpackedTarball_apache_commons_httpclient.mk | 2 +-
apache-commons/UnpackedTarball_apache_commons_lang.mk | 2 +-
apache-commons/UnpackedTarball_apache_commons_logging.mk | 2 +-
beanshell/UnpackedTarball_beanshell.mk | 2 +-
cairo/UnpackedTarball_cairo.mk | 2 +-
cairo/UnpackedTarball_pixman.mk | 2 +-
cppunit/UnpackedTarball_cppunit.mk | 2 +-
curl/UnpackedTarball_curl.mk | 2 +-
epm/UnpackedTarball_epm.mk | 2 +-
fontconfig/UnpackedTarball_fontconfig.mk | 2 +-
freetype/UnpackedTarball_freetype.mk | 2 +-
harfbuzz/UnpackedTarball_harfbuzz.mk | 2 +-
hsqldb/UnpackedTarball_hsqldb.mk | 2 +-
liblangtag/UnpackedTarball_langtag.mk | 2 +-
libxml2/UnpackedTarball_xml2.mk | 2 +-
libxmlsec/UnpackedTarball_xmlsec.mk | 2 +-
openldap/UnpackedTarball_openldap.mk | 2 +-
openssl/UnpackedTarball_openssl.mk | 2 +-
poppler/UnpackedTarball_poppler.mk | 2 +-
postgresql/UnpackedTarball_postgresql.mk | 2 +-
python3/UnpackedTarball_python3.mk | 2 +-
redland/UnpackedTarball_raptor.mk | 2 +-
redland/UnpackedTarball_rasqal.mk | 2 +-
redland/UnpackedTarball_redland.mk | 2 +-
rhino/UnpackedTarball_rhino.mk | 2 +-
tomcat/UnpackedTarball_tomcat.mk | 2 +-
27 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 523a1c00e1bf4da53daaa0fbaadc670f8b89ea37
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Sun Jul 7 17:14:14 2013 -0500
enable binary package option for a set of 'stable' libraries
Change-Id: I8924ba22d178aa4d8e500ae3f484af654a37e87e
Reviewed-on: https://gerrit.libreoffice.org/4765
Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org>
Reviewed-by: David Ostrovsky <david.ostrov...@gmx.de>
Tested-by: David Ostrovsky <david.ostrov...@gmx.de>
diff --git a/apache-commons/Module_apache-commons.mk
b/apache-commons/Module_apache-commons.mk
index 4bb62cb..b588344 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 6139a94..c5279e8 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 ade8fe4..9b9f077 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 27fe272..8d725ff 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 6e798ae..b22cbce 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 93cd015..a6c1a36 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 3e44bc9..85a79ad 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 733a302..0a5f649 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 e6a8cac..70ac670 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 b9e7e3b..3902317 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 7a6cfcb..fc2be74 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 a1060ad..c1ba0ae 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 f875190..9c6d81f 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 271f692..fc31af5 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 8594707..b7c80b0 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 a417111..b0a80d6 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 7860295..57008e7 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 44db530..43e3e2a 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 bb5e771..92ce3da 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 9e756acc..35ecaf1 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 3409a02..c7e1704 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 0d5fce5..08d3283 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 08f8b67..e2d2252 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 ef28ea7..feb5fcf 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 f90702d..8ad2b63 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 32c6457..4ee92d2 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 ed408f1..88b8063 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))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
