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: 1099390 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-101969-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="ivNm+/5P"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BpPYfSJ6"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 453DJ513Jgz9sNl for ; Tue, 14 May 2019 20:21:56 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=dR8Howof/rDZ4jBAYjoOIZqlFGXF8+vDS+ZO3AXVqB1fZaOV9mdCg ISB82VgJHriOXqTDQO3S3SM12q0mQjuHsuP/fjnoCxLGWthpmtCM5LuEh0n0VYp/ oXGNhmhA4Zjr5S23RDBPoqLanAwH7aqkJoO+LlUedsdX/CfuWP0RAM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id :mime-version:content-type:content-transfer-encoding; s=default; bh=kjM3ZTpuQAHDi6CdltkW6bIzGIQ=; b=ivNm+/5POYQT7tCgGJIFRLtsZnj4 QqrMnaCEbIKuQhHGFyXTQmBOnizD//Wo2Q+ZH2CZBWEaYDHksR06iAlEUFmF+xJl wiLAYakQuyMh+Vc1/590bkmv05ZonRmA85b0ko09Ox6W/wg/3ktyzg3xXNbv72zG A0Y5b8bnd9PSd50= 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== From: =?utf-8?q?Alexandra_H=C3=A1jkov=C3=A1?= To: libc-alpha@sourceware.org, mcermak@redhat.com Cc: =?utf-8?q?Alexandra_H=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