Thanks, applied as 32a82145b77b87d07b14122be84850749b32e913.

Michael

[sent from post-receive hook]

On Mon, 18 May 2026 09:53:52 +0200, Thorsten Scherer <[email protected]> 
wrote:
> Signed-off-by: Thorsten Scherer <[email protected]>
> Message-Id: <[email protected]>
> Signed-off-by: Michael Olbrich <[email protected]>
> 
> diff --git 
> a/patches/libiodbc-3.52.7/0001-iodbc-config-add-SYSROOT-support.patch 
> b/patches/libiodbc-3.52.7/0001-iodbc-config-add-SYSROOT-support.patch
> deleted file mode 100644
> index 9de893367103..000000000000
> --- a/patches/libiodbc-3.52.7/0001-iodbc-config-add-SYSROOT-support.patch
> +++ /dev/null
> @@ -1,51 +0,0 @@
> -From ce98dea7e75bd95b386cea865131d0303ba372d7 Mon Sep 17 00:00:00 2001
> -From: Marc Kleine-Budde <[email protected]>
> -Date: Sat, 9 Jan 2010 23:26:55 +0100
> -Subject: [PATCH] iodbc-config: add SYSROOT support
> -
> -Signed-off-by: Marc Kleine-Budde <[email protected]>
> ----
> - bin/iodbc-config.in |   10 +++++-----
> - 1 files changed, 5 insertions(+), 5 deletions(-)
> -
> -diff --git a/bin/iodbc-config.in b/bin/iodbc-config.in
> -index 7649752..702ed02 100644
> ---- a/bin/iodbc-config.in
> -+++ b/bin/iodbc-config.in
> -@@ -136,8 +136,8 @@ while test $# -gt 0; do
> -       exit 0
> -       ;;
> -     --cflags)
> --      if test "@includedir@" != /usr/include ; then
> --        includes="-I@includedir@"
> -+      if test "${SYSROOT}@includedir@" != /usr/include ; then
> -+        includes="-I${SYSROOT}@includedir@"
> -       fi
> -       echo_cflags=yes
> -       ;;
> -@@ -196,19 +196,19 @@ if test "$echo_libs" = "yes"; then
> -     if test "$lib_iodbc" = "yes"; then
> -             libs="$libs -liodbc -liodbcinst"
> -     fi
> --    echo "-L@libdir@ $libs"
> -+    echo "-L${SYSROOT}@libdir@ $libs"
> - fi
> - if test "$echo_staticlibs" = "yes"; then
> -     libs=""
> -     if test "$lib_iodbc" = "yes"; then
> --            libs="@libdir@/libiodbc.a @libdir@/libiodbcinst.a @LIBADD_DL@"
> -+            libs="${SYSROOT}@libdir@/libiodbc.a 
> ${SYSROOT}@libdir@/libiodbcinst.a @LIBADD_DL@"
> -     fi
> -     echo "$libs"
> - fi
> - if test "$echo_libtoollibs" = "yes"; then
> -     libs=""
> -     if test "$lib_iodbc" = "yes"; then
> --            libs="@libdir@/libiodbc.la @libdir@/libiodbcinst.la"
> -+            libs="${SYSROOT}@libdir@/libiodbc.la 
> ${SYSROOT}@libdir@/libiodbcinst.la"
> -     fi
> -     echo "$libs"
> - fi
> --- 
> -1.6.6
> -
> diff --git a/patches/libiodbc-3.52.7/series b/patches/libiodbc-3.52.7/series
> deleted file mode 100644
> index 7fc01ef17982..000000000000
> --- a/patches/libiodbc-3.52.7/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -0001-iodbc-config-add-SYSROOT-support.patch
> diff --git a/rules/libiodbc.in b/rules/libiodbc.in
> deleted file mode 100644
> index 2f5d61bbebad..000000000000
> --- a/rules/libiodbc.in
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=system_libraries
> -
> -menuconfig LIBIODBC
> -     tristate "libiodbc                      "
> -     select LIBC_DL
> -     select GTK if LIBIODBC_GUI
> -     help
> -       iODBC Driver Manager
> -
> -       iODBC (intrinsic Open Database Connectivity) driver manager
> -       is compatible with ODBC 2.x and 3.x specification and
> -       performs exact the jobs of an ODBC driver manager
> -       (i.e. driver loading, Parameters and function sequence
> -       checking, driver's function invoking, etc). Any ODBC driver
> -       works with ODBC 2.0 and 3.x driver manager will also work
> -       with iODBC driver manager and vice versa.
> -
> -       Applications (using ODBC function calls) linked with iODBC
> -       driver manager will be able to simultaneously access
> -       different type of data sources within one process through
> -       suitable iODBC drivers.
> -
> -       STAGING: remove in PTXdist 2026.03.0
> -       Unmaintained in PTXdist and fails to build with current toolchains.
> -
> -if LIBIODBC
> -
> -config LIBIODBC_GUI
> -     bool
> -     prompt "gui"
> -     # needs gtk2
> -     depends on BROKEN
> -     help
> -       build GUI applications
> -
> -choice
> -     prompt "driver manager version"
> -     help
> -       Specify which driver manager version we should be compatible with.
> -
> -     config LIBIODBC_DRIVER_VERSION_3
> -             bool "3.x"
> -             help
> -               build ODBC 3.x compatible driver manager
> -
> -     config LIBIODBC_DRIVER_VERSION_2
> -             bool "2.x"
> -             # currently not supported
> -             depends on BROKEN
> -             help
> -               build ODBC 2.x compatible driver manager
> -
> -endchoice
> -
> -endif
> diff --git a/rules/libiodbc.make b/rules/libiodbc.make
> deleted file mode 100644
> index 1c6df5caad8b..000000000000
> --- a/rules/libiodbc.make
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2009 by Robert Schwebel <[email protected]>
> -# Copyright (C) 2009 by Juergen Beisert <[email protected]>
> -#
> -# For further information about the PTXdist project and license conditions
> -# see the README file.
> -#
> -
> -#
> -# We provide this package
> -#
> -PACKAGES-$(PTXCONF_LIBIODBC) += libiodbc
> -
> -#
> -# Paths and names
> -#
> -LIBIODBC_VERSION     := 3.52.7
> -LIBIODBC_MD5         := ddbd274cb31d65be6a78da58fc09079a
> -LIBIODBC             := libiodbc-$(LIBIODBC_VERSION)
> -LIBIODBC_SUFFIX              := tar.gz
> -LIBIODBC_URL         := $(call ptx/mirror, SF, 
> iodbc/$(LIBIODBC).$(LIBIODBC_SUFFIX))
> -LIBIODBC_SOURCE              := $(SRCDIR)/$(LIBIODBC).$(LIBIODBC_SUFFIX)
> -LIBIODBC_DIR         := $(BUILDDIR)/$(LIBIODBC)
> -LIBIODBC_LICENSE     := LGPL-2.0-only AND BSD
> -
> -# 
> ----------------------------------------------------------------------------
> -# Prepare
> -# 
> ----------------------------------------------------------------------------
> -
> -LIBIODBC_MAKE_PAR    := NO
> -
> -#
> -# autoconf
> -#
> -LIBIODBC_CONF_TOOL   := autoconf
> -LIBIODBC_CONF_OPT    := \
> -     $(CROSS_AUTOCONF_USR) \
> -     --enable-libodbc \
> -     --enable-pthreads \
> -     --disable-gtktest \
> -     --$(call ptx/endis, PTXCONF_LIBIODBC_GUI)-gui \
> -     --$(call ptx/endis, PTXCONF_LIBIODBC_DRIVER_VERSION_3)-odbc3
> -
> -# 
> ----------------------------------------------------------------------------
> -# Target-Install
> -# 
> ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/libiodbc.targetinstall:
> -     @$(call targetinfo)
> -
> -     @$(call install_init, libiodbc)
> -     @$(call install_fixup, libiodbc,PRIORITY,optional)
> -     @$(call install_fixup, libiodbc,SECTION,base)
> -     @$(call install_fixup, libiodbc,AUTHOR,"Robert Schwebel 
> <[email protected]>")
> -     @$(call install_fixup, libiodbc,DESCRIPTION,missing)
> -
> -     @$(call install_lib, libiodbc, 0, 0, 0644, libiodbc)
> -     @$(call install_lib, libiodbc, 0, 0, 0644, libiodbcinst)
> -
> -     @$(call install_finish, libiodbc)
> -
> -     @$(call touch)
> -
> -# vim: syntax=make

Reply via email to