Ticket #40888: patch-xcode5.diff

File patch-xcode5.diff, 1.7 KB (added by t21@…, 11 years ago)

Patch to remove need for xcode-select --install on Mavericks/Xcode5

  • Makefile

    old new  
    4848        -rm -f tuntap_$(TUNTAP_VERSION)_src.tar.gz
    4949
    5050tap.kext:
    51         cd src/tap && make TUNTAP_VERSION=$(TUNTAP_VERSION) -f Makefile all
     51        cd src/tap && make SDK_ROOT=`xcrun --show-sdk-path` TUNTAP_VERSION=$(TUNTAP_VERSION) -f Makefile all
    5252
    5353tun.kext:
    54         cd src/tun && make TUNTAP_VERSION=$(TUNTAP_VERSION) -f Makefile all
     54        cd src/tun && make SDK_ROOT=`xcrun --show-sdk-path` TUNTAP_VERSION=$(TUNTAP_VERSION) -f Makefile all
    5555
    5656test:
    5757        # configd messes with interface flags, issuing SIOCSIFFLAGS ioctls upon receiving kernel

  • src/tun/Makefile

    old new  
    2020BUNDLE_PACKAGETYPE = KEXT
    2121BUNDLE_VERSION = $(TUN_KEXT_VERSION)
    2222
    23 INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
     23SDK_ROOT =
     24
     25INCLUDE = -I.. -I$(SDK_ROOT)/System/Library/Frameworks/Kernel.framework/Headers
    2426CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
    2527        -fno-builtin -fno-stack-protector -arch x86_64 \
    2628        -DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \

  • src/tap/Makefile

    old new  
    1919BUNDLE_PACKAGETYPE = KEXT
    2020BUNDLE_VERSION = $(TAP_KEXT_VERSION)
    2121
    22 INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
     22SDK_ROOT =
     23
     24INCLUDE = -I.. -I$(SDK_ROOT)/System/Library/Frameworks/Kernel.framework/Headers
    2325CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
    2426        -fno-builtin -fno-stack-protector -arch x86_64 \
    2527        -DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \