X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fbootstrap;h=0fcb9e531018039a852edd779d3ad082715f2318;hb=5ad6561ceab66b046b648e7651ed63c071d6012d;hp=0eb3c6acf0778f6be5036735030754d8e31cbdb3;hpb=b2cb8c3e5aa691a559c8e813d22da0a9c0dfe969;p=vlc

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 0eb3c6acf0..0fcb9e5310 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -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=
@@ -51,8 +51,8 @@ fi
 
 rm -f config.mak
 {
-	echo "# Automatically generated by bootstrap."
-	echo "# Make changes if you know what you're doing."
+    echo "# Automatically generated by bootstrap."
+    echo "# Make changes if you know what you're doing."
 } > config.mak
 
 rm -f distro.mak
@@ -67,6 +67,7 @@ if test "$HOST" != "$BUILD"; then
     LD="${HOST}-ld"
     RANLIB="${HOST}-ranlib"
     AR="${HOST}-ar"
+    STRIP="${HOST}-strip"
 fi
 
 # Check the HAVE_{OS}
@@ -92,140 +93,184 @@ esac
 case $HOST in
     ppc-darwin)
 # 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
-	    exit 1
-	;;
+        echo "Your version of Mac OS X is too old!" >&2
+        echo "Compiling VLC requires 10.4.x or later" >&2
+        exit 1
+    ;;
     powerpc-apple-darwin8)
-# Mac OS X 10.4
+# 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 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
-	    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} -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
-        ;;
+        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
+    ;;
     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
-        ;;
+        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
+    ;;
     powerpc-apple-darwin9)
-	    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} -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
-        ;;
+# Mac OS X 10.5 with Xcode 3, specific rules apply
+        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
+        echo "HAVE_DARWIN_9 = 1" >> 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
+        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
+    ;;
     i686-apple-darwin9)
-	    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
-        ;;
+        SDK_TARGET=10.4
+        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
+        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
+        fi
+        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
+        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
+    ;;
+    i686-apple-darwin10d1)
+        SDK_TARGET=10.6
+        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
+        echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
+        echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.6.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
+        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
+    ;;
     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
+    ;;
     *mingw32*)
-            echo "HAVE_WIN32 = 1" >> config.mak
-            echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
-            cat src/Distributions/win32.mak >> distro.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
+    ;;
     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
+        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
@@ -238,30 +283,40 @@ echo "CXX = ${CXX}" >> config.mak
 echo "LD = ${LD}" >> config.mak
 echo "RANLIB = ${RANLIB}" >> config.mak
 echo "AR = ${AR}" >> config.mak
+echo "STRIP = ${STRIP}" >> config.mak
 echo "EXTRA_CFLAGS = ${CFLAGS_TUNING} ${EXTRA_CFLAGS}" >> config.mak
 echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS} -isystem \$(PREFIX)/include" >> config.mak
 echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak
 
-if which curl >/dev/null; then
-	echo "WGET = curl -L -O" >> config.mak
-elif wget --version >/dev/null 2>&1; then
-	echo "WGET = wget" >> config.mak
+if wget --version >/dev/null 2>&1; 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 svn --version >/dev/null 2>&1; then
+    echo "SVN = `which svn`" >> config.mak
+else
+    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 need at least wget or curl to fetch the packages." >&2
-	exit 1
+    echo "You do not have a Git client in your PATH." >&2
 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 = svn" >> config.mak
+if test -z "$CONTRIBS_RELEASE"; then
+    set +x
+    echo
+    echo "***********************************************************"
+    echo "* If you are building contribs for a release build of VLC *"
+    echo "* Please run CONTRIBS_RELEASE=sexy ./bootstrap            *"
+    echo "***********************************************************"
 else
-        echo "You do not have a subversion client installed." >&2
+    echo "EXTRA_CFLAGS += -DNDEBUG" >> config.mak
 fi