pkgsrc/databases/cstore/patches/patch-aa
wiz 401deb1bad Add a some missing header files and fix a cast.
Adapt for db4 update post 4.5.
Now dies with segfault during build:
terminate called after throwing an instance of 'std::out_of_range'
  what():  basic_string::substr
[1]   Abort trap (core dumped) ./cstoreqptest 0...
2011-12-20 13:42:47 +00:00

33 lines
1.2 KiB
Text

$NetBSD: patch-aa,v 1.2 2011/12/20 13:42:47 wiz Exp $
--- Build/makefile.init 2007/10/01 11:20:34 1.1
+++ Build/makefile.init 2007/10/01 11:24:09
@@ -1,10 +1,11 @@
CC:=$(WTF) g++
CSTORE_INCLUDE := src
-SLEEPYCAT_DIRECTORY := /usr/local/BerkeleyDB.4.2
-SLEEPYCAT_INCLUDE := $(SLEEPYCAT_DIRECTORY)/include/
+SLEEPYCAT_DIRECTORY := @PREFIX@
+SLEEPYCAT_INCLUDE := $(SLEEPYCAT_DIRECTORY)/include/db4
SLEEPYCAT_LIB := $(SLEEPYCAT_DIRECTORY)/lib
-LZO_LIB := /home/dna/huff/lzo-1.08/src/.libs
+LZO_INCLUDE := @PREFIX@/include/lzo
+LZO_LIB := @PREFIX@/lib
CFLAGS := -O0 -g3 -Wall -c -Wno-deprecated -fmessage-length=0
#override CFLAGS with optimization flags if so desired
@@ -17,10 +18,10 @@
endif
RULEFLAGS := -MM -MG -P -w
-IFLAGS := -I$(SLEEPYCAT_INCLUDE) -I$(CSTORE_INCLUDE)
-LFLAGS := -L$(SLEEPYCAT_LIB) -L$(LZO_LIB)
+IFLAGS := -I$(SLEEPYCAT_INCLUDE) -I$(CSTORE_INCLUDE) -I$(LZO_INCLUDE)
+LFLAGS := -L$(SLEEPYCAT_LIB) -L$(LZO_LIB) -Wl,-R$(SLEEPYCAT_LIB) -Wl,-R$(LZO_LIB)
OPTS := -Wl,--demangle
-LIBS := -ldb-4.2 -ldb_cxx-4.2 -lpthread -llzo
+LIBS := -ldb4 -ldb4_cxx -lpthread -llzo2
#override OPTS with gprof flags
ifdef __CSTORE_GPROF__
OPTS := -pg -Wl,--demangle