greg/wterl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
wterl/c_src/wiredtiger-build.patch

25 lines
1.3 KiB
Diff
Raw Normal View History

Switching back to static linking to avoid platform issues and have confidence when in deployment of what code is being used.
2013-04-16 15:47:04 +00:00
diff --git a/ext/compressors/bzip2/Makefile.am b/ext/compressors/bzip2/Makefile.am
Simplified the worker look function. Added ability to pick block compressor in config, default is snappy, off is {block_compressor, none}.
2013-04-17 17:19:06 +00:00
index 0aedc2e..a70ae2e 100644
Switching back to static linking to avoid platform issues and have confidence when in deployment of what code is being used.
2013-04-16 15:47:04 +00:00
--- a/ext/compressors/bzip2/Makefile.am
+++ b/ext/compressors/bzip2/Makefile.am
Simplified the worker look function. Added ability to pick block compressor in config, default is snappy, off is {block_compressor, none}.
2013-04-17 17:19:06 +00:00
@@ -2,5 +2,6 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
Continue to iterate on the build system to accomodate shared libs.
2013-04-17 01:46:53 +00:00
Switching back to static linking to avoid platform issues and have confidence when in deployment of what code is being used.
2013-04-16 15:47:04 +00:00
lib_LTLIBRARIES = libwiredtiger_bzip2.la
libwiredtiger_bzip2_la_SOURCES = bzip2_compress.c
Continue to iterate on the build system to accomodate shared libs.
2013-04-17 01:46:53 +00:00
-libwiredtiger_bzip2_la_LDFLAGS = -avoid-version -module
Copy paste error in patch file prevented proper build arguments for bzip2.
2013-04-25 20:36:17 +00:00
+libwiredtiger_bzip2_la_CFLAGS = -I$(src_builddir)/../../system/include
+libwiredtiger_bzip2_la_LDFLAGS = -avoid-version -module -L$(src_builddir)/../../system/lib -Wl,-rpath,lib/wterl-0.9.0/priv:lib/wterl/priv:priv
Simplified the worker look function. Added ability to pick block compressor in config, default is snappy, off is {block_compressor, none}.
2013-04-17 17:19:06 +00:00
libwiredtiger_bzip2_la_LIBADD = -lbz2
Switching back to static linking to avoid platform issues and have confidence when in deployment of what code is being used.
2013-04-16 15:47:04 +00:00
diff --git a/ext/compressors/snappy/Makefile.am b/ext/compressors/snappy/Makefile.am
Simplified the worker look function. Added ability to pick block compressor in config, default is snappy, off is {block_compressor, none}.
2013-04-17 17:19:06 +00:00
index 6d78823..2122cf8 100644
Switching back to static linking to avoid platform issues and have confidence when in deployment of what code is being used.
2013-04-16 15:47:04 +00:00
--- a/ext/compressors/snappy/Makefile.am
+++ b/ext/compressors/snappy/Makefile.am
Simplified the worker look function. Added ability to pick block compressor in config, default is snappy, off is {block_compressor, none}.
2013-04-17 17:19:06 +00:00
@@ -2,5 +2,6 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
Continue to iterate on the build system to accomodate shared libs.
2013-04-17 01:46:53 +00:00
Switching back to static linking to avoid platform issues and have confidence when in deployment of what code is being used.
2013-04-16 15:47:04 +00:00
lib_LTLIBRARIES = libwiredtiger_snappy.la
libwiredtiger_snappy_la_SOURCES = snappy_compress.c
Continue to iterate on the build system to accomodate shared libs.
2013-04-17 01:46:53 +00:00
-libwiredtiger_snappy_la_LDFLAGS = -avoid-version -module
Simplified the worker look function. Added ability to pick block compressor in config, default is snappy, off is {block_compressor, none}.
2013-04-17 17:19:06 +00:00
+libwiredtiger_snappy_la_CFLAGS = -I$(src_builddir)/../../system/include
+libwiredtiger_snappy_la_LDFLAGS = -avoid-version -module -L$(src_builddir)/../../system/lib -Wl,-rpath,lib/wterl-0.9.0/priv:lib/wterl/priv:priv
libwiredtiger_snappy_la_LIBADD = -lsnappy
Reference in a new issue Copy permalink