Ticket #47438: patch-buildsystem.diff.diff

File patch-buildsystem.diff.diff, 2.0 KB (added by gallafent, 10 years ago)

Differences between previous buildsystem patch and revised buildsystem patch

  • files/patch-buildsystem.diff

    old new  
    99 readonly M_PLISTSIGNER_TEST_KEY="`dirname $0`/prefpane/autoinstaller/TestKeys/private_key.der"
    1010 
    1111 # Other constants
     12@@ -105,6 +105,9 @@
     13 declare M_XCODE62=""
     14 declare M_XCODE62_VERSION=6.2
     15 readonly M_XCODE62_COMPILER="com.apple.compilers.llvm.clang.1_0"
     16+declare M_XCODE63=""
     17+declare M_XCODE63_VERSION=6.3
     18+readonly M_XCODE63_COMPILER="com.apple.compilers.llvm.clang.1_0"
     19 
     20 declare M_ACTUAL_PLATFORM=""
     21 declare M_PLATFORMS=""
    1222@@ -104,37 +104,37 @@
    1323 declare M_XCODE_VERSION_REQUIRED=""
    1424 
     
    7181     m_exit_on_error "cannot prepare library build for installation."
    7282 
    7383     for f in "$ms_osxfuse_root"/lib/libosxfuse_i64*.dylib; do
     84@@ -2569,6 +2572,14 @@
     85                     M_XCODE62_VERSION=$m_xcode_version
     86                 fi
     87                 ;;
     88+            6.3*)
     89+                m_version_compare $M_XCODE63_VERSION $m_xcode_version
     90+                if [[ $? != 2 ]]
     91+                then
     92+                    M_XCODE63="$m_xcode_root"
     93+                    M_XCODE63_VERSION=$m_xcode_version
     94+                fi
     95+                ;;
     96             *)
     97                 m_log "skip unsupported Xcode version in '$m_xcode_root'."
     98                 ;;
     99@@ -2786,6 +2797,21 @@
     100         M_SDK_1010_COMPILER="$M_XCODE62_COMPILER"
     101         m_platform_realistic_add "10.10"
     102     fi
     103+    if [[ -n "$M_XCODE63" ]]
     104+    then
     105+        m_xcode_latest="$M_XCODE63"
     106+
     107+        M_SDK_109="$M_XCODE63/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"
     108+        M_SDK_109_XCODE="$M_XCODE63"
     109+        M_SDK_109_COMPILER="$M_XCODE63_COMPILER"
     110+        m_platform_realistic_add "10.9"
     111+        m_platform_add "10.10"
     112+
     113+        M_SDK_1010="$M_XCODE63/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"
     114+        M_SDK_1010_XCODE="$M_XCODE63"
     115+        M_SDK_1010_COMPILER="$M_XCODE63_COMPILER"
     116+        m_platform_realistic_add "10.10"
     117+    fi
     118 
     119     m_read_input "$@"
     120