sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-30 10:36:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

multimedia/libx264: fix build on powerpc64le on 15

Browse source 
cc: error: unsupported option '-mabi=' for target 'powerpc64le-unknown-freebsd15.0'
This commit is contained in:
Piotr Kubaj 2024-01-05 23:58:04 +01:00
parent 1b819e4869
commit 951dfc6f76
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
multimedia/libx264/Makefile
View file

@ -7,9 +7,6 @@ COMMENT= H.264/MPEG-4 AVC Video Encoding (Library)
MASTERDIR= ${.CURDIR}/../x264 MASTERDIR= ${.CURDIR}/../x264
PLIST= ${.CURDIR}/pkg-plist PLIST= ${.CURDIR}/pkg-plist
NOT_FOR_ARCHS= powerpc64le
NOT_FOR_ARCHS_REASON= endian test failed
# Clear dependency on libx264 (itself), see x264/Makefile # Clear dependency on libx264 (itself), see x264/Makefile
LIB_DEPENDS= # LIB_DEPENDS= #

27
multimedia/x264/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig 2020-09-12 17:23:57 UTC --- configure.orig 2024-01-05 22:26:57 UTC
+++ configure +++ configure
@@ -743,12 +743,6 @@ case $host_cpu in @@ -744,12 +744,6 @@ case $host_cpu in
AS_EXT=".asm" AS_EXT=".asm"
ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
if [ $compiler = GNU ]; then if [ $compiler = GNU ]; then
@ -13,7 +13,7 @@
CFLAGS="-m32 $CFLAGS" CFLAGS="-m32 $CFLAGS"
LDFLAGS="-m32 $LDFLAGS" LDFLAGS="-m32 $LDFLAGS"
fi fi
@@ -763,7 +757,7 @@ case $host_cpu in @@ -764,7 +758,7 @@ case $host_cpu in
ASFLAGS="$ASFLAGS -f elf32" ASFLAGS="$ASFLAGS -f elf32"
fi fi
;; ;;
@ -22,7 +22,16 @@
ARCH="X86_64" ARCH="X86_64"
AS="${AS-nasm}" AS="${AS-nasm}"
AS_EXT=".asm" AS_EXT=".asm"
@@ -952,7 +946,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p @@ -801,7 +795,7 @@ case $host_cpu in
if [ $SYS = MACOSX ] ; then
CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4"
else
- CFLAGS="$CFLAGS -maltivec -mabi=altivec"
+ CFLAGS="$CFLAGS -maltivec"
define HAVE_ALTIVEC_H
fi
if [ "$vsx" != "no" ] ; then
@@ -958,7 +952,7 @@ fi
fi fi
fi fi
@ -31,7 +40,7 @@
if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then
VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )" VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )"
echo "Found $VER" echo "Found $VER"
@@ -965,9 +959,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \ @@ -971,9 +965,6 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
fi fi
if [ $asm = auto -a $ARCH = ARM ] ; then if [ $asm = auto -a $ARCH = ARM ] ; then
@ -41,7 +50,7 @@
cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
define HAVE_ARMV6 define HAVE_ARMV6
@@ -978,9 +969,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then @@ -984,9 +975,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
ASFLAGS="$ASFLAGS -c" ASFLAGS="$ASFLAGS -c"
else else
@ -53,7 +62,7 @@
fi fi
fi fi
@@ -1012,9 +1002,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then @@ -1018,9 +1008,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then
define HAVE_MSA define HAVE_MSA
else else
@ -65,7 +74,7 @@
fi fi
fi fi
@@ -1343,10 +1332,6 @@ if cc_check '' -Wshadow ; then @@ -1368,10 +1357,6 @@ fi
CFLAGS="-Wshadow $CFLAGS" CFLAGS="-Wshadow $CFLAGS"
fi fi
@ -76,7 +85,7 @@
if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then
CFLAGS="$CFLAGS -fvisibility=hidden" CFLAGS="$CFLAGS -fvisibility=hidden"
fi fi
@@ -1386,6 +1371,9 @@ if [ "$opencl" = "yes" ]; then @@ -1411,6 +1396,9 @@ if [ "$opencl" = "yes" ]; then
opencl="yes" opencl="yes"
define HAVE_OPENCL "(BIT_DEPTH==8)" define HAVE_OPENCL "(BIT_DEPTH==8)"
libdl="-ldl" libdl="-ldl"