diff options
author | Sergey A. Osokin <osa@FreeBSD.org> | 2004-03-28 19:03:27 +0000 |
---|---|---|
committer | Sergey A. Osokin <osa@FreeBSD.org> | 2004-03-28 19:03:27 +0000 |
commit | 8c61ccc7c3552b2584b55bcba61e149e80472d3f (patch) | |
tree | bc7a544bd79903d176b5ba8b525846eb6fb9b141 /databases/fastdb/files | |
parent | 91e67482b4ec156962d382c4b14910a3380825ac (diff) |
Notes
Diffstat (limited to 'databases/fastdb/files')
-rw-r--r-- | databases/fastdb/files/patch-makefile | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/databases/fastdb/files/patch-makefile b/databases/fastdb/files/patch-makefile index 883beb0ff587..023c25e6a192 100644 --- a/databases/fastdb/files/patch-makefile +++ b/databases/fastdb/files/patch-makefile @@ -1,6 +1,6 @@ ---- makefile.orig Thu Dec 4 13:21:49 2003 -+++ makefile Thu Dec 4 13:26:32 2003 -@@ -32,8 +32,8 @@ +--- makefile.orig Sun Mar 28 22:41:06 2004 ++++ makefile Sun Mar 28 22:45:57 2004 +@@ -33,11 +33,11 @@ SUFF= else ifneq (,$(findstring FreeBSD,$(OSTYPE))) @@ -9,34 +9,42 @@ +TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS} +THRLIBS=${PTHREAD_LIBS} else - TFLAGS=-D_REENTRANT -D_THREAD_SAFE - THRLIBS=-lpthread -@@ -65,7 +65,7 @@ +-TFLAGS=-D_REENTRANT -D_THREAD_SAFE +-THRLIBS=-lpthread ++TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS} ++THRLIBS=${PTHREAD_LIBS} + endif + SUFF=_r + endif +@@ -66,21 +66,21 @@ WEB_EXAMPLES = cgistub bugdb clidb -CC = g++ +CC = ${CXX} - # Possible FastDB compile time parameters (-Dxxx should be added to DEFS macro): - # 1. USE_LOCALE_SETTINGS - use C locale for string comparison operations -@@ -107,13 +107,12 @@ - DEFS = -DUSE_QUEUE_MANAGER -DUSE_LOCALE_SETTINGS + # DEFS macro is deprecatred, edit config.h file instead + DEFS = #CFLAGS = $(TFLAGS) -c -Wall -O5 -g -fPIC $(DEFS) -CFLAGS = -c -Wall -O0 -g -fPIC $(DEFS) $(TFLAGS) +CFLAGS = -c ${CXXFLAGS} $(DEFS) $(TFLAGS) -fPIC #CFLAGS = -c -Wall -O0 -fPIC -DFASTDB_DEBUG=DEBUG_TRACE -g $(DEFS) $(TFLAGS) - SHFLAGS=-shared -Wl,-soname,$@ -- +-#SHFLAGS=-shared -Wl,-soname,$@ +-SHFLAGS=-shared ++SHFLAGS=-shared -Wl,-soname,$@ ++#SHFLAGS=-shared + + LD = $(CC) -LDFLAGS = -g $(TFLAGS) +LDFLAGS = $(TFLAGS) AR = ar ARFLAGS = -cru -@@ -354,13 +354,12 @@ +@@ -320,14 +320,13 @@ + install: subsql installlib mkdir -p $(BINSPATH) - cp subsql $(BINSPATH) |