diff options
| author |   Brian Evans <grknight@gentoo.org> | 2015-05-17 21:24:37 +0000 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2015-05-17 21:24:37 +0000 |
| commit | dd3d680b5639b1f7592abbda68016df2e3b2df8b (patch) | |
| tree | f1d734d67859833c136f854adfba162d80100938 /dev-db/myodbc/files | |
| parent | Version bump (bug #549466). Removed old (diff) | |
| download | gentoo-2-dd3d680b5639b1f7592abbda68016df2e3b2df8b.tar.gz gentoo-2-dd3d680b5639b1f7592abbda68016df2e3b2df8b.tar.bz2 gentoo-2-dd3d680b5639b1f7592abbda68016df2e3b2df8b.zip | |
Drop old; 5.1 series no longer builds with current libmysqlclient from servers
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xD1F781EFF9F4A3B6)
Diffstat (limited to 'dev-db/myodbc/files')
| -rw-r--r-- | dev-db/myodbc/files/5.2.7-cxxlinkage.patch | 23 | ||||
| -rw-r--r-- | dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch | 15 |
2 files changed, 0 insertions, 38 deletions
diff --git a/dev-db/myodbc/files/5.2.7-cxxlinkage.patch b/dev-db/myodbc/files/5.2.7-cxxlinkage.patch deleted file mode 100644 index a78c89ba4f56..000000000000 --- a/dev-db/myodbc/files/5.2.7-cxxlinkage.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -uarN mysql-connector-odbc-5.3.4-src.orig/cmake/FindMySQL.cmake mysql-connector-odbc-5.3.4-src/cmake/FindMySQL.cmake ---- mysql-connector-odbc-5.3.4-src.orig/cmake/FindMySQL.cmake 2014-06-18 18:50:16.000000000 -0400 -+++ mysql-connector-odbc-5.3.4-src/cmake/FindMySQL.cmake 2014-08-20 10:05:00.191485304 -0400 -@@ -105,16 +105,16 @@ - # Finally remove the dot - STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}") - -- IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) -+ IF(MYSQL_CXX_LINKAGE) - EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags" - OUTPUT_VARIABLE _mysql_config_output - ) - SET(MYSQL_CXX_LINKAGE 1) -- ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) -+ ELSE (MYSQL_CXX_LINKAGE) - EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags" - OUTPUT_VARIABLE _mysql_config_output - ) -- ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603) -+ ENDIF(MYSQL_CXX_LINKAGE) - - # Remove the stl4port dependency - STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}") diff --git a/dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch b/dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch deleted file mode 100644 index a79ddc4fa201..000000000000 --- a/dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nuar mysql-connector-odbc-5.1.6.orig/qt.m4 mysql-connector-odbc-5.1.6/qt.m4 ---- mysql-connector-odbc-5.1.6.orig/qt.m4 2009-11-05 13:34:53.000000000 -0800 -+++ mysql-connector-odbc-5.1.6/qt.m4 2010-01-30 22:12:02.105400463 -0800 -@@ -91,6 +91,10 @@ - AC_SUBST(QTVERSION) - AC_SUBST(MOC) - AC_SUBST(UIC) -+ if expr "$QTVERSION" '>=' "040000" > /dev/null ; then -+ QT_CXXFLAGS="-I$qt_includes -I$qt_includes/QtCore -I$qt_includes/QtGui" -+ else -+ QT_CXXFLAGS="-I$qt_includes" -+ fi -- QT_CXXFLAGS="-I$qt_includes" - AC_SUBST(QT_CXXFLAGS) - QT_LDFLAGS="-L$qt_libraries" |