From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 95880 invoked by alias); 31 Oct 2019 23:15:53 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 95817 invoked by uid 97); 31 Oct 2019 23:15:53 -0000 Date: Thu, 31 Oct 2019 23:15:00 -0000 Message-ID: <20191031231553.95816.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: DJ Delorie To: glibc-cvs@sourceware.org Subject: [glibc/release/2.29/master] support: Export bindir path on support_path X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/release/2.29/master X-Git-Oldrev: 5e1548a6d9c5c544f13cb71f4462b3f38e87a3c6 X-Git-Newrev: c1803823c697b4b586208f703ae1ca6a9986b52a X-SW-Source: 2019-q4/txt/msg00246.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c1803823c697b4b586208f703ae1ca6a9986b52a commit c1803823c697b4b586208f703ae1ca6a9986b52a Author: Adhemerval Zanella Date: Mon May 13 13:57:37 2019 -0300 support: Export bindir path on support_path 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: --- ChangeLog | 8 ++++++++ support/Makefile | 3 ++- support/support.h | 2 ++ support/support_paths.c | 7 +++++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 86eedc7..582ba45 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 [BZ #24259] diff --git a/support/Makefile b/support/Makefile index 8d61de6..5542de3 100644 --- a/support/Makefile +++ b/support/Makefile @@ -172,7 +172,8 @@ CFLAGS-support_paths.c = \ -DOBJDIR_PATH=\"`cd $(objpfx)/..; pwd`\" \ -DOBJDIR_ELF_LDSO_PATH=\"`cd $(objpfx)/..; pwd`/elf/$(rtld-installed-name)\" \ -DINSTDIR_PATH=\"$(prefix)\" \ - -DLIBDIR_PATH=\"$(libdir)\" + -DLIBDIR_PATH=\"$(libdir)\" \ + -DBINDIR_PATH=\"$(bindir)\" ifeq (,$(CXX)) LINKS_DSO_PROGRAM = links-dso-program-c diff --git a/support/support.h b/support/support.h index 119495e..1a45ecb 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[]; 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 937e6e1..75634aa 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -57,3 +57,10 @@ const char support_libdir_prefix[] = LIBDIR_PATH; #else # error please -DLIBDIR_PATH=something in the Makefile #endif + +#ifdef BINDIR_PATH +/* Corresponds to the install's bin/ directory. */ +const char support_bindir_prefix[] = BINDIR_PATH; +#else +# error please -DBINDIR_PATH=something in the Makefile +#endif