denisarnaud pushed to xapian-core (epel7). "remove other references to libdir"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat May 30 22:06:23 UTC 2015
From 3627f12970f0330cdb549c398048ddbe7afc687a Mon Sep 17 00:00:00 2001
From: drago01 <drago01 at fedoraproject.org>
Date: Thu, 25 Oct 2007 22:46:28 +0000
Subject: remove other references to libdir
diff --git a/multilib-devel-conflict-fix.patch b/multilib-devel-conflict-fix.patch
index 3537a4a..18618b3 100644
--- a/multilib-devel-conflict-fix.patch
+++ b/multilib-devel-conflict-fix.patch
@@ -1,6 +1,6 @@
diff -upNr xapian-core-1.0.2.orign/xapian-config.in xapian-core-1.0.2/xapian-config.in
--- xapian-core-1.0.2.orign/xapian-config.in 2007-07-05 02:39:51.000000000 +0200
-+++ xapian-core-1.0.2/xapian-config.in 2007-10-25 23:10:59.000000000 +0200
++++ xapian-core-1.0.2/xapian-config.in 2007-10-26 00:45:12.000000000 +0200
@@ -68,7 +68,6 @@ set_F_to_extra_ldflags() {
# -L option required (if any).
set_L_to_library_path() {
@@ -9,3 +9,27 @@ diff -upNr xapian-core-1.0.2.orign/xapian-config.in xapian-core-1.0.2/xapian-con
}
# -I options for compiling against an uninstalled xapian.
+@@ -204,11 +203,6 @@ while [ 0 != "$#" ] ; do
+ # yet.
+ ;;
+ *)
+- # Only pull in dependency_libs if libtool would.
+- if [ no != "@link_all_deplibs_CXX@" ]; then
+- extract_dependency_libs "@libdir@/libxapian.la"
+- [ -n "$dependency_libs" ] && D=" $dependency_libs"
+- fi
+ ;;
+ esac
+ echo "$F$L-lxapian$D"
+@@ -224,11 +218,6 @@ while [ 0 != "$#" ] ; do
+ continue
+ fi
+
+- if [ -f "@libdir@/libxapian.la" ]; then
+- echo "${F}@libdir@/libxapian.la"
+- continue
+- fi
+-
+ # If we need to pull in dependency_libs, we need libxapian.la. Otherwise
+ # we can cope with out it, which is useful as some Linux distros have an
+ # unhelpful policy of not packaging .la files.
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xapian-core.git/commit/?h=epel7&id=3627f12970f0330cdb549c398048ddbe7afc687a
More information about the scm-commits
mailing list