X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fbootstrap;h=85eb400689fe320e92b6b6ccbcac000b19d21980;hb=c74014005f4d51a2bc9fdec493433ada6abde8e7;hp=3b2bcecb38e00e5c37f29a3f3643698c9568ac38;hpb=ed0d83037ef49dab6a4014d92965e8ba3eda61ba;p=vlc

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 3b2bcecb38..85eb400689 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -72,26 +72,25 @@ fi
 
 case $HOST in
     *powerpc*|*ppc*)
-         echo "ARCH=ppc" >> config.mak
+         ARCH="ppc"
      ;;
     *darwin10*)
-         echo "ARCH=x86_64" >> config.mak
+         ARCH="x86_64"
+     ;;
+    *86_64*)
+          ARCH="x86_64"
      ;;
     *86*)
-          echo "ARCH=i386" >> config.mak
+          ARCH="i386"
      ;;
 esac
+echo "ARCH = $ARCH" >> config.mak
 
 # Check the HAVE_{OS}
 case $HOST in
     *darwin*)
         echo "HAVE_DARWIN_OS = 1" >> config.mak
         echo "HAVE_BSD = 1" >> config.mak
-        if test $CONTRIBS_CC_LLVM; then
-            echo "DARWIN_COMPILER = GCC" >> config.mak
-        else
-            echo "DARWIN_COMPILER = LLVMGCC" >> config.mak
-        fi
     ;;
     *linux*)
         echo "HAVE_LINUX = 1" >> config.mak
@@ -109,65 +108,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
-        if test "$CONTRIBS_CC_LLVM"; then
-            SDK_TARGET=10.5
-        else
-            SDK_TARGET=10.4
-        fi
+        SDK_TARGET=10.5
         echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
         echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
-        if test "$CONTRIBS_CC_LLVM"; then
-            echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
-        else
-            echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk" >> config.mak
-        fi
+        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} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
-        EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
-        if test "$CONTRIBS_CC_LLVM"; then
-            CC="gcc"
-            CXX="g++"
-        else
-            CC="/Developer/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2"
-            CXX="/Developer/usr/llvm-gcc-4.2/bin/llvm-g++-4.2"
-        fi
+        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
@@ -179,11 +147,7 @@ case $HOST in
         fi
     ;;
     i686-apple-darwin9)
-        if test "$CONTRIBS_CC_LLVM"; then
-            SDK_TARGET=10.4
-        else
-            SDK_TARGET=10.5
-        fi
+        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
@@ -194,21 +158,12 @@ case $HOST in
             exit 1
         fi
         echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
-        if test "$CONTRIBS_CC_LLVM"; then
-            echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
-        else
-            echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk" >> config.mak
-        fi
-        CFLAGS_TUNING=" -march=pentium-m -mtune=prescott"
+        echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.5.sdk" >> config.mak
+        CFLAGS_TUNING=" -march=prescott -mtune=generic -arch i386"
         EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
-        EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
-        if test "$CONTRIBS_CC_LLVM"; then
-            CC="gcc"
-            CXX="g++"
-        else
-            CC="/Developer/usr/llvm-gcc-4.2/bin/i686-apple-darwin9-llvm-gcc-4.2"
-            CXX="/Developer/usr/llvm-gcc-4.2/bin/i686-apple-darwin9-llvm-g++-4.2"
-        fi
+        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
@@ -227,7 +182,11 @@ case $HOST in
         HAVE_DARWIN_10=1
         echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
         echo "MACOSX_SDK = /Developer/SDKs/MacOSX${SDK_TARGET}.sdk" >> config.mak
-        CFLAGS_TUNING=" -march=core2"
+        if test $ARCH = "x86_64"; then
+            CFLAGS_TUNING=" -march=core2 -mtune=core2"
+        else
+            CFLAGS_TUNING=" -march=prescott -mtune=core2"
+        fi
         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
@@ -265,6 +224,11 @@ case $HOST in
         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
@@ -298,6 +262,15 @@ case $HOST in
             cat src/Distributions/unix.mak >> distro.mak
         fi
     ;;
+    *86_64*linux*)
+        EXTRA_CFLAGS=" -fPIC"
+        EXTRA_CPPFLAGS=" -fPIC"
+        EXTRA_LDFLAGS=" -L/usr/lib64"
+        echo "LIBRARY_PATH = /usr/lib64" >> config.mak
+        echo "PKG_CONFIG_PATH = /usr/lib64/pkgconfig" >> config.mak
+        echo "PKG_CONFIG_LIBDIR = /usr/lib64/pkgconfig" >> config.mak
+        cat src/Distributions/unix.mak >> distro.mak
+    ;;
     *)
         if test "$HOST" = "$BUILD"; then
             if test -d "/usr/lib/pkgconfig"; then
@@ -311,6 +284,8 @@ case $HOST in
             # Try to match distribution
             if test -f /etc/fedora-release; then
                 cat src/Distributions/fedora.mak >> distro.mak
+            elif test -f /etc/maemo_version; then
+                cat src/Distributions/maemo.mak >> distro.mak
             else
                 # Default Unix-like systems
                 cat src/Distributions/unix.mak >> distro.mak
@@ -363,31 +338,24 @@ else
 fi
 
 if test -z "$CONTRIBS_RELEASE"; then
+    echo "EXTRA_CFLAGS += -DNDEBUG" >> config.mak
     set +x
     echo
     echo "*****************************************************************"
-    echo "* If you are building contribs for a release build of VLC       *"
-    echo "* Please run CONTRIBS_RELEASE=sexy ./bootstrap                  *"
-    echo "*                                                               *"
-    echo "* Ignore this message if you don't compile the 3rd party        *"
-    echo "* libraries your own aka by just running 'make' next.           *"
+    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 "*****************************************************************"
-else
-    echo "EXTRA_CFLAGS += -DNDEBUG" >> config.mak
 fi
 
 if test $HAVE_DARWIN_9; then
-if test -z "$CONTRIBS_CC_LLVM"; then
     set +x
     echo
     echo "*****************************************************************"
-    echo "* We are using the llvm-gcc-4.2 compiler by default on OS X,    *"
-    echo "* so no build will run on earlier version than Mac OS X 10.5.   *"
-    echo "*                                                               *"
-    echo "* Please run CONTRIBS_CC_LLVM=no ./bootstrap to disable this.   *"
+    echo "* We are using both the llvm-gcc-4.2 and the gcc-4.2 compilers  *"
+    echo "* on OS X, so compilation will fail if these are not installed. *"
     echo "*****************************************************************"
 fi
-fi
 
 if test $HAVE_DARWIN_10; then
     set +x
@@ -395,6 +363,9 @@ if test $HAVE_DARWIN_10; then
     echo "*****************************************************************"
     echo "* You are running Darwin 10.                                    *"
     echo "* For testing purposes, VLC will be compiled in 64bit mode.     *"
+    echo "* While doing so, for the 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 GCC 4.2.                         *"
     echo "*****************************************************************"
     set -x
 fi