diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
| commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
| tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /dev-db/libdbi-drivers | |
| parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) | |
gentoo resync : 20.03.2021
Diffstat (limited to 'dev-db/libdbi-drivers')
| -rw-r--r-- | dev-db/libdbi-drivers/Manifest | 3 | ||||
| -rw-r--r-- | dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch | 21 | ||||
| -rw-r--r-- | dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild | 22 |
3 files changed, 35 insertions, 11 deletions
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest index f0f6a4074d42..1f90304d10a3 100644 --- a/dev-db/libdbi-drivers/Manifest +++ b/dev-db/libdbi-drivers/Manifest @@ -1,4 +1,5 @@ AUX libdbi-drivers-0.9.0-doc-build-fix.patch 694 BLAKE2B 95207e6fbd947c01a1c3a99806f09e3f932b6d7b6fe1b55ffeb98ce73a54b7f984ffe9811c834e53e961500ae688b0548599b3f9b47a5d1e083eedf5c7ed650d SHA512 0ff58a08909327db91ebd0dfad7ac88ebb17156bbb7afc8bfc8a3711fee37708a7ad715ed50b5085cdd15d3cdb5c06de3a0779694104fb6332a1e9c2f51f5b0e +AUX libdbi-drivers-0.9.0-slibtool-libdir.patch 564 BLAKE2B 7effa5db121872b079af2919b56857fda040f9712a10789ba3e4c4352a0b172127026f1df9c2f93071cf78a14f05431557e23e63b74f52df87710942d9c14711 SHA512 9f4ca8fd4147ed1c619c2d7ac40b4d67e67f3f6f940568647dd1782a705a52cd3d10241b2c4039ad8cca2ecc7186841640ffa44fd56d5fc9d19a7e8f3fc974ba DIST libdbi-drivers-0.9.0.tar.gz 1829864 BLAKE2B 2071c0cc21b1b4eeda926d5ce36f6dde03ede206dac91780aabafcb7c5b399f4b9580910e5ede08c9f0bf026f4af2088d1d0e8c1835b86273a7739b2946ed3c3 SHA512 f4d3aaa71014697c53012a10bf9f0af398bcf5ee5872af165f8f43a682d2fb3045a9172ffea0e068dcbfcad52494878c037d8d90fadfaf176936e42f7f1e85c1 -EBUILD libdbi-drivers-0.9.0-r1.ebuild 2170 BLAKE2B 84ee219333a4c1aecaf6f6bde7fd1a237c2e5b4d19edee27d7beacea85173ea492ad2fcda12afa4660fdd4f690555a99ea7004258165fee5fcd760afa814c8ec SHA512 23b2842089bb96164f09ff6a8ea4ae80c9e451418d7dc50babde784c7ffc755740dc91433d48f6e045ab418c84fccb41c71f4ae64a6c6ee7e97a67e232f466a8 +EBUILD libdbi-drivers-0.9.0-r1.ebuild 2215 BLAKE2B 677085541cba057c53e0c2fe5658ab3e682af6305258a5150cb04dd20f9d255a0e0330e064097981d4eff3e2e0787fa848afc43dc36bbe9491c8d8f98842aceb SHA512 6759e67116de90a12467bc5d473333917e45048a20a1906fb426445e002bcbe5715d8c578eac15f678032fc43f6dbb251f98f3bd5ea0028a538ef69c3dcd8b3d MISC metadata.xml 302 BLAKE2B 50e613a8be312f9b8e234ef4a810a318f51f70e71f37a01f1932f2e70fecc543956e84690de88a14dac252101865ac0ef454966bc1bf54e5f574d2d6fddecf3e SHA512 d0d6c905c747105c3b5c2bde24ea7f8c63225779fe41f106b3de3d3082cbc01b0749546c3477db1e9f14db44e1b2921316f4cddb256ef8dddec3b4176a051c70 diff --git a/dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch b/dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch new file mode 100644 index 000000000000..4db7485d33de --- /dev/null +++ b/dev-db/libdbi-drivers/files/libdbi-drivers-0.9.0-slibtool-libdir.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/775878 + +commit efbee1f631981bd454051d20796f1cd52fe16f00 +Author: orbea <orbea@riseup.net> +Date: Fri Mar 19 09:01:22 2021 -0700 + + build: Fix the pgsql linker path. + +diff --git a/acinclude.m4 b/acinclude.m4 +index 8e89af8..7504d63 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -191,7 +191,7 @@ if test "$ac_pgsql" = "yes"; then + PGSQL_INCLUDE=-I$ac_pgsql_incdir + fi + if test "$ac_pgsql_libdir" = "no"; then +- PGSQL_LDFLAGS=`pg_config --libdir` ++ PGSQL_LDFLAGS=-L`pg_config --libdir` + else + PGSQL_LDFLAGS=-L$ac_pgsql_libdir + fi diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild index 81c597acfdfb..74c9b7367fbb 100644 --- a/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild +++ b/dev-db/libdbi-drivers/libdbi-drivers-0.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,13 +6,14 @@ EAPI=7 inherit autotools DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz" HOMEPAGE="http://libdbi-drivers.sourceforge.net/" -LICENSE="LGPL-2.1" +SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}/${P}.tar.gz" -IUSE="doc firebird mysql oci8 postgres +sqlite static-libs" +LICENSE="LGPL-2.1" +SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" -SLOT=0 +IUSE="doc firebird mysql oci8 postgres +sqlite static-libs" + REQUIRED_USE="|| ( mysql postgres sqlite firebird oci8 )" RESTRICT="firebird? ( bindist )" @@ -29,10 +30,11 @@ BDEPEND="doc? ( app-text/openjade )" DOCS=( AUTHORS ChangeLog NEWS README README.osx TODO ) PATCHES=( - #"${FILESDIR}"/${P}-fix-ac-macro.patch \ - #"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch \ - #"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch - "${FILESDIR}"/${PN}-0.9.0-doc-build-fix.patch + #"${FILESDIR}"/${P}-fix-ac-macro.patch + #"${FILESDIR}"/${PN}-0.8.3-oracle-build-fix.patch + #"${FILESDIR}"/${PN}-0.8.3-firebird-fix.patch + "${FILESDIR}"/${PN}-0.9.0-doc-build-fix.patch + "${FILESDIR}"/${PN}-0.9.0-slibtool-libdir.patch ) pkg_setup() { @@ -83,5 +85,5 @@ src_test() { src_install() { default - find "${D}" -name '*.la' -type f -delete || die + find "${ED}" -name '*.la' -type f -delete || die } |