[mysql-connector-odbc] mysql-connector-odbc-5.2.5-aarch64.patch

Jakub QB Dorňák jdornak at fedoraproject.org
Wed Jan 8 16:00:44 UTC 2014


commit 8bb145716dc6cd591b22198ed9be6be322d200c8
Author: Marcin Juszkiewicz <mjuszkiewicz redhat com>
Date:   Wed Jan 8 16:42:56 2014 +0100

    mysql-connector-odbc-5.2.5-aarch64.patch
    
    Build failed because whether to use lib64 or not is done by checking list of
    known 64-bit architectures. So added AArch64 to that list.
    
      Resolves: #1041348

 mysql-connector-odbc-5.2.5-aarch64.patch |   11 +++++++++++
 mysql-connector-odbc.spec                |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/mysql-connector-odbc-5.2.5-aarch64.patch b/mysql-connector-odbc-5.2.5-aarch64.patch
new file mode 100644
index 0000000..79cb997
--- /dev/null
+++ b/mysql-connector-odbc-5.2.5-aarch64.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -228,7 +228,7 @@
+ SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
+ 
+ SET(LIB_SUBDIR "lib")
+-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64)")
++IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|aarch64|ppc64|ppc64p7|s390x|sparc64)")
+   SET(LIB_SUBDIR "lib64")
+ ENDIF()
+ 
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index 6d15fac..7796603 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.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/
 # exceptions allow library to be linked with most open source SW,
@@ -33,6 +33,7 @@ Patch8: mysql-connector-odbc-buffsize.patch
 Patch9: mysql-connector-odbc-cleartext.patch
 Patch10: mysql-connector-odbc-cond.patch
 Patch11: mysql-connector-odbc-format-security.patch
+Patch12: mysql-connector-odbc-5.2.5-aarch64.patch
 
 BuildRequires: mysql-devel unixODBC-devel
 BuildRequires: cmake
@@ -57,6 +58,7 @@ tar xfz %{SOURCE1}
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 # mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has
@@ -103,6 +105,11 @@ rm -rf $RPM_BUILD_ROOT/usr/test
 %{_libdir}/lib*so
 
 %changelog
+* Wed Jan  8 2014 Marcin Juszkiewicz <mjuszkiewicz redhat com> - 5.2.5-5
+- Build failed because whether to use lib64 or not is done by checking
+  list of known 64-bit architectures. So added AArch64 to that list.
+  Resolves: #1041348
+
 * Thu Dec 12 2013 Jakub Dorňák <jdornak at redhat.com> - 5.2.5-4
 - format-security
   Resolves: #1037209


More information about the scm-commits mailing list