From patchwork Mon Aug 27 06:39:05 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: DJ Delorie <dj@redhat.com>
X-Patchwork-Id: 29061
Received: (qmail 98579 invoked by alias); 27 Aug 2018 06:39:09 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 98246 invoked by uid 89); 27 Aug 2018 06:39:09 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-23.9 required=5.0 tests=AWL, BAYES_00,
	GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,
	KAM_LAZY_DOMAIN_SECURITY,
	SPF_HELO_PASS autolearn=ham version=3.3.2
	spammy=Hx-languages-length:1495, turns
X-HELO: mx1.redhat.com
Date: Mon, 27 Aug 2018 02:39:05 -0400
Message-Id: <xnzhx8cnzq.fsf@greed.delorie.com>
From: DJ Delorie <dj@redhat.com>
To: libc-alpha@sourceware.org
Subject: [patch] test-in-container: fix Arch Linux build-programs bug?

Turns out Arch Linux uses the build-programs variable to build
different parts of glibc with different flags; but setting
build-programs to "no" also disables the default rules for programs,
leading to makefile-related errors elsewhere.

Since the "others:" target already depends on $(others) (or not) depending
on build-programs - see :

ifeq ($(build-programs),yes)
others: $(addprefix $(objpfx),$(others) $(sysdep-others) $(extra-objs))
else
others: $(addprefix $(objpfx),$(extra-objs))
endif

Setting $(others) is sufficient, and dependencies on others: are
redundant - or in this case, problematic.

Is my understanding and description accurate?

Tested via plain builds/tests with and without build-programs=no, plus
build-many-glibcs for targets x86_64-linux-gnu, i686-gnu, and
ia64-linux-gnu.

Ok to install?

	* support/Makefile (others): Don't list programs explicitly as
	a dependency of "others".
Reviewed-by: Carlos O'Donell <carlos@redhat.com>

diff --git a/support/Makefile b/support/Makefile
index 0ed00212cb..b528f538a6 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -168,16 +168,6 @@ LINKS_DSO_PROGRAM = links-dso-program
 LDLIBS-links-dso-program = -lstdc++ -lgcc -lgcc_s $(libunwind)
 endif
 
-others: \
-	$(objpfx)test-container \
-	$(objpfx)shell-container \
-	$(objpfx)echo-container \
-	$(objpfx)true-container \
-	$(objpfx)$(LINKS_DSO_PROGRAM)
-
-ifeq ($(build-programs),yes)
-endif
-
 LDLIBS-test-container = $(libsupport)
 
 others += test-container