From patchwork Tue May 14 10:21:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alexandra_H=C3=A1jkov=C3=A1?= X-Patchwork-Id: 32669 Received: (qmail 68465 invoked by alias); 14 May 2019 10:21:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 68455 invoked by uid 89); 14 May 2019 10:21:49 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: mail-wr1-f41.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=teB1CAc2+2juqi3Pd+dJEyHrIE9iUX2Opa0zPpkhmMU=; b=BpPYfSJ60+Y27ZFbJmrJSZ3EKGW+n24GsikOy5QhsU+32uAy5zjRTMZL3AR+OKMc8z G/0fJK/Y0DeEsRloPPbir2IhXtD1qR+e91OOftVmHWILtDyMQX9gRgwBnxM+OuzLs1kk nfoIjSvF8Tz0pBBsfqOQkRYKEvIXSIFVO/jkDbQLKXbTleyKjFCLZ8MWnj67VAdaKcQD SKl0uGZEPdFZbzQTSnF7XX28yetb9+MuWb9aoRthMD+M0STkazvB/IipWfRXmbanaULD kgoejzx1xRLha7RdQ5tY4oL3D8uMk3c9eugWMSk+soimYNQ/C0EJn0DHrq71WeHgpOyh UFPw== Return-Path: From: =?UTF-8?Q?Alexandra_H=C3=A1jkov=C3=A1?= To: libc-alpha@sourceware.org, mcermak@redhat.com Cc: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= Subject: [PATCH] support: Add support_install_rootsbindir Date: Tue, 14 May 2019 12:21:38 +0200 Message-Id: <20190514102138.23239-1-ahajkova@redhat.com> MIME-Version: 1.0 From: Alexandra Hájková Reviewed-by: Adhemerval Zanella --- support/Makefile | 3 ++- support/support.h | 2 ++ support/support_paths.c | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/support/Makefile b/support/Makefile index 64044f6f5c..3ed607a79b 100644 --- a/support/Makefile +++ b/support/Makefile @@ -179,7 +179,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)\" \ + -DROOTSBINDIR_PATH=\"$(rootsbindir)\" ifeq (,$(CXX)) LINKS_DSO_PROGRAM = links-dso-program-c diff --git a/support/support.h b/support/support.h index 97fef2cd23..c5297a642d 100644 --- a/support/support.h +++ b/support/support.h @@ -106,6 +106,8 @@ extern const char support_install_prefix[]; /* Corresponds to the install's lib/ or lib64/ directory. */ extern const char support_libdir_prefix[]; +extern const char support_install_rootsbindir[]; + 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..c54be4faf6 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -57,3 +57,9 @@ const char support_libdir_prefix[] = LIBDIR_PATH; #else # error please -DLIBDIR_PATH=something in the Makefile #endif + +#ifdef ROOTSBINDIR_PATH +const char support_install_rootsbindir[] = ROOTSBINDIR_PATH; +#else +# error please -DROOTSBINDIR_PATH=something in the Makefile +#endif