summaryrefslogtreecommitdiff
path: root/dev-db/myodbc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-27 22:40:05 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-03-27 22:40:05 +0100
commit8c364c784966be1700ea39ae45028f3e9be9cae0 (patch)
treec1971211069b79e3831b71accd52a67a9fdc77a3 /dev-db/myodbc
parent6bd95d1f6320b8666a31ec949183aaa3088aa16f (diff)
gentoo resync : 27.03.2018
Diffstat (limited to 'dev-db/myodbc')
-rw-r--r--dev-db/myodbc/Manifest2
-rw-r--r--dev-db/myodbc/myodbc-5.3.10-r2.ebuild (renamed from dev-db/myodbc/myodbc-5.3.10-r1.ebuild)16
2 files changed, 2 insertions, 16 deletions
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index fa3063ee1e59..5a7232dca28f 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -16,6 +16,6 @@ DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
EBUILD myodbc-5.2.7-r1.ebuild 3363 BLAKE2B c2023e4e3d9b5be097438f32a44b754ac41b3366b978d28220a8cbc5e33575045dd68d120c6bd6e3abe89bce427a560cbfdf8752e609ca2bcf63b616e898a9d0 SHA512 f2b041eec24689bf072691e127381a180545bbef7d60e79ba76160c09ce8088999ee251a439a4bd6cafe5c7055ad454e5b68cf2dd5120353bd40da09c15919e7
EBUILD myodbc-5.2.7-r3.ebuild 3767 BLAKE2B 40e3d7f3eb5c1a3064f8a790adfb06b66e2317a29a05ec4825ed5fc704de32a1388e0f0eccc4347806c80568335660544712393e61f7e7812f8ae96ccc284d3e SHA512 dd4e3ea7e5cc504b9ee3f59944e4d52a34fec1e7247b6f4f0744c6c5416e69677c9a986d144eb5db62f76c752af3406e0c6659cb6a38021cfe9fefa7b28e54d0
-EBUILD myodbc-5.3.10-r1.ebuild 4189 BLAKE2B 2ba12e3ecb3e403db26dde4050ff91cb9ec0e2db7793c1ebad2b624bdb41c01aff88730e142ca9e50c719802bc834c58d8ec31affaa36f6fbf89aa188096da55 SHA512 f67fa28318bc872730763be47e3b8211584f221485a6aca81dbca3ad34785265dae802960bdec27328cad617e028655286ddc6616fad90f6af46eb62dc696207
+EBUILD myodbc-5.3.10-r2.ebuild 3660 BLAKE2B 9d607e8d23d1b15d0bd8cb23e987bfd90a317803a10e2802de2516b6de743dbf15eca90507bedfa102a1f525976d3493cd5564056e6d171db36d9f4c1ecb9ab0 SHA512 4046a7f1e806a6938c71e9ad2944fbd649aae7ede4c8d147f8abe7195d7ede68e5e3db7d4664f9eba1ed270b22777814fc9366da2eeb238bbef30f38ec79780c
EBUILD myodbc-5.3.9.ebuild 3142 BLAKE2B 5f535a2f331a91d4884ccd2f6e7429fe2b981375f6c71a4e4a1d85d1ee226760221a3aa29790c1cf3e69a9963f43c1c266ff9c5c26b4b89d5fd77f5adfe49ca6 SHA512 376f9bb1fb00b8e0ca2fe2f9962bf259eb2bd5828a9422f8f63897756359140a84b1e064d84e6a26590713050f7cf0c3820c1de1fa375e723fa1cf708fa5f5e0
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
index 5aeb327fb5b1..62d7f9d9034e 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
@@ -41,39 +41,25 @@ DRIVER_NAME="${PN}-${SLOT}"
PATCHES=(
"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
"${FILESDIR}/5.3.10-cxxlinkage.patch"
-# "${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch"
- "${FILESDIR}/5.2.7-my_malloc.patch"
"${FILESDIR}/5.3.10-mariadb.patch"
)
src_prepare() {
- # Fix undefined references due to standards change
-# append-cflags -std=gnu89
-
# Remove Tests
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
"${S}/CMakeLists.txt"
# Fix as-needed on the installer binary
- echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
+# echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
cmake-utils_src_prepare
}
multilib_src_configure() {
-# local clientlib
-# for clientlib in "mariadb" "perconaclient" "mysqlclient" "notfound" ; do
-# [[ -x "${EPREFIX}/usr/$(get_libdir)/lib${clientlib}.so" ]] && break
-# done
-# [[ "${clientlib}x" == "notfoundx" ]] && \
-# die "Installed client library name could not be determined"
-
# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
mycmakeargs+=(
-DMYSQL_CXX_LINKAGE=0
-DWITH_UNIXODBC=1
-# -DMYSQLCLIENT_LIB_NAME="${clientlib}"
-# -DMYSQLCLIENT_LIB_NAME="mysqlclient"
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"