* [gentoo-commits] proj/musl:master commit in: dev-db/libiodbc/, dev-db/libiodbc/files/
@ 2015-07-18 18:08 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2015-07-18 18:08 UTC (permalink / raw
To: gentoo-commits
commit: 6e4c089ca35348009b9944da23d0cbad4a7e85ed
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 18:10:08 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 18:10:08 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=6e4c089c
dev-db/libiodbc: remove brain dead wchar_t check.
Package-Manager: portage-2.2.18
RepoMan-Options: --force
Manifest-Sign-Key: 0xF52D4BBA
dev-db/libiodbc/Manifest | 12 ++++
dev-db/libiodbc/files/fix-runpaths.patch | 15 +++++
.../files/libiodbc-3.52.7-debian_bug501100.patch | 14 +++++
.../files/libiodbc-3.52.7-debian_bug508480.patch | 14 +++++
dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch | 16 +++++
.../libiodbc/files/libiodbc-3.52.7-multilib.patch | 35 +++++++++++
.../files/libiodbc-3.52.7-unicode_includes.patch | 12 ++++
.../files/libiodbc-3.52.8-gtk-parallel-make.patch | 23 ++++++++
...libiodbc-3.52.8-musl-remove-wchar_t-check.patch | 23 ++++++++
.../files/libiodbc-3.52.8-runtime-failures.patch | 56 ++++++++++++++++++
dev-db/libiodbc/libiodbc-3.52.8-r99.ebuild | 69 ++++++++++++++++++++++
dev-db/libiodbc/metadata.xml | 10 ++++
12 files changed, 299 insertions(+)
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
new file mode 100644
index 0000000..09499c4
--- /dev/null
+++ b/dev-db/libiodbc/Manifest
@@ -0,0 +1,12 @@
+AUX fix-runpaths.patch 434 SHA256 b18af410745b0c0fe2468c486e310fa8e48ec36f28ff3315fd1be395ed419b9a SHA512 48364d6004c0f2dadb71a8b6838a4c4b1caf4d2df59e2f4acca82f6203704c4ad4aa4b3d0d4f33fdab4e8d01d7c70dad916b6bc4455dfa1581ff80f9f48468fa WHIRLPOOL a51adaa95024a5ed0ea1130328b7c9d96b39c8848f554f790a52c23e5211254db41c5cca598a00b2d578962425eb3bfc2e372535ad2687ffa0f646f1d77f5fbb
+AUX libiodbc-3.52.7-debian_bug501100.patch 408 SHA256 d81564fdf0637bacbcbad52d7ad097ec9236f4145ad4f958763747bdc5239158 SHA512 e36a2b936b36af3cbdf125725628a2c5ca1f4d246c7b7eaf8c08a97e96fa25915b2b03bdd33f7a1c42b08d54f89174edbcb7f1ebaaa1a2e9777ff33023ac2575 WHIRLPOOL 215843432087ee2d8f782c301491167b4d8599a527774a6a10154975b082a65cfea390e16847a9a357c531c206156ff1fa6bcd08cfb4a71489929b497477d6ea
+AUX libiodbc-3.52.7-debian_bug508480.patch 577 SHA256 234990661704b35a475a55f28fe0c7275558bf85c5faf1abac4f94ccb8302113 SHA512 2e3a0ab2284b0b302e2eb5d27e1cc952810c5ec2d123491047cda15d1e0b2aa651a1d3357fb330be24fa72ec855a89143eb88bd4b87ce079b469b6ab8647ce74 WHIRLPOOL 949aa7a117577b7331b955fa5981e92e4e0041315d9a00375c2bb8d131b92cbbbc63c2da4aa7f20c38ce0f35bce31f57bf72d440b84e9d8c99f85f0791ade6c8
+AUX libiodbc-3.52.7-gtk.patch 445 SHA256 a883c7c87c1abac24c8964f94ccfe61e6011a1d3d6c424782ae3116fae85bd0e SHA512 ec7d682846103ac67274eb145c8501bdc8fdc2f0a7bda650302713e785ca428c75ad29230301e455ec2ad967aa272b13ad5283e8d5b01ff0dfca6beeac7dd0fb WHIRLPOOL e3e0fcb11518ed63fa0ae45f81b2fcf8863bfd4a3fbb61f913a3c6b750d68bccce5e16afef66a06ac8de08937781178c948bf38359046acebc7f1a88bceff6fb
+AUX libiodbc-3.52.7-multilib.patch 853 SHA256 bb9e60277d14f16206351efdd22e74264e03608b487300a5ef6fc641b9078bea SHA512 b91644eb58110cc429458ce372441e76655171ffa52904e0629f238bc6df21793875a6f4b524dddaa9f68f1f2ebc773db56d6da08643e4054299d09f38517849 WHIRLPOOL dec275bcaab1d2c94b3d5d893c5b59f57ac07d81e59dc64b32a955df2dbef01deab31ea657217f9ccec792009601cdaa42bf231d568c79bfe73de7d78fb37ca6
+AUX libiodbc-3.52.7-unicode_includes.patch 432 SHA256 cfa6fc4bdbd200f5eb7d502b9d5878d46a9c7b140b41c876dfda4e42bbda6f97 SHA512 b4bd56e88199ed06ec7ce64bbf53c3d792c501cdadee44a1c52d95336c36e93c2379d312b14c576a138210f2cf277e895ded18e80db4e5bb3f664ccb5695a305 WHIRLPOOL 8af0a923e8425094afaa10b22c00aa67094084c350885d6bd03ec467cafbb703d93d0c94885ba7edbc79e95a1493df38e8c99ff34d3a3beb8bbb7d77d0b79040
+AUX libiodbc-3.52.8-gtk-parallel-make.patch 661 SHA256 c7275637ce251106258d2436f640c352eef11c3083515cf109ce88e0d6efaac5 SHA512 5378bba53eea8c45a13631b5b8d0d4efed78ea2f786835d509431da3813924cbc07aae3d19053efef6fc052d351193f576ed4fcc301956f59f3e36e18280d537 WHIRLPOOL 059a360ff0d0a9cc04e1a65bc6323a2673935dda8eaf7db78a56a1a63e66f31ff3f71ce8bc1bf42a4a3c61b1a5a58c74556763743069c20d66032e2bebd33e49
+AUX libiodbc-3.52.8-musl-remove-wchar_t-check.patch 747 SHA256 c3664c3decc488e023ae89ecd776a989475629cac10c8ad5814b78c685c92984 SHA512 d69f685e59a8a7b9b2acad713410f1ba61f5c948d740b760d603dca0689710d7b4c1bd9f57d38cdc34e3ab428dc047bb13c68669c3586de2bd6ffdace679c17c WHIRLPOOL ff9700ceb1c97c5739cf3c21b45e3e8d189131dfb6935e114677c4a30328db9042bd261f2f9727904d54c23d883bc5b1f17793142c14a0a095948c2a413fab35
+AUX libiodbc-3.52.8-runtime-failures.patch 2033 SHA256 84909ef0bbd8a862c9ed83ca73f22fa7bf75107eeb35d36d87a9b8413c9da66d SHA512 a6b921a85bf4076cf5af8744987cdd98ebc570043344e681def5a83e677e64ddc6457f86c135b33162f7248de6c9897b65978699582e0ad71cb9e696f6270142 WHIRLPOOL 2dd19d56ad6ba8ff6688769f22c2afd25d275fe0c75c9824b1b8c3e1d575ead75be6b180b5e7c2e40301a29a381db6a29ff8a94c6ebde1a7cab28a21cbc4a108
+DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49688399e656e8e4743ed72a0c SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551 WHIRLPOOL b6dafe709c3dff771ef43f023e62f528d92f9f9b05f0b986942826a2ded16e3cc2ccdae1606b2c31931ee487d01c25a173488c5e6d6c1ddafddb8f6be7dd326b
+EBUILD libiodbc-3.52.8-r99.ebuild 1801 SHA256 d49f6ddbb20972023e28167acf0fa64badf1727a844847ecf90c15848afb760f SHA512 683824976fbcdd7ad49539fefe58ee2c321cea8707fed3503b86bee1eea6930a6a304ecfcad1a11ecbbaef1651ba23d21ecd611322fa7f3605908edf0771180b WHIRLPOOL 153d232bcf294e05d4e9778d718690e79802e23004892bf32de746964676678656cd9b9f2a44d534af5edb0835a9f1ce2273de8f26b53c4e50a1b645be7d8605
+MISC metadata.xml 293 SHA256 7582da44248963f2a330103077bd8d0ea471890d8295a536ebc29fe9af7af609 SHA512 37ee49b9df67bb1de1e310a5089d666bc91aae728ed6b38cf8eb0a4883c8d3a9ce348e45e0c3cdb10e0564bee010e1ed4d6a03f90a5ee16846310322f862e358 WHIRLPOOL 1cb9ca189190906ca761704646ff9b299078aac7932aa136400d95c1e8b40daa30b69a870b16957abd4a990a246b46e11d8346630dabd3926669c4a30d9168bb
diff --git a/dev-db/libiodbc/files/fix-runpaths.patch b/dev-db/libiodbc/files/fix-runpaths.patch
new file mode 100644
index 0000000..e913b4c
--- /dev/null
+++ b/dev-db/libiodbc/files/fix-runpaths.patch
@@ -0,0 +1,15 @@
+--- samples/Makefile.am 2012-03-27 05:15:02.000000000 +0200
++++ samples/Makefile.am.new 2013-04-09 14:07:48.303789999 +0200
+@@ -78,12 +78,10 @@
+ #
+ iodbctest_SOURCES = iodbctest.c
+ iodbctest_LDADD = ../iodbc/libiodbc.la
+-iodbctest_LDFLAGS = -static
+
+ iodbctestw_CFLAGS = -DUNICODE
+ iodbctestw_SOURCES = iodbctest.c
+ iodbctestw_LDADD = ../iodbc/libiodbc.la
+-iodbctestw_LDFLAGS = -static
+
+ EXTRA_DIST = $(srcdir)/Makefile.sample
+
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch
new file mode 100644
index 0000000..5e19d1e
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch
@@ -0,0 +1,14 @@
+Index: libiodbc2-3.52.7/include/sqltypes.h
+===================================================================
+--- libiodbc2-3.52.7.orig/include/sqltypes.h 2010-06-26 21:15:00.000000000 +0200
++++ libiodbc2-3.52.7/include/sqltypes.h 2010-06-26 21:15:36.000000000 +0200
+@@ -96,6 +96,9 @@
+ extern "C" {
+ #endif
+
++#ifndef _IODBCUNIX_H
++#include <iodbcunix.h>
++#endif
+
+ /*
+ * Environment specific definitions
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch
new file mode 100644
index 0000000..d1e8018
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch
@@ -0,0 +1,14 @@
+Index: libiodbc2-3.52.7/iodbcinst/inifile.c
+===================================================================
+--- libiodbc2-3.52.7.orig/iodbcinst/inifile.c 2010-06-26 21:29:43.000000000 +0200
++++ libiodbc2-3.52.7/iodbcinst/inifile.c 2010-06-26 21:30:07.000000000 +0200
+@@ -1023,7 +1023,8 @@
+
+ if (!_iodbcdm_cfg_find (pCfg, lpszSection, NULL))
+ {
+- while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg))
++ while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg)
++ && pCfg->section)
+ {
+ if (_iodbcdm_cfg_section (pCfg))
+ break;
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch
new file mode 100644
index 0000000..83fc954
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch
@@ -0,0 +1,16 @@
+diff -pruN 3.52.6-1/configure.in 3.52.6-1ubuntu1/configure.in
+--- 3.52.6-1/configure.in 2007-10-08 14:04:32.000000000 +0100
++++ 3.52.6-1ubuntu1/configure.in 2007-12-06 00:12:00.000000000 +0000
+@@ -315,12 +315,6 @@ then
+ no_gtk=""
+ # Check for GTK+ 2.x
+ AM_PATH_GTK_2_0(2.0.0)
+- if test x$no_gtk != x
+- then
+- # Try GTK 1.2.x instead
+- no_gtk=""
+- AM_PATH_GTK(1.2.3)
+- fi
+ if test x$no_gtk = x
+ then
+ USE_GTK=true
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch
new file mode 100644
index 0000000..73e81d3
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch
@@ -0,0 +1,35 @@
+--- bin/iodbc-config.in.orig 2006-01-23 11:29:22.000000000 +0100
++++ bin/iodbc-config.in 2009-06-04 17:48:19.000000000 +0200
+@@ -145,10 +145,10 @@
+ echo_libs=yes
+ ;;
+ --static-libs)
+- echo_staticlibs=yes
++ echo_libs=yes
+ ;;
+ --libtool-libs)
+- echo_libtoollibs=yes
++ echo_libs=yes
+ ;;
+ --data-dir)
+ echo_data_dir=yes
+@@ -196,19 +196,5 @@
+ if test "$lib_iodbc" = "yes"; then
+ libs="$libs -liodbc -liodbcinst"
+ fi
+- echo "-L@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@"
+- fi
+- echo "$libs"
+-fi
+-if test "$echo_libtoollibs" = "yes"; then
+- libs=""
+- if test "$lib_iodbc" = "yes"; then
+- libs="@libdir@/libiodbc.la @libdir@/libiodbcinst.la"
+- fi
+ echo "$libs"
+ fi
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch
new file mode 100644
index 0000000..67730ec
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch
@@ -0,0 +1,12 @@
+Index: libiodbc2-3.52.7/iodbcinst/unicode.h
+===================================================================
+--- libiodbc2-3.52.7.orig/iodbcinst/unicode.h 2009-09-09 14:13:17.000000000 +0200
++++ libiodbc2-3.52.7/iodbcinst/unicode.h 2010-06-26 21:16:26.000000000 +0200
+@@ -76,6 +76,7 @@
+
+ #ifndef _UNICODE_H
+ #define _UNICODE_H
++#include <iodbc.h>
+
+
+ #if defined (__APPLE__) && !defined (MACOSX102) && !defined (HAVE_CONFIG_H)
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch
new file mode 100644
index 0000000..7278499
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch
@@ -0,0 +1,23 @@
+diff -u -r iODBC-3.52.8.orig/iodbcadm/Makefile.am iODBC-3.52.8/iodbcadm/Makefile.am
+--- iODBC-3.52.8.orig/iodbcadm/Makefile.am 2012-03-27 05:15:02.000000000 -0500
++++ iODBC-3.52.8/iodbcadm/Makefile.am 2013-01-08 08:12:58.639414826 -0600
+@@ -96,7 +96,7 @@
+
+ if GTK
+ libiodbcadm_la_LIBADD = \
+- ../iodbcadm/gtk/libiodbcadm-gtk.la \
++ gtk/libiodbcadm-gtk.la \
+ $(LIBADD_DL) \
+ @GTK_LIBS@ \
+ ../iodbcinst/libiodbc_common.la \
+@@ -117,8 +117,8 @@
+
+ iodbcadm_gtk_SOURCES =
+ iodbcadm_gtk_LDADD = \
+- ../iodbcadm/gtk/main.lo \
+- ../iodbcadm/libiodbcadm.la \
++ gtk/main.lo \
++ libiodbcadm.la \
+ ../iodbcinst/libiodbcinst.la \
+ ../iodbc/libiodbc.la \
+ @GTK_LIBS@
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-musl-remove-wchar_t-check.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-musl-remove-wchar_t-check.patch
new file mode 100644
index 0000000..3a4aa96
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.8-musl-remove-wchar_t-check.patch
@@ -0,0 +1,23 @@
+diff -Naur iODBC-3.52.8.orig/include/sqltypes.h iODBC-3.52.8/include/sqltypes.h
+--- iODBC-3.52.8.orig/include/sqltypes.h 2012-03-27 05:15:02.000000000 -0400
++++ iODBC-3.52.8/include/sqltypes.h 2015-07-18 14:05:24.514478508 -0400
+@@ -399,19 +399,7 @@
+ typedef unsigned short SQLWCHAR;
+ #else
+ # include <stdlib.h>
+-
+-# if defined(__cplusplus) || \
+- defined(_WCHAR_T) || \
+- defined(_WCHAR_T_DEFINED) || \
+- defined(_WCHAR_T_DEFINED_) || \
+- defined(_WCHAR_T_DECLARED) || \
+- defined(_BSD_WCHAR_T_DEFINED_) || \
+- defined(_BSD_WCHAR_T_) || \
+- defined(_BSD_CT_RUNE_T_)
+ typedef wchar_t SQLWCHAR;
+-# else
+-# error Please make sure your system supports the wchar_t type
+-# endif
+ #endif /* WIN32 */
+
+
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch
new file mode 100644
index 0000000..50724ba
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch
@@ -0,0 +1,56 @@
+diff -u -r iODBC-3.52.8.orig/configure.in iODBC-3.52.8/configure.in
+--- iODBC-3.52.8.orig/configure.in 2012-03-27 05:15:02.000000000 -0500
++++ iODBC-3.52.8/configure.in 2013-01-08 10:31:39.740041040 -0600
+@@ -87,7 +87,7 @@
+ AC_CONFIG_SRCDIR([include/isql.h])
+ AC_CONFIG_AUX_DIR(admin)
+ AC_CONFIG_MACRO_DIR(admin)
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADER(include/config.h)
+ AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION)
+ AC_CANONICAL_HOST
+ AM_MAINTAINER_MODE
+diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c iODBC-3.52.8/iodbcadm/gtk/administrator.c
+--- iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c 2012-03-27 05:15:02.000000000 -0500
++++ iODBC-3.52.8/iodbcadm/gtk/administrator.c 2013-01-08 10:29:51.758462953 -0600
+@@ -72,6 +72,13 @@
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
++#ifdef __linux
++# ifndef _GNU_SOURCE
++# define _GNU_SOURCE /* make sure dladdr is declared */
++# endif
++# define HAVE_DL_INFO 1
++#endif
++
+ #include <iodbc.h>
+ #include <dlfcn.h>
+ #include <sys/stat.h>
+@@ -82,7 +89,7 @@
+ #include "odbc4.xpm"
+
+
+-#if !defined(HAVE_DL_INFO)
++#if defined (HAVE_DLADDR) && !defined(HAVE_DL_INFO)
+ typedef struct
+ {
+ const char *dli_fname; /* File name of defining object. */
+@@ -90,6 +97,7 @@
+ const char *dli_sname; /* Name of nearest symbol. */
+ void *dli_saddr; /* Exact value of nearest symbol. */
+ } Dl_info;
++
+ #endif /* HAVE_DL_INFO */
+
+ static char *szDriverButtons[] = {
+diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/gui.h iODBC-3.52.8/iodbcadm/gtk/gui.h
+--- iODBC-3.52.8.orig/iodbcadm/gtk/gui.h 2012-03-27 05:15:02.000000000 -0500
++++ iODBC-3.52.8/iodbcadm/gtk/gui.h 2013-01-08 10:30:48.124240299 -0600
+@@ -219,5 +219,6 @@
+ void addlistofdir_to_optionmenu(GtkWidget* widget, LPCSTR path, TDSNCHOOSER *choose_t);
+ LPSTR create_keyval (HWND wnd, LPCSTR attrs, BOOL *verify_conn);
+ LPSTR create_fgensetup (HWND hwnd, LPCSTR dsn, LPCSTR attrs, BOOL add, BOOL *verify_conn);
++void create_message (HWND hwnd, LPCSTR dsn, LPCSTR text);
+
+ #endif
diff --git a/dev-db/libiodbc/libiodbc-3.52.8-r99.ebuild b/dev-db/libiodbc/libiodbc-3.52.8-r99.ebuild
new file mode 100644
index 0000000..05b6039
--- /dev/null
+++ b/dev-db/libiodbc/libiodbc-3.52.8-r99.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild,v 1.8 2015/02/20 09:29:48 zlogene Exp $
+
+EAPI="5"
+
+inherit autotools eutils multilib-minimal
+
+MY_PN="iODBC"
+
+DESCRIPTION="ODBC Interface for Linux"
+HOMEPAGE="http://www.iodbc.org/"
+SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
+
+KEYWORDS="amd64 arm ~mips ppc x86"
+LICENSE="|| ( LGPL-2 BSD )"
+SLOT="0"
+IUSE="gtk"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/iodbc-config
+)
+
+src_prepare() {
+ sed -i.orig \
+ -e '/^cd "$PREFIX"/,/^esac/d' \
+ iodbc/install_libodbc.sh || die "sed failed"
+ epatch \
+ "${FILESDIR}"/libiodbc-3.52.7-debian_bug501100.patch \
+ "${FILESDIR}"/libiodbc-3.52.7-debian_bug508480.patch \
+ "${FILESDIR}"/libiodbc-3.52.7-gtk.patch \
+ "${FILESDIR}"/libiodbc-3.52.7-multilib.patch \
+ "${FILESDIR}"/libiodbc-3.52.7-unicode_includes.patch \
+ "${FILESDIR}"/libiodbc-3.52.8-gtk-parallel-make.patch \
+ "${FILESDIR}"/libiodbc-3.52.8-runtime-failures.patch \
+ "${FILESDIR}"/libiodbc-3.52.8-musl-remove-wchar_t-check.patch \
+ "${FILESDIR}"/fix-runpaths.patch
+ chmod -x include/*.h || die
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static \
+ --enable-odbc3 \
+ --enable-pthreads \
+ --with-layout=gentoo \
+ --with-iodbc-inidir=yes \
+ $(use_enable gtk gui)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+
+ # Install lintian overrides
+ insinto /usr/share/lintian/overrides
+ newins debian/iodbc.lintian-overrides iodbc
+ newins debian/libiodbc2.lintian-overrides libiodbc2
+}
diff --git a/dev-db/libiodbc/metadata.xml b/dev-db/libiodbc/metadata.xml
new file mode 100644
index 0000000..ccf439c
--- /dev/null
+++ b/dev-db/libiodbc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>olemarkus@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">openlink/iODBC</remote-id>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-db/libiodbc/, dev-db/libiodbc/files/
@ 2019-05-11 13:35 Anthony G. Basile
0 siblings, 0 replies; 3+ messages in thread
From: Anthony G. Basile @ 2019-05-11 13:35 UTC (permalink / raw
To: gentoo-commits
commit: 09c93063b938e5d939c96515fcb8bace5ef561fd
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 13:35:16 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May 11 13:35:16 2019 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=09c93063
dev-db/libiodbc: sync with main tree
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
dev-db/libiodbc/Manifest | 1 +
dev-db/libiodbc/files/fix-runpaths-r1.patch | 15 +++++
.../libiodbc/files/libiodbc-3.52.12-multilib.patch | 37 ++++++++++++
dev-db/libiodbc/libiodbc-3.52.12.ebuild | 68 ++++++++++++++++++++++
4 files changed, 121 insertions(+)
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index c74ce7e..d193c8f 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -1 +1,2 @@
+DIST libiodbc-3.52.12.zip 1248801 BLAKE2B e19b740904a332df7d7f510a6ef7414121e99bcbce0b89db94f4b7a09c0de09f39a8f8abdbec40029b79140fab6e1e1d319ad146cc7d74872a7fe69852a3f710 SHA512 240f6f7dc406fcc6688499bac8800b81380d32e8443e4f098875fabc649da1b86567b67d2259206be64cced8537d3171040d16be39845b9009cd90be62ae97db
DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49688399e656e8e4743ed72a0c SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551 WHIRLPOOL b6dafe709c3dff771ef43f023e62f528d92f9f9b05f0b986942826a2ded16e3cc2ccdae1606b2c31931ee487d01c25a173488c5e6d6c1ddafddb8f6be7dd326b
diff --git a/dev-db/libiodbc/files/fix-runpaths-r1.patch b/dev-db/libiodbc/files/fix-runpaths-r1.patch
new file mode 100644
index 0000000..2cd76c8
--- /dev/null
+++ b/dev-db/libiodbc/files/fix-runpaths-r1.patch
@@ -0,0 +1,15 @@
+--- a/samples/Makefile.am 2012-03-27 05:15:02.000000000 +0200
++++ b/samples/Makefile.am.new 2013-04-09 14:07:48.303789999 +0200
+@@ -78,12 +78,10 @@
+ #
+ iodbctest_SOURCES = iodbctest.c
+ iodbctest_LDADD = ../iodbc/libiodbc.la
+-iodbctest_LDFLAGS = -static
+
+ iodbctestw_CFLAGS = -DUNICODE
+ iodbctestw_SOURCES = iodbctest.c
+ iodbctestw_LDADD = ../iodbc/libiodbc.la
+-iodbctestw_LDFLAGS = -static
+
+ EXTRA_DIST = $(srcdir)/Makefile.sample
+
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch b/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch
new file mode 100644
index 0000000..e281921
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch
@@ -0,0 +1,37 @@
+diff --git a/bin/iodbc-config.in b/bin/iodbc-config.in
+index 08d46ae..576aa8b 100644
+--- a/bin/iodbc-config.in
++++ b/bin/iodbc-config.in
+@@ -145,10 +145,10 @@ while test $# -gt 0; do
+ echo_libs=yes
+ ;;
+ --static-libs)
+- echo_staticlibs=yes
++ echo_libs=yes
+ ;;
+ --libtool-libs)
+- echo_libtoollibs=yes
++ echo_libs=yes
+ ;;
+ --data-dir)
+ echo_data_dir=yes
+@@ -196,19 +196,5 @@ if test "$echo_libs" = "yes"; then
+ if test "$lib_iodbc" = "yes"; then
+ libs="$libs -liodbc -liodbcinst"
+ fi
+- echo "-L@libdir@ $libs"
+-fi
+-if test "$echo_staticlibs" = "yes"; then
+- libs=""
+- if test "$lib_iodbc" = "yes"; then
+- libs="@libdir@/libiodbc.a @libdir@/libiodbcinst.a -lpthread @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"
+- fi
+ echo "$libs"
+ fi
diff --git a/dev-db/libiodbc/libiodbc-3.52.12.ebuild b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
new file mode 100644
index 0000000..22e5799
--- /dev/null
+++ b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+MY_PN="iODBC"
+
+DESCRIPTION="ODBC Interface for Linux"
+HOMEPAGE="http://www.iodbc.org/"
+SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+LICENSE="|| ( LGPL-2 BSD )"
+SLOT="0"
+IUSE="gtk"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/iodbc-config )
+
+PATCHES=(
+ "${FILESDIR}"/libiodbc-3.52.12-multilib.patch
+ "${FILESDIR}"/libiodbc-3.52.7-debian_bug501100.patch
+ "${FILESDIR}"/libiodbc-3.52.7-debian_bug508480.patch
+ "${FILESDIR}"/libiodbc-3.52.7-unicode_includes.patch
+ "${FILESDIR}"/fix-runpaths-r1.patch
+ "${FILESDIR}"/libiodbc-3.52.8-musl-remove-wchar_t-check.patch \
+)
+
+src_prepare() {
+ default
+ sed -i.orig \
+ -e '/^cd "$PREFIX"/,/^esac/d' \
+ iodbc/install_libodbc.sh || die "sed failed"
+
+ # Without this, automake dies. It's what upstream's autogen.sh does.
+ touch ChangeLog || die "failed to create empty ChangeLog"
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf \
+ --disable-static \
+ --enable-odbc3 \
+ --enable-pthreads \
+ --with-layout=gentoo \
+ --with-iodbc-inidir=yes \
+ $(use_enable gtk gui)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+
+ # Install lintian overrides
+ insinto /usr/share/lintian/overrides
+ newins debian/iodbc.lintian-overrides iodbc
+ newins debian/libiodbc2.lintian-overrides libiodbc2
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/musl:master commit in: dev-db/libiodbc/, dev-db/libiodbc/files/
@ 2021-03-13 21:02 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-03-13 21:02 UTC (permalink / raw
To: gentoo-commits
commit: d9dca6fd094dcfeea5787bcb61e9b6b9ee92bf44
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 13 13:17:42 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 21:02:39 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d9dca6fd
dev-db/libiodbc: remove from overlay
Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --force
Manifest-Sign-Key: 0xA1919C830E9498E0
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
Closes: https://github.com/gentoo/musl/pull/408
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/libiodbc/Manifest | 2 -
dev-db/libiodbc/files/fix-runpaths-r1.patch | 15 -----
dev-db/libiodbc/files/fix-runpaths.patch | 15 -----
.../libiodbc/files/libiodbc-3.52.12-multilib.patch | 37 ------------
.../files/libiodbc-3.52.7-debian_bug501100.patch | 14 -----
.../files/libiodbc-3.52.7-debian_bug508480.patch | 14 -----
dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch | 16 -----
.../libiodbc/files/libiodbc-3.52.7-multilib.patch | 35 -----------
.../files/libiodbc-3.52.7-unicode_includes.patch | 12 ----
.../files/libiodbc-3.52.8-gtk-parallel-make.patch | 23 --------
...libiodbc-3.52.8-musl-remove-wchar_t-check.patch | 23 --------
.../files/libiodbc-3.52.8-runtime-failures.patch | 56 ------------------
dev-db/libiodbc/libiodbc-3.52.12.ebuild | 68 ----------------------
dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild | 68 ----------------------
dev-db/libiodbc/metadata.xml | 10 ----
15 files changed, 408 deletions(-)
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
deleted file mode 100644
index d193c8f..0000000
--- a/dev-db/libiodbc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libiodbc-3.52.12.zip 1248801 BLAKE2B e19b740904a332df7d7f510a6ef7414121e99bcbce0b89db94f4b7a09c0de09f39a8f8abdbec40029b79140fab6e1e1d319ad146cc7d74872a7fe69852a3f710 SHA512 240f6f7dc406fcc6688499bac8800b81380d32e8443e4f098875fabc649da1b86567b67d2259206be64cced8537d3171040d16be39845b9009cd90be62ae97db
-DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49688399e656e8e4743ed72a0c SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551 WHIRLPOOL b6dafe709c3dff771ef43f023e62f528d92f9f9b05f0b986942826a2ded16e3cc2ccdae1606b2c31931ee487d01c25a173488c5e6d6c1ddafddb8f6be7dd326b
diff --git a/dev-db/libiodbc/files/fix-runpaths-r1.patch b/dev-db/libiodbc/files/fix-runpaths-r1.patch
deleted file mode 100644
index 2cd76c8..0000000
--- a/dev-db/libiodbc/files/fix-runpaths-r1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/samples/Makefile.am 2012-03-27 05:15:02.000000000 +0200
-+++ b/samples/Makefile.am.new 2013-04-09 14:07:48.303789999 +0200
-@@ -78,12 +78,10 @@
- #
- iodbctest_SOURCES = iodbctest.c
- iodbctest_LDADD = ../iodbc/libiodbc.la
--iodbctest_LDFLAGS = -static
-
- iodbctestw_CFLAGS = -DUNICODE
- iodbctestw_SOURCES = iodbctest.c
- iodbctestw_LDADD = ../iodbc/libiodbc.la
--iodbctestw_LDFLAGS = -static
-
- EXTRA_DIST = $(srcdir)/Makefile.sample
-
diff --git a/dev-db/libiodbc/files/fix-runpaths.patch b/dev-db/libiodbc/files/fix-runpaths.patch
deleted file mode 100644
index e913b4c..0000000
--- a/dev-db/libiodbc/files/fix-runpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- samples/Makefile.am 2012-03-27 05:15:02.000000000 +0200
-+++ samples/Makefile.am.new 2013-04-09 14:07:48.303789999 +0200
-@@ -78,12 +78,10 @@
- #
- iodbctest_SOURCES = iodbctest.c
- iodbctest_LDADD = ../iodbc/libiodbc.la
--iodbctest_LDFLAGS = -static
-
- iodbctestw_CFLAGS = -DUNICODE
- iodbctestw_SOURCES = iodbctest.c
- iodbctestw_LDADD = ../iodbc/libiodbc.la
--iodbctestw_LDFLAGS = -static
-
- EXTRA_DIST = $(srcdir)/Makefile.sample
-
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch b/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch
deleted file mode 100644
index e281921..0000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/bin/iodbc-config.in b/bin/iodbc-config.in
-index 08d46ae..576aa8b 100644
---- a/bin/iodbc-config.in
-+++ b/bin/iodbc-config.in
-@@ -145,10 +145,10 @@ while test $# -gt 0; do
- echo_libs=yes
- ;;
- --static-libs)
-- echo_staticlibs=yes
-+ echo_libs=yes
- ;;
- --libtool-libs)
-- echo_libtoollibs=yes
-+ echo_libs=yes
- ;;
- --data-dir)
- echo_data_dir=yes
-@@ -196,19 +196,5 @@ if test "$echo_libs" = "yes"; then
- if test "$lib_iodbc" = "yes"; then
- libs="$libs -liodbc -liodbcinst"
- fi
-- echo "-L@libdir@ $libs"
--fi
--if test "$echo_staticlibs" = "yes"; then
-- libs=""
-- if test "$lib_iodbc" = "yes"; then
-- libs="@libdir@/libiodbc.a @libdir@/libiodbcinst.a -lpthread @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"
-- fi
- echo "$libs"
- fi
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch
deleted file mode 100644
index 5e19d1e..0000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libiodbc2-3.52.7/include/sqltypes.h
-===================================================================
---- libiodbc2-3.52.7.orig/include/sqltypes.h 2010-06-26 21:15:00.000000000 +0200
-+++ libiodbc2-3.52.7/include/sqltypes.h 2010-06-26 21:15:36.000000000 +0200
-@@ -96,6 +96,9 @@
- extern "C" {
- #endif
-
-+#ifndef _IODBCUNIX_H
-+#include <iodbcunix.h>
-+#endif
-
- /*
- * Environment specific definitions
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch
deleted file mode 100644
index d1e8018..0000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libiodbc2-3.52.7/iodbcinst/inifile.c
-===================================================================
---- libiodbc2-3.52.7.orig/iodbcinst/inifile.c 2010-06-26 21:29:43.000000000 +0200
-+++ libiodbc2-3.52.7/iodbcinst/inifile.c 2010-06-26 21:30:07.000000000 +0200
-@@ -1023,7 +1023,8 @@
-
- if (!_iodbcdm_cfg_find (pCfg, lpszSection, NULL))
- {
-- while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg))
-+ while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg)
-+ && pCfg->section)
- {
- if (_iodbcdm_cfg_section (pCfg))
- break;
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch
deleted file mode 100644
index 83fc954..0000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -pruN 3.52.6-1/configure.in 3.52.6-1ubuntu1/configure.in
---- 3.52.6-1/configure.in 2007-10-08 14:04:32.000000000 +0100
-+++ 3.52.6-1ubuntu1/configure.in 2007-12-06 00:12:00.000000000 +0000
-@@ -315,12 +315,6 @@ then
- no_gtk=""
- # Check for GTK+ 2.x
- AM_PATH_GTK_2_0(2.0.0)
-- if test x$no_gtk != x
-- then
-- # Try GTK 1.2.x instead
-- no_gtk=""
-- AM_PATH_GTK(1.2.3)
-- fi
- if test x$no_gtk = x
- then
- USE_GTK=true
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch
deleted file mode 100644
index 73e81d3..0000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- bin/iodbc-config.in.orig 2006-01-23 11:29:22.000000000 +0100
-+++ bin/iodbc-config.in 2009-06-04 17:48:19.000000000 +0200
-@@ -145,10 +145,10 @@
- echo_libs=yes
- ;;
- --static-libs)
-- echo_staticlibs=yes
-+ echo_libs=yes
- ;;
- --libtool-libs)
-- echo_libtoollibs=yes
-+ echo_libs=yes
- ;;
- --data-dir)
- echo_data_dir=yes
-@@ -196,19 +196,5 @@
- if test "$lib_iodbc" = "yes"; then
- libs="$libs -liodbc -liodbcinst"
- fi
-- echo "-L@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@"
-- fi
-- echo "$libs"
--fi
--if test "$echo_libtoollibs" = "yes"; then
-- libs=""
-- if test "$lib_iodbc" = "yes"; then
-- libs="@libdir@/libiodbc.la @libdir@/libiodbcinst.la"
-- fi
- echo "$libs"
- fi
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch
deleted file mode 100644
index 67730ec..0000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libiodbc2-3.52.7/iodbcinst/unicode.h
-===================================================================
---- libiodbc2-3.52.7.orig/iodbcinst/unicode.h 2009-09-09 14:13:17.000000000 +0200
-+++ libiodbc2-3.52.7/iodbcinst/unicode.h 2010-06-26 21:16:26.000000000 +0200
-@@ -76,6 +76,7 @@
-
- #ifndef _UNICODE_H
- #define _UNICODE_H
-+#include <iodbc.h>
-
-
- #if defined (__APPLE__) && !defined (MACOSX102) && !defined (HAVE_CONFIG_H)
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch
deleted file mode 100644
index 7278499..0000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -u -r iODBC-3.52.8.orig/iodbcadm/Makefile.am iODBC-3.52.8/iodbcadm/Makefile.am
---- iODBC-3.52.8.orig/iodbcadm/Makefile.am 2012-03-27 05:15:02.000000000 -0500
-+++ iODBC-3.52.8/iodbcadm/Makefile.am 2013-01-08 08:12:58.639414826 -0600
-@@ -96,7 +96,7 @@
-
- if GTK
- libiodbcadm_la_LIBADD = \
-- ../iodbcadm/gtk/libiodbcadm-gtk.la \
-+ gtk/libiodbcadm-gtk.la \
- $(LIBADD_DL) \
- @GTK_LIBS@ \
- ../iodbcinst/libiodbc_common.la \
-@@ -117,8 +117,8 @@
-
- iodbcadm_gtk_SOURCES =
- iodbcadm_gtk_LDADD = \
-- ../iodbcadm/gtk/main.lo \
-- ../iodbcadm/libiodbcadm.la \
-+ gtk/main.lo \
-+ libiodbcadm.la \
- ../iodbcinst/libiodbcinst.la \
- ../iodbc/libiodbc.la \
- @GTK_LIBS@
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-musl-remove-wchar_t-check.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-musl-remove-wchar_t-check.patch
deleted file mode 100644
index 3a4aa96..0000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.8-musl-remove-wchar_t-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur iODBC-3.52.8.orig/include/sqltypes.h iODBC-3.52.8/include/sqltypes.h
---- iODBC-3.52.8.orig/include/sqltypes.h 2012-03-27 05:15:02.000000000 -0400
-+++ iODBC-3.52.8/include/sqltypes.h 2015-07-18 14:05:24.514478508 -0400
-@@ -399,19 +399,7 @@
- typedef unsigned short SQLWCHAR;
- #else
- # include <stdlib.h>
--
--# if defined(__cplusplus) || \
-- defined(_WCHAR_T) || \
-- defined(_WCHAR_T_DEFINED) || \
-- defined(_WCHAR_T_DEFINED_) || \
-- defined(_WCHAR_T_DECLARED) || \
-- defined(_BSD_WCHAR_T_DEFINED_) || \
-- defined(_BSD_WCHAR_T_) || \
-- defined(_BSD_CT_RUNE_T_)
- typedef wchar_t SQLWCHAR;
--# else
--# error Please make sure your system supports the wchar_t type
--# endif
- #endif /* WIN32 */
-
-
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch
deleted file mode 100644
index 50724ba..0000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -u -r iODBC-3.52.8.orig/configure.in iODBC-3.52.8/configure.in
---- iODBC-3.52.8.orig/configure.in 2012-03-27 05:15:02.000000000 -0500
-+++ iODBC-3.52.8/configure.in 2013-01-08 10:31:39.740041040 -0600
-@@ -87,7 +87,7 @@
- AC_CONFIG_SRCDIR([include/isql.h])
- AC_CONFIG_AUX_DIR(admin)
- AC_CONFIG_MACRO_DIR(admin)
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADER(include/config.h)
- AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION)
- AC_CANONICAL_HOST
- AM_MAINTAINER_MODE
-diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c iODBC-3.52.8/iodbcadm/gtk/administrator.c
---- iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c 2012-03-27 05:15:02.000000000 -0500
-+++ iODBC-3.52.8/iodbcadm/gtk/administrator.c 2013-01-08 10:29:51.758462953 -0600
-@@ -72,6 +72,13 @@
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-+#ifdef __linux
-+# ifndef _GNU_SOURCE
-+# define _GNU_SOURCE /* make sure dladdr is declared */
-+# endif
-+# define HAVE_DL_INFO 1
-+#endif
-+
- #include <iodbc.h>
- #include <dlfcn.h>
- #include <sys/stat.h>
-@@ -82,7 +89,7 @@
- #include "odbc4.xpm"
-
-
--#if !defined(HAVE_DL_INFO)
-+#if defined (HAVE_DLADDR) && !defined(HAVE_DL_INFO)
- typedef struct
- {
- const char *dli_fname; /* File name of defining object. */
-@@ -90,6 +97,7 @@
- const char *dli_sname; /* Name of nearest symbol. */
- void *dli_saddr; /* Exact value of nearest symbol. */
- } Dl_info;
-+
- #endif /* HAVE_DL_INFO */
-
- static char *szDriverButtons[] = {
-diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/gui.h iODBC-3.52.8/iodbcadm/gtk/gui.h
---- iODBC-3.52.8.orig/iodbcadm/gtk/gui.h 2012-03-27 05:15:02.000000000 -0500
-+++ iODBC-3.52.8/iodbcadm/gtk/gui.h 2013-01-08 10:30:48.124240299 -0600
-@@ -219,5 +219,6 @@
- void addlistofdir_to_optionmenu(GtkWidget* widget, LPCSTR path, TDSNCHOOSER *choose_t);
- LPSTR create_keyval (HWND wnd, LPCSTR attrs, BOOL *verify_conn);
- LPSTR create_fgensetup (HWND hwnd, LPCSTR dsn, LPCSTR attrs, BOOL add, BOOL *verify_conn);
-+void create_message (HWND hwnd, LPCSTR dsn, LPCSTR text);
-
- #endif
diff --git a/dev-db/libiodbc/libiodbc-3.52.12.ebuild b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
deleted file mode 100644
index 6494021..0000000
--- a/dev-db/libiodbc/libiodbc-3.52.12.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-MY_PN="iODBC"
-
-DESCRIPTION="ODBC Interface for Linux"
-HOMEPAGE="http://www.iodbc.org/"
-SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-LICENSE="|| ( LGPL-2 BSD )"
-SLOT="0"
-IUSE="gtk"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/iodbc-config )
-
-PATCHES=(
- "${FILESDIR}"/libiodbc-3.52.12-multilib.patch
- "${FILESDIR}"/libiodbc-3.52.7-debian_bug501100.patch
- "${FILESDIR}"/libiodbc-3.52.7-debian_bug508480.patch
- "${FILESDIR}"/libiodbc-3.52.7-unicode_includes.patch
- "${FILESDIR}"/fix-runpaths-r1.patch
- "${FILESDIR}"/libiodbc-3.52.8-musl-remove-wchar_t-check.patch \
-)
-
-src_prepare() {
- default
- sed -i.orig \
- -e '/^cd "$PREFIX"/,/^esac/d' \
- iodbc/install_libodbc.sh || die "sed failed"
-
- # Without this, automake dies. It's what upstream's autogen.sh does.
- touch ChangeLog || die "failed to create empty ChangeLog"
-
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" \
- econf \
- --disable-static \
- --enable-odbc3 \
- --enable-pthreads \
- --with-layout=gentoo \
- --with-iodbc-inidir=yes \
- $(use_enable gtk gui)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-
- # Install lintian overrides
- insinto /usr/share/lintian/overrides
- newins debian/iodbc.lintian-overrides iodbc
- newins debian/libiodbc2.lintian-overrides libiodbc2
-}
diff --git a/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild b/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild
deleted file mode 100644
index d44ce39..0000000
--- a/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils multilib-minimal
-
-MY_PN="iODBC"
-
-DESCRIPTION="ODBC Interface for Linux"
-HOMEPAGE="http://www.iodbc.org/"
-SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
-
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-LICENSE="|| ( LGPL-2 BSD )"
-SLOT="0"
-IUSE="gtk"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/iodbc-config
-)
-
-src_prepare() {
- sed -i.orig \
- -e '/^cd "$PREFIX"/,/^esac/d' \
- iodbc/install_libodbc.sh || die "sed failed"
- epatch \
- "${FILESDIR}"/libiodbc-3.52.7-debian_bug501100.patch \
- "${FILESDIR}"/libiodbc-3.52.7-debian_bug508480.patch \
- "${FILESDIR}"/libiodbc-3.52.7-gtk.patch \
- "${FILESDIR}"/libiodbc-3.52.7-multilib.patch \
- "${FILESDIR}"/libiodbc-3.52.7-unicode_includes.patch \
- "${FILESDIR}"/libiodbc-3.52.8-gtk-parallel-make.patch \
- "${FILESDIR}"/libiodbc-3.52.8-runtime-failures.patch \
- "${FILESDIR}"/libiodbc-3.52.8-musl-remove-wchar_t-check.patch \
- "${FILESDIR}"/fix-runpaths.patch
- chmod -x include/*.h || die
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --enable-odbc3 \
- --enable-pthreads \
- --with-layout=gentoo \
- --with-iodbc-inidir=yes \
- $(use_enable gtk gui)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-
- # Install lintian overrides
- insinto /usr/share/lintian/overrides
- newins debian/iodbc.lintian-overrides iodbc
- newins debian/libiodbc2.lintian-overrides libiodbc2
-}
diff --git a/dev-db/libiodbc/metadata.xml b/dev-db/libiodbc/metadata.xml
deleted file mode 100644
index 298c436..0000000
--- a/dev-db/libiodbc/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>olemarkus@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">openlink/iODBC</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-13 21:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-18 18:08 [gentoo-commits] proj/musl:master commit in: dev-db/libiodbc/, dev-db/libiodbc/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2019-05-11 13:35 Anthony G. Basile
2021-03-13 21:02 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox