From patchwork Tue Oct 31 09:50:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Shankar X-Patchwork-Id: 78818 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E47BC3858D32 for ; Tue, 31 Oct 2023 09:51:16 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id EC0003858D1E for ; Tue, 31 Oct 2023 09:51:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EC0003858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org EC0003858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698745865; cv=none; b=X5L5uVzjntxVBzpCPdVPfRmxtE1GbQUU7ieroQy0VNOKFF2edp69O7bQyK9+nOY3XglX8v9RCzcm9xR0Ltl3eK8Z/I47rAKqWNWS256zHy67mj4rUBkROaI7aE1aLwFClg8xjGcaNjhmvLnWqKUjqo/YDwr8VaW90q+i59inpWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698745865; c=relaxed/simple; bh=zOt00Y0D2/rAsTwsQAp+WIq1w3s8eXUcM91fhcLWUVY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=cv/ehJSTAYMCqROxWxppKcz1AEIPv8xZaP+ytC/174fo/cTtx84RGbb4naV+1dqX3UxxJ1bxaKpc45Ogog739J7XLrnOatyfYJT0xw9vLlkacdDWBc1S+Y/gTn0V/a84syZYQQcRoVjwJLxexptz5XmWo8wznrjNghwNDSAwkaE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698745863; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1evIbGLIrU9EmEXQqkA1tH9hhYv6dFWwcUDvhppqreY=; b=NccIl2KwtlzN0SGNo2MQNIw2YfrlkW37LrPgbI33vgzhEfzLBfyPmY654ETQSu8QD6e6qe z13o+OYuPP6JtP2Y7JhNq13GS9CWfhO6CG5QgHe2VGaMatGhO1+QuJbhb4r5NyGMHGPfmW BeZFwPDysgy2FA72EKpE7bQiZRIWA3g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-306-zgyPHiR8P_-rBezF6eM-gg-1; Tue, 31 Oct 2023 05:50:58 -0400 X-MC-Unique: zgyPHiR8P_-rBezF6eM-gg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A8CE0185A785; Tue, 31 Oct 2023 09:50:58 +0000 (UTC) Received: from x1carbon.redhat.com (unknown [10.45.226.109]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 92FC240C6EB9; Tue, 31 Oct 2023 09:50:57 +0000 (UTC) From: Arjun Shankar To: Arjun Shankar , Joseph Myers , libc-alpha@sourceware.org Subject: [PATCH] Use correct subdir when building tst-rfc3484* for mach and arm Date: Tue, 31 Oct 2023 10:50:09 +0100 Message-ID: <20231031095048.1920117-1-arjun@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Commit 7f602256ab5b85db1dbfb5f40bd109c4b37b68c8 moved the tst-rfc3484* tests from posix/ to nss/, but didn't correct references to point to their new subdir when building for mach and arm. This commit fixes that. Tested with build-many-glibcs.sh for i686-gnu. --- sysdeps/mach/Makefile | 5 ++--- sysdeps/unix/sysv/linux/arm/Makefile | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sysdeps/mach/Makefile b/sysdeps/mach/Makefile index a9d4aa04ce..5194e6ccea 100644 --- a/sysdeps/mach/Makefile +++ b/sysdeps/mach/Makefile @@ -60,12 +60,11 @@ else ifeq (nss,$(subdir)) LDLIBS-nss_files.so += $(objdir)/mach/libmachuser.so LDLIBS-nss_db.so += $(objdir)/mach/libmachuser.so LDLIBS-nss_compat.so += $(objdir)/mach/libmachuser.so -else ifeq (hesiod,$(subdir)) - LDLIBS-nss_hesiod.so += $(objdir)/mach/libmachuser.so -else ifeq (posix,$(subdir)) LDLIBS-tst-rfc3484 += $(objdir)/mach/libmachuser.so LDLIBS-tst-rfc3484-2 += $(objdir)/mach/libmachuser.so LDLIBS-tst-rfc3484-3 += $(objdir)/mach/libmachuser.so +else ifeq (hesiod,$(subdir)) + LDLIBS-nss_hesiod.so += $(objdir)/mach/libmachuser.so else ifeq (nscd,$(subdir)) LDLIBS-nscd += $(objdir)/mach/libmachuser.so endif diff --git a/sysdeps/unix/sysv/linux/arm/Makefile b/sysdeps/unix/sysv/linux/arm/Makefile index e2b5a0eab3..a73c897f43 100644 --- a/sysdeps/unix/sysv/linux/arm/Makefile +++ b/sysdeps/unix/sysv/linux/arm/Makefile @@ -38,9 +38,6 @@ endif ifeq ($(subdir),nss) libnss_db-sysdep_routines += libc-do-syscall libnss_db-shared-only-routines += libc-do-syscall -endif - -ifeq ($(subdir),posix) LDFLAGS-tst-rfc3484 += $(common-objpfx)csu/libc-do-syscall.o LDFLAGS-tst-rfc3484-2 += $(common-objpfx)csu/libc-do-syscall.o LDFLAGS-tst-rfc3484-3 += $(common-objpfx)csu/libc-do-syscall.o