X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fbootstrap;h=c221e827be953ccddc59271b3ffdd5487d50f7b8;hb=14f37b2101842fa6e427f962f689db74eff6faba;hp=38fb005e7937ac0cb7cab0ef38b4a09696e1055b;hpb=5d34fbe1ce2f13b11c1fcb09dfca81dc3b3ed214;p=vlc diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap index 38fb005e79..c221e827be 100755 --- a/extras/contrib/bootstrap +++ b/extras/contrib/bootstrap @@ -2,12 +2,12 @@ # *************************************************************************** # bootstrap : Set up config.mak # *************************************************************************** -# Copyright (C) 2003-2007 the VideoLAN team +# Copyright (C) 2003-2009 the VideoLAN team # $Id$ # # Authors: Christophe Massiot # Derk-Jan Hartman -# Felix Kühne +# Felix Paul Kühne # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,9 +25,9 @@ # *************************************************************************** if test "$#" -gt "2" -o "$1" = "-h" -o "$1" = "--help" ; then - echo "Usage: $0 [host [distro]]" >&2 - echo " Prepare config.mak and distro.mak file." >&2 - exit 1 + echo "Usage: $0 [host [distro]]" >&2 + echo " Prepare config.mak and distro.mak file." >&2 + exit 1 fi LANG=C @@ -37,9 +37,9 @@ set -x BUILD=`gcc -dumpmachine` if test "$#" -ge "1"; then - HOST="$1" + HOST="$1" else - HOST="$BUILD" + HOST="$BUILD" fi DISTRO= @@ -70,6 +70,18 @@ if test "$HOST" != "$BUILD"; then STRIP="${HOST}-strip" fi +case $HOST in + *powerpc*|*ppc*) + echo "ARCH=ppc" >> config.mak + ;; + *darwin10*) + echo "ARCH=x86_64" >> config.mak + ;; + *86*) + echo "ARCH=i386" >> config.mak + ;; +esac + # Check the HAVE_{OS} case $HOST in *darwin*) @@ -92,50 +104,34 @@ esac case $HOST in ppc-darwin) -# Mac OS X < 10.4 + # Mac OS X < 10.4 echo "Your version of Mac OS X is too old!" >&2 - echo "Compiling VLC requires 10.4.x or later" >&2 + echo "Compiling VLC requires 10.5.x or later" >&2 exit 1 ;; powerpc-apple-darwin8) -# Mac OS X 10.4 or 10.5 with Xcode 2.5 -# Makefile cross compiling is only supported with gcc-4.0 -# ENVP defines the oldest environment on which the program will be able to run - SDK_TARGET=10.4 - echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak - echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak - echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak - CFLAGS_TUNING=" -arch ppc -mtune=G4" - EXTRA_CFLAGS=" -D\${ENVP} -mmacosx-version-min=\${SDK_TARGET}" - CC="gcc -isysroot \${MACOSX_SDK}" - CXX="g++ -isysroot \${MACOSX_SDK}" - LD="ld -arch ppc -syslibroot \${MACOSX_SDK}" - echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak - cat src/Distributions/darwin.mak >> distro.mak - ;; + echo "Your version of Mac OS X is too old!" >&2 + echo "Compiling and running VLC requires 10.5.x or later" >&2 + exit 1 + ;; i686-apple-darwin8) - SDK_TARGET=10.4 - echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak - echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak - echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak - echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak - CFLAGS_TUNING=" -march=pentium-m -mtune=prescott" - EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" - EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" - echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak - cat src/Distributions/darwin.mak >> distro.mak - ;; + echo "Your version of Mac OS X is too old!" >&2 + echo "Compiling and running VLC requires 10.5.x or later" >&2 + exit 1 + ;; powerpc-apple-darwin9) # Mac OS X 10.5 with Xcode 3, specific rules apply - SDK_TARGET=10.4 + SDK_TARGET=10.5 echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak - echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak + echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk" >> config.mak echo "HAVE_DARWIN_9 = 1" >> config.mak + HAVE_DARWIN_9=1 CFLAGS_TUNING=" -arch ppc -mtune=G4" - EXTRA_CFLAGS=" -D\${ENVP} -mmacosx-version-min=\${SDK_TARGET}" - CC="gcc -isysroot \${MACOSX_SDK}" - CXX="g++ -isysroot \${MACOSX_SDK}" + EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" + EXTRA_LDFLAGS=" -arch ppc -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" + CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2" + CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2" LD="ld -arch ppc -syslibroot \${MACOSX_SDK}" echo "PATH = /bin:/usr/bin:/usr/local/bin:" >> config.mak cat src/Distributions/darwin.mak >> distro.mak @@ -145,22 +141,49 @@ case $HOST in echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2 exit 1 fi - ;; + ;; i686-apple-darwin9) - SDK_TARGET=10.4 + SDK_TARGET=10.5 MIN_LD_VERSION_WITH_TEXT_RELOCATION=81 echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak echo "HAVE_DARWIN_9 = 1" >> config.mak + HAVE_DARWIN_9=1 if test `ld -v 2> /dev/stdout | sed -E 's/.*ld64-([0-9]+).*/\1/'` -lt ${MIN_LD_VERSION_WITH_TEXT_RELOCATION}; then - echo "NO_TEXT_RELOCATION = 1" >> config.mak + echo "ERROR: Your ld version is unable to compile VLC.\nUpdate to Xcode 3.1 or higher." >&2 + exit 1 + fi + echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak + echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk" >> config.mak + CFLAGS_TUNING=" -march=pentium-m -mtune=prescott -arch i386" + EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" + EXTRA_LDFLAGS=" -arch i386 -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" + CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2" + CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2" + echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak + cat src/Distributions/darwin.mak >> distro.mak + if test -e /Developer/SDKs; then + echo "SDKs found. Everything is fine." >&2 + else + echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2 + exit 1 fi + ;; + *-apple-darwin10) + SDK_TARGET=10.5 + echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak + echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak + echo "HAVE_DARWIN_9 = 1" >> config.mak + echo "HAVE_DARWIN_10 = 1" >> config.mak + HAVE_DARWIN_10=1 echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak - echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak - CFLAGS_TUNING=" -march=pentium-m -mtune=prescott" + echo "MACOSX_SDK = /Developer/SDKs/MacOSX${SDK_TARGET}.sdk" >> config.mak + CFLAGS_TUNING=" -march=core2" EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}" EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak + CC="gcc" + CXX="g++" cat src/Distributions/darwin.mak >> distro.mak if test -e /Developer/SDKs; then echo "SDKs found. Everything is fine." >&2 @@ -168,89 +191,94 @@ case $HOST in echo "ERROR:\nYour Developer Tools' SDKs were not found.\nYou need to add extra symbolic links to /Developer to achieve correctly\nbuilt contribs.\nHave a look at the OSX-Compile-HOWTO for details." >&2 exit 1 fi - ;; + ;; i586-pc-beos) - if test -f /boot/beos/system/lib/libbind.so; then - EXTRA_LDFLAGS=" -lbind -lsocket" - else - EXTRA_LDFLAGS=" -lnet" - fi - if test "$HOST" = "$BUILD"; then -# Compiling on BeOS - PATH=".:/boot/home/config/bin:/bin:/boot/apps" - PATH="${PATH}:/boot/preferences:/boot/beos/apps" - PATH="${PATH}:/boot/beos/preferences" - PATH="${PATH}:/boot/develop/tools/gnupro/bin" - echo "PATH = ${PATH}" >> config.mak - LIBRARY_PATH="${LIBRARY_PATH}:%A/lib:/boot/home/config/lib" - LIBRARY_PATH="${LIBRARY_PATH}:/boot/beos/system/lib" - echo "LIBRARY_PATH = ${LIBRARY_PATH}" >> config.mak - else -# Cross compiling from Linux - PATH="/opt/beos-tools/bin:/opt/cross-tools/bin" - PATH="${PATH}:/usr/bin:/bin" - echo "PATH = ${PATH}" >> config.mak - fi - cat src/Distributions/beos.mak >> distro.mak - ;; + if test -f /boot/beos/system/lib/libbind.so; then + EXTRA_LDFLAGS=" -lbind -lsocket" + else + EXTRA_LDFLAGS=" -lnet" + fi + if test "$HOST" = "$BUILD"; then +# Compiling on BeOS + PATH=".:/boot/home/config/bin:/bin:/boot/apps" + PATH="${PATH}:/boot/preferences:/boot/beos/apps" + PATH="${PATH}:/boot/beos/preferences" + PATH="${PATH}:/boot/develop/tools/gnupro/bin" + echo "PATH = ${PATH}" >> config.mak + LIBRARY_PATH="${LIBRARY_PATH}:%A/lib:/boot/home/config/lib" + LIBRARY_PATH="${LIBRARY_PATH}:/boot/beos/system/lib" + echo "LIBRARY_PATH = ${LIBRARY_PATH}" >> config.mak + else +# Cross compiling from Linux + PATH="/opt/beos-tools/bin:/opt/cross-tools/bin" + PATH="${PATH}:/usr/bin:/bin" + echo "PATH = ${PATH}" >> config.mak + fi + cat src/Distributions/beos.mak >> distro.mak + ;; + *mingw32ce) + echo "HAVE_WINCE = 1" >> config.mak + echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak + cat src/Distributions/wince.mak >> distro.mak + ;; *mingw32*) - echo "HAVE_WIN32 = 1" >> config.mak - echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak + echo "HAVE_WIN32 = 1" >> config.mak + echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak EXTRA_CFLAGS="-O3" - cat src/Distributions/win32.mak >> distro.mak - ;; + cat src/Distributions/win32.mak >> distro.mak + ;; i686-pc-cygwin) - echo "HAVE_WIN32 = 1" >> config.mak - echo "HAVE_CYGWIN = 1" >> config.mak - CC="gcc -mno-cygwin -isystem /usr/include/mingw" - CXX="g++ -mno-cygwin -isystem /usr/include/mingw" - HOST=`$CC -dumpmachine` - EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw" - EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw" - EXTRA_LDFLAGS=" -mno-cygwin" - echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak - cat src/Distributions/win32.mak >> distro.mak - ;; + echo "HAVE_WIN32 = 1" >> config.mak + echo "HAVE_CYGWIN = 1" >> config.mak + CC="gcc -mno-cygwin -isystem /usr/include/mingw" + CXX="g++ -mno-cygwin -isystem /usr/include/mingw" + HOST=`$CC -dumpmachine` + EXTRA_CFLAGS=" -mno-cygwin -isystem /usr/include/mingw" + EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw" + EXTRA_LDFLAGS=" -mno-cygwin" + echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak + cat src/Distributions/win32.mak >> distro.mak + ;; arm-wince-pe) - echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak - EXTRA_CPPFLAGS=" -D_WIN32_WCE" - cat src/Distributions/wince.mak >> distro.mak - ;; + echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak + EXTRA_CPPFLAGS=" -D_WIN32_WCE" + cat src/Distributions/wince.mak >> distro.mak + ;; armeb-linux-uclibc) - echo "HAVE_UCLIBC = 1" >> config.mak - echo "HAVE_BIGENDIAN = 1" >> config.mak - EXTRA_CFLAGS="-Os -march=armv5 -msoft-float" + echo "HAVE_UCLIBC = 1" >> config.mak + echo "HAVE_BIGENDIAN = 1" >> config.mak + EXTRA_CFLAGS="-Os -march=armv5 -msoft-float" + if test ! -z "${DISTRO}"; then + cat src/Distributions/${DISTRO}.mak >> distro.mak + else + cat src/Distributions/unix.mak >> distro.mak + fi + ;; + *) + if test "$HOST" = "$BUILD"; then + if test -d "/usr/lib/pkgconfig"; then + if test -z "$PKG_CONFIG_PATH"; then + echo "PKG_CONFIG_PATH = /usr/lib/pkgconfig" >> config.mak + fi + if test -z "$PKG_CONFIG_LIBDIR"; then + echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak + fi + fi + # Try to match distribution + if test -f /etc/fedora-release; then + cat src/Distributions/fedora.mak >> distro.mak + else + # Default Unix-like systems + cat src/Distributions/unix.mak >> distro.mak + fi + else # unknown distro if test ! -z "${DISTRO}"; then cat src/Distributions/${DISTRO}.mak >> distro.mak else cat src/Distributions/unix.mak >> distro.mak fi - ;; - *) - if test "$HOST" = "$BUILD"; then - if test -d "/usr/lib/pkgconfig"; then - if test -z "$PKG_CONFIG_PATH"; then - echo "PKG_CONFIG_PATH = /usr/lib/pkgconfig" >> config.mak - fi - if test -z "$PKG_CONFIG_LIBDIR"; then - echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak - fi - fi - # Try to match distribution - if test -f /etc/fedora-release; then - cat src/Distributions/fedora.mak >> distro.mak - else - # Default Unix-like systems - cat src/Distributions/unix.mak >> distro.mak - fi - else # unknown distro - if test ! -z "${DISTRO}"; then - cat src/Distributions/${DISTRO}.mak >> distro.mak - else - cat src/Distributions/unix.mak >> distro.mak - fi - fi - ;; + fi + ;; esac echo "BUILD = $BUILD" >> config.mak @@ -270,24 +298,55 @@ echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak if wget --version >/dev/null 2>&1; then - echo "WGET = `which wget` -c" >> config.mak -elif which curl >/dev/null; then + echo "WGET = `which wget` -c --passive" >> config.mak +elif test -z `curl --version >/dev/null 2>&1`; then echo "WGET = `which curl` -L -O" >> config.mak else echo "You need at least wget or curl to fetch the packages." >&2 exit 1 fi -if test -f /sw/bin/svn; then - echo "SVN = /sw/bin/svn" >> config.mak -elif test -f /usr/local/bin/svn; then - echo "SVN = /usr/local/bin/svn" >> config.mak -elif test -f /usr/bin/svn; then - echo "SVN = /usr/bin/svn" >> config.mak -elif test -f /opt/local/bin/svn; then - echo "SVN = /opt/local/bin/svn" >> config.mak -elif svn help >/dev/null 2>&1; then - echo "SVN = `which svn`" >> config.mak +if svn --version >/dev/null 2>&1; then + echo "SVN = `which svn`" >> config.mak else - echo "You do not have a subversion client installed." >&2 + echo "You do not have a subversion client in your PATH." >&2 +fi + +if git --version>/dev/null 2>&1; then + echo "GIT = `which git`" >> config.mak +else + echo "You do not have a Git client in your PATH." >&2 +fi + +if test -z "$CONTRIBS_RELEASE"; then + echo "EXTRA_CFLAGS += -DNDEBUG" >> config.mak + set +x + echo + echo "*****************************************************************" + echo "* If you need contribs with all debug information, run this *" + echo "* line and compile the libraries on your own. *" + echo "* CONTRIBS_RELEASE=no ./bootstrap *" + echo "*****************************************************************" +fi + +if test $HAVE_DARWIN_9; then + set +x + echo + echo "*****************************************************************" + echo "* We are using the llvm-gcc-4.2 compiler on OS X by default, *" + echo "* so compilation will fail if it isn't installed. *" + echo "*****************************************************************" +fi + +if test $HAVE_DARWIN_10; then + set +x + echo + echo "*****************************************************************" + echo "* You are running Darwin 10. *" + echo "* For testing purposes, VLC will be compiled in 64bit mode. *" + echo "* While doing so, for time being, the 10.5 SDK is used. *" + echo "* Note that in contrast to our Darwin 9 builds, we are not *" + echo "* using the llvm compiler, but plain GCC 4.2. *" + echo "*****************************************************************" + set -x fi