Add an RPATH to the extionsion shared libs so they can find objects in the priv/ directory at runtime
This commit is contained in:
parent
95a6f52a1d
commit
a75d60bf27
2 changed files with 27 additions and 2 deletions
|
@ -3,6 +3,7 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
WT_BRANCH=basho
|
WT_BRANCH=basho
|
||||||
|
WT_REMOTE_REPO=http://github.com/wiredtiger/wiredtiger.git
|
||||||
|
|
||||||
[ `basename $PWD` != "c_src" ] && cd c_src
|
[ `basename $PWD` != "c_src" ] && cd c_src
|
||||||
|
|
||||||
|
@ -21,8 +22,10 @@ case "$1" in
|
||||||
git fetch && \
|
git fetch && \
|
||||||
git merge origin/$WT_BRANCH)
|
git merge origin/$WT_BRANCH)
|
||||||
else
|
else
|
||||||
git clone http://github.com/wiredtiger/wiredtiger.git -b $WT_BRANCH && \
|
git clone -b $WT_BRANCH --single-branch $WT_REMOTE_REPO && \
|
||||||
(cd wiredtiger && ./autogen.sh)
|
(cd wiredtiger && \
|
||||||
|
patch -p1 < ../wiredtiger-extension-link.patch && \
|
||||||
|
./autogen.sh)
|
||||||
fi
|
fi
|
||||||
(cd wiredtiger/build_posix && \
|
(cd wiredtiger/build_posix && \
|
||||||
../configure --with-pic \
|
../configure --with-pic \
|
||||||
|
|
22
c_src/wiredtiger-extension-link.patch
Normal file
22
c_src/wiredtiger-extension-link.patch
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
diff --git a/ext/compressors/bzip2/Makefile.am b/ext/compressors/bzip2/Makefile.am
|
||||||
|
index 0aedc2e..1cc4cf6 100644
|
||||||
|
--- a/ext/compressors/bzip2/Makefile.am
|
||||||
|
+++ b/ext/compressors/bzip2/Makefile.am
|
||||||
|
@@ -2,5 +2,5 @@ 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_LDFLAGS = -avoid-version -module -Wl,-rpath,lib/wterl/priv:priv:/usr/local/lib
|
||||||
|
libwiredtiger_bzip2_la_LIBADD = -lbz2
|
||||||
|
diff --git a/ext/compressors/snappy/Makefile.am b/ext/compressors/snappy/Makefile.am
|
||||||
|
index 6d78823..7d35777 100644
|
||||||
|
--- a/ext/compressors/snappy/Makefile.am
|
||||||
|
+++ b/ext/compressors/snappy/Makefile.am
|
||||||
|
@@ -2,5 +2,5 @@ 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_LDFLAGS = -avoid-version -module -Wl,-rpath,lib/wterl/priv:priv:/usr/local/lib
|
||||||
|
libwiredtiger_snappy_la_LIBADD = -lsnappy
|
Loading…
Reference in a new issue