58 lines
2.0 KiB
Plaintext
58 lines
2.0 KiB
Plaintext
$OpenBSD: patch-configure,v 1.14 2013/03/09 09:31:12 brad Exp $
|
|
--- configure.orig Sat Mar 2 16:45:04 2013
|
|
+++ configure Sat Mar 2 20:50:20 2013
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
|
|
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
|
|
cat <<EOF
|
|
@@ -946,18 +946,6 @@ fi
|
|
|
|
cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
|
|
|
|
-if [ "$pic" = "yes" ] ; then
|
|
- CFLAGS="$CFLAGS -fPIC"
|
|
- ASFLAGS="$ASFLAGS -DPIC"
|
|
- # resolve textrels in the x86 asm
|
|
- cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic"
|
|
- [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
|
|
-fi
|
|
-
|
|
-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
|
|
- CFLAGS="$CFLAGS -fomit-frame-pointer"
|
|
-fi
|
|
-
|
|
if [ "$strip" = "yes" ]; then
|
|
CFLAGS="$CFLAGS -s"
|
|
LDFLAGS="$LDFLAGS -s"
|
|
@@ -968,9 +956,9 @@ if [ "$debug" = "yes" ]; then
|
|
elif [ $ARCH = ARM ]; then
|
|
# arm-gcc-4.2 produces incorrect output with -ffast-math
|
|
# and it doesn't save any speed anyway on 4.4, so disable it
|
|
- CFLAGS="-O3 -fno-fast-math $CFLAGS"
|
|
+ CFLAGS="-fno-fast-math $CFLAGS"
|
|
else
|
|
- CFLAGS="-O3 -ffast-math $CFLAGS"
|
|
+ CFLAGS="-ffast-math $CFLAGS"
|
|
fi
|
|
|
|
if cc_check '' -fno-tree-vectorize ; then
|
|
@@ -1118,7 +1106,6 @@ if [ "$cli" = "yes" ]; then
|
|
fi
|
|
|
|
if [ "$shared" = "yes" ]; then
|
|
- API=$(grep '#define X264_BUILD' < ${SRCPATH}/x264.h | cut -f 3 -d ' ')
|
|
if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then
|
|
echo "SONAME=libx264-$API.dll" >> config.mak
|
|
if [ $compiler = ICL ]; then
|
|
@@ -1146,7 +1133,7 @@ if [ "$shared" = "yes" ]; then
|
|
else
|
|
echo "SOSUFFIX=so" >> config.mak
|
|
echo "SONAME=libx264.so.$API" >> config.mak
|
|
- echo "SOFLAGS=-shared -Wl,-soname,\$(SONAME) $SOFLAGS" >> config.mak
|
|
+ echo "SOFLAGS=-shared -fPIC $SOFLAGS" >> config.mak
|
|
fi
|
|
echo 'default: lib-shared' >> config.mak
|
|
echo 'install: install-lib-shared' >> config.mak
|