Changeset 822

Show
Ignore:
Timestamp:
03/07/08 12:31:27 (6 months ago)
Author:
astrange
Message:

Turn PIC back off for Xcode 3.1. My sh is terrible...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/createStaticLibs.sh

    r810 r822  
    77fi 
    88 
    9 generalConfigureOptions="--disable-muxers --disable-encoders --disable-strip --enable-pthreads --disable-ffmpeg --disable-network --disable-ffplay --disable-vhook --disable-decoder=cavs --disable-decoder=vc1 --disable-decoder=wmv3" 
     9generalConfigureOptions="--disable-muxers --disable-encoders --disable-strip --enable-pthreads --disable-ffmpeg --disable-network --disable-ffplay --disable-vhook" 
    1010sdkflags="-isysroot $SDKROOT -mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET -gstabs+ -Dattribute_deprecated=" 
    1111 
    …… 
    1414fi 
    1515 
    16 ver=$(uname -r) 
    17 if (( ${ver:0:1} < 9 )); then 
     16ver=`what /usr/bin/ld` 
     17needs_pic=false || (echo $ver | grep "ld64-77") 
     18 
     19if $needs_pic; then 
    1820    #no-pic only on pre-leopard 
    19     sdkflags="$sdkflags -mdynamic-no-pic" 
     21    sdkflags="$sdkflags -fPIC" 
     22    generalConfigureOptions="$generalConfigureOptions --disable-decoder=cavs --disable-decoder=vc1 --disable-decoder=wmv3" 
     23else  
     24        sdkflags="$sdkflags -mdynamic-no-pic" # ld can't handle -fno-pic on ppc 
    2025fi 
    2126export sdkflags 
    …… 
    5964fi 
    6065 
    61 (cd ffmpeg; patch -p1 < ../Patches/ffmpeg.diff; touch patched) 
     66if $needs_pic; then 
     67 (cd ffmpeg; patch -p1 < ../Patches/ffmpeg-pic.diff) 
     68fi 
     69 
     70touch patched 
    6271 
    6372if [ "$buildid_ffmpeg" = "$oldbuildid_ffmpeg" ] ; then