From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 96416 invoked by alias); 31 Oct 2019 23:16:08 -0000 Mailing-List: contact libc-stable-help@sourceware.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: List-Archive: Sender: libc-stable-owner@sourceware.org Received: (qmail 96404 invoked by uid 89); 31 Oct 2019 23:16:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-17.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-Spam-Status: No, score=-17.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: us-smtp-1.mimecast.com Received: from us-smtp-delivery-1.mimecast.com (HELO us-smtp-1.mimecast.com) (205.139.110.120) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 31 Oct 2019 23:16:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572563765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RInnPKhdddWbqxg6TJlMmPtLN75/uzQoYiPiqtm1x8I=; b=KDIY58ARhAgQA+1ULOlt8kIT3v/JCFpzJQsS1fb5Xwi9aiPimh3yS63yIO1COVo8HIZtOU DW/PdZXphAGPdP4y+y3RvTYnmqhhuATDfxs4U63xuOM9MUYby1dCBOiEWLbBGHXPFn+KgE gVO+f32kyhW8BY7ZeLMrrdDS+gKZTZI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-KTNHrzoPMfyloOiroaM7JA-1; Thu, 31 Oct 2019 19:16:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2449800D49 for ; Thu, 31 Oct 2019 23:16:02 +0000 (UTC) Received: from greed.delorie.com (ovpn-116-99.phx2.redhat.com [10.3.116.99]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 943435D6A7 for ; Thu, 31 Oct 2019 23:16:02 +0000 (UTC) Received: from greed.delorie.com.redhat.com (localhost [127.0.0.1]) by greed.delorie.com (8.14.7/8.14.7) with ESMTP id x9VNG1h6028363 for ; Thu, 31 Oct 2019 19:16:01 -0400 Date: Tue, 01 Jan 2019 00:00:00 -0000 Message-Id: From: DJ Delorie To: libc-stable@sourceware.org Subject: [2.29 COMMITTED] support: Export bindir path on support_path X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: KTNHrzoPMfyloOiroaM7JA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes X-SW-Source: 2019-10/txt/msg00015.txt.bz2 From: Adhemerval Zanella Checked on x86_64-linux-gnu. * support/Makefile (CFLAGS-support_paths.c): Add -DBINDIR_PATH. * support/support.h (support_bindir_prefix): New variable. * support/support_paths.c [BINDIR_PATH] (support_bindir_prefix): Reviewed-by: DJ Delorie (cherry picked from commit c7ac9caaae6f8d02d4e0c7618d4991324a084c66) diff --git a/ChangeLog b/ChangeLog index 86eedc7416..582ba45c79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2019-05-14 Adhemerval Zanella + + * support/Makefile (CFLAGS-support_paths.c): Add -DBINDIR_PATH. + * support/support.h (support_bindir_prefix): New variable. + * support/support_paths.c [BINDIR_PATH] (support_bindir_prefix): + + * config.make.in (bindir): New variable. + 2019-07-01 H.J. Lu =20 [BZ #24259] diff --git a/support/Makefile b/support/Makefile index 8d61de6c57..5542de3fa1 100644 --- a/support/Makefile +++ b/support/Makefile @@ -172,7 +172,8 @@ CFLAGS-support_paths.c =3D \ -DOBJDIR_PATH=3D\"`cd $(objpfx)/..; pwd`\" \ -DOBJDIR_ELF_LDSO_PATH=3D\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-n= ame)\" \ -DINSTDIR_PATH=3D\"$(prefix)\" \ - -DLIBDIR_PATH=3D\"$(libdir)\" + -DLIBDIR_PATH=3D\"$(libdir)\" \ + -DBINDIR_PATH=3D\"$(bindir)\" =20 ifeq (,$(CXX)) LINKS_DSO_PROGRAM =3D links-dso-program-c diff --git a/support/support.h b/support/support.h index 119495e5a9..1a45ecbb14 100644 --- a/support/support.h +++ b/support/support.h @@ -104,6 +104,8 @@ extern const char support_objdir_elf_ldso[]; extern const char support_install_prefix[]; /* Corresponds to the install's lib/ or lib64/ directory. */ extern const char support_libdir_prefix[]; +/* Corresponds to the install's bin/ directory. */ +extern const char support_bindir_prefix[]; =20 extern ssize_t support_copy_file_range (int, off64_t *, int, off64_t *, size_t, unsigned int); diff --git a/support/support_paths.c b/support/support_paths.c index 937e6e1012..75634aab9a 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -57,3 +57,10 @@ const char support_libdir_prefix[] =3D LIBDIR_PATH; #else # error please -DLIBDIR_PATH=3Dsomething in the Makefile #endif + +#ifdef BINDIR_PATH +/* Corresponds to the install's bin/ directory. */ +const char support_bindir_prefix[] =3D BINDIR_PATH; +#else +# error please -DBINDIR_PATH=3Dsomething in the Makefile +#endif