13a9036764
extensions reference other shared libraries. Previously I tried to turn all those shared libs into static libs, however that didn't pan out so well. So now the libwiredtiger.so library is loaded by wterl.so also, later on during use libwiredtiger.so will load libwiredtiger_snappy.so and libwiredtiger_bzip2.so which now have libsnappy.a and libbz2.a respectively linked statically so as to avoid confusion.
20 lines
1 KiB
Diff
20 lines
1 KiB
Diff
diff --git a/ext/compressors/bzip2/Makefile.am b/ext/compressors/bzip2/Makefile.am
|
|
index 0aedc2e..9cd96e3 100644
|
|
--- a/ext/compressors/bzip2/Makefile.am
|
|
+++ b/ext/compressors/bzip2/Makefile.am
|
|
@@ -3,4 +3,4 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
|
|
lib_LTLIBRARIES = libwiredtiger_bzip2.la
|
|
libwiredtiger_bzip2_la_SOURCES = bzip2_compress.c
|
|
libwiredtiger_bzip2_la_LDFLAGS = -avoid-version -module
|
|
-libwiredtiger_bzip2_la_LIBADD = -lbz2
|
|
+libwiredtiger_bzip2_la_LIBADD = -L$(BASEDIR)/system/lib/libbz2.a
|
|
diff --git a/ext/compressors/snappy/Makefile.am b/ext/compressors/snappy/Makefile.am
|
|
index 6d78823..286dc55 100644
|
|
--- a/ext/compressors/snappy/Makefile.am
|
|
+++ b/ext/compressors/snappy/Makefile.am
|
|
@@ -3,4 +3,4 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
|
|
lib_LTLIBRARIES = libwiredtiger_snappy.la
|
|
libwiredtiger_snappy_la_SOURCES = snappy_compress.c
|
|
libwiredtiger_snappy_la_LDFLAGS = -avoid-version -module
|
|
-libwiredtiger_snappy_la_LIBADD = -lsnappy
|
|
+libwiredtiger_snappy_la_LIBADD = -L$(BASEDIR)/system/lib/libsnappy.a
|