Skip to content

Commit

Permalink
tuntap: look for Kernel.framework headers in the SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
jacknagel committed May 11, 2014
1 parent 0db7ba2 commit e3b1872
Showing 1 changed file with 38 additions and 7 deletions.
45 changes: 38 additions & 7 deletions Formula/tuntap.rb
@@ -1,16 +1,17 @@
require 'formula'
require "formula"

class Tuntap < Formula
homepage 'http://tuntaposx.sourceforge.net/'
url 'git://git.code.sf.net/p/tuntaposx/code', :tag => 'release_20111101'
homepage "http://tuntaposx.sourceforge.net/"
url "git://git.code.sf.net/p/tuntaposx/code", :tag => "release_20111101"
head "git://git.code.sf.net/p/tuntaposx/code", :branch => "master"

head 'git://git.code.sf.net/p/tuntaposx/code', :branch => 'master'
# Get Kernel.framework headers from the SDK
patch :DATA

def install
ENV.j1 # to avoid race conditions (can't open: ../tuntap.o)
cd 'tuntap' do
# Makefile doesn't take these from the environment
# "CCP" is in fact the var used for C++, not CXX

cd "tuntap" do
system "make", "CC=#{ENV.cc}", "CCP=#{ENV.cxx}"
kext_prefix.install "tun.kext", "tap.kext"
prefix.install "startup_item/tap", "startup_item/tun"
Expand Down Expand Up @@ -45,3 +46,33 @@ def caveats; <<-EOS.undent
EOS
end
end

__END__
diff --git a/tuntap/src/tap/Makefile b/tuntap/src/tap/Makefile
index d4d1158..1dfe294 100644
--- a/tuntap/src/tap/Makefile
+++ b/tuntap/src/tap/Makefile
@@ -19,7 +19,8 @@ BUNDLE_SIGNATURE = ????
BUNDLE_PACKAGETYPE = KEXT
BUNDLE_VERSION = $(TAP_KEXT_VERSION)

-INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
+SDKROOT = $(shell xcodebuild -version -sdk macosx Path 2>/dev/null)
+INCLUDE = -I.. -I$(SDKROOT)/System/Library/Frameworks/Kernel.framework/Headers
CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
-fno-builtin -fno-stack-protector -arch i386 -arch x86_64 \
-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
diff --git a/tuntap/src/tun/Makefile b/tuntap/src/tun/Makefile
index 9ca6794..c530f10 100644
--- a/tuntap/src/tun/Makefile
+++ b/tuntap/src/tun/Makefile
@@ -20,7 +20,8 @@ BUNDLE_SIGNATURE = ????
BUNDLE_PACKAGETYPE = KEXT
BUNDLE_VERSION = $(TUN_KEXT_VERSION)

-INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
+SDKROOT = $(shell xcodebuild -version -sdk macosx Path 2>/dev/null)
+INCLUDE = -I.. -I$(SDKROOT)/System/Library/Frameworks/Kernel.framework/Headers
CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
-fno-builtin -fno-stack-protector -arch i386 -arch x86_64 \
-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \

0 comments on commit e3b1872

Please sign in to comment.