[mysql-connector-odbc] Fix libdir in cmake for ppc64

Honza Horak hhorak at fedoraproject.org
Wed Apr 3 07:57:29 UTC 2013


commit c7406d2767ea3055827767e73e61d424810d3073
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date:   Wed Apr 3 09:56:44 2013 +0200

    Fix libdir in cmake for ppc64

 myodbc-libdir.patch       |   12 ++++++++++++
 mysql-connector-odbc.spec |    7 ++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/myodbc-libdir.patch b/myodbc-libdir.patch
new file mode 100644
index 0000000..5ecf2bb
--- /dev/null
+++ b/myodbc-libdir.patch
@@ -0,0 +1,12 @@
+diff -up mysql-connector-odbc-5.2.4-src/CMakeLists.txt.libdir mysql-connector-odbc-5.2.4-src/CMakeLists.txt
+--- mysql-connector-odbc-5.2.4-src/CMakeLists.txt.libdir	2013-04-03 02:18:49.002164793 -0400
++++ mysql-connector-odbc-5.2.4-src/CMakeLists.txt	2013-04-03 03:05:55.840694007 -0400
+@@ -228,7 +228,7 @@ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINA
+ SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
+ 
+ SET(LIB_SUBDIR "lib")
+-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
++IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)")
+   SET(LIB_SUBDIR "lib64")
+ ENDIF()
+ 
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index dc3e587..2173c0b 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 5.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/
 # exceptions allow library to be linked with most open source SW,
@@ -28,6 +28,7 @@ Patch3: myodbc-64bit.patch
 Patch4: myodbc-maria.patch
 Patch5: myodbc-movecmpfunc.patch
 Patch6: myodbc-libname.patch
+Patch7: myodbc-libdir.patch
 
 BuildRequires: mysql-devel unixODBC-devel
 BuildRequires: cmake
@@ -47,6 +48,7 @@ tar xfz %{SOURCE1}
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 # mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has
@@ -93,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT/usr/test
 %{_libdir}/lib*so
 
 %changelog
+* Wed Apr  3 2013 Honza Horak <hhorak at redhat.com> - 5.2.4-2
+- Fix libdir in cmake for ppc64
+
 * Tue Mar  5 2013 Honza Horak <hhorak at redhat.com> - 5.2.4-1
 - Update to 5.2.4
 


More information about the scm-commits mailing list