From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 9D0B7386F022 for ; Fri, 11 Dec 2020 17:19:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9D0B7386F022 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-587-ppi6wo0jPNSGIsVLVM07Jw-1; Fri, 11 Dec 2020 12:19:21 -0500 X-MC-Unique: ppi6wo0jPNSGIsVLVM07Jw-1 Received: by mail-qk1-f197.google.com with SMTP id 198so7106484qkj.7 for ; Fri, 11 Dec 2020 09:19:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=GwQiY5hie3zshaDsyEHp5saDPIUUvgoqRQRwBrfRwb8=; b=PBAAaYp1GTUaShwiQeNgv3qUN6lxQj/Y6bedVcPKqLwEuM7QZcmo1T1QjWmw5PO4Rd 7wGaTKYE8+jL85gx0qzdSvhOhSfv8oroTFcfQ+fFri5EOgxzLowK88T2VQ7TDJ/ojmUa fcvJc9y1DU3xNpZaouxY+XEyRpVi7FxRWFoGvEkcZbPYLcgxWSKAlmGFIL75XOF6PBAB TNRJYD2MfnicIGOdkAU4gogjfET4zDYnnU5ElfaKFGDWOuJL9LDd1GBhXWYYc6OEP+p0 e378zSYVNmlJeVYF6DB3BkLQ1HGTHytNwxSwWmcoBZJNAXGr0gvFeCw7es4AqBicP03H Di9Q== X-Gm-Message-State: AOAM532vfb3h634sutlbipOmi3iuwMHFWJTG4SkKxy0Y+L25C/YO7FE6 h8c5A4miH4v0DAZelKN1zXOydd0X8on2dR4zDoI4w5ueN8zil0mA0iRQBFHrMRpKMCsogkL75mW XzxIClx/BAdz9ZEPOjLQrbt9QpVOEIlDsfyyCTo9332GwpYYeMFQ/ehVCaKg1ROSbO7kTHw== X-Received: by 2002:a37:2742:: with SMTP id n63mr13026570qkn.390.1607707160495; Fri, 11 Dec 2020 09:19:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJyOM/nw2AAKVDN/Hod7WLSxfLdITFRqjzO7BAgNUy+ORz95E6LHxt8LfCNAEp3NGTb7GqjteA== X-Received: by 2002:a37:2742:: with SMTP id n63mr13026538qkn.390.1607707160219; Fri, 11 Dec 2020 09:19:20 -0800 (PST) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id i4sm6618974qti.78.2020.12.11.09.19.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Dec 2020 09:19:18 -0800 (PST) Subject: Re: [PATCH] support: Add support_slibdir_prefix variable To: Florian Weimer , libc-alpha@sourceware.org References: <87o8j0uvxy.fsf@oldenburg2.str.redhat.com> From: Carlos O'Donell Organization: Red Hat Message-ID: <75ec681c-870f-751d-f59e-042f1142aa2f@redhat.com> Date: Fri, 11 Dec 2020 12:19:18 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <87o8j0uvxy.fsf@oldenburg2.str.redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, 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-List-Received-Date: Fri, 11 Dec 2020 17:19:24 -0000 On 12/11/20 11:52 AM, Florian Weimer via Libc-alpha wrote: > --- > support/Makefile | 1 + > support/support.h | 2 ++ > support/support_paths.c | 7 +++++++ > 3 files changed, 10 insertions(+) LGTM. 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; > -- Cheers, Carlos.