diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-db/libiodbc |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-db/libiodbc')
-rw-r--r-- | dev-db/libiodbc/Manifest | 17 | ||||
-rw-r--r-- | dev-db/libiodbc/files/fix-runpaths-r1.patch | 15 | ||||
-rw-r--r-- | dev-db/libiodbc/files/fix-runpaths.patch | 15 | ||||
-rw-r--r-- | dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch | 37 | ||||
-rw-r--r-- | dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch | 14 | ||||
-rw-r--r-- | dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch | 14 | ||||
-rw-r--r-- | dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch | 16 | ||||
-rw-r--r-- | dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch | 35 | ||||
-rw-r--r-- | dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch | 12 | ||||
-rw-r--r-- | dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch | 23 | ||||
-rw-r--r-- | dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch | 56 | ||||
-rw-r--r-- | dev-db/libiodbc/libiodbc-3.52.12.ebuild | 67 | ||||
-rw-r--r-- | dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild | 67 | ||||
-rw-r--r-- | dev-db/libiodbc/metadata.xml | 8 |
14 files changed, 396 insertions, 0 deletions
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest new file mode 100644 index 000000000000..3b804c5ca108 --- /dev/null +++ b/dev-db/libiodbc/Manifest @@ -0,0 +1,17 @@ +AUX fix-runpaths-r1.patch 438 SHA256 07efa7397c869dbf4baa17b8ab102d5c746a609710c438f0f65b0c91f02ed8e2 SHA512 2c64890a2e61f7fd3c6c053a35308b57eb7c50bf070d4833bd0b8a4182d3581cfb358ee315cc26cb26d6b11941d4e9265b38f59732f7b679d3b2d23d0dda0035 WHIRLPOOL 526c90ffcbb947ec0320fe90ba7e8b5d654b26a0024d3c5eee10792a9d82da9a11f7f089f2f91207a9ccdea16d28f17f3016ce7194863a003c9c4d4e4e1e03b1 +AUX fix-runpaths.patch 434 SHA256 b18af410745b0c0fe2468c486e310fa8e48ec36f28ff3315fd1be395ed419b9a SHA512 48364d6004c0f2dadb71a8b6838a4c4b1caf4d2df59e2f4acca82f6203704c4ad4aa4b3d0d4f33fdab4e8d01d7c70dad916b6bc4455dfa1581ff80f9f48468fa WHIRLPOOL a51adaa95024a5ed0ea1130328b7c9d96b39c8848f554f790a52c23e5211254db41c5cca598a00b2d578962425eb3bfc2e372535ad2687ffa0f646f1d77f5fbb +AUX libiodbc-3.52.12-multilib.patch 934 SHA256 1fdfd4df7484cae69fd0efb34e822cf11cbd6cbc769ac610f9f7971a7000852b SHA512 718f564371d962283525f946b60b9028e66b3477d4bf20fd6f5363d08635c2d2603d9de5fb157e6039c124324578e5367e985d83623a3b1cd4dd0de7605f1911 WHIRLPOOL 5808ae4b057d55bbb90193250d06b823e5067df59629448503bca2a339a7081dd2ca6cd8869a604885be356baf8a28e2e9ba7767e9c6d2bf1225822d0393868c +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-runtime-failures.patch 2033 SHA256 84909ef0bbd8a862c9ed83ca73f22fa7bf75107eeb35d36d87a9b8413c9da66d SHA512 a6b921a85bf4076cf5af8744987cdd98ebc570043344e681def5a83e677e64ddc6457f86c135b33162f7248de6c9897b65978699582e0ad71cb9e696f6270142 WHIRLPOOL 2dd19d56ad6ba8ff6688769f22c2afd25d275fe0c75c9824b1b8c3e1d575ead75be6b180b5e7c2e40301a29a381db6a29ff8a94c6ebde1a7cab28a21cbc4a108 +DIST libiodbc-3.52.12.zip 1248801 SHA256 3e764524538bf26ada27a8e55915d7ca42d5069e01d36ed57eabcb724d3764b4 SHA512 240f6f7dc406fcc6688499bac8800b81380d32e8443e4f098875fabc649da1b86567b67d2259206be64cced8537d3171040d16be39845b9009cd90be62ae97db WHIRLPOOL 782eec0afb4802abf6d2b3d293b0a886bdb8aa011676fc2814d7df02c14919c425b82cc7428495015fcdc14512a0aa887e5eb641b3eeb8372838e21e73a3e5dd +DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49688399e656e8e4743ed72a0c SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551 WHIRLPOOL b6dafe709c3dff771ef43f023e62f528d92f9f9b05f0b986942826a2ded16e3cc2ccdae1606b2c31931ee487d01c25a173488c5e6d6c1ddafddb8f6be7dd326b +EBUILD libiodbc-3.52.12.ebuild 1658 SHA256 21d54836da157150726da10cd2aab0c4aa195b7969d10614e9e90d0c89c2f543 SHA512 53efa97c5709d59b26d631aaefb9210468ab3aa2a8bdc32d9492a691b0ee2b66c7d6f9163095f00ab747370113a528600481eba35388914a91c36ff20d1df3a1 WHIRLPOOL 1f5297d87c288863915e9dda70b880b5ce7df2af0d9dbcba8a3db8bc7412ffe0867a06057d4e127a348562d9120273a4800d99a1b4d3ca9ea4acacf43abf387e +EBUILD libiodbc-3.52.8-r2.ebuild 1711 SHA256 6c1943360c66b65b8ed52cddd75063a114dbc176a637a8500ba1e1a41ce4a6e9 SHA512 9ac4fa353299828cd7419ee5c5502434a3390db1a3f6c3558bda884cf091fa31cec34c69d2e2612985bd73c0ad97ee8dfa6bf6d96af59424f34148706475c8b1 WHIRLPOOL f964f07008868f9024ab7810a6ac1420e4b10928c7536a37627972ed4238b1655a8abec3732fa5d7dbe0562f41376d1997e9ac59ad2f3706858181c6191a1b96 +MISC ChangeLog 3724 SHA256 100fef70c65a9577d0e3bd3bdb410724bc36ade707a040dab691d4e1f0b74056 SHA512 cafc86087a2889c72c3b27da245d92923d5dc6cca36f740921d6a8534050ffd62dcc5f3edbb0740d2f7087c7c81be16ca3f5a584a3b645df7e56b856f5763191 WHIRLPOOL f171c4be3731af414ebf1458b30607e23276b59e16f22705c59749f9a8484be362cbac2cae4bce7b4dfabc3b109536bb835a4dd9272b3d6ed400c3cb85cfacc2 +MISC ChangeLog-2015 9092 SHA256 452849aff501c673fa4922154b800ae60312cef5ba5dc641a8019eaca0436e7b SHA512 4d3e31bdb0ea6764562168561fa691b389f44e04a69a8ce604691c43107dcf86ef5ca8f13bd4d4b6a77ad204bdb36ff8d2b77886e29a37a327f8767ada95ed3f WHIRLPOOL e09d877cf38cc49121b05e8d363b8b9b6fb8143823c6c6efbb00bb55db4b9abfbec2d124193aa2fc08301c8d08bc16a5562ae549d9c7956e26971a22f63fdf76 +MISC metadata.xml 251 SHA256 4e1c02894ff5f769312db313c8f094a234a29e559cc6f88357ca6fbacdd18fca SHA512 ec0eb5cbc30d0a7ad8c74612255d84a473c370d977f9be4c95904eb5281060bbe3c23d97fb9537e844bbaf90c2f6dd1fae891d44628bbca29fbecb0fe0cb8bbd WHIRLPOOL b54f8ed32c068cbc42189d6140a2689b1bb1b449db0300d29e926e6e782fcc35ebce78257f026a90bc6f412aa8df36fcd2be7370925d48f275502c3fd3518296 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 000000000000..2cd76c816254 --- /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/fix-runpaths.patch b/dev-db/libiodbc/files/fix-runpaths.patch new file mode 100644 index 000000000000..e913b4c7c4cc --- /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.12-multilib.patch b/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch new file mode 100644 index 000000000000..e2819211ccac --- /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/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 000000000000..5e19d1e68094 --- /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 000000000000..d1e80184e5b1 --- /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 000000000000..83fc954d46c9 --- /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 000000000000..73e81d30aec0 --- /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 000000000000..67730ec65556 --- /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 000000000000..7278499aff35 --- /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-runtime-failures.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch new file mode 100644 index 000000000000..50724ba46b48 --- /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.12.ebuild b/dev-db/libiodbc/libiodbc-3.52.12.ebuild new file mode 100644 index 000000000000..601567f5e7e1 --- /dev/null +++ b/dev-db/libiodbc/libiodbc-3.52.12.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +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 +) + +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 new file mode 100644 index 000000000000..364fe91e946c --- /dev/null +++ b/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2015 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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +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}"/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 000000000000..81b92f1d893e --- /dev/null +++ b/dev-db/libiodbc/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">openlink/iODBC</remote-id> + </upstream> +</pkgmetadata> |