From ea9d7d049b51cba8868c6257d2f022a18f562255 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 27 Feb 2016 19:07:19 +0100 Subject: [PATCH] - workaround for broken lib suffix guesswork --- libcassandra-ac.patch | 13 +++++++++++++ libcassandra.spec | 1 + 2 files changed, 14 insertions(+) diff --git a/libcassandra-ac.patch b/libcassandra-ac.patch index 102c299..10cbb4f 100644 --- a/libcassandra-ac.patch +++ b/libcassandra-ac.patch @@ -30,3 +30,16 @@ cassandra_constants.cpp \ Cassandra.cpp \ cassandra_types.cpp +--- matkor-libcassandra-98ab52b/m4/lib-prefix.m4~ 2011-06-01 13:08:55.000000000 +0200 ++++ matkor-libcassandra-98ab52b/m4/lib-prefix.m4 2016-02-27 18:40:19.531804165 +0100 +@@ -174,7 +174,9 @@ + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) +- acl_libdirstem=lib ++ if test -z "$acl_libdirstem" ; then ++ acl_libdirstem=lib ++ fi + acl_libdirstem2= + case "$host_os" in + solaris*) diff --git a/libcassandra.spec b/libcassandra.spec index e8826ae..202bc76 100644 --- a/libcassandra.spec +++ b/libcassandra.spec @@ -58,6 +58,7 @@ Pliki nagłówkowe biblioteki libcassandra. %{__autoheader} %{__automake} %configure \ + acl_libdirstem=%{_lib} \ CXXFLAGS="%{rpmcxxflags} -Wno-variadic-macros -Wno-deprecated" %{__make} V=1 -- 2.44.0