Summary: | sys-apps/pciutils: convert to multilib | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Christoph Junghans (RETIRED) <junghans> |
Component: | [OLD] Core system | Assignee: | Gentoo's Team for Core System packages <base-system> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | multilib+disabled |
Priority: | Normal | Keywords: | Inclusion, PATCH |
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Bug Depends on: | |||
Bug Blocks: | 510180, 540036 | ||
Attachments: | patch against gx86 |
Description
Christoph Junghans (RETIRED)
2015-02-14 04:28:41 UTC
Comment on attachment 396418 [details, diff] patch against gx86 >@@ -40,7 +42,10 @@ > > if use static-libs ; then > cp -pPR "${S}" "${S}.static" || die >+ mv "${S}.static" "${S}/static" || die > fi >+ >+ multilib_copy_sources > } > > pemake() { How about changing the cp rather than adding mv afterwards? The rest looks fine. (In reply to Michał Górny from comment #1) > Comment on attachment 396418 [details, diff] [details, diff] > patch against gx86 > > >@@ -40,7 +42,10 @@ > > > > if use static-libs ; then > > cp -pPR "${S}" "${S}.static" || die > >+ mv "${S}.static" "${S}/static" || die > > fi > How about changing the cp rather than adding mv afterwards? copying stuff into itself will generate an error, maybe mkdir "${S}/static" cp "${S}"!(static) "${S}/static (In reply to Christoph Junghans from comment #2) > (In reply to Michał Górny from comment #1) > > Comment on attachment 396418 [details, diff] [details, diff] [details, diff] > > patch against gx86 > > > > >@@ -40,7 +42,10 @@ > > > > > > if use static-libs ; then > > > cp -pPR "${S}" "${S}.static" || die > > >+ mv "${S}.static" "${S}/static" || die > > > fi > > How about changing the cp rather than adding mv afterwards? > copying stuff into itself will generate an error, maybe > mkdir "${S}/static" > cp "${S}"!(static) "${S}/static Oh right, sorry, missed that. Please don't get into the non-readable extglob stuff. (In reply to Michał Górny from comment #3) > Oh right, sorry, missed that. Please don't get into the non-readable extglob > stuff. Then let's leave the original patch! @base-system: please review! Comment on attachment 396418 [details, diff] patch against gx86 > if use static-libs ; then > cp -pPR "${S}" "${S}.static" || die >+ mv "${S}.static" "${S}/static" || die you can simplify since you're relocating: cp -pPR "${S}" static || die mv static "${S}/" || die otherwise looks fine (In reply to SpanKY from comment #5) > Comment on attachment 396418 [details, diff] [details, diff] > patch against gx86 > > > if use static-libs ; then > > cp -pPR "${S}" "${S}.static" || die > >+ mv "${S}.static" "${S}/static" || die > > you can simplify since you're relocating: > cp -pPR "${S}" static || die Nope, won't work for the same reason as above, src_prepare is executed in ${S}. +*pciutils-3.3.0-r2 (16 Feb 2015) + + 16 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +pciutils-3.3.0-r2.ebuild: + added multilib support (bug #540030) + When adding multilib support to a library, please remember to check for file collisions with emul-linux-x86-* :) +*emul-linux-x86-baselibs-20140508-r15 (16 Feb 2015) + + 16 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + +emul-linux-x86-baselibs-20140508-r15.ebuild, + +files/remove-native-20140508-r15: + sys-apps/pciutils now has native multilib support + 16 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + pciutils-3.3.0-r2.ebuild: + Prevent file collision with emul-linux-x86-baselibs |