Makefile.fetch | 1 + download.lst | 2 ++ external/liblangtag/ExternalProject_langtag.mk | 2 +- external/liblangtag/UnpackedTarball_langtag.mk | 4 ++++ 4 files changed, 8 insertions(+), 1 deletion(-)
New commits: commit a33662bb67dc14f0283f7b11e0846858fa07fb10 Author: Eike Rathke <er...@redhat.com> Date: Thu Apr 10 14:16:25 2014 +0200 build liblangtag with updated IANA language-subtag-registry ... as downloaded from https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry Reviewed-on: https://gerrit.libreoffice.org/8919 Tested-by: LibreOffice gerrit bot <ger...@libreoffice.org> Reviewed-by: Eike Rathke <er...@redhat.com> (cherry picked from commit 39d29be28b92328149430045f1e10e1ebeb6a0eb) Conflicts: download.lst Change-Id: I7aee9c6e42aabc9e023ab9a2ec3880dbde940396 Reviewed-on: https://gerrit.libreoffice.org/8920 Tested-by: David Tardon <dtar...@redhat.com> Reviewed-by: David Tardon <dtar...@redhat.com> diff --git a/Makefile.fetch b/Makefile.fetch index 530ee0f..ce6d71b 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -83,6 +83,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \ $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ + $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \ diff --git a/download.lst b/download.lst index 24639dc..6ce3dfc 100644 --- a/download.lst +++ b/download.lst @@ -26,6 +26,8 @@ LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 export LIBEOT_TARBALL := libeot-0.01.tar.bz2 +LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97 +export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2 export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index b4f17ce..b87b37d 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -23,7 +23,6 @@ $(eval $(call gb_ExternalProject_register_targets,langtag,\ $(call gb_ExternalProject_get_state_target,langtag,build): $(call gb_ExternalProject_run,build,\ ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \ - $(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \ $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ $(if $(filter NO,$(SYSTEM_LIBXML)),\ @@ -36,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ && $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath -w $(lastword $(CC)))") \ $(if $(VERBOSE)$(verbose),V=1) \ + $(gb_Helper_set_ld_path) \ $(MAKE) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk index 88f7f16..7637ee9 100644 --- a/external/liblangtag/UnpackedTarball_langtag.mk +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,langtag)) $(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag)) +$(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\ + $(GNUTAR) -x -j -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \ +)) + $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ external/liblangtag/liblangtag-0.5.1-msvc-warning.patch \ external/liblangtag/liblangtag-0.5.1-vsnprintf.patch \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits