lkml.org 
[lkml]   [2021]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5] scripts: use pkg-config to locate libcrypto
    Date
    Otherwise build fails if the headers are not in the default location. While 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 | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    This has been sent multiple times since more than 2 year, please pick it up
    through whatever tree. I need to patch every new stable kernel version to
    make them build in our chrooted environment.


    diff --git a/scripts/Makefile b/scripts/Makefile
    index b5418ec587fb..7553692d241f 100644
    --- a/scripts/Makefile
    +++ b/scripts/Makefile
    @@ -3,6 +3,11 @@
    # scripts contains sources for various helper programs used throughout
    # the kernel for the build process.

    +PKG_CONFIG ?= pkg-config
    +
    +CRYPTO_LIBS = $(shell $(PKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)
    +CRYPTO_CFLAGS = $(shell $(PKG_CONFIG) --cflags libcrypto 2> /dev/null)
    +
    hostprogs-always-$(CONFIG_BUILD_BIN2C) += bin2c
    hostprogs-always-$(CONFIG_KALLSYMS) += kallsyms
    hostprogs-always-$(BUILD_C_RECORDMCOUNT) += recordmcount
    @@ -14,8 +19,9 @@ hostprogs-always-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert

    HOSTCFLAGS_sorttable.o = -I$(srctree)/tools/include
    HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
    -HOSTLDLIBS_sign-file = -lcrypto
    -HOSTLDLIBS_extract-cert = -lcrypto
    +HOSTLDLIBS_sign-file = $(CRYPTO_LIBS)
    +HOSTCFLAGS_extract-cert.o = $(CRYPTO_CFLAGS)
    +HOSTLDLIBS_extract-cert = $(CRYPTO_LIBS)

    ifdef CONFIG_UNWINDER_ORC
    ifeq ($(ARCH),x86_64)
    --
    2.29.2
    --
    Rolf Eike Beer, emlix GmbH, http://www.emlix.com
    Fon +49 551 30664-0, Fax +49 551 30664-11
    Gothaer Platz 3, 37083 Göttingen, Germany
    Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160
    Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055
    emlix - smart embedded open source



    \
     
     \ /
      Last update: 2021-01-13 13:52    [W:4.154 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site