Commit 512766b4 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Updated the contrib system to work with the new id gcc-4 returns for Tiger

parent 83d7472b
...@@ -46,7 +46,7 @@ echo "BUILD = $BUILD" >> config.mak ...@@ -46,7 +46,7 @@ echo "BUILD = $BUILD" >> config.mak
echo "HOST = $HOST" >> config.mak echo "HOST = $HOST" >> config.mak
case $HOST in case $HOST in
ppc-darwin) powerpc-apple-darwin8 | ppc-darwin)
echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
echo "CONTRIB_URL = http://download.videolan.org/pub/videolan/devtools/contrib-macosx.tar.bz2" >> config.mak echo "CONTRIB_URL = http://download.videolan.org/pub/videolan/devtools/contrib-macosx.tar.bz2" >> config.mak
;; ;;
......
...@@ -30,6 +30,13 @@ include ./packages.mak ...@@ -30,6 +30,13 @@ include ./packages.mak
# *************************************************************************** # ***************************************************************************
ifeq ($(HOST),ppc-darwin) ifeq ($(HOST),ppc-darwin)
HAVE_DARWIN_OS=1
endif
ifeq ($(HOST),powerpc-apple-darwin8)
HAVE_DARWIN_OS=1
endif
ifdef HAV_DARWIN_OS
export PATH = $(PREFIX)/bin:/bin:/usr/bin export PATH = $(PREFIX)/bin:/bin:/usr/bin
export DYLD_LIBRARY_PATH = $(PREFIX)/lib export DYLD_LIBRARY_PATH = $(PREFIX)/lib
endif endif
...@@ -74,7 +81,7 @@ endif ...@@ -74,7 +81,7 @@ endif
# Standard rules # Standard rules
# *************************************************************************** # ***************************************************************************
ifeq ($(HOST),ppc-darwin) ifdef HAVE_DARWIN_OS
all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \ all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \ .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
...@@ -130,7 +137,7 @@ endef ...@@ -130,7 +137,7 @@ endef
# $(INSTALL_NAME) # $(INSTALL_NAME)
# touch $@ # touch $@
ifeq ($(HOST),ppc-darwin) ifdef HAVE_DARWIN_OS
define INSTALL_NAME_LIB define INSTALL_NAME_LIB
install_name_tool \ install_name_tool \
-change $(PREFIX)/lib/$(shell cd $(PREFIX)/lib; ls | grep "lib$(INSTALL_LIB).[0-9]*.dylib") \ -change $(PREFIX)/lib/$(shell cd $(PREFIX)/lib; ls | grep "lib$(INSTALL_LIB).[0-9]*.dylib") \
...@@ -208,7 +215,7 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz ...@@ -208,7 +215,7 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz
# libtool # libtool
# *************************************************************************** # ***************************************************************************
ifeq ($(BUILD),ppc-darwin) ifdef HAVE_DARWIN_OS
.libtool: .libtool:
if test -x /usr/bin/glibtoolize; then \ if test -x /usr/bin/glibtoolize; then \
ln -sf /usr/bin/glibtoolize $(PREFIX)/bin/libtoolize ; \ ln -sf /usr/bin/glibtoolize $(PREFIX)/bin/libtoolize ; \
...@@ -761,7 +768,7 @@ libdvdnav-$(LIBDVDNAV_VERSION).tar.gz: ...@@ -761,7 +768,7 @@ libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p 0 < Patches/dvdnav.patch patch -p 0 < Patches/dvdnav.patch
ifeq ($(BUILD),ppc-darwin) ifdef HAVE_DARWIN_OS
(cd $@; autoconf) (cd $@; autoconf)
else else
(cd $@; ./autogen.sh noconfig) (cd $@; ./autogen.sh noconfig)
...@@ -942,7 +949,7 @@ vcdimager-$(VCDIMAGER_VERSION).tar.gz: ...@@ -942,7 +949,7 @@ vcdimager-$(VCDIMAGER_VERSION).tar.gz:
vcdimager: vcdimager-$(VCDIMAGER_VERSION).tar.gz vcdimager: vcdimager-$(VCDIMAGER_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
ifeq ($(HOST),ppc-darwin) ifdef HAVE_DARWIN_OS
.vcdimager: vcdimager .vcdimager: vcdimager
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static LDFLAGS="$(LDFLAGS) -framework CoreFoundation -framework IOKit" && make && make install) (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static LDFLAGS="$(LDFLAGS) -framework CoreFoundation -framework IOKit" && make && make install)
touch $@ touch $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment