mirror of
https://git.freebsd.org/ports.git
synced 2025-06-05 04:46:28 -04:00
7b3b93c9f9
PR: 248081 Submitted by: riggs Approved by: koobs (maintainer) MFH: 2020Q3 (hat: ports-secteam)
116 lines
4.1 KiB
Text
116 lines
4.1 KiB
Text
--- configure.orig 2020-07-02 16:50:47 UTC
|
|
+++ configure
|
|
@@ -729,12 +729,6 @@ case $host_cpu in
|
|
AS_EXT=".asm"
|
|
ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
|
|
if [ $compiler = GNU ]; then
|
|
- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
|
|
- CFLAGS="$CFLAGS -march=i686"
|
|
- fi
|
|
- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
|
|
- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
|
|
- fi
|
|
CFLAGS="-m32 $CFLAGS"
|
|
LDFLAGS="-m32 $LDFLAGS"
|
|
fi
|
|
@@ -749,7 +743,7 @@ case $host_cpu in
|
|
ASFLAGS="$ASFLAGS -f elf32"
|
|
fi
|
|
;;
|
|
- x86_64)
|
|
+ amd64|x86_64)
|
|
ARCH="X86_64"
|
|
AS="${AS-nasm}"
|
|
AS_EXT=".asm"
|
|
@@ -825,7 +819,7 @@ case $host_cpu in
|
|
AS="${AS-${CC}}"
|
|
fi
|
|
;;
|
|
- aarch64)
|
|
+ aarch64|arm64)
|
|
ARCH="AARCH64"
|
|
stack_alignment=16
|
|
if [ "$SYS" = MACOSX ] ; then
|
|
@@ -938,7 +932,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p
|
|
fi
|
|
fi
|
|
|
|
-if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
|
|
+if [ $cli_libx264 != system -a $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
|
|
if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then
|
|
VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )"
|
|
echo "Found $VER"
|
|
@@ -951,9 +945,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \
|
|
fi
|
|
|
|
if [ $asm = auto -a $ARCH = ARM ] ; then
|
|
- # set flags so neon is built by default
|
|
- [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
|
|
-
|
|
cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
|
|
if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
|
|
define HAVE_ARMV6
|
|
@@ -964,9 +955,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
|
|
cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
|
|
ASFLAGS="$ASFLAGS -c"
|
|
else
|
|
- echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS."
|
|
- echo "If you really want to run on such a CPU, configure with --disable-asm."
|
|
- exit 1
|
|
+ echo "No usable SIMD found, assuming --disable-asm."
|
|
+ asm="no"
|
|
fi
|
|
fi
|
|
|
|
@@ -998,9 +988,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
|
|
if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then
|
|
define HAVE_MSA
|
|
else
|
|
- echo "You specified a pre-MSA CPU in your CFLAGS."
|
|
- echo "If you really want to run on such a CPU, configure with --disable-asm."
|
|
- exit 1
|
|
+ echo "No usable SIMD found, assuming --disable-asm."
|
|
+ asm="no"
|
|
fi
|
|
fi
|
|
|
|
@@ -1232,15 +1221,16 @@ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
|
|
gpac="no"
|
|
GPAC_LIBS="-lgpac_static"
|
|
cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
|
|
+ cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"
|
|
if [ "$SYS" = "WINDOWS" ] ; then
|
|
cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
|
|
cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"
|
|
fi
|
|
if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_close(0);" ; then
|
|
- if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0);" ; then
|
|
+ if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0,0);" ; then
|
|
gpac="yes"
|
|
else
|
|
- echo "Warning: gpac is too old, update to 2007-06-21 UTC or later"
|
|
+ echo "Warning: gpac is too old, update to v0.8.0 or later"
|
|
fi
|
|
fi
|
|
fi
|
|
@@ -1328,10 +1318,6 @@ if cc_check '' -Wshadow ; then
|
|
CFLAGS="-Wshadow $CFLAGS"
|
|
fi
|
|
|
|
-if cc_check '' -Wmaybe-uninitialized ; then
|
|
- CFLAGS="-Wno-maybe-uninitialized $CFLAGS"
|
|
-fi
|
|
-
|
|
if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then
|
|
CFLAGS="$CFLAGS -fvisibility=hidden"
|
|
fi
|
|
@@ -1371,6 +1357,9 @@ if [ "$opencl" = "yes" ]; then
|
|
opencl="yes"
|
|
define HAVE_OPENCL "(BIT_DEPTH==8)"
|
|
libdl="-ldl"
|
|
+ else
|
|
+ opencl="yes"
|
|
+ define HAVE_OPENCL "(BIT_DEPTH==8)"
|
|
fi
|
|
LDFLAGS="$LDFLAGS $libdl"
|
|
fi
|