vlc/vlc-3.0 | branch: master | Martin Storsjö <[email protected]> | Tue Dec 19 11:14:34 2017 +0200| [d72a928f7c1ae4228d864a9fb7a44fea3836ac3c] | committer: Hugo Beauzée-Luyssen
contrib: arm: Disable the assembly when building mad, gmp and nettle for windows All of these do have arm assembly, but it can't (easily) be built in thumb mode, while windows on arm is thumb only. (cherry picked from commit 18b4577b856fec300cc799f29e4bc1d3dc06d069) Signed-off-by: Hugo Beauzée-Luyssen <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d72a928f7c1ae4228d864a9fb7a44fea3836ac3c --- contrib/src/gmp/rules.mak | 6 ++++++ contrib/src/mad/rules.mak | 6 ++++++ contrib/src/nettle/rules.mak | 8 +++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak index 1d20c8e0a1..b4ab683584 100644 --- a/contrib/src/gmp/rules.mak +++ b/contrib/src/gmp/rules.mak @@ -14,6 +14,12 @@ GMP_CONF += --disable-assembly endif endif +ifdef HAVE_WIN32 +ifeq ($(ARCH),arm) +GMP_CONF += --disable-assembly +endif +endif + $(TARBALLS)/gmp-$(GMP_VERSION).tar.bz2: $(call download_pkg,$(GMP_URL),gmp) diff --git a/contrib/src/mad/rules.mak b/contrib/src/mad/rules.mak index 315e523a50..c1491cf77a 100644 --- a/contrib/src/mad/rules.mak +++ b/contrib/src/mad/rules.mak @@ -10,6 +10,12 @@ ifeq ($(call need_pkg,"mad"),) PKGS_FOUND += mad endif +ifdef HAVE_WIN32 +ifeq ($(ARCH),arm) +MAD_CONF += --disable-aso +endif +endif + $(TARBALLS)/libmad-$(MAD_VERSION).tar.gz: $(call download,$(MAD_URL)) diff --git a/contrib/src/nettle/rules.mak b/contrib/src/nettle/rules.mak index 289718fa8e..c5a31f1020 100644 --- a/contrib/src/nettle/rules.mak +++ b/contrib/src/nettle/rules.mak @@ -7,6 +7,12 @@ ifeq ($(call need_pkg,"nettle >= 2.7"),) PKGS_FOUND += nettle endif +ifdef HAVE_WIN32 +ifeq ($(ARCH),arm) +NETTLE_CONF += --disable-assembler +endif +endif + $(TARBALLS)/nettle-$(NETTLE_VERSION).tar.gz: $(call download_pkg,$(NETTLE_URL),nettle) @@ -24,6 +30,6 @@ DEPS_nettle = gmp $(DEPS_gmp) ifndef GPL $(REQUIRE_GNUV3) endif - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(NETTLE_CONF) cd $< && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
