diff options
| author | Eike Rathke <erack@redhat.com> | 2014-04-10 14:16:25 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-04-10 14:22:29 +0000 |
| commit | 39d29be28b92328149430045f1e10e1ebeb6a0eb (patch) | |
| tree | 08131582970bed513896d0b0b226db5e337e469a /external/liblangtag | |
| parent | Reduce indentation by early bailout. (diff) | |
| download | core-39d29be28b92328149430045f1e10e1ebeb6a0eb.tar.gz core-39d29be28b92328149430045f1e10e1ebeb6a0eb.zip | |
build liblangtag with updated IANA language-subtag-registry
... as downloaded from
https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
Change-Id: I7aee9c6e42aabc9e023ab9a2ec3880dbde940396
Reviewed-on: https://gerrit.libreoffice.org/8919
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'external/liblangtag')
| -rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk | 2 | ||||
| -rw-r--r-- | external/liblangtag/UnpackedTarball_langtag.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index fbf64bda05ac..33a7bf26bdcf 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 $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ $(if $(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 3bce944e9e8c..90068cb3eac6 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 \ |