diff mbox series

[1/1] package/unixodbc: bump to version 2.3.12

Message ID 20230924211524.1598438-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/unixodbc: bump to version 2.3.12 | expand

Commit Message

Fabrice Fontaine Sept. 24, 2023, 9:15 p.m. UTC 
Drop patch (already in version)

https://github.com/lurcher/unixODBC/releases/tag/2.3.12

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 .checkpackageignore                           |  1 -
 ...ivermanager.h-fix-build-without-thre.patch | 34 -------------------
 package/unixodbc/unixodbc.hash                |  2 +-
 package/unixodbc/unixodbc.mk                  |  2 +-
 4 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch

Comments

Peter Korsgaard Sept. 27, 2023, 7:13 p.m. UTC | #1 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Drop patch (already in version)
 > https://github.com/lurcher/unixODBC/releases/tag/2.3.12

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.
diff mbox series

Patch

diff --git a/.checkpackageignore b/.checkpackageignore
index c11a9cf840..7918a22c44 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -1414,7 +1414,6 @@  package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch Upstream
 package/umtprd/0001-Fix-output_dir-make-dependency.patch Upstream
 package/unbound/S70unbound Shellcheck
 package/unifdef/0001-Makefile-fix-error-on-install.patch Upstream
-package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch Upstream
 package/unscd/S46unscd Indent Shellcheck Variables
 package/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch Upstream
 package/upmpdcli/S99upmpdcli Indent Shellcheck Variables
diff --git a/package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch b/package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch
deleted file mode 100644
index 9d54bbf5ef..0000000000
--- a/package/unixodbc/0001-DriverManager-drivermanager.h-fix-build-without-thre.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From 119cab666646cd9210439d4696a4bfa18343a2c6 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 12 Jul 2022 00:29:28 +0200
-Subject: [PATCH] DriverManager/drivermanager.h: fix build without threads
-
-Fix the following build failure without threads raised since version
-2.3.10 and commit 6df155fb213896b9507b421c58856e4376647ae1:
-
-/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: ../DriverManager/.libs/libodbc.so: undefined reference to `pool_timedwait'
-/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: ../DriverManager/.libs/libodbc.so: undefined reference to `pool_signal'
-
-Fixes:
- - http://autobuild.buildroot.org/results/131eafaddfc956c7d54c81ed72a31baf28ab1ab6
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/lurcher/unixODBC/commit/119cab666646cd9210439d4696a4bfa18343a2c6]
----
- DriverManager/drivermanager.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/DriverManager/drivermanager.h b/DriverManager/drivermanager.h
-index 9528fae..abd324b 100644
---- a/DriverManager/drivermanager.h
-+++ b/DriverManager/drivermanager.h
-@@ -808,6 +808,8 @@ void pool_signal();
- 
- #define thread_protect(a,b)
- #define thread_release(a,b)
-+#define pool_timedwait(a)
-+#define pool_signal()
- 
- #endif
- 
diff --git a/package/unixodbc/unixodbc.hash b/package/unixodbc/unixodbc.hash
index 9e5401c2b3..6262dab5ae 100644
--- a/package/unixodbc/unixodbc.hash
+++ b/package/unixodbc/unixodbc.hash
@@ -1,4 +1,4 @@ 
 # Locally computed
-sha256  d9e55c8e7118347e3c66c87338856dad1516b490fb7c756c1562a2c267c73b5c  unixODBC-2.3.11.tar.gz
+sha256  f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec  unixODBC-2.3.12.tar.gz
 sha256  a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8  COPYING
 sha256  1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4  exe/COPYING
diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk
index 650e3b3b36..28f1e5bc94 100644
--- a/package/unixodbc/unixodbc.mk
+++ b/package/unixodbc/unixodbc.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-UNIXODBC_VERSION = 2.3.11
+UNIXODBC_VERSION = 2.3.12
 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz
 UNIXODBC_SITE = http://www.unixodbc.org
 UNIXODBC_INSTALL_STAGING = YES