diff options
| author | Nishant Limbachia <nishant@mnspace.net> | 2014-09-07 08:03:39 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-09-07 08:03:39 +0700 |
| commit | 95830fd236cf42d4003f103b01bd8ab9d1022639 (patch) | |
| tree | 3b311f6c3efd739742db8adbb8f700561c56c92a /libraries | |
| parent | 4202b4faa6c62ba68cd42c13b75765d3a61e96f8 (diff) | |
libraries/libmemcached: Script update.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/libmemcached/libmemcached.SlackBuild | 15 | ||||
| -rw-r--r-- | libraries/libmemcached/patches/libmemcached-fix-linking-with-libpthread.patch | 19 |
2 files changed, 33 insertions, 1 deletions
diff --git a/libraries/libmemcached/libmemcached.SlackBuild b/libraries/libmemcached/libmemcached.SlackBuild index dac8bd17bd31..3cc3e35ca172 100644 --- a/libraries/libmemcached/libmemcached.SlackBuild +++ b/libraries/libmemcached/libmemcached.SlackBuild @@ -25,9 +25,13 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# patched to include suggestions from Larry Hajali --- 9/3/2014 +# pthread linking patch and added following configure switches +# --enable-libmemcachedprotocol --enable-memaslap --enable-dtrace + PRGNAM="libmemcached" VERSION=${VERSION:-1.0.18} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,6 +75,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Have configure find mysqld +export PATH="/usr/libexec:$PATH" + +# Fix bug: https://bugzilla.redhat.com/show_bug.cgi?id=1037707 +patch -p1 < $CWD/patches/libmemcached-fix-linking-with-libpthread.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -82,6 +92,9 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info \ --disable-static \ + --enable-libmemcachedprotocol \ + --enable-memaslap \ + --enable-dtrace \ --build=$ARCH-slackware-linux make V=1 diff --git a/libraries/libmemcached/patches/libmemcached-fix-linking-with-libpthread.patch b/libraries/libmemcached/patches/libmemcached-fix-linking-with-libpthread.patch new file mode 100644 index 000000000000..e5e21c433587 --- /dev/null +++ b/libraries/libmemcached/patches/libmemcached-fix-linking-with-libpthread.patch @@ -0,0 +1,19 @@ +diff -up libmemcached-1.0.16/build-aux/ltmain.sh.orig libmemcached-1.0.16/build-aux/ltmain.sh +--- libmemcached-1.0.16/build-aux/ltmain.sh.orig 2013-12-03 16:36:53.222107642 +0100 ++++ libmemcached-1.0.16/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100 +@@ -5664,6 +5664,15 @@ func_mode_link () + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac ++ # As we are forced to pass -nostdlib to g++ during linking, the option ++ # -pthread{,s} is not in effect; add the -lpthread to $deplist ++ # explicitly to link correctly. ++ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then ++ case "$arg" in ++ -pthread*) func_append deplibs " -lpthread" ;; ++ esac ++ fi ++ + continue + ;; + |