- workaround for broken lib suffix guesswork

diff --git a/libcassandra-ac.patch b/libcassandra-ac.patch
index 102c29912f9e5ee7ba34e2d483c430cd5d5f8617..10cbb4f72d07f1fc088c7d6e64e27b1ead9749cd 100644 (file)
--- 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 e8826ae08b175c2bcd8b08e87fc46068ce2135b4..202bc7689d403722ff73e47d8a75b7e1bdadc343 100644 (file)
--- 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