Bug#742640: src:eglibc: build stage2 without selinux

[Aurelien Jarno <aurelien@aurel32.net>]

On Thu, Jul 10, 2014 at 08:58:41AM +0200, Helmut Grohne wrote:
> Version: 2.19-5
> 
> On Tue, Mar 25, 2014 at 09:51:33PM +0100, Helmut Grohne wrote:
> > The eglibc package currently lacks a stage2 build profile entirely. A
> > stage2 is needed though, because libselinux cannot be built without an
> > actual libc among other things and eglibc explicitly enabled selinux via
> > a configure flag. The attached patch removes that flag when the package
> > is built with dpkg-buildpackage -Pstage2.
> 
> Updated patch to apply against glibc 2.19. It also disables systemptap
> now.
> 
> Helmut

> diff -Nru eglibc-2.19/debian/sysdeps/linux.mk eglibc-2.19/debian/sysdeps/linux.mk
> --- eglibc-2.19/debian/sysdeps/linux.mk
> +++ eglibc-2.19/debian/sysdeps/linux.mk
> @@ -12,7 +12,11 @@
>  ifeq ($(DEB_BUILD_PROFILE),bootstrap)
>    libc_extra_config_options = $(extra_config_options)

Hmm, the above has actually been removed in favor of a test on
$(DEB_BUILD_PROFILES).

>  else
> -  libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options)
> +  ifneq ($(filter stage2,$(DEB_BUILD_PROFILES)),)
> +    libc_extra_config_options = $(extra_config_options)
> +  else 
> +    libc_extra_config_options = --with-selinux --enable-systemtap $(extra_config_options)
> +  endif
>  endif
>  
>  ifndef LINUX_SOURCE

Instead of duplicating the code, please test for both stage1 and stage2
in the same test.

-- 
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
aurelien@aurel32.net                 http://www.aurel32.net