| 1 |
commit: d3ecd1e5d0d45f9356367f294da2039449436738 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 27 12:50:38 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 27 12:50:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3ecd1e5 |
| 7 |
|
| 8 |
dev-db/myodbc: Drop patch that was integrated upstream |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/651386 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
.../{myodbc-5.3.10-r1.ebuild => myodbc-5.3.10-r2.ebuild} | 16 +--------------- |
| 14 |
1 file changed, 1 insertion(+), 15 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild |
| 17 |
similarity index 85% |
| 18 |
rename from dev-db/myodbc/myodbc-5.3.10-r1.ebuild |
| 19 |
rename to dev-db/myodbc/myodbc-5.3.10-r2.ebuild |
| 20 |
index 5aeb327fb5b..62d7f9d9034 100644 |
| 21 |
--- a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild |
| 22 |
+++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild |
| 23 |
@@ -41,39 +41,25 @@ DRIVER_NAME="${PN}-${SLOT}" |
| 24 |
PATCHES=( |
| 25 |
"${FILESDIR}/${MAJOR}-cmake-doc-path.patch" |
| 26 |
"${FILESDIR}/5.3.10-cxxlinkage.patch" |
| 27 |
-# "${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch" |
| 28 |
- "${FILESDIR}/5.2.7-my_malloc.patch" |
| 29 |
"${FILESDIR}/5.3.10-mariadb.patch" |
| 30 |
) |
| 31 |
|
| 32 |
src_prepare() { |
| 33 |
- # Fix undefined references due to standards change |
| 34 |
-# append-cflags -std=gnu89 |
| 35 |
- |
| 36 |
# Remove Tests |
| 37 |
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \ |
| 38 |
"${S}/CMakeLists.txt" |
| 39 |
|
| 40 |
# Fix as-needed on the installer binary |
| 41 |
- echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" |
| 42 |
+# echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt" |
| 43 |
|
| 44 |
cmake-utils_src_prepare |
| 45 |
} |
| 46 |
|
| 47 |
multilib_src_configure() { |
| 48 |
-# local clientlib |
| 49 |
-# for clientlib in "mariadb" "perconaclient" "mysqlclient" "notfound" ; do |
| 50 |
-# [[ -x "${EPREFIX}/usr/$(get_libdir)/lib${clientlib}.so" ]] && break |
| 51 |
-# done |
| 52 |
-# [[ "${clientlib}x" == "notfoundx" ]] && \ |
| 53 |
-# die "Installed client library name could not be determined" |
| 54 |
- |
| 55 |
# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB |
| 56 |
mycmakeargs+=( |
| 57 |
-DMYSQL_CXX_LINKAGE=0 |
| 58 |
-DWITH_UNIXODBC=1 |
| 59 |
-# -DMYSQLCLIENT_LIB_NAME="${clientlib}" |
| 60 |
-# -DMYSQLCLIENT_LIB_NAME="mysqlclient" |
| 61 |
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF} |
| 62 |
-DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
| 63 |
-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}" |
Archives