Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20538915.Wj2CyUsUYa@devpool35> <2278760.8Yd83Mgoko@devpool35>
 <3394639.6NgGvCfkNl@devpool47> <3207945.kN7qQvqmsI@devpool47>
In-Reply-To: <3207945.kN7qQvqmsI@devpool47>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Thu, 28 Jan 2021 15:37:54 +0900
Message-ID: <CAK7LNATMFicsV3Lz3RfrqjzKOOpcyEomVJOPqM29X6y4pXiFDA@mail.gmail.com>
Subject: Re: [PATCH v6] scripts: use pkg-config to locate libcrypto
To:     Rolf Eike Beer <eb@emlix.com>
Cc:     David Woodhouse <dwmw2@infradead.org>,
        Linux Kernel Developers List <linux-kernel@vger.kernel.org>,
        David Howells <dhowells@redhat.com>, keyrings@vger.kernel.org,
        Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Jan 27, 2021 at 5:06 PM Rolf Eike Beer <eb@emlix.com> wrote:
>
> From f467f251e44cd406c9556ea7d68d131f56e0d832 Mon Sep 17 00:00:00 2001
> From: Rolf Eike Beer <eb@emlix.com>
> Date: Thu, 22 Nov 2018 16:40:49 +0100
> Subject: [PATCH] scripts: use pkg-config to locate libcrypto
>
> Otherwise build fails if the headers are not in the default location. Whi=
le at
> it also ask pkg-config for the libs, with fallback to the existing value.
>
> Signed-off-by: Rolf Eike Beer <eb@emlix.com>
> Cc: stable@vger.kernel.org # 5.6.x
> ---
>  scripts/Makefile | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> Changes in v6:
>  - hardcode pkg-config
>
> diff --git a/scripts/Makefile b/scripts/Makefile
> index b5418ec587fb..9de3c03b94aa 100644
> --- a/scripts/Makefile
> +++ b/scripts/Makefile
> @@ -3,6 +3,9 @@
>  # scripts contains sources for various helper programs used throughout
>  # the kernel for the build process.
>
> +CRYPTO_LIBS =3D $(shell pkg-config --libs libcrypto 2> /dev/null || echo=
 -lcrypto)
> +CRYPTO_CFLAGS =3D $(shell pkg-config --cflags libcrypto 2> /dev/null)
> +
>  hostprogs-always-$(CONFIG_BUILD_BIN2C)                 +=3D bin2c
>  hostprogs-always-$(CONFIG_KALLSYMS)                    +=3D kallsyms
>  hostprogs-always-$(BUILD_C_RECORDMCOUNT)               +=3D recordmcount
> @@ -14,8 +17,9 @@ hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE)   +=
=3D insert-sys-cert
>
>  HOSTCFLAGS_sorttable.o =3D -I$(srctree)/tools/include
>  HOSTCFLAGS_asn1_compiler.o =3D -I$(srctree)/include
> -HOSTLDLIBS_sign-file =3D -lcrypto
> -HOSTLDLIBS_extract-cert =3D -lcrypto
> +HOSTLDLIBS_sign-file =3D $(CRYPTO_LIBS)
> +HOSTCFLAGS_extract-cert.o =3D $(CRYPTO_CFLAGS)
> +HOSTLDLIBS_extract-cert =3D $(CRYPTO_LIBS)
>
>  ifdef CONFIG_UNWINDER_ORC
>  ifeq ($(ARCH),x86_64)
> --
> 2.30.0
>
> --
> Rolf Eike Beer, emlix GmbH, http://www.emlix.com
> Fon +49 551 30664-0, Fax +49 551 30664-11
> Gothaer Platz 3, 37083 G=C3=B6ttingen, Germany
> Sitz der Gesellschaft: G=C3=B6ttingen, Amtsgericht G=C3=B6ttingen HR B 31=
60
> Gesch=C3=A4ftsf=C3=BChrung: Heike Jordan, Dr. Uwe Kracke =E2=80=93 Ust-Id=
Nr.: DE 205 198 055
>
> emlix - smart embedded open source
>
>
>

Applied to linux-kbuild. Thanks.

--=20
Best Regards
Masahiro Yamada