[yap] Locate mysql by mysql_config
Petr Pisar
ppisar at fedoraproject.org
Tue Jan 4 10:45:09 UTC 2011
commit 5ae19e749589d9c96ced226a200e817a96c0d49a
Author: Petr Písař <ppisar at redhat.com>
Date: Tue Dec 21 10:39:09 2010 +0100
Locate mysql by mysql_config
yap-6.2.0-Locate-mysql-by-mysql_config.patch | 25 +++++++++++++++++++++++++
yap.spec | 6 ++++++
2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/yap-6.2.0-Locate-mysql-by-mysql_config.patch b/yap-6.2.0-Locate-mysql-by-mysql_config.patch
new file mode 100644
index 0000000..ae81528
--- /dev/null
+++ b/yap-6.2.0-Locate-mysql-by-mysql_config.patch
@@ -0,0 +1,25 @@
+From 131213c12d09cdce8a56b5148ce753b0f5ae8e77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Tue, 21 Dec 2010 10:32:02 +0100
+Subject: [PATCH] Locate mysql by mysql_config
+
+---
+ configure.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 4ce9538..80208e5 100755
+--- a/configure.in
++++ b/configure.in
+@@ -665,7 +665,7 @@ then
+ if test "$yap_cv_mysql" = yes
+ then
+ YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_MYSQL"
+- LIBS="$LIBS -L${yap_cv_myddas}/lib/mysql -lmysqlclient "
++ LIBS="$LIBS $(mysql_config --libs) "
+ fi
+
+ dnl check for odbc
+--
+1.7.3.4
+
diff --git a/yap.spec b/yap.spec
index 587210e..0cf8918 100644
--- a/yap.spec
+++ b/yap.spec
@@ -11,8 +11,10 @@ Source2: chr_translate_bootstrap1.pl
Source3: chr_translate_bootstrap2.pl
Source4: chr_translate.pl
Patch1: Yap-noni386.patch
+Patch2: yap-6.2.0-Locate-mysql-by-mysql_config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: readline-devel, gmp-devel, texinfo
+BuildRequires: autoconf
Requires(post): /sbin/install-info, /sbin/ldconfig
Requires(postun): /sbin/install-info, /sbin/ldconfig
@@ -46,6 +48,9 @@ Documentation for Yap.
%prep
%setup -q -n %{name}-6
%patch1 -p1
+%patch2 -p1 -b .mysql_config
+# Regerenate configure because of yap-6.2.0-Locate-mysql-by-mysql_config.patch
+autoconf
find -name CVS -print0 | xargs -0 rm -rf
# chr and clpqr are optional and they are a copy from SWI Prolog
@@ -170,6 +175,7 @@ rm -rf $RPM_BUILD_ROOT
- 6.2.0 bump
- Remove uneeded Yap-creat.patch
- Remove uneeded Yap-5.1.1-config.sub.patch
+- Locate mysql by mysql_config
* Wed Dec 08 2010 Petr Pisar <ppisar at redhat.com> - 5.1.3-3
- Hack SWI-compatible libraries build system to be compilable (bug #660965)
More information about the scm-commits
mailing list