Bug 540030 – sys-apps/pciutils: convert to multilib

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Christoph Junghans (RETIRED) 2015-02-14 04:28:41 UTC]

Created attachment 396418 [details, diff]
patch against gx86

sys-apps/pciutils is a dependency of sys-apps/hwloc, which is needed for sys-cluster/openmpi (bug #519700).

Changes:
- conversion through multilib-minimal.eclass
- multilib dependency with versions for sys-libs/zlib and virtual/libudev
- config.h needs header wrapping
- make static source a sub-directory, so that multilib_copy_sources copies it around
- export AR and RANLIB for static lib build
- use libkmod only on native abi

[Comment 1 Michał Górny 2015-02-14 07:59:22 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.

[Comment 2 Christoph Junghans (RETIRED) 2015-02-14 15:05:59 UTC]

(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

[Comment 3 Michał Górny 2015-02-14 15:36:36 UTC]

(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.

[Comment 4 Christoph Junghans (RETIRED) 2015-02-15 16:10:05 UTC]

(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 5 SpanKY 2015-02-15 19:36:04 UTC]

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

[Comment 6 Christoph Junghans (RETIRED) 2015-02-16 01:59:54 UTC]

(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}.

[Comment 7 Christoph Junghans (RETIRED) 2015-02-16 02:33:36 UTC]

+*pciutils-3.3.0-r2 (16 Feb 2015)
+
+  16 Feb 2015; Christoph Junghans <[e-mail]> +pciutils-3.3.0-r2.ebuild:
+  added multilib support (bug #540030)
+

[Comment 8 Alexandre Rostovtsev (RETIRED) 2015-02-17 00:00:57 UTC]

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 <[e-mail]>
+  +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 <[e-mail]>
+  pciutils-3.3.0-r2.ebuild:
+  Prevent file collision with emul-linux-x86-baselibs