1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36
|
Author: Michael R. Crusoe <crusoe@debian.org>
Description: Since the Debian package of vowpal_wabbit is broken and not in testing/stable; make the local copy use the Debian package of rapidjson
Forwarded: not-needed
--- vg.orig/deps/vowpal_wabbit/library/Makefile.am
+++ vg/deps/vowpal_wabbit/library/Makefile.am
@@ -18,7 +18,7 @@
AM_CXXFLAGS = ${BOOST_CPPFLAGS} ${ZLIB_CPPFLAGS} ${PTHREAD_CFLAGS}
-AM_CXXFLAGS += -I ../rapidjson/include
+AM_CXXFLAGS += -I /usr/include/rapidjson/
AM_LDFLAGS = ${BOOST_LDFLAGS} ${BOOST_PROGRAM_OPTIONS_LIB} ${ZLIB_LDFLAGS} ${PTHREAD_LIBS}
--- vg.orig/deps/vowpal_wabbit/python/Makefile
+++ vg/deps/vowpal_wabbit/python/Makefile
@@ -25,7 +25,7 @@
PYTHON_INCLUDE = $(shell python$(PYTHON_VERSION)-config --includes)
PYTHON_LDFLAGS = $(shell python$(PYTHON_VERSION)-config --ldflags)
-JSON_INCLUDE = -I ../rapidjson/include
+JSON_INCLUDE = -I /usr/include/rapidjson
ifeq (,$(wildcard ../vowpalwabbit/vw.so))
VWLIBS = ../vowpalwabbit/libvw.a ../vowpalwabbit/liballreduce.a
--- vg.orig/deps/vowpal_wabbit/vowpalwabbit/Makefile.am
+++ vg/deps/vowpal_wabbit/vowpalwabbit/Makefile.am
@@ -48,7 +48,7 @@
AM_CXXFLAGS += -stdlib=libc++
endif
-AM_CXXFLAGS += -I ../rapidjson/include
+AM_CXXFLAGS += -I /usr/include/rapidjson
AM_CXXFLAGS += $(CXXOPTIMIZE)
|