public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
@ 2018-02-28 23:12 Brian Evans
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2018-02-28 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     fb94ebc448db596b58715e5b081e30a73dceec3d
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 23:12:43 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 23:12:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb94ebc4

dev-db/myodbc: Version bump for 5.3.10; fix building 5.2.7-r3

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-db/myodbc/Manifest                             |  1 +
 dev-db/myodbc/files/5.3.10-cxxlinkage.patch        | 29 ++++++++++
 dev-db/myodbc/myodbc-5.2.7-r3.ebuild               |  1 +
 ...myodbc-5.2.7-r3.ebuild => myodbc-5.3.10.ebuild} | 62 +++++++++++++---------
 4 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ffc0ab6232d..c15882461b4 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,3 +1,4 @@
 DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 BLAKE2B 297f1ae57802f682616283bae9c3ff7ef88f8f016274884794f6b476bf9b92bc1da8af9cb89f41fa2a74238f91fbc39b9427529b806ac4ffb52aecd895cd8cd8 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f
+DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a566668be17f595ca7ba SHA512 ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e SHA512 02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44

diff --git a/dev-db/myodbc/files/5.3.10-cxxlinkage.patch b/dev-db/myodbc/files/5.3.10-cxxlinkage.patch
new file mode 100644
index 00000000000..796a13754f8
--- /dev/null
+++ b/dev-db/myodbc/files/5.3.10-cxxlinkage.patch
@@ -0,0 +1,29 @@
+diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake	2016-11-29 07:40:13.000000000 -0500
++++ b/cmake/FindMySQL.cmake	2017-02-17 13:59:18.115389096 -0500
+@@ -747,7 +747,7 @@
+     endif()
+ 
+     if(NOT MYSQL_CXXFLAGS)
+-      if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
++      if(MYSQL_CXX_LINKAGE)
+         _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+         set(MYSQL_CXX_LINKAGE 1)
+       else()
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2018-02-10 21:41:13.161553751 -0500
++++ b/CMakeLists.txt	2018-02-10 21:45:20.038398824 -0500
+@@ -379,10 +379,9 @@
+ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
+ 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)")
+-  SET(LIB_SUBDIR "lib64")
+-ENDIF()
++IF(NOT LIB_SUBDIR)
++	MESSAGE(ERROR "LIB_SUBDIR is not set")
++ENDIF(NOT LIB_SUBDIR)
+ 
+ MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
+ 

diff --git a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
index 2aa325486f3..5f7d1930d02 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
@@ -69,6 +69,7 @@ multilib_src_configure() {
 		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
 		-DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
 		-DLIB_SUBDIR="$(get_libdir)"
+		-DNO_THREADS=ON
 	)
 	cmake-utils_src_configure
 }

diff --git a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild b/dev-db/myodbc/myodbc-5.3.10.ebuild
similarity index 68%
copy from dev-db/myodbc/myodbc-5.2.7-r3.ebuild
copy to dev-db/myodbc/myodbc-5.3.10.ebuild
index 2aa325486f3..9fd6b225fc6 100644
--- a/dev-db/myodbc/myodbc-5.2.7-r3.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10.ebuild
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
+# Build is broken with ninja
+CMAKE_MAKEFILE_GENERATOR=emake
+
 inherit cmake-multilib flag-o-matic versionator
 
 MAJOR="$(get_version_component_range 1-2 $PV)"
@@ -10,12 +14,11 @@ MY_P="${MY_PN}-${PV/_p/r}-src"
 
 DESCRIPTION="ODBC driver for MySQL"
 HOMEPAGE="http://www.mysql.com/products/myodbc/"
-SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 # Does not build with mysql-connector-c
@@ -25,8 +28,6 @@ RDEPEND="
 	abi_x86_32? (
 		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
 	)
-	!dev-db/mysql-connector-c
-	!>=dev-db/mariadb-10.2.0
 "
 DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}
@@ -34,7 +35,19 @@ S=${WORKDIR}/${MY_P}
 # Careful!
 DRIVER_NAME="${PN}-${SLOT}"
 
+# Patch document path so it doesn't install files to /usr
+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}/${MAJOR}-mariadb-buffer_length.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"
@@ -42,33 +55,33 @@ src_prepare() {
 	# Fix as-needed on the installer binary
 	echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
 
-	# Patch document path so it doesn't install files to /usr
-	local FILES=( "${FILESDIR}/cmake-doc-path.patch"
-		"${FILESDIR}/${PV}-r1-cxxlinkage.patch"
-		"${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
-		"${FILESDIR}/${PV}-my_malloc.patch" )
-
-	# Fix undefined references due to standards change
-	append-cflags -std=gnu89
-
-	MYSQL_SERVER_INCLUDE=$(mysql_config --include | cut -d ' ' -f 1)
-	append-cflags "${MYSQL_SERVER_INCLUDE}/server"
-
-	append-cppflags -DSTACK_DIRECTION=1
-
 	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
-	# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
+#	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="libmysqlclient.so"
+#		-DMYSQLCLIENT_LIB_NAME="${clientlib}"
+#		-DMYSQLCLIENT_LIB_NAME="mysqlclient"
 		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-		-DMYSQL_LIB_DIR="${ROOT}/usr/$(get_libdir)"
-		-DLIB_SUBDIR="$(get_libdir)"
+		-DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+		-DMYSQL_INCLUDE_DIR="$(mysql_config --variable=pkgincludedir)"
+		-DMYSQLCLIENT_NO_THREADS=ON
+		-DDISABLE_GUI=ON
+		# The NUMA and LIBWRAP options are not really used.
+		# They are just copied from the server code
+		-DWITH_NUMA=OFF
+		-DWITH_LIBWRAP=OFF
 	)
 	cmake-utils_src_configure
 }
@@ -82,8 +95,7 @@ multilib_src_install_all() {
 			sed \
 			-e "s,__PN__,${DRIVER_NAME},g" \
 			-e "s,__PF__,${MAJOR},g" \
-			-e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
-			-e "s,lib/libmyodbc,$(get_libdir)/${DRIVER_NAME}/libmyodbc,g" \
+			-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
 			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
 			<"${FILESDIR}"/${i}.m4 \
 			|| die "Failed to build $i"


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
@ 2018-03-01 17:52 Brian Evans
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2018-03-01 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     1c3d12ccc75b97f990ba95de27d345566d6d5b08
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 17:51:53 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 17:51:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c3d12cc

dev-db/myodbc: Fix build of 5.3.10 with mariadb 10.{0,1}

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-db/myodbc/files/5.3.10-mariadb.patch | 58 ++++++++++++++++++++++++++++++++
 dev-db/myodbc/myodbc-5.3.10-r1.ebuild    |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/dev-db/myodbc/files/5.3.10-mariadb.patch b/dev-db/myodbc/files/5.3.10-mariadb.patch
new file mode 100644
index 00000000000..c860349e4b7
--- /dev/null
+++ b/dev-db/myodbc/files/5.3.10-mariadb.patch
@@ -0,0 +1,58 @@
+--- a/include/sys_main.h	2018-01-19 05:36:38.000000000 -0500
++++ b/include/sys_main.h	2018-03-01 11:40:04.554713079 -0500
+@@ -20,6 +20,8 @@
+ extern "C" {
+ #endif
+ 
++#include "sys/mysql/psi/psi_memory.h"
++
+ #define MY_FAE		8	/* Fatal if any error */
+ #define MY_WME		16	/* Write message on error */
+ #define MY_ZEROFILL	32	/* my_malloc(), fill array with zero */
+--- a/driver/connect.c	2018-01-19 05:36:38.000000000 -0500
++++ b/driver/connect.c	2018-03-01 11:39:51.458676373 -0500
+@@ -179,7 +179,7 @@
+   /* Set other connection options */
+ 
+   if (ds->allow_big_results || ds->safe)
+-#if MYSQL_VERSION_ID >= 50709
++#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
+     mysql_options(mysql, MYSQL_OPT_MAX_ALLOWED_PACKET, &max_long);
+ #else
+     /* max_allowed_packet is a magical mysql macro. */
+@@ -252,7 +252,7 @@
+                   ds_get_utf8attr(ds->rsakey, &ds->rsakey8));
+   }
+ #endif
+-#if MYSQL_VERSION_ID >= 50710
++#if MYSQL_VERSION_ID >= 50710 && !defined(MARIADB_BASE_VERSION)
+   {
+     char tls_options[128] = { 0 };
+     if (!ds->no_tls_1)
+@@ -323,7 +323,7 @@
+ #endif
+ 
+   mysql->options.use_ssl = !ds->disable_ssl_default;
+-#if MYSQL_VERSION_ID >= 50703
++#if MYSQL_VERSION_ID >= 50703 && !defined(MARIADB_BASE_VERSION)
+   {
+     if (ds->ssl_enforce)
+     {
+@@ -332,7 +332,7 @@
+   }
+ #endif
+ 
+-#if MYSQL_VERSION_ID >= 50711
++#if MYSQL_VERSION_ID >= 50711 && !defined(MARIADB_BASE_VERSION)
+   if (ds->sslmode)
+   {
+     unsigned int mode = 0;
+@@ -510,7 +510,7 @@
+     }
+   }
+ 
+-#if MYSQL_VERSION_ID >= 50709
++#if MYSQL_VERSION_ID >= 50709 && !defined(MARIADB_BASE_VERSION)
+   mysql_get_option(mysql, MYSQL_OPT_NET_BUFFER_LENGTH, &dbc->net_buffer_len);
+ #else
+   // for older versions just use net_buffer_length() macro

diff --git a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
index 63881efa73e..5aeb327fb5b 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
@@ -43,7 +43,7 @@ PATCHES=(
 	"${FILESDIR}/5.3.10-cxxlinkage.patch"
 #	"${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch"
 	"${FILESDIR}/5.2.7-my_malloc.patch"
-#	"${FILESDIR}/${MAJOR}-mariadb-buffer_length.patch"
+	"${FILESDIR}/5.3.10-mariadb.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
@ 2019-06-11 19:09 Brian Evans
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2019-06-11 19:09 UTC (permalink / raw
  To: gentoo-commits

commit:     1237cc0efb7475c04d0d2dbfe4c31220d6bfecff
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 19:01:57 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 19:01:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1237cc0e

dev-db/myodbc: Version bump for 8.0.16

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/myodbc/Manifest                       |   1 +
 dev-db/myodbc/files/8.0-cmake-doc-path.patch |  42 ++++++++++
 dev-db/myodbc/files/8.0.16-cxxlinkage.patch  |  63 ++++++++++++++
 dev-db/myodbc/myodbc-8.0.16.ebuild           | 119 +++++++++++++++++++++++++++
 4 files changed, 225 insertions(+)

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index a3791a4441a..da72be6d266 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,3 +1,4 @@
 DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a566668be17f595ca7ba SHA512 ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e SHA512 02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
+DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d SHA512 b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd

diff --git a/dev-db/myodbc/files/8.0-cmake-doc-path.patch b/dev-db/myodbc/files/8.0-cmake-doc-path.patch
new file mode 100644
index 00000000000..405c39e0bcd
--- /dev/null
+++ b/dev-db/myodbc/files/8.0-cmake-doc-path.patch
@@ -0,0 +1,42 @@
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2019-06-11 11:21:59.723705824 -0400
++++ b/CMakeLists.txt	2019-06-11 11:26:11.109625713 -0400
+@@ -71,6 +71,12 @@
+ 
+ INCLUDE(version.cmake)
+ 
++IF(WITH_DOCUMENTATION_INSTALL_PATH)
++       set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
++ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
++       set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
++ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
++
+ IF(NOT WIN32)
+ 	INCLUDE(CheckFunctionExists)
+ 	CHECK_FUNCTION_EXISTS(dlopen DLOPEN_IN_LIBC)
+@@ -520,13 +526,10 @@
+ #------------ Installation ---------------------------
+-INCLUDE(cmake/info_bin.cmake)
+ 
+-INSTALL(FILES LICENSE.txt   DESTINATION .)
+-
+ if(EXISTS "${CMAKE_SOURCE_DIR}/README.txt")
+-  INSTALL(FILES README.txt    DESTINATION .)
++  INSTALL(FILES README.txt    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ else()
+-  INSTALL(FILES README.md    DESTINATION .)
+-  INSTALL(FILES CONTRIBUTING.md    DESTINATION .)
++  INSTALL(FILES README.md    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++  INSTALL(FILES CONTRIBUTING.md    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ endif()
+ 
+ IF(WIN32)
+@@ -567,7 +571,7 @@
+ 
+ ELSE(WIN32)
+ 
+-  INSTALL(FILES ChangeLog    DESTINATION .)
++  INSTALL(FILES ChangeLog    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ 
+ ENDIF(WIN32)
+ 

diff --git a/dev-db/myodbc/files/8.0.16-cxxlinkage.patch b/dev-db/myodbc/files/8.0.16-cxxlinkage.patch
new file mode 100644
index 00000000000..326036c0b88
--- /dev/null
+++ b/dev-db/myodbc/files/8.0.16-cxxlinkage.patch
@@ -0,0 +1,63 @@
+diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake	2016-11-29 07:40:13.000000000 -0500
++++ b/cmake/FindMySQL.cmake	2017-02-17 13:59:18.115389096 -0500
+@@ -747,7 +747,7 @@
+     endif()
+ 
+     if(NOT MYSQL_CXXFLAGS)
+-      if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
++      if(MYSQL_CXX_LINKAGE)
+         _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+         set(MYSQL_CXX_LINKAGE 1)
+       else()
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2018-02-10 21:41:13.161553751 -0500
++++ b/CMakeLists.txt	2018-02-10 21:45:20.038398824 -0500
+@@ -379,10 +379,9 @@
+ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
+ 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|aarch64)")
+-  SET(LIB_SUBDIR "lib64")
+-ENDIF()
++IF(NOT LIB_SUBDIR)
++	MESSAGE(ERROR "LIB_SUBDIR is not set")
++ENDIF(NOT LIB_SUBDIR)
+ 
+ MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
+ 
+diff -aurN a/driver/CMakeLists.txt b/driver/CMakeLists.txt
+--- a/driver/CMakeLists.txt	2019-06-11 13:46:37.863345781 -0400
++++ b/driver/CMakeLists.txt	2019-06-11 14:04:25.758997218 -0400
+@@ -194,29 +194,3 @@
+ 
+ ENDWHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
+ 
+-IF(MYSQL8)
+-  SET(ssl_libs_to_find
+-    libcrypto.*
+-    libssl.*
+-    libeay32.*
+-    ssleay32.*
+-  )
+-
+-  SET(_SSL_PATH)
+-
+-  IF(WIN32)
+-    SET(_SSL_PATH ${MYSQL_DIR}/bin/)
+-  ELSE(WIN32)
+-    SET(_SSL_PATH ${MYSQL_DIR}/lib/)
+-  ENDIF(WIN32)
+-
+-  FOREACH(_lib_to_find IN LISTS ssl_libs_to_find)
+-    INSTALL(DIRECTORY ${_SSL_PATH} DESTINATION ${LIB_SUBDIR}
+-          FILES_MATCHING
+-          PATTERN "mecab" EXCLUDE
+-          PATTERN "pkgconfig" EXCLUDE
+-          PATTERN "plugin" EXCLUDE
+-          PATTERN ${_lib_to_find})
+-  ENDFOREACH()
+-
+-ENDIF(MYSQL8)
+\ No newline at end of file

diff --git a/dev-db/myodbc/myodbc-8.0.16.ebuild b/dev-db/myodbc/myodbc-8.0.16.ebuild
new file mode 100644
index 00000000000..a5db40b27ad
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.16.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="http://www.mysql.com/products/myodbc/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	>=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+	"${FILESDIR}/8.0.16-cxxlinkage.patch"
+)
+
+src_prepare() {
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	mycmakeargs+=(
+		-DMYSQLCLIENT_STATIC_LINKING=1
+		-DMYSQL_CXX_LINKAGE=1
+		-DWITH_UNIXODBC=1
+		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+		-DMYSQLCLIENT_NO_THREADS=ON
+		-DDISABLE_GUI=ON
+		# The NUMA and LIBWRAP options are not really used.
+		# They are just copied from the server code
+		-DWITH_NUMA=OFF
+		-DWITH_LIBWRAP=OFF
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${MAJOR},g" \
+			-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done;
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
+}
+
+pkg_config() {
+
+	[ "${ROOT}" != "/" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
@ 2020-01-23  1:30 Thomas Deutschmann
  0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2020-01-23  1:30 UTC (permalink / raw
  To: gentoo-commits

commit:     971857a38729c0e0c48014d70d995b981c25a78a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 01:28:11 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 01:30:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=971857a3

dev-db/myodbc: bump to v8.0.19

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-db/myodbc/Manifest                             |   1 +
 dev-db/myodbc/files/myodbc-8.0.19-cxxlinkage.patch |  27 +++++
 dev-db/myodbc/myodbc-8.0.19.ebuild                 | 118 +++++++++++++++++++++
 3 files changed, 146 insertions(+)

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index a7f7a463760..0be45e21dbe 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -3,3 +3,4 @@ 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
 DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d SHA512 b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
 DIST mysql-connector-odbc-8.0.17-src.tar.gz 3953949 BLAKE2B 6d7fcef89c15d9f421f690291e793f1020b5f77f5e2132f130becd1ceed041887ffce77fda4cbc411d06972f1d488d434c8f132c0778af30a436c6b6e372e59e SHA512 474b107eb5d4c23e10c24dcf37b3787418afbd34ea385791fd0d8cdb5d29a6770cde4a61e3591329b344c442ff8f6daad3a2c250e881f9f5837eaa4e951af7e4
+DIST mysql-connector-odbc-8.0.19-src.tar.gz 3770465 BLAKE2B 7c57d85c13c17c08e1aed1deff3d60851ff68474c42971ea796fc50e3b766d7c49e5d993527691534c30f4007a94be852ac240bf50244cd3adf0f9500fbfc68c SHA512 4761d9d3eeccc932bfd76b9b27be4672e65b6125e85312dcfcb0b8b3cfe0ccf19982d40b2f85ae26e936e968d35d3136bab201b7dcb47eb4ad460c178c0d9f88

diff --git a/dev-db/myodbc/files/myodbc-8.0.19-cxxlinkage.patch b/dev-db/myodbc/files/myodbc-8.0.19-cxxlinkage.patch
new file mode 100644
index 00000000000..f26b27417c1
--- /dev/null
+++ b/dev-db/myodbc/files/myodbc-8.0.19-cxxlinkage.patch
@@ -0,0 +1,27 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -454,10 +454,9 @@ endmacro()
+ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
+ 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|aarch64)")
+-  SET(LIB_SUBDIR "lib64")
+-ENDIF()
++IF(NOT LIB_SUBDIR)
++	MESSAGE(ERROR "LIB_SUBDIR is not set")
++ENDIF(NOT LIB_SUBDIR)
+ 
+ MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
+ 
+--- a/cmake/FindMySQL.cmake
++++ b/cmake/FindMySQL.cmake
+@@ -805,7 +805,7 @@ if(NOT WIN32)
+     endif()
+ 
+     if(NOT MYSQL_CXXFLAGS)
+-      if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
++      if(MYSQL_CXX_LINKAGE)
+         _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+         set(MYSQL_CXX_LINKAGE 1)
+       else()

diff --git a/dev-db/myodbc/myodbc-8.0.19.ebuild b/dev-db/myodbc/myodbc-8.0.19.ebuild
new file mode 100644
index 00000000000..e6635dadba1
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.19.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	>=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+	"${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+)
+
+src_prepare() {
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	mycmakeargs+=(
+		-DMYSQLCLIENT_STATIC_LINKING=1
+		-DMYSQL_CXX_LINKAGE=1
+		-DWITH_UNIXODBC=1
+		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+		-DMYSQLCLIENT_NO_THREADS=ON
+		-DDISABLE_GUI=ON
+		# The NUMA and LIBWRAP options are not really used.
+		# They are just copied from the server code
+		-DWITH_NUMA=OFF
+		-DWITH_LIBWRAP=OFF
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${MAJOR},g" \
+			-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done;
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
+}
+
+pkg_config() {
+
+	[ "${ROOT}" != "/" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/
@ 2024-04-24 19:08 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-04-24 19:08 UTC (permalink / raw
  To: gentoo-commits

commit:     50d4c3260ae7b8a644779ba36463a7827a2f5edb
Author:     Christopher Fore <csfore <AT> posteo <DOT> net>
AuthorDate: Thu Dec 14 19:49:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 19:07:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d4c326

dev-db/myodbc: add 8.0.32, fix GCC 14 error, EAPI bump

Patch attached includes `<string.h>`.
Bump EAPI 7 -> 8.

Closes: https://bugs.gentoo.org/919501
Signed-off-by: Christopher Fore <csfore <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/34274
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/myodbc/Manifest                             |   1 +
 .../files/myodbc-8.0.32-include-string.patch       |  14 +++
 dev-db/myodbc/myodbc-8.0.32.ebuild                 | 128 +++++++++++++++++++++
 3 files changed, 143 insertions(+)

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 9aab17339b8a..36c1165fbe55 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1,2 @@
 DIST mysql-connector-odbc-8.0.27-src.tar.gz 3849283 BLAKE2B 6a2500cdd706c0f8cda83dd04d3e573baa0bfbad59c931e20bb25a3f09dd78d2380079d0a20e075c3f44482d58acb6e727f4cbcf490e9d4d7817dd26f98061ee SHA512 4f907b7647425c274d3bd1c3b3ebbb83ac2360f2ee56733dabb501c17b800a26ef1117e16e5b05180ff904bfc642d25393baa861b96a79edf9d35f186a8689b2
+DIST mysql-connector-odbc-8.0.32-src.tar.gz 3845574 BLAKE2B 84adca951149739b79c60ee89416d2e638c5a5880feaed69afbd9de3a671ce505bad04303ccab9f13410f83e8827d9e3ee658b9e1241e66243d3424ac525525b SHA512 8011b131657e214de3f33407893ff990e2238e79a5d0ef76a64797c6f160f0895ed819e81c04054b3b4d439fc0db85c4813c713401db28092a9f6da16f24fb34

diff --git a/dev-db/myodbc/files/myodbc-8.0.32-include-string.patch b/dev-db/myodbc/files/myodbc-8.0.32-include-string.patch
new file mode 100644
index 000000000000..6bf31e1a53eb
--- /dev/null
+++ b/dev-db/myodbc/files/myodbc-8.0.32-include-string.patch
@@ -0,0 +1,14 @@
+# Gentoo Bug: https://bugs.gentoo.org/919501
+
+diff --git a/dltest/dltest.c b/dltest/dltest.c
+index d3b9360..3fb354b 100644
+--- a/dltest/dltest.c
++++ b/dltest/dltest.c
+@@ -28,6 +28,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #ifdef WIN32
+     #include <windows.h>

diff --git a/dev-db/myodbc/myodbc-8.0.32.ebuild b/dev-db/myodbc/myodbc-8.0.32.ebuild
new file mode 100644
index 000000000000..4b81f9c17da2
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.32.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="https://dev.mysql.com/downloads/connector/odbc/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	>=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+	"${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+	"${FILESDIR}/${PN}-8.0.32-include-string.patch"
+)
+
+src_prepare() {
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	mycmakeargs+=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DMYSQLCLIENT_STATIC_LINKING=OFF
+		-DMYSQL_CXX_LINKAGE=YES
+		-DWITH_UNIXODBC=YES
+		-DWITH_DOCUMENTATION_INSTALL_PATH="${EPREFIX}"/usr/share/doc/${PF}
+		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+		-DMYSQLCLIENT_NO_THREADS=ON
+		-DDISABLE_GUI=ON
+		# Don't build "libmysql_strings.so" and "libmysql_sys.so" which are only
+		# used internally
+		-DBUILD_SHARED_LIBS=OFF
+		# The NUMA and LIBWRAP options are not really used.
+		# They are just copied from the server code
+		-DWITH_NUMA=OFF
+		-DWITH_LIBWRAP=OFF
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${MAJOR},g" \
+			-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done
+
+	rm -rf "${ED}/usr/$(get_libdir)/${PN}-${MAJOR}/private" \
+		|| die "failed to remove bundled libs"
+
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
+}
+
+pkg_config() {
+	[ -n "${ROOT}" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-24 19:08 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-28 23:12 [gentoo-commits] repo/gentoo:master commit in: dev-db/myodbc/, dev-db/myodbc/files/ Brian Evans
  -- strict thread matches above, loose matches on Subject: below --
2018-03-01 17:52 Brian Evans
2019-06-11 19:09 Brian Evans
2020-01-23  1:30 Thomas Deutschmann
2024-04-24 19:08 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox