Blob Blame History Raw
commit 69202bb7186c3b2c8a56f2cfae638850be584813
Author: Tom Hughes <tom@compton.nu>
Date:   Mon Nov 23 00:12:59 2015 +0000

    Patch out attempts to clone various dependencies

diff --git a/Makefile b/Makefile
index 5989923..92743aa 100755
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,10 @@
 MAPNIK_PLUGINDIR := $(shell mapnik-config --input-plugins)
 BUILDTYPE ?= Release
 
-CLIPPER_REVISION=ac8d6bf2517f46c05647b5c19cac113fb180ffb4
-PROTOZERO_REVISION=v1.4.2
-GYP_REVISION=3464008
-
 all: libvtile
 
-./deps/gyp:
-	git clone https://chromium.googlesource.com/external/gyp.git ./deps/gyp && cd ./deps/gyp && git checkout $(GYP_REVISION)
-
-./deps/protozero:
-	git clone https://github.com/mapbox/protozero.git ./deps/protozero && cd ./deps/protozero && git checkout $(PROTOZERO_REVISION)
-
-./deps/clipper:
-	git clone https://github.com/mapnik/clipper.git -b r496-mapnik ./deps/clipper && cd ./deps/clipper && git checkout $(CLIPPER_REVISION) && ./cpp/fix_members.sh
-
-build/Makefile: ./deps/gyp ./deps/clipper ./deps/protozero gyp/build.gyp test/*
-	deps/gyp/gyp gyp/build.gyp --depth=. -DMAPNIK_PLUGINDIR=\"$(MAPNIK_PLUGINDIR)\" -Goutput_dir=. --generator-output=./build -f make
+build/Makefile: gyp/build.gyp test/*
+	gyp gyp/build.gyp --depth=. -DMAPNIK_PLUGINDIR=\"$(MAPNIK_PLUGINDIR)\" -Goutput_dir=. --generator-output=./build -f make
 
 libvtile: build/Makefile Makefile
 	@$(MAKE) -C build/ BUILDTYPE=$(BUILDTYPE) V=$(V)
diff --git a/gyp/build.gyp b/gyp/build.gyp
index 98db069..dcbb93b 100644
--- a/gyp/build.gyp
+++ b/gyp/build.gyp
@@ -42,7 +42,7 @@
       ],
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)/',
-        '../deps/protozero/include'
+        '/usr/include/protozero'
       ],
       'cflags_cc' : [
           '-D_THREAD_SAFE',
@@ -61,7 +61,7 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)/',
-          '../deps/protozero/include'
+          '/usr/include/protozero'
         ],
         'libraries':[
           '-lprotobuf-lite'
@@ -92,7 +92,7 @@
           '<!@(mapnik-config --cflags)'
       ],
       'include_dirs': [
-        '../deps/protozero/include',
+        '/usr/include/protozero',
         '../deps/clipper/cpp'
       ],
       'xcode_settings': {
@@ -103,7 +103,7 @@
       'direct_dependent_settings': {
         'include_dirs': [
           '<(SHARED_INTERMEDIATE_DIR)/',
-          '../deps/protozero/include',
+          '/usr/include/protozero',
           '../deps/clipper/cpp'
         ],
         'defines' : [
@@ -141,7 +141,7 @@
       ],
       "include_dirs": [
         "../src",
-        '../deps/protozero/include',
+        '/usr/include/protozero',
         '../test',
         '../test/utils'
       ]
@@ -159,7 +159,7 @@
       ],
       "include_dirs": [
         "../src",
-        '../deps/protozero/include'
+        '/usr/include/protozero'
       ]
     },
     {
@@ -175,7 +175,7 @@
       ],
       "include_dirs": [
         "../src",
-        '../deps/protozero/include'
+        '/usr/include/protozero'
       ]
     },
     {