git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/libcaca-osx-sdkofourchoice.patch

   1 --- libcaca/configure.orig      2010-02-08 14:46:58.000000000 +0100
   2 +++ libcaca/configure   2010-08-09 17:46:59.000000000 +0200
   3 @@ -16785,33 +16785,9 @@
   4  done
   5
   6    if test "${ac_cv_my_have_cocoa}" = "yes"; then
   7 -    case x${target} in
   8 -    xpowerpc*darwin*)
   9 -      # 10.3 needed to link with X11
  10 -      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.3.9.sdk}"
  11 -      GCC_VERSION="${GCC_VERSION:-3.3}"
  12 -      ARCH="${ARCH:--arch ppc}"
  13 -      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--nostdinc -isystem ${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include}"
  14 -      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:--nostdinc++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/ppc-darwin -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/backward}"
  15 -      MACOSX_SDK_LDFLAGS="${MACOSX_SDK_LDFLAGS:--L${MACOSX_SDK}/usr/lib/gcc/darwin -L${MACOSX_SDK}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOSX_SDK}/usr/lib}"
  16 -      ;;
  17 -    x*86_64*darwin*)
  18 -      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.5.sdk}"
  19 -      GCC_VERSION="${GCC_VERSION:-4.0}"
  20 -      ARCH="${ARCH:--arch i386}"
  21 -      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
  22 -      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
  23 -      ;;
  24 -    x*86*darwin*)
  25 -      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.6.sdk}"
  26 -      GCC_VERSION="${GCC_VERSION:-4.0}"
  27 -      ARCH="${ARCH:--arch i386}"
  28 -      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
  29 -      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
  30 -      ;;
  31 -    esac
  32 -    CC="${CC:-gcc-${GCC_VERSION}}"
  33 -    CXX="${CXX:-g++-${GCC_VERSION}}"
  34 +    MACOSX_SDK=/Developer/SDKs/MacOSX10.5.sdk
  35 +    MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
  36 +    MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
  37      MACOSX_SDK_FRAMEWORKS="${MACOSX_SDK_FRAMEWORKS:--F${MACOSX_SDK}/System/Library/Frameworks}"
  38      CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
  39      CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"