diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2016-08-02 19:12:05 -0400 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2016-08-02 19:18:34 -0400 |
| commit | 1632e2115f726b6e668aca48915f2b83e662325b (patch) | |
| tree | a43077bd46f758170f89400acbaa1dedacce7d5c /dev-db/libiodbc/files | |
| parent | dev-perl/Test-NoWarnings: Weaken dependency on dev-perl/Test-Tester (diff) | |
| download | gentoo-1632e2115f726b6e668aca48915f2b83e662325b.tar.gz gentoo-1632e2115f726b6e668aca48915f2b83e662325b.tar.bz2 gentoo-1632e2115f726b6e668aca48915f2b83e662325b.zip | |
dev-db/libiodbc: new version 3.5.12.
This new version comes with a few changes. Most noticeably, the ebuild
was updated to EAPI=6 and the eutils eclass was dropped. One patch
(fix-runpaths-r1.patch) had to be revisioned to make it compatible
with eapply.
Another patch, libiodbc-*-multilib.patch, had to be updated to apply
to the new version. I duplicated the additions/deletions in the
original patch exactly. Two other patches, libiodbc-3.52.7-gtk.patch
and libiodbc-3.52.8-gtk-parallel-make.patch, have become obsolete and
were removed completely.
I removed a "chmod -x include/*.h" hack, as it looks no longer
necessary. I then added a new hack, "touch ChangeLog" before
eautoreconf.
Gentoo-Bug: 516300
Package-Manager: portage-2.2.28
Diffstat (limited to 'dev-db/libiodbc/files')
| -rw-r--r-- | dev-db/libiodbc/files/fix-runpaths-r1.patch | 15 | ||||
| -rw-r--r-- | dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch | 37 |
2 files changed, 52 insertions, 0 deletions
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/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 |