[patch] portability fix for musl

0001-sys-apps-pciutils-portability-fix-for-musl.patch (text/plain), 10.28 KB, created by Travis Tilley on 2015-03-20 02:58:38 UTC

From 8237d21cc8f9557d95dfae0107177bfbff67eb12 Mon Sep 17 00:00:00 2001
From: layman <layman@localhost>
Date: Thu, 19 Mar 2015 22:54:21 -0400
Subject: [PATCH] sys-apps/pciutils: portability fix for musl

---
 sys-apps/pciutils/Manifest                         |  3 +-
 .../files/pciutils-3.2.1-fix-pread-ifdef.patch     | 29 ++++++++
 sys-apps/pciutils/pciutils-3.2.0-r99.ebuild        | 86 ++++++++++++++++++++++
 sys-apps/pciutils/pciutils-3.2.0.ebuild            | 85 ---------------------
 4 files changed, 117 insertions(+), 86 deletions(-)
 create mode 100644 sys-apps/pciutils/files/pciutils-3.2.1-fix-pread-ifdef.patch
 create mode 100644 sys-apps/pciutils/pciutils-3.2.0-r99.ebuild
 delete mode 100644 sys-apps/pciutils/pciutils-3.2.0.ebuild

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 33b454b..3362a1f 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -2,6 +2,7 @@ AUX conf.d-pciparm 988 SHA256 ffdec7d6c510a502d212129d31a9b37c3b9c75393a48a8b1ee
 AUX init.d-pciparm 1871 SHA256 30a62e5778997954f766cdf289a11ac124502943e8422bc33c49b6aa118df6a5 SHA512 231b7b96a751332a5a2395902e2a8024ae687f1e25b881d07bdcfba08acd1b6b6254e8fa694a7e01d851aa28c4ec6ff3d9c5ac64f8c1a471cc1f8f9a325881bd WHIRLPOOL 1fad1cc4fdb031f7f24d9ec47439b6c6f83f22e85b6081eca283ab8cc501f7af9bbf91f8a0118ca10f45490ffab26c4ff4650f1fc1ab418afaf2cf44a0aa9f00
 AUX pciutils-3.1.9-static-pc.patch 373 SHA256 81f8c664cf844adfe2238f6dc584100340de8781d361cb185035d5928aee82fe SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49 WHIRLPOOL 9d5bf04b08a76bb786524e8fdc4de412154340f17dcccf48ebcb7504a6b5feb8a719337489a20dd8d94d77bdeb93e75009f66840a18ec63805d8fe36dc7e1981
 AUX pciutils-3.2.0-io.patch 311 SHA256 aec9f72d5c7eae1e7a7ccc5c433322e2c3ff04237b1049cfe22cd952a3fac548 SHA512 9acea1ac1f6d87a647c1c69b084726930535ebcb75e79d5fc750dc2862c6cac0a89187febfd215bdc9bd6f75f2a809c02e7967a35eb288167db0a8a780864f99 WHIRLPOOL bcef00c8f4a079ced8e2354bdefee56fe5c33a60cdb0aaa72bd63528e3e792a22ad49fb894a88bdd46639419af89b9228600788a501684295259dcae6c379287
+AUX pciutils-3.2.1-fix-pread-ifdef.patch 905 SHA256 747bc745ccf17c20e361c375652cbb69ac2a6f76f25e1fdd4e5d4ef34cc05cf6 SHA512 b9725b3e170a57404ae7b6060efbf756d49e308e209bc2295e875ad39e4c88a9fc0e279703e6f8ed20d20413da4a5323723bce6ff76551686c72531808e0eb70 WHIRLPOOL 028fce38b320eb7827e9305019567c2a273cbea74fe2881b5b6b200eef3b31f12cf91d75295b7c72a71d831021aea6f12efb60c52e399494295f2b663d516ed0
 DIST pciutils-3.2.0.tar.gz 357003 SHA256 84e705bff712b128a942117565a3506bd4b8bf841d397c1962c6255169762f71 SHA512 ce619bca35c529f947b883858164584db9fd16be05b44bd20d7f30b73246076b8c80a9e0ff3f7b2c27366a08043488ccfee98dd3cb43e3c5ee8962efaa056fd1 WHIRLPOOL fda9efb423ba444b460986b82b89feb3e5940d63774377eab4dce6ed1a1c690824192ca25d04a4f34960412ddedbdb9c874dace2256ccd1dede61ee99618b418
-EBUILD pciutils-3.2.0.ebuild 2279 SHA256 baaee63528064e053068e03eec6210d68d533105fa2e4bd9fbcf5708c3135257 SHA512 03962535e2124984ecf9b02c50ee1b81f5f42bf0b529ebdcc47081bc441cd9cd01927b39ba7e8de79f12022efe3ee8580761b41199591ec20e616545f88a929f WHIRLPOOL 6e4c81b708b84ce1642079632f06c41bc1a576ec043371d33fb20af4cfe18abbfb6f4c03beb579969664bfd035b3ac0b67730d4f5fb050546528c5a61387dbff
+EBUILD pciutils-3.2.0-r99.ebuild 2335 SHA256 8c22d4e00d33e78030f741c2883cfbd2e963c6424fe613081cd94a38ff599f23 SHA512 804b0f0f41925a8dbedd2f4f5949a6ca0b00b0697a9a3a676b151c0411764f7be5297ada454fdbfbdb06223b606429879b32ac0d42b08580bc798bef3f0f6bb3 WHIRLPOOL 9da25322a02931077175323a1fe5fd53887b32b3af05ff47be22c06d93939ae236085b0253b054347b60acd101a79517611cccb6b239184e265cf02dbcb2e814
 MISC metadata.xml 345 SHA256 2e1f814fd8995f54e2d029e18f0f8f4b742f7383ce3448697994c4a57e498254 SHA512 d075e1944952d3d6c5316c46247003159782dd2e18d449048bc34bfd7f2f307fc287e9a9803f6f1399898c22d4faee294c013241d9b709b887c14b7966c52be6 WHIRLPOOL f1bc3329686d73cc96c8d4bdf5d05451e555aeda3bac9c3a5e2b1b5fa33294b39eff6a1ef5b945d8013c41dbfa188a38a62d205a7ce58ef1cac55828efa5941e
diff --git a/sys-apps/pciutils/files/pciutils-3.2.1-fix-pread-ifdef.patch b/sys-apps/pciutils/files/pciutils-3.2.1-fix-pread-ifdef.patch
new file mode 100644
index 0000000..ffc34b6
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.2.1-fix-pread-ifdef.patch
@@ -0,0 +1,29 @@
+musl does not define an identifier macro like __GLIBC__ or __UCLIBC
+which is right. So we make sure that we do the right thing and not assume
+defines
+
+Signed-off-by: Khem Raj <[e-mail]>
+Upstream-Status: Pending
+
+Index: pciutils-3.2.1/lib/pread.h
+===================================================================
+--- pciutils-3.2.1.orig/lib/pread.h	2014-04-27 03:00:31.918719246 -0700
++++ pciutils-3.2.1/lib/pread.h	2014-04-27 03:24:14.972059749 -0700
+@@ -12,7 +12,8 @@
+  *  don't define it.
+  */
+ 
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ > 0
++#if defined(__GLIBC__)
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ > 0
+ /* glibc 2.1 or newer -> pread/pwrite supported automatically */
+ 
+ #elif defined(i386) && defined(__GLIBC__)
+@@ -59,6 +60,7 @@
+ make_rw_glue(write)
+ #define PCI_HAVE_DO_READ
+ #endif
++#endif
+ 
+ #ifndef PCI_HAVE_DO_READ
+ #define do_read(d,f,b,l,p) pread(f,b,l,p)
diff --git a/sys-apps/pciutils/pciutils-3.2.0-r99.ebuild b/sys-apps/pciutils/pciutils-3.2.0-r99.ebuild
new file mode 100644
index 0000000..1fa7729
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.2.0-r99.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.2.0.ebuild,v 1.14 2014/01/18 04:55:35 vapier Exp $
+
+EAPI="5"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc x86"
+IUSE="+kmod static-libs zlib"
+
+# Have the sub-libs in RDEPEND with [static-libs] since, logically,
+# our libssl.a depends on libz.a/etc... at runtime.
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )"
+DEPEND="kmod? ( sys-apps/kmod )
+	static-libs? ( ${LIB_DEPEND} )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+RDEPEND="${DEPEND}
+	sys-apps/hwids"
+DEPEND="${DEPEND}
+	kmod? ( virtual/pkgconfig )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
+	epatch "${FILESDIR}"/${PN}-3.2.0-io.patch
+	epatch "${FILESDIR}"/${PN}-3.2.1-fix-pread-ifdef.patch
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+	fi
+}
+
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		DNS="yes" \
+		IDSDIR='$(SHAREDIR)/misc' \
+		MANDIR='$(SHAREDIR)/man' \
+		PREFIX="${EPREFIX}/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(usex zlib) \
+		PCI_COMPRESSED_IDS=0 \
+		PCI_IDS=pci.ids \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		LIBKMOD="$(usex kmod)" \
+		"$@"
+}
+
+src_compile() {
+	pemake OPT="${CFLAGS}" all
+	if use static-libs ; then
+		pemake \
+			-C "${S}.static" \
+			OPT="${CFLAGS}" \
+			SHARED="no" \
+			lib/libpci.a
+	fi
+}
+
+src_install() {
+	pemake DESTDIR="${D}" install install-lib
+	use static-libs && dolib.a "${S}.static/lib/libpci.a"
+	dodoc ChangeLog README TODO
+
+	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
+		"${ED}"/usr/share/man/man8/update-pciids.8*
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
+		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
+		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
+	fi
+}
diff --git a/sys-apps/pciutils/pciutils-3.2.0.ebuild b/sys-apps/pciutils/pciutils-3.2.0.ebuild
deleted file mode 100644
index 8e9ed66..0000000
--- a/sys-apps/pciutils/pciutils-3.2.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.2.0.ebuild,v 1.14 2014/01/18 04:55:35 vapier Exp $
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ http://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+kmod static-libs zlib"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libssl.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )"
-DEPEND="kmod? ( sys-apps/kmod )
-	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-DEPEND="${DEPEND}
-	kmod? ( virtual/pkgconfig )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-	epatch "${FILESDIR}"/${PN}-3.2.0-io.patch
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-	fi
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		DNS="yes" \
-		IDSDIR='$(SHAREDIR)/misc' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=0 \
-		PCI_IDS=pci.ids \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD="$(usex kmod)" \
-		"$@"
-}
-
-src_compile() {
-	pemake OPT="${CFLAGS}" all
-	if use static-libs ; then
-		pemake \
-			-C "${S}.static" \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-src_install() {
-	pemake DESTDIR="${D}" install install-lib
-	use static-libs && dolib.a "${S}.static/lib/libpci.a"
-	dodoc ChangeLog README TODO
-
-	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
-		"${ED}"/usr/share/man/man8/update-pciids.8*
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
-		elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
-		elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
-	fi
-}
-- 
2.0.5