CVS commit: pkgsrc/databases/myodbc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases/myodbc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sun, 25 Dec 2022 08:22:26 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Dec 25 08:22:26 UTC 2022

Modified Files:
        pkgsrc/databases/myodbc: Makefile PLIST distinfo
        pkgsrc/databases/myodbc/patches: patch-CMakeLists.txt
            patch-test_CMakeLists.txt
Added Files:
        pkgsrc/databases/myodbc/patches: patch-cmake_info__bin.cmake
            patch-dltest_CMakeLists.txt patch-driver_driver.h

Log Message:
myodbc: update to 8.0.31.

Fixes build.

Changes:
Now for mysql80*.
Otherwise, too many to list here, see
https://dev.mysql.com/doc/relnotes/connector-odbc/en/news-8-0.html
for details.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/myodbc/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/myodbc/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/databases/myodbc/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/myodbc/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/databases/myodbc/patches/patch-cmake_info__bin.cmake \
    pkgsrc/databases/myodbc/patches/patch-dltest_CMakeLists.txt \
    pkgsrc/databases/myodbc/patches/patch-driver_driver.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/myodbc/patches/patch-test_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/myodbc/Makefile
diff -u pkgsrc/databases/myodbc/Makefile:1.45 pkgsrc/databases/myodbc/Makefile:1.46
--- pkgsrc/databases/myodbc/Makefile:1.45       Wed Jun 23 20:33:08 2021
+++ pkgsrc/databases/myodbc/Makefile    Sun Dec 25 08:22:26 2022
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.45 2021/06/23 20:33:08 nia Exp $
+# $NetBSD: Makefile,v 1.46 2022/12/25 08:22:26 wiz Exp $
 
-DISTNAME=      mysql-connector-odbc-5.3.14-src
-PKGNAME=       ${DISTNAME:S/mysql-connector-odbc/myodbc/:S/-src$//}
-PKGREVISION=   1
+DISTNAME=      mysql-connector-odbc-8.0.31
+PKGNAME=       ${DISTNAME:S/mysql-connector-odbc/myodbc/}
 CATEGORIES=    databases
-MASTER_SITES=  ${MASTER_SITE_MYSQL:=Connector-ODBC/5.3/}
+#MASTER_SITES= ${MASTER_SITE_MYSQL:=Connector-ODBC/5.3/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=mysql/}
+GITHUB_PROJECT=        mysql-connector-odbc
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.mysql.com/
@@ -22,7 +24,7 @@ INSTALLATION_DIRS+=   share/mysql-connecto
 
 .include "options.mk"
 
-MYSQL_VERSIONS_ACCEPTED=       56 57
+MYSQL_VERSIONS_ACCEPTED=       80
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/databases/myodbc/PLIST
diff -u pkgsrc/databases/myodbc/PLIST:1.12 pkgsrc/databases/myodbc/PLIST:1.13
--- pkgsrc/databases/myodbc/PLIST:1.12  Mon Jan 11 05:49:29 2021
+++ pkgsrc/databases/myodbc/PLIST       Sun Dec 25 08:22:26 2022
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2021/01/11 05:49:29 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.13 2022/12/25 08:22:26 wiz Exp $
 bin/myodbc-installer
-lib/libmyodbc5a.so
-lib/libmyodbc5w.so
+lib/libmyodbc8a.so
+lib/libmyodbc8w.so
 share/doc/mysql-connector-odbc/ChangeLog
+share/doc/mysql-connector-odbc/INFO_BIN
+share/doc/mysql-connector-odbc/INFO_SRC
 share/doc/mysql-connector-odbc/LICENSE.txt
 share/doc/mysql-connector-odbc/README.txt
 share/mysql-connector-odbc/test/CTestTestfile.cmake
@@ -13,6 +15,7 @@ share/mysql-connector-odbc/test/my_bug13
 share/mysql-connector-odbc/test/my_bulk
 share/mysql-connector-odbc/test/my_catalog1
 share/mysql-connector-odbc/test/my_catalog2
+share/mysql-connector-odbc/test/my_catalog3
 share/mysql-connector-odbc/test/my_crash
 share/mysql-connector-odbc/test/my_curext
 share/mysql-connector-odbc/test/my_cursor
@@ -23,7 +26,9 @@ share/mysql-connector-odbc/test/my_dyn_c
 share/mysql-connector-odbc/test/my_error
 share/mysql-connector-odbc/test/my_info
 share/mysql-connector-odbc/test/my_keys
+share/mysql-connector-odbc/test/my_options
 share/mysql-connector-odbc/test/my_param
+share/mysql-connector-odbc/test/my_param2
 share/mysql-connector-odbc/test/my_pooling
 share/mysql-connector-odbc/test/my_prepare
 share/mysql-connector-odbc/test/my_relative

Index: pkgsrc/databases/myodbc/distinfo
diff -u pkgsrc/databases/myodbc/distinfo:1.15 pkgsrc/databases/myodbc/distinfo:1.16
--- pkgsrc/databases/myodbc/distinfo:1.15       Tue Oct 26 10:09:24 2021
+++ pkgsrc/databases/myodbc/distinfo    Sun Dec 25 08:22:26 2022
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 10:09:24 nia Exp $
+$NetBSD: distinfo,v 1.16 2022/12/25 08:22:26 wiz Exp $
 
-BLAKE2s (mysql-connector-odbc-5.3.14-src.tar.gz) = bc522b4a8a737cfc11a116cdd29731c716e89d8ba365f5ded2d911e9eee0f95a
-SHA512 (mysql-connector-odbc-5.3.14-src.tar.gz) = f5dee3127cc9fbeeb1c855cc964fe882254056cbb2fca343b28360ac80c6dceb3b36c1e3458828a33e1a46ead5ff3e7de5157c7d30d5e806888652aab40b7980
-Size (mysql-connector-odbc-5.3.14-src.tar.gz) = 3010166 bytes
-SHA1 (patch-CMakeLists.txt) = 1021a5309ff0f051310f0b4b8ff56185ab2ab991
-SHA1 (patch-test_CMakeLists.txt) = 7d004271310243f8ccca1bfe8f7b1e8333f6ffdc
+BLAKE2s (mysql-connector-odbc-8.0.31.tar.gz) = 2057e85ae70b9d01c16ce94d019bce5d59c56f7c001d6c7f22308839719a9a48
+SHA512 (mysql-connector-odbc-8.0.31.tar.gz) = 478340a09a173f79e2844a62f08b3ae1168fce69c705e8fb4ae9a86c040003e349c6453b53dfcc99da2d73161dacec0f6c7e9c2cb4a69e9442a359882f12cd9d
+Size (mysql-connector-odbc-8.0.31.tar.gz) = 3881744 bytes
+SHA1 (patch-CMakeLists.txt) = 48fac0ce2be161be4e5f79abbe496a276af9e744
+SHA1 (patch-cmake_info__bin.cmake) = eab0c87af5b2b181028df5f17d7cf80f0e8b5c88
+SHA1 (patch-dltest_CMakeLists.txt) = ecd762bce89d793f58fb2b19407a146e0b95d2b0
+SHA1 (patch-driver_driver.h) = c199d3d4d11b1d5159999866580f14fd4e314fa2
+SHA1 (patch-test_CMakeLists.txt) = 67dabed8575aa3ee380d248b8cb4ae158e675493

Index: pkgsrc/databases/myodbc/patches/patch-CMakeLists.txt
diff -u pkgsrc/databases/myodbc/patches/patch-CMakeLists.txt:1.3 pkgsrc/databases/myodbc/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/databases/myodbc/patches/patch-CMakeLists.txt:1.3    Mon Jan 11 05:49:29 2021
+++ pkgsrc/databases/myodbc/patches/patch-CMakeLists.txt        Sun Dec 25 08:22:26 2022
@@ -1,33 +1,33 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2021/01/11 05:49:29 jnemeth Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2022/12/25 08:22:26 wiz Exp $
 
---- CMakeLists.txt.orig        2019-10-28 17:50:32.000000000 +0000
+Install into more appropriate localtion for pkgsrc.
+
+--- CMakeLists.txt.orig        2022-09-01 11:59:03.000000000 +0000
 +++ CMakeLists.txt
-@@ -420,6 +420,8 @@ ENDIF()
- 
- MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
- 
-+SET(DOC_SUBDIR "share/doc/mysql-connector-odbc")
-+
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
- 
- ADD_SUBDIRECTORY(util)
-@@ -501,8 +503,8 @@ cmake/sql.*\\\\.c$
+@@ -591,13 +591,13 @@ cmake/sql.*\\\\.c$
  #------------ Installation ---------------------------
- 
+ INCLUDE(cmake/info_bin.cmake)
  
 -INSTALL(FILES LICENSE.txt   DESTINATION .)
--INSTALL(FILES README.txt    DESTINATION .)
-+INSTALL(FILES LICENSE.txt   DESTINATION ${DOC_SUBDIR})
-+INSTALL(FILES README.txt    DESTINATION ${DOC_SUBDIR})
++INSTALL(FILES LICENSE.txt   DESTINATION share/doc/mysql-connector-odbc)
  
- IF(WIN32)
+ if(EXISTS "${CMAKE_SOURCE_DIR}/README.txt")
+-  INSTALL(FILES README.txt    DESTINATION .)
++  INSTALL(FILES README.txt    DESTINATION share/doc/mysql-connector-odbc)
+ else()
+-  INSTALL(FILES README.md    DESTINATION .)
+-  INSTALL(FILES CONTRIBUTING.md    DESTINATION .)
++  INSTALL(FILES README.md    DESTINATION share/doc/mysql-connector-odbc)
++  INSTALL(FILES CONTRIBUTING.md    DESTINATION share/doc/mysql-connector-odbc)
+ endif()
  
-@@ -542,7 +544,7 @@ IF(WIN32)
+ IF(WIN32)
+@@ -658,7 +658,7 @@ IF(WIN32)
  
  ELSE(WIN32)
  
 -  INSTALL(FILES ChangeLog    DESTINATION .)
-+  INSTALL(FILES ChangeLog    DESTINATION ${DOC_SUBDIR})
++  INSTALL(FILES ChangeLog    DESTINATION share/doc/mysql-connector-odbc)
  
  ENDIF(WIN32)
  

Index: pkgsrc/databases/myodbc/patches/patch-test_CMakeLists.txt
diff -u pkgsrc/databases/myodbc/patches/patch-test_CMakeLists.txt:1.2 pkgsrc/databases/myodbc/patches/patch-test_CMakeLists.txt:1.3
--- pkgsrc/databases/myodbc/patches/patch-test_CMakeLists.txt:1.2       Wed Jul  2 03:41:51 2014
+++ pkgsrc/databases/myodbc/patches/patch-test_CMakeLists.txt   Sun Dec 25 08:22:26 2022
@@ -1,8 +1,11 @@
-$NetBSD: patch-test_CMakeLists.txt,v 1.2 2014/07/02 03:41:51 jnemeth Exp $
+$NetBSD: patch-test_CMakeLists.txt,v 1.3 2022/12/25 08:22:26 wiz Exp $
 
---- test/CMakeLists.txt.orig   2014-03-26 21:20:55.000000000 +0000
+Install in better prefix.
+Add library for backtrace_symbols_fd() to one executable on NetBSD.
+
+--- test/CMakeLists.txt.orig   2022-09-01 11:59:03.000000000 +0000
 +++ test/CMakeLists.txt
-@@ -55,7 +55,7 @@ FOREACH(T my_basics my_blob my_bulk my_c
+@@ -71,7 +71,7 @@ FOREACH(FN my_basics.c my_blob.c my_bulk
            COMPILE_FLAGS "${MYSQLODBCCONN_COMPILE_FLAGS_ENV} ${MYSQL_CXXFLAGS}")
    ENDIF(MYSQL_CXX_LINKAGE)
  
@@ -11,7 +14,26 @@ $NetBSD: patch-test_CMakeLists.txt,v 1.2
    SET_TARGET_PROPERTIES(${T} PROPERTIES 
        LINK_FLAGS "${MYSQLODBCCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}")
  
-@@ -102,7 +102,7 @@ IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Dar
+@@ -92,7 +92,7 @@ FOREACH(FN my_basics.c my_blob.c my_bulk
+       TARGET_LINK_LIBRARIES(${T} ${ODBCLIB} ${ODBCINSTLIB} myodbc-util)
+     ENDIF(MYSQL8)
+   ELSE(WIN32)
+-    TARGET_LINK_LIBRARIES(${T} ${ODBC_LINK_FLAGS} ${ODBCINSTLIB} myodbc-util)
++    TARGET_LINK_LIBRARIES(${T} PRIVATE ${ODBC_LINK_FLAGS} ${ODBCINSTLIB} myodbc-util)
+   ENDIF(WIN32)
+   ADD_TEST(${T} ${T})
+ 
+@@ -106,6 +106,9 @@ endif()
+ 
+ ENDFOREACH(FN)
+ 
++if (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
++  TARGET_LINK_LIBRARIES(my_param2 PRIVATE execinfo)
++endif()
+ # Adding testsuites for testing driver without DM. May be useful to test behaviors that normally are initiated by DM only
+ # Separate testsuites for ansi and unicode driver are created - we can't use same test for both since there is no DM to convert
+ # data and to map calls. Excluding OS X so far, since direct linking there is problematic
+@@ -135,7 +138,7 @@ IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Dar
                COMPILE_FLAGS "${MYSQLODBCCONN_COMPILE_FLAGS_ENV} ${MYSQL_CXXFLAGS}")
        ENDIF(MYSQL_CXX_LINKAGE)
  
@@ -20,10 +42,30 @@ $NetBSD: patch-test_CMakeLists.txt,v 1.2
        SET_TARGET_PROPERTIES(${T} PROPERTIES 
            LINK_FLAGS "${MYSQLODBCCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}")
  
-@@ -130,5 +130,5 @@ INSTALL(FILES
+@@ -149,7 +152,7 @@ IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Dar
+       ENDIF(WIN32)
+ 
+       # Not quite clear atm whether ${ODBCINSTLIB} is needed
+-      TARGET_LINK_LIBRARIES(${T} myodbc8${CONNECTOR_DRIVER_TYPE_SHORT})
++      TARGET_LINK_LIBRARIES(${T} PRIVATE myodbc8${CONNECTOR_DRIVER_TYPE_SHORT})
+       ADD_TEST(${T} ${T})
+     ENDIF (NOT ${CONNECTOR_DRIVER_TYPE_SHORT} STREQUAL "w")
+ 
+@@ -159,7 +162,7 @@ ENDIF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "
+ 
+ ENDIF(NOT skip_no_dm)
+ 
+-TARGET_LINK_LIBRARIES(my_basics ${CMAKE_THREAD_LIBS_INIT})
++TARGET_LINK_LIBRARIES(my_basics PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+ 
+ 
+ #
+@@ -216,7 +219,7 @@ INSTALL(FILES
        ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfile.cmake
        ${CMAKE_CURRENT_BINARY_DIR}/odbc.ini
        ${CMAKE_CURRENT_BINARY_DIR}/odbcinst.ini
 -        DESTINATION test COMPONENT tests)
 +        DESTINATION share/mysql-connector-odbc/test COMPONENT tests)
  
+ INSTALL(DIRECTORY
+        ${PROJECT_BINARY_DIR}/test/Debug/

Added files:

Index: pkgsrc/databases/myodbc/patches/patch-cmake_info__bin.cmake
diff -u /dev/null pkgsrc/databases/myodbc/patches/patch-cmake_info__bin.cmake:1.1
--- /dev/null   Sun Dec 25 08:22:26 2022
+++ pkgsrc/databases/myodbc/patches/patch-cmake_info__bin.cmake Sun Dec 25 08:22:26 2022
@@ -0,0 +1,27 @@
+$NetBSD: patch-cmake_info__bin.cmake,v 1.1 2022/12/25 08:22:26 wiz Exp $
+
+Install into more appropriate location for pkgsrc.
+
+--- cmake/info_bin.cmake.orig  2022-09-01 11:59:03.000000000 +0000
++++ cmake/info_bin.cmake
+@@ -100,7 +100,7 @@ FUNCTION(GENERATE_INFO_BIN)
+   ENDIF()
+ 
+   CONFIGURE_FILE(INFO_BIN.in "${CMAKE_SOURCE_DIR}/INFO_BIN")
+-  install(FILES "${CMAKE_SOURCE_DIR}/INFO_BIN" DESTINATION . COMPONENT Readme)
++  install(FILES "${CMAKE_SOURCE_DIR}/INFO_BIN" DESTINATION share/doc/mysql-connector-odbc COMPONENT Readme)
+ ENDFUNCTION()
+ 
+ 
+@@ -179,8 +179,8 @@ FUNCTION(GENERATE_INFO_SRC)
+ 
+     CONFIGURE_FILE(INFO_SRC.in "${CMAKE_SOURCE_DIR}/INFO_SRC")
+   ENDIF()
+-  install(FILES "${CMAKE_SOURCE_DIR}/INFO_SRC" DESTINATION . COMPONENT Readme)
++  install(FILES "${CMAKE_SOURCE_DIR}/INFO_SRC" DESTINATION share/doc/mysql-connector-odbc COMPONENT Readme)
+ ENDFUNCTION()
+ 
+ GENERATE_INFO_SRC()
+-GENERATE_INFO_BIN()
+\ No newline at end of file
++GENERATE_INFO_BIN()
Index: pkgsrc/databases/myodbc/patches/patch-dltest_CMakeLists.txt
diff -u /dev/null pkgsrc/databases/myodbc/patches/patch-dltest_CMakeLists.txt:1.1
--- /dev/null   Sun Dec 25 08:22:26 2022
+++ pkgsrc/databases/myodbc/patches/patch-dltest_CMakeLists.txt Sun Dec 25 08:22:26 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-dltest_CMakeLists.txt,v 1.1 2022/12/25 08:22:26 wiz Exp $
+
+Do not install test binary.
+
+--- dltest/CMakeLists.txt.orig 2022-09-01 11:59:03.000000000 +0000
++++ dltest/CMakeLists.txt
+@@ -31,7 +31,6 @@
+ ADD_EXECUTABLE(dltest dltest.c)
+ set_target_properties(dltest PROPERTIES FOLDER Tests)
+ 
+-INSTALL(TARGETS dltest DESTINATION test COMPONENT tests)
+ 
+ IF(NOT WIN32)
+ 
Index: pkgsrc/databases/myodbc/patches/patch-driver_driver.h
diff -u /dev/null pkgsrc/databases/myodbc/patches/patch-driver_driver.h:1.1
--- /dev/null   Sun Dec 25 08:22:26 2022
+++ pkgsrc/databases/myodbc/patches/patch-driver_driver.h       Sun Dec 25 08:22:26 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-driver_driver.h,v 1.1 2022/12/25 08:22:26 wiz Exp $
+
+NetBSD does not provide uselocale().
+
+--- driver/driver.h.orig       2022-09-01 11:59:03.000000000 +0000
++++ driver/driver.h
+@@ -252,7 +252,7 @@ extern std::mutex global_fido_mutex;
+       _configthreadlocale(loc); \
+     }
+ 
+-#elif defined LC_GLOBAL_LOCALE
++#elif defined(LC_GLOBAL_LOCALE) && !defined(__NetBSD__)
+   #define DECLARE_LOCALE_HANDLE locale_t nloc;
+ 
+   #define __LOCALE_SET(LOC) \

Prev by Date: CVS commit: pkgsrc/databases/mysql80-client
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/databases/mysql80-client
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index