Changeset 129582fb64723cfd56bd584a982fba10f071a38f

Show
Ignore:
Timestamp:
20/09/08 00:46:52 (2 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1221864412 -0700
git-parent:

[14149265e6fc1854ab15eb555d74003f681886ea]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1221863557 -0700
Message:

Contribs: Die if NO_RELOCATION

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Makefile

    rfa79d12 r129582f  
    144144endif 
    145145 
    146 ifdef NO_TEXT_RELOCATION 
    147 FFMPEGCONF += --disable-mmx 
    148 endif 
    149  
    150146ifdef HAVE_DARWIN_OS 
    151147X264CONF += --enable-pic 
    …… 
    794790    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install) 
    795791else 
    796   ifdef NO_TEXT_RELOCATION 
    797     (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm $(THEORACONF) && make && make install) 
    798   else 
    799792    (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install) 
    800   endif 
    801793endif 
    802794    $(INSTALL_NAME) 
    …… 
    10821074    (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch) 
    10831075endif 
    1084 ifdef NO_TEXT_RELOCATION 
    1085     (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch) 
    1086 endif 
    10871076ifdef HAVE_UCLIBC 
    10881077    patch -p0 < Patches/ffmpeg-svn-uclibc.patch 
    10891078    patch -p0 < Patches/ffmpeg-svn-internal-define.patch 
    10901079    patch -p0 < Patches/ffmpeg-svn-libavformat.patch 
     1080endif 
     1081ifdef NO_TEXT_RELOCATION 
     1082    echo "Broken LD. Fix your tools." 
     1083    exit -1 
    10911084endif 
    10921085else