summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2016-05-20 12:33:57 -0400
committerIan Stakenvicius <axs@gentoo.org>2016-05-20 13:11:09 -0400
commitbcf44e3ced194129a6a63ac84f6a7723941d4dd7 (patch)
treeda26f3e8f71a41696d51c5618d87c61788be4a2f /sys-apps/pciutils
parentkde-apps/spectacle: Remove 16.04.1 (r0) (diff)
downloadgentoo-bcf44e3ced194129a6a63ac84f6a7723941d4dd7.tar.gz
gentoo-bcf44e3ced194129a6a63ac84f6a7723941d4dd7.tar.bz2
gentoo-bcf44e3ced194129a6a63ac84f6a7723941d4dd7.zip
sys-apps/pciutils-3.5.0: fix missing pci_init for LIBPCI_3.0
Bug: http://bugs.gentoo.org/583580 Package-Manager: portage-2.2.28
Diffstat (limited to 'sys-apps/pciutils')
-rw-r--r--sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch21
-rw-r--r--sys-apps/pciutils/pciutils-3.5.0-r1.ebuild (renamed from sys-apps/pciutils/pciutils-3.5.0.ebuild)3
2 files changed, 23 insertions, 1 deletions
diff --git a/sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch b/sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch
new file mode 100644
index 000000000000..d5e9a5e80fcc
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch
@@ -0,0 +1,21 @@
+--- a/lib/init.c 2016-05-20 11:53:00.065874342 -0400
++++ b/lib/init.c 2016-05-20 11:53:16.725850370 -0400
+@@ -214,6 +214,8 @@
+ }
+
+ STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a));
++DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35);
++SYMBOL_VERSION(pci_init_v30, pci_init@LIBPCI_3.0);
+ SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5);
+
+ void
+--- a/lib/internal.h 2016-05-14 05:58:01.000000000 -0400
++++ b/lib/internal.h 2016-05-20 12:04:02.144993094 -0400
+@@ -61,6 +61,7 @@
+ void pci_mfree(void *);
+ char *pci_strdup(struct pci_access *a, const char *s);
+
++void pci_init_v30(struct pci_access *a) VERSIONED_ABI;
+ void pci_init_v35(struct pci_access *a) VERSIONED_ABI;
+
+ /* access.c */
diff --git a/sys-apps/pciutils/pciutils-3.5.0.ebuild b/sys-apps/pciutils/pciutils-3.5.0-r1.ebuild
index 392ac4c249e9..334ecdb2fdbd 100644
--- a/sys-apps/pciutils/pciutils-3.5.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.0-r1.ebuild
@@ -42,7 +42,8 @@ switch_config() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+ epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch \
+ "${FILESDIR}"/${PN}-3.5.0-expose-pci_init_v30.patch
if use static-libs ; then
cp -pPR "${S}" "${S}.static" || die