win32/nsis: fix section descriptions

[vlc] / extras / contrib / bootstrap

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 87cf4d1509b2aa069cdeae282dcea06ea1c5135e..6b78f9c1ddb9522d7c6a1d1fae1b13ea398eb070 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -72,22 +72,19 @@ 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*)
-          echo "ARCH=x86_64" >> config.mak
           ARCH="x86_64"
      ;;
     *86*)
-          echo "ARCH=i386" >> config.mak
           ARCH="i386"
      ;;
 esac
+echo "ARCH = $ARCH" >> config.mak
 
 # Check the HAVE_{OS}
 case $HOST in
@@ -136,10 +133,10 @@ case $HOST in
         HAVE_DARWIN_9=1
         CFLAGS_TUNING=" -arch ppc -mtune=G4"
         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}"
+        EXTRA_LDFLAGS=" -arch ppc -isysroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET} -Wl,-syslibroot,\${MACOSX_SDK}"
+        CC="/Developer/usr/bin/gcc-4.2"
+        CXX="/Developer/usr/bin/g++-4.2"
+        LD="ld -arch ppc -syslibroot \${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
         echo "PATH = /bin:/usr/bin:/usr/local/bin:" >> config.mak
         cat src/Distributions/darwin.mak >> distro.mak
         if test -e /Developer/SDKs; then
@@ -164,9 +161,9 @@ case $HOST in
         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=" -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"
+        EXTRA_LDFLAGS=" -arch i386 -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
+        CC="/Developer/usr/bin/gcc-4.2"
+        CXX="/Developer/usr/bin/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
@@ -191,7 +188,7 @@ case $HOST in
             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}"
+        EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK} -mmacosx-version-min=\${SDK_TARGET}"
         echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         CC="gcc"
         CXX="g++"
@@ -355,8 +352,8 @@ if test $HAVE_DARWIN_9; then
     set +x
     echo
     echo "*****************************************************************"
-    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 "* We are using GCC-4.2 on OS X, so compilation WILL FAIL if it  *"
+    echo "* is NOT installed. *"
     echo "*****************************************************************"
 fi
 
@@ -365,10 +362,8 @@ if test $HAVE_DARWIN_10; then
     echo
     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 "* For testing purposes, VLC will be compiled in 64bit mode      *"
+    echo "* using the 10.5 SDK for backward-compatibility.                *"
     echo "*****************************************************************"
     set -x
 fi