contrib: remove manual arm64 to aarch64 arch override thanks to updat…

…ed autoconf.
dsghi · Dec 2, 2021 · 8911871 · 8911871
1 parent 1284ed4
commit 8911871
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 46 deletions.
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
@@ -10,8 +10,4 @@ FRIBIDI.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autore
 
 ifeq ($(HOST.system),darwin)
     FRIBIDI.CONFIGURE.extra = CFLAGS_FOR_BUILD="-arch $(BUILD.machine)"
-    ifneq ($(HOST.machine),$(BUILD.machine))
-        FRIBIDI.CONFIGURE.args.host = --host=$(HOST.machine:arm64=aarch64)-$(HOST.vendor)-$(HOST.system)
-        FRIBIDI.CONFIGURE.args.build = --build=$(BUILD.machine:arm64=aarch64)-$(BUILD.vendor)-$(BUILD.system)
-    endif
 endif
diff --git a/contrib/jansson/module.defs b/contrib/jansson/module.defs
@@ -6,10 +6,3 @@ JANSSON.FETCH.url    += https://www.digip.org/jansson/releases/jansson-2.13.1.ta
 JANSSON.FETCH.sha256  = ee90a0f879d2b7b7159124ff22b937a2a9a8c36d3bb65d1da7dd3f04370a10bd
 
 JANSSON.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; mkdir m4; autoreconf -fiv;
-
-ifeq (darwin,$(HOST.system))
-    ifneq ($(HOST.machine),$(BUILD.machine))
-        JANSSON.CONFIGURE.args.host = --host=$(HOST.machine:arm64=aarch64)-$(HOST.vendor)-$(HOST.system)
-        JANSSON.CONFIGURE.args.build = --build=$(BUILD.machine:arm64=aarch64)-$(BUILD.vendor)-$(BUILD.system)
-    endif
-endif
diff --git a/contrib/libogg/module.defs b/contrib/libogg/module.defs
@@ -6,10 +6,3 @@ LIBOGG.FETCH.url    += https://downloads.xiph.org/releases/ogg/libogg-1.3.4.tar.
 LIBOGG.FETCH.sha256  = fe5670640bd49e828d64d2879c31cb4dde9758681bb664f9bdbf159a01b0c76e
 
 LIBOGG.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -fiv;
-
-ifeq (darwin,$(HOST.system))
-    ifneq ($(HOST.machine),$(BUILD.machine))
-        LIBOGG.CONFIGURE.args.host = --host=$(HOST.machine:arm64=aarch64)-$(HOST.vendor)-$(HOST.system)
-        LIBOGG.CONFIGURE.args.build = --build=$(BUILD.machine:arm64=aarch64)-$(BUILD.vendor)-$(BUILD.system)
-    endif
-endif
diff --git a/contrib/libopus/module.defs b/contrib/libopus/module.defs
@@ -12,11 +12,4 @@ LIBOPUS.CONFIGURE.extra = --disable-doc --disable-extra-programs
 # optimizations are turned off.
 LIBOPUS.GCC.args.extra += -DOPUS_WILL_BE_SLOW
 
-ifeq (darwin,$(HOST.system))
-    ifneq ($(HOST.machine),$(BUILD.machine))
-        LIBOPUS.CONFIGURE.extra += --host=$(HOST.machine:arm64=aarch64)-$(HOST.vendor)-$(HOST.system)
-        LIBOPUS.CONFIGURE.args.build = --build=$(BUILD.machine:arm64=aarch64)-$(BUILD.vendor)-$(BUILD.system)
-    endif
-endif
-
 LIBOPUS.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -fiv;
diff --git a/contrib/libtheora/module.defs b/contrib/libtheora/module.defs
@@ -20,10 +20,3 @@ LIBTHEORA.CONFIGURE.extra = \
 ifeq (1-msys,$(HOST.cross)-$(BUILD.system))
     LIBTHEORA.CONFIGURE.args.build = --build=$(BUILD.machine)-unknown-linux-gnu
 endif
-
-ifeq (darwin,$(HOST.system))
-    ifneq ($(HOST.machine),$(BUILD.machine))
-        LIBTHEORA.CONFIGURE.args.host = --host=$(HOST.machine:arm64=aarch64)-$(HOST.vendor)-$(HOST.system)
-        LIBTHEORA.CONFIGURE.args.build = --build=$(BUILD.machine:arm64=aarch64)-$(BUILD.vendor)-$(BUILD.system)
-    endif
-endif
diff --git a/contrib/libvorbis/module.defs b/contrib/libvorbis/module.defs
@@ -8,10 +8,3 @@ LIBVORBIS.FETCH.sha256  = 0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399
 LIBVORBIS.CONFIGURE.extra = --with-ogg=$(call fn.ABSOLUTE,$(CONTRIB.build/)) HAVE_PKG_CONFIG="no"
 
 LIBVORBIS.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
-
-ifeq (darwin,$(HOST.system))
-    ifneq ($(HOST.machine),$(BUILD.machine))
-        LIBVORBIS.CONFIGURE.args.host = --host=$(HOST.machine:arm64=aarch64)-$(HOST.vendor)-$(HOST.system)
-        LIBVORBIS.CONFIGURE.args.build = --build=$(BUILD.machine:arm64=aarch64)-$(BUILD.vendor)-$(BUILD.system)
-    endif
-endif
diff --git a/contrib/zimg/module.defs b/contrib/zimg/module.defs
@@ -9,10 +9,3 @@ ZIMG.EXTRACT.tarbase = zimg-release-3.0.1
 ZIMG.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -fiv;
 
 ZIMG.CONFIGURE.extra += --enable-static --disable-shared
-
-ifeq (darwin,$(HOST.system))
-    ifneq ($(HOST.machine),$(BUILD.machine))
-        ZIMG.CONFIGURE.args.host = --host=$(HOST.machine:arm64=aarch64)-$(HOST.vendor)-$(HOST.system)
-        ZIMG.CONFIGURE.args.build = --build=$(BUILD.machine:arm64=aarch64)-$(BUILD.vendor)-$(BUILD.system)
-    endif
-endif