Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f1dcfb8f
Commit
f1dcfb8f
authored
Sep 04, 2008
by
Bradley C. Kuszmaul
Committed by
Yoni Fogel
Apr 16, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add -lz. Addresses #1131.
git-svn-id:
file:///svn/tokudb.1131@5954
c7de825b-a66e-492c-adef-691d508d4ae1
parent
91767073
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
9 deletions
+11
-9
db-benchmark-test-cxx/Makefile
db-benchmark-test-cxx/Makefile
+1
-1
db-benchmark-test/Makefile
db-benchmark-test/Makefile
+2
-1
src/lock_tree/tests/Makefile
src/lock_tree/tests/Makefile
+5
-4
src/tests/Makefile
src/tests/Makefile
+2
-2
utils/Makefile
utils/Makefile
+1
-1
No files found.
db-benchmark-test-cxx/Makefile
View file @
f1dcfb8f
...
@@ -47,7 +47,7 @@ clean:
...
@@ -47,7 +47,7 @@ clean:
db-benchmark-test-tokudb
:
../lib/libtokudb_cxx.a
db-benchmark-test-tokudb
:
../lib/libtokudb_cxx.a
db-benchmark-test-tokudb
:
db-benchmark-test.cpp
db-benchmark-test-tokudb
:
db-benchmark-test.cpp
$(CXX)
$(CXXFLAGS)
-I
../include
-L
../lib
-Wl
,-rpath,
$(PWD)
/../lib
$<
-o
$@
-ltokudb
-ltokudb_cxx
-DDIRSUF
=
tokudb
$(CXX)
$(CXXFLAGS)
-I
../include
-L
../lib
-Wl
,-rpath,
$(PWD)
/../lib
$<
-o
$@
-ltokudb
-ltokudb_cxx
-
lz
-
DDIRSUF
=
tokudb
db-benchmark-test-bdb
:
db-benchmark-test.cpp
db-benchmark-test-bdb
:
db-benchmark-test.cpp
$(CXX)
$(CXXFLAGS)
$(BDB_CPPFLAGS)
$(BDB_LDFLAGS)
$<
-o
$@
-DDIRSUF
=
bdb
$(CXX)
$(CXXFLAGS)
$(BDB_CPPFLAGS)
$(BDB_LDFLAGS)
$<
-o
$@
-DDIRSUF
=
bdb
db-benchmark-test/Makefile
View file @
f1dcfb8f
...
@@ -20,6 +20,7 @@ OPTFLAGS = -O2
...
@@ -20,6 +20,7 @@ OPTFLAGS = -O2
CFLAGS
=
-Wall
-Werror
-g
$(OPTFLAGS)
$(GCOV_FLAGS)
$(PROF_FLAGS)
CFLAGS
=
-Wall
-Werror
-g
$(OPTFLAGS)
$(GCOV_FLAGS)
$(PROF_FLAGS)
# CFLAGS += -pg
# CFLAGS += -pg
LDFLAGS
+=
-lpthread
ifdef
BDBDIR
ifdef
BDBDIR
BDB_CPPFLAGS
=
-I
$(BDBDIR)
/include
BDB_CPPFLAGS
=
-I
$(BDBDIR)
/include
BDB_LDFLAGS
=
-L
$(BDBDIR)
/lib
-ldb
-lpthread
-Wl
,-rpath,
$(BDBDIR)
/lib
BDB_LDFLAGS
=
-L
$(BDBDIR)
/lib
-ldb
-lpthread
-Wl
,-rpath,
$(BDBDIR)
/lib
...
@@ -28,7 +29,7 @@ BDB_CPPFLAGS =
...
@@ -28,7 +29,7 @@ BDB_CPPFLAGS =
BDB_LDFLAGS
=
-ldb
BDB_LDFLAGS
=
-ldb
endif
endif
TDB_CPPFLAGS
=
-I
../include
TDB_CPPFLAGS
=
-I
../include
TDB_LDFLAGS
=
-L
../lib
-ltokudb
-Wl
,-rpath,
$(PWD)
/../lib
TDB_LDFLAGS
=
-L
../lib
-ltokudb
-
lz
-
Wl
,-rpath,
$(PWD)
/../lib
TARGET_BDB
=
db-benchmark-test-bdb
TARGET_BDB
=
db-benchmark-test-bdb
TARGET_TDB
=
db-benchmark-test-tokudb
TARGET_TDB
=
db-benchmark-test-tokudb
...
...
src/lock_tree/tests/Makefile
View file @
f1dcfb8f
...
@@ -21,6 +21,7 @@ CFLAGS += -Wbad-function-cast -Wcast-align -Waggregate-return
...
@@ -21,6 +21,7 @@ CFLAGS += -Wbad-function-cast -Wcast-align -Waggregate-return
CFLAGS
+=
-Wmissing-noreturn
-Wmissing-format-attribute
CFLAGS
+=
-Wmissing-noreturn
-Wmissing-format-attribute
CPPFLAGS
+=
-L
../
-L
../../range_tree
CPPFLAGS
+=
-L
../
-L
../../range_tree
CPPFLAGS
+=
-I
.
-I
../
-I
../../range_tree
-I
../../../newbrt
-I
../../../include
CPPFLAGS
+=
-I
.
-I
../
-I
../../range_tree
-I
../../../newbrt
-I
../../../include
LDFLAGS
+=
-lz
SRCS
=
$(
wildcard
*
.c
)
SRCS
=
$(
wildcard
*
.c
)
...
@@ -118,13 +119,13 @@ foo:
...
@@ -118,13 +119,13 @@ foo:
echo
../locktree.h test.h
$(LT_LINEAR)
echo
../locktree.h test.h
$(LT_LINEAR)
%.lin
:
%.c ../locktree.h test.h $(LT_LINEAR)
%.lin
:
%.c ../locktree.h test.h $(LT_LINEAR)
$(CC)
-DDIR
=
\"
dir.
$<
.lin
\"
$(CPPFLAGS)
$(CFLAGS)
$<
-o
$@
$(LT_LINEAR)
$(NEWBRT_BINS)
$(CC)
-DDIR
=
\"
dir.
$<
.lin
\"
$(CPPFLAGS)
$(CFLAGS)
$<
-o
$@
$(LT_LINEAR)
$(NEWBRT_BINS)
$(LDFLAGS)
%.tlin
:
%.c ../locktree.h test.h $(LT_TLINEAR)
%.tlin
:
%.c ../locktree.h test.h $(LT_TLINEAR)
$(CC)
-DDIR
=
\"
dir.
$<
.tlin
\"
$(CPPFLAGS)
$(CFLAGS)
$<
-o
$@
$(LT_TLINEAR)
$(NEWBRT_BINS)
-DTOKU_RT_NOOVERLAPS
$(CC)
-DDIR
=
\"
dir.
$<
.tlin
\"
$(CPPFLAGS)
$(CFLAGS)
$<
-o
$@
$(LT_TLINEAR)
$(NEWBRT_BINS)
-DTOKU_RT_NOOVERLAPS
$(LDFLAGS)
%.tlog
:
%.c ../locktree.h test.h $(LT_TLOG)
%.tlog
:
%.c ../locktree.h test.h $(LT_TLOG)
$(CC)
-DDIR
=
\"
dir.
$<
.tlog
\"
$(CPPFLAGS)
$(CFLAGS)
$<
-o
$@
$(LT_TLOG)
$(NEWBRT_BINS)
-DTOKU_RT_NOOVERLAPS
$(CC)
-DDIR
=
\"
dir.
$<
.tlog
\"
$(CPPFLAGS)
$(CFLAGS)
$<
-o
$@
$(LT_TLOG)
$(NEWBRT_BINS)
-DTOKU_RT_NOOVERLAPS
$(LDFLAGS)
%.log
:
%.c ../locktree.h test.h $(LT_LOG)
%.log
:
%.c ../locktree.h test.h $(LT_LOG)
$(CC)
-DDIR
=
\"
dir.
$<
.log
\"
$(CPPFLAGS)
$(CFLAGS)
$<
-o
$@
$(LT_LOG)
$(NEWBRT_BINS)
$(CC)
-DDIR
=
\"
dir.
$<
.log
\"
$(CPPFLAGS)
$(CFLAGS)
$<
-o
$@
$(LT_LOG)
$(NEWBRT_BINS)
$(LDFLAGS)
clean
:
clean
:
rm
-f
$(ALL_TESTS)
*
.o
*
.gcno
*
.gcda
*
.gcov
rm
-f
$(ALL_TESTS)
*
.o
*
.gcno
*
.gcda
*
.gcov
...
...
src/tests/Makefile
View file @
f1dcfb8f
...
@@ -32,8 +32,8 @@ endif
...
@@ -32,8 +32,8 @@ endif
BDB_LDFLAGS
+=
-Wl
,-rpath,
$(BDBDIR)
/lib
BDB_LDFLAGS
+=
-Wl
,-rpath,
$(BDBDIR)
/lib
endif
endif
BDB_LDFLAGS
+=
-lpthread
BDB_LDFLAGS
+=
-lpthread
TDB_LOADLIBES
=
-L
..
-ltokudb
-Wl
,-rpath,..
-lpthread
TDB_LOADLIBES
=
-L
..
-ltokudb
-Wl
,-rpath,..
-lpthread
-lz
TDB_TRACELOADLIBES
=
-L
..
-ltokudbtrace
-Wl
,-rpath,..
-lpthread
TDB_TRACELOADLIBES
=
-L
..
-ltokudbtrace
-Wl
,-rpath,..
-lpthread
-lz
ifeq
($(VGRIND),)
ifeq
($(VGRIND),)
BDB_SUPPRESSIONS
=
BDB_SUPPRESSIONS
=
...
...
utils/Makefile
View file @
f1dcfb8f
...
@@ -26,7 +26,7 @@ else
...
@@ -26,7 +26,7 @@ else
SETTOKUENV
=
SETTOKUENV
=
UNSETTOKUENV
=
UNSETTOKUENV
=
endif
endif
LDFLAGS
=
-L
../lib
-ltokudb
-lpthread
$(TDB_LOADLIBES)
LDFLAGS
=
-L
../lib
-ltokudb
-lpthread
$(TDB_LOADLIBES)
-lz
# vars to compile bins that handle tokudb using libtokudb.a
# vars to compile bins that handle tokudb using libtokudb.a
STATIC_CPPFLAGS
=
-I
../include
STATIC_CPPFLAGS
=
-I
../include
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment