diff mbox

[alternative] fakeroot: fix build when libcap-dev is installed

Message ID 1451932436-27742-1-git-send-email-ricardo.martincoski@gmail.com
State Accepted
Commit 6fc5de4ef466b649b37a86e4f4994a667149dd80
Headers show

Commit Message

Ricardo Martincoski Jan. 4, 2016, 6:33 p.m. UTC
Fixes https://bugs.busybox.net/show_bug.cgi?id=8541

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
---
Alternative patch to https://patchwork.ozlabs.org/patch/562348/

We don't need libcap for buildroot, as Gustavo Zacarias explained in the past.
It seems reasonable to me to disable this detection too.

I can reproduce the original bug with libcap-dev in my Ubuntu 14.04.
Using this patch I cannot reproduce the bug anymore.
---
 package/fakeroot/fakeroot.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Arnout Vandecappelle Jan. 4, 2016, 9:30 p.m. UTC | #1
On 04-01-16 19:33, Ricardo Martincoski wrote:
> Fixes https://bugs.busybox.net/show_bug.cgi?id=8541
> 
> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (various cases with and without host- and system-libcap)

 In addition, this patch fixes the issue that the build of host-fakeroot will be
different depending on whether host-libcap was built before or not.

 Regards,
 Arnout

> ---
> Alternative patch to https://patchwork.ozlabs.org/patch/562348/
> 
> We don't need libcap for buildroot, as Gustavo Zacarias explained in the past.
> It seems reasonable to me to disable this detection too.
> 
> I can reproduce the original bug with libcap-dev in my Ubuntu 14.04.
> Using this patch I cannot reproduce the bug anymore.
> ---
>  package/fakeroot/fakeroot.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
> index 837c2b9..168cd13 100644
> --- a/package/fakeroot/fakeroot.mk
> +++ b/package/fakeroot/fakeroot.mk
> @@ -10,7 +10,10 @@ FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/
>  # Force capabilities detection off
>  # For now these are process capabilities (faked) rather than file
>  # so they're of no real use
> -HOST_FAKEROOT_CONF_ENV = ac_cv_func_capset=no
> +HOST_FAKEROOT_CONF_ENV = \
> +	ac_cv_header_sys_capability_h=no \
> +	ac_cv_func_capset=no
> +
>  FAKEROOT_LICENSE = GPLv3+
>  FAKEROOT_LICENSE_FILES = COPYING
>  
>
Peter Korsgaard Jan. 4, 2016, 9:41 p.m. UTC | #2
>>>>> "Ricardo" == Ricardo Martincoski <ricardo.martincoski@gmail.com> writes:

 > Fixes https://bugs.busybox.net/show_bug.cgi?id=8541
 > Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
> ---
 > Alternative patch to https://patchwork.ozlabs.org/patch/562348/

Committed, thanks.
diff mbox

Patch

diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index 837c2b9..168cd13 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -10,7 +10,10 @@  FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/
 # Force capabilities detection off
 # For now these are process capabilities (faked) rather than file
 # so they're of no real use
-HOST_FAKEROOT_CONF_ENV = ac_cv_func_capset=no
+HOST_FAKEROOT_CONF_ENV = \
+	ac_cv_header_sys_capability_h=no \
+	ac_cv_func_capset=no
+
 FAKEROOT_LICENSE = GPLv3+
 FAKEROOT_LICENSE_FILES = COPYING