From patchwork Fri Dec 11 16:52:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 41366 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2767A3973031; Fri, 11 Dec 2020 16:52:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2767A3973031 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607705556; bh=qixJD3+DUpjpMthn8erKmVluvz4P6diXY+4tYeipWd0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Z7BHokFSh+hj0+MBCobhp1GAPdDeNYZA6fr4u5vieco9yQg+AUTwIzrKar4J36f6+ D7hDcR+hINEMt/vMAdI0hg0hTFPjwu5tBqZDIIfp0QqfHfAL6bbmhDIRvWWTIrwHub YXbBZrMD9KD5e/TZBPG8CVaHjm/8Dxw2vk1C+8Bk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id CF9D9397300E for ; Fri, 11 Dec 2020 16:52:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CF9D9397300E 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-497-gRWrCMo_P6aptgrf2yyFhg-1; Fri, 11 Dec 2020 11:52:30 -0500 X-MC-Unique: gRWrCMo_P6aptgrf2yyFhg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C12F681CAF7 for ; Fri, 11 Dec 2020 16:52:27 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-113-30.ams2.redhat.com [10.36.113.30]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3E2435D9D2 for ; Fri, 11 Dec 2020 16:52:27 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] support: Add support_slibdir_prefix variable Date: Fri, 11 Dec 2020 17:52:25 +0100 Message-ID: <87o8j0uvxy.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" --- support/Makefile | 1 + support/support.h | 2 ++ support/support_paths.c | 7 +++++++ 3 files changed, 10 insertions(+) Reviewed-by: Carlos O'Donell diff --git a/support/Makefile b/support/Makefile index f5f59bf8d2..3198eb5022 100644 --- a/support/Makefile +++ b/support/Makefile @@ -196,6 +196,7 @@ CFLAGS-support_paths.c = \ -DLIBDIR_PATH=\"$(libdir)\" \ -DBINDIR_PATH=\"$(bindir)\" \ -DSBINDIR_PATH=\"$(sbindir)\" \ + -DSLIBDIR_PATH=\"$(slibdir)\" \ -DROOTSBINDIR_PATH=\"$(rootsbindir)\" \ -DCOMPLOCALEDIR_PATH=\"$(complocaledir)\" diff --git a/support/support.h b/support/support.h index abda3a69f1..96971f83ac 100644 --- a/support/support.h +++ b/support/support.h @@ -114,6 +114,8 @@ extern const char support_libdir_prefix[]; extern const char support_bindir_prefix[]; /* Corresponds to the install's sbin/ directory. */ extern const char support_sbindir_prefix[]; +/* Corresponds to the install's system /lib or /lib64 directory. */ +extern const char support_slibdir_prefix[]; /* Corresponds to the install's sbin/ directory (without prefix). */ extern const char support_install_rootsbindir[]; /* Corresponds to the install's compiled locale directory. */ diff --git a/support/support_paths.c b/support/support_paths.c index edc6511304..514273444a 100644 --- a/support/support_paths.c +++ b/support/support_paths.c @@ -72,6 +72,13 @@ const char support_sbindir_prefix[] = SBINDIR_PATH; # error please -DSBINDIR_PATH=something in the Makefile #endif +#ifdef SLIBDIR_PATH +/* Corresponds to the system /lib or /lib64 directory. */ +const char support_slibdir_prefix[] = SLIBDIR_PATH; +#else +# error please -DSLIBDIR_PATH=something in the Makefile +#endif + #ifdef ROOTSBINDIR_PATH /* Corresponds to the install's sbin/ directory. */ const char support_install_rootsbindir[] = ROOTSBINDIR_PATH;