contrib: remove deprecated platform

This commit removes conditional code for the Nacl platform, in the contribs.
5 years ago · 18b045381d
10 changed files with 0 additions and 49 deletions
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@ -355,9 +355,6 @@ case "${OS}" in
 	*solaris*)
 		add_make_enabled "HAVE_SOLARIS"
 		;;
-	*nacl*)
-		add_make_enabled "HAVE_NACL"
-		;;
 	*emscripten*)
 	       add_make_enabled "HAVE_EMSCRIPTEN"
 	       ;;
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@ -23,14 +23,8 @@ WITH_FONTCONFIG = 0
 WITH_HARFBUZZ = 1
 WITH_DWRITE = 1
 else
-ifdef HAVE_NACL
 WITH_FONTCONFIG = 1
 WITH_HARFBUZZ = 1
-WITH_ASS_ASM = 0
-else
-WITH_FONTCONFIG = 1
-WITH_HARFBUZZ = 1
-endif
 endif
 endif
 endif
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@ -211,10 +211,6 @@ endif
 FFMPEGCONF += --target-os=sunos --enable-pic
 endif

-ifdef HAVE_NACL
-FFMPEGCONF+=--disable-inline-asm --disable-asm --target-os=linux
-endif
-
 ifdef HAVE_EMSCRIPTEN
 FFMPEGCONF+= --arch=wasm32 --target-os=emscripten
 endif
--- a/contrib/src/fontconfig/rules.mak
+++ b/contrib/src/fontconfig/rules.mak
@ -50,10 +50,6 @@ FONTCONFIG_ENV += LIBXML2_CFLAGS=`xml2-config --cflags`
 FONTCONFIG_ENV += LIBXML2_LIBS=`xml2-config --libs`
 endif

-ifdef HAVE_NACL
-FONTCONFIG_ENV += ac_cv_func_random=no
-endif
-
 DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)

 .fontconfig: fontconfig
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@ -72,12 +72,6 @@ ifeq ($(ARCH),aarch64)
 GCRYPT_CONF += --disable-arm-crypto-support
 endif
 endif
-ifdef HAVE_NACL
-GCRYPT_CONF += --disable-asm --disable-aesni-support ac_cv_func_syslog=no --disable-sse41-support
-GCRYPT_CONF += --disable-avx-support --disable-avx2-support --disable-padlock-support
-GCRYPT_CONF += --disable-amd64-as-feature-detection --disable-drng-support
-GCRYPT_CONF += --disable-pclmul-support
-endif

 .gcrypt: gcrypt
 	# Reconfiguring this requires a git repo to be available, to
--- a/contrib/src/gmp/rules.mak
+++ b/contrib/src/gmp/rules.mak
@ -13,11 +13,6 @@ ifeq ($(ARCH),mips64el)
 GMP_CONF += --disable-assembly
 endif
 endif
-ifdef HAVE_NACL
-ifeq ($(ARCH),x86_64)
-GMP_CONF += --disable-assembly
-endif
-endif

 ifdef HAVE_WIN32
 ifeq ($(ARCH),arm)
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@ -75,10 +75,6 @@ ifeq ($(ARCH),aarch64)
 endif
 endif

-ifdef HAVE_NACL
-	GNUTLS_CONF += --disable-hardware-acceleration
-endif
-
 .gnutls: gnutls
 	cd $< && $(GNUTLS_ENV) ./configure $(GNUTLS_CONF)
 	cd $< && $(MAKE) -C gl install
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@ -34,15 +34,6 @@ else
 	cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h
 endif
 endif
-ifdef HAVE_NACL
-ifeq ($(ARCH),i386) # 32bits intel
-	cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h $@/src/syscfg/lock-obj-pub.nacl.h
-else
-ifeq ($(ARCH),x86_64)
-	cp $@/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h $@/src/syscfg/lock-obj-pub.nacl.h
-endif
-endif
-endif

 GPGERROR_CONF := $(HOSTCONF) \
 	--disable-nls \
--- a/contrib/src/mpg123/rules.mak
+++ b/contrib/src/mpg123/rules.mak
@ -30,10 +30,6 @@ MPG123CONF += --with-cpu=generic_dither
 endif
 endif

-ifdef HAVE_NACL
-MPG123CONF += ac_cv_header_sys_select_h=no
-endif
-
 $(TARBALLS)/mpg123-$(MPG123_VERSION).tar.bz2:
 	$(call download_pkg,$(MPG123_URL),mpg123)

--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@ -103,10 +103,6 @@ ifdef HAVE_SOLARIS
 POSTPROCCONF += --enable-pic
 endif

-ifdef HAVE_NACL
-POSTPROCCONF += --target-os=linux
-endif
-
 # Build

 ifdef GPL