From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by sourceware.org (Postfix) with ESMTPS id D7A5F385842F for ; Fri, 11 Feb 2022 23:42:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D7A5F385842F Received: by mail-pj1-x1036.google.com with SMTP id c5-20020a17090a1d0500b001b904a7046dso11793847pjd.1 for ; Fri, 11 Feb 2022 15:42:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t6qPVROShKK8as+PjwWZsNDdotWga74H0P+oJGEqLXQ=; b=UwKLvJV1zPJRpiZCWkeyPTRT6Se+FbpyxYxzNkjP9dc4o7/6Tq4lETGnaexvh4xt4U J9bTc+yCd3aY0g/TalU59Eg7f/6DT4taCPdPfth/S2Nr9wnY86Bvsu+Fi+gJUVO5cEm2 +HtSGxADnvBFAlbeY/WwE5SSsA0nhXqEq3/EFOPYMzSK7rSwAISsiKivRg1RnLvviB3+ kasQMg7JJpZ4aNZ8P9XxhCbUR2DJ6YzCWHwRPTg9rrvoXmVY8NcQPA3it9qqi0Qv5Q74 TBw/bPb1Zhpux8Ys90dYyIvFl7YsIQjdueQXjETYK0wqjcjgsq3K537AivR/53NEzuKj k7SA== X-Gm-Message-State: AOAM5326A6R7YMxwvtSL1S4QP94/B2t8wsvNU110H8CZR+NfHuhqLVaL 6YyUoz8SZXjUULSz1c+gJxNPlk2fvW12Tw== X-Google-Smtp-Source: ABdhPJxfmYkN+99Ktf+0Nd1AjDS2Yi6VAtkNuU7l/lrNUtTx5yp2HwTMIOfFA/FDKq4Sq5LR5FQ/VA== X-Received: by 2002:a17:903:1c5:: with SMTP id e5mr1621314plh.162.1644622968629; Fri, 11 Feb 2022 15:42:48 -0800 (PST) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id v123sm11215450pfb.12.2022.02.11.15.42.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Feb 2022 15:42:47 -0800 (PST) From: Stafford Horne To: GLIBC patches Cc: Florian Weimer , Stafford Horne Subject: [PATCH] resolv: Fix tst-resolv tests for 2.35 ABIs and later Date: Sat, 12 Feb 2022 08:42:39 +0900 Message-Id: <20220211234239.1251406-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2022 23:42:51 -0000 The commit 737e873b30 ("resolv: Do not build libanl.so for ABIs starting at 2.35") disabled building libanl for ports supporting only 2.35 and later like OpenRISC. However, the if statement was not updated quite correctly and the change ends up disabling many tst-resolv* tests. This was not supposed to be done and it causes test dependency errors like: make: Entering directory 'gnu-home/glibc/resolv' make: *** No rule to make target 'gnu-home/build-glibc/resolv/tst-resolv-res_ninit.out', needed by 'gnu-home/build-glibc/resolv/mtrace-tst-resolv-res_ninit.out'. Stop. make: Leaving directory 'gnu-home/glibc/resolv' This patch move the extra-libs += libanl definition and condition down to be closer to other libanl definitions. The $(have-GLIBC_2.34) condition now includes libanl-routines and libanl-shared-only-routines as well. Also, I have added a comment to endif of $(have-thread-library) to help show the bondary of the have-thread-library definitions. --- Notes: - I also moved libanl-shared-only-routines into the have-GLIBC_2.34 condition, Florian didn't mention this in his mail but it seems correct. - I documented the boundary of the have-thread-library condition. I think this highlights that for non have-thread-library builds the tst-resolv-res_ninit will still be broken, because tst-resolv-res_ninit is outside the have-thread-library condition. resolv/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/resolv/Makefile b/resolv/Makefile index c465479e8b..438672786f 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -79,11 +79,6 @@ generate := mtrace-tst-leaks.out tst-leaks.mtrace tst-leaks2.mtrace extra-libs := libresolv libnss_dns ifeq ($(have-thread-library),yes) routines += gai_sigqueue -endif - -ifeq ($(have-GLIBC_2.34)$(have-thread-library),yesyes) -# Empty compatibility library for old binaries. -extra-libs += libanl tests += \ tst-bug18665 \ @@ -144,7 +139,8 @@ xtests += tst-resolv-qtypes # This test has dropped packet tests and runs for a long time. xtests += tst-resolv-rotate -endif +endif # $(have-thread-library) + extra-libs-others = $(extra-libs) libresolv-routines := \ base64 \ @@ -168,6 +164,13 @@ libresolv-routines := \ resolv-deprecated \ # libresolv-routines +ifeq ($(have-GLIBC_2.34)$(have-thread-library),yesyes) +# Empty compatibility library for old binaries. +extra-libs += libanl +libanl-routines += libanl-compat +libanl-shared-only-routines += libanl-compat +endif + $(libanl-routines-var) += \ gai_cancel \ gai_error \ @@ -177,9 +180,6 @@ $(libanl-routines-var) += \ getaddrinfo_a \ # $(libanl-routines-var) -libanl-routines += libanl-compat -libanl-shared-only-routines += libanl-compat - # Pretend that libanl.so is a linker script, so that the symbolic link # is not installed. install-lib-ldscripts = libanl.so -- 2.31.1