Bug 488286 – sys-libs/libcap: add multilib support

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Reinis Danne 2013-10-16 20:18:33 UTC]

Dependency of 32bit pulsaudio.

Reproducible: Always

[Comment 1 Reinis Danne 2013-10-16 20:19:00 UTC]

Created attachment 361076 [details, diff]
libcap-2.22-r1.ebuild.patch

[Comment 2 SpanKY 2013-10-16 20:40:39 UTC]

Comment on attachment 361076 [details, diff]
libcap-2.22-r1.ebuild.patch

most of the changes are fine

>-EAPI="4"
>+EAPI="5"

there's no point in doing this

>+multilib_src_configure() {
>+	tc-export_build_env BUILD_CC

this should only be done once

>+	tc-export CC AR RANLIB

this should be done on a per-ABI basis, but it doesn't really work today since these env vars will simply get read the next time around.  so running it more than once currently is pointless.

> 	dopamsecurity '' pam_cap/capability.conf

this should only be installed once

[Comment 3 Reinis Danne 2013-10-16 21:05:22 UTC]

(In reply to SpanKY from comment #2)
> Comment on attachment 361076 [details, diff] [details, diff]
> libcap-2.22-r1.ebuild.patch
> 
> most of the changes are fine
> 
> >-EAPI="4"
> >+EAPI="5"
> 
> there's no point in doing this

It doesn't hurt either because it doesn't affect anything, but I can drop it.

> 
> >+multilib_src_configure() {
> >+	tc-export_build_env BUILD_CC
> 
> this should only be done once
> 
> >+	tc-export CC AR RANLIB
> 
> this should be done on a per-ABI basis, but it doesn't really work today
> since these env vars will simply get read the next time around.  so running
> it more than once currently is pointless.

Would it be ok to move both of these to src_prepare? AFACT, at least CC is supposed to be handled correctly by multilib_toolchain_setup in multilib.eclass.

> 
> > 	dopamsecurity '' pam_cap/capability.conf
> 
> this should only be installed once

Does the virtual/pam and pambase also need multilib and MULTILIB_USEDEP in this ebuild?

[Comment 4 Julian Ospald 2013-10-17 06:34:42 UTC]

(In reply to Reinis Danne from comment #3)
> (In reply to SpanKY from comment #2)
> > Comment on attachment 361076 [details, diff] [details, diff] [details, diff]
> > libcap-2.22-r1.ebuild.patch
> > 
> > most of the changes are fine
> > 
> > >-EAPI="4"
> > >+EAPI="5"
> > 
> > there's no point in doing this
> 
> It doesn't hurt either because it doesn't affect anything, but I can drop it.
> 

The code behind EAPI 4 is tested more thoroughly. So, for system packages the "always use latest EAPI" recommendation doesn't really count. I think there was also something about the upgrade path...

[Comment 5 David Heidelberg (okias) 2013-11-18 01:10:08 UTC]

Created attachment 363460 [details]
libcap-2.22-r2.ebuild

This is slightly modified ebuild from FireBurn overlay, it compiles and works.

If there could be done some improvements, please let me know.

[Comment 6 Michał Górny 2013-11-24 11:07:14 UTC]

Created attachment 363886 [details, diff]
Ebuild patch (v3)

This one is based on the earlier two but:

1. keeps EAPI=4,

2. actually respects what tc-export does.

Not sure if we don't want to build 32-bit PAM module as well since that's what's in emul-linux.

[Comment 7 Michał Górny 2013-11-25 14:18:17 UTC]

Created attachment 363950 [details, diff]
Patch v4, even cleaner

[Comment 8 Michał Górny 2013-11-25 14:26:30 UTC]

+*libcap-2.22-r2 (25 Nov 2013)
+
+  25 Nov 2013; Michał Górny <[e-mail]> +libcap-2.22-r2.ebuild:
+  Enable multilib support, bug #488286. Acked by Chainsaw.