scripts: use pkg-config to locate libcrypto
Subsystems (2)
PATCH v3 1/1 scripts: use pkg-config to locate libcrypto
From 71e19be4247fbaa2540dfb321e2b148234680a13 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <[email protected]>
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. While at it also ask pkg-config for the libs, with fallback to the existing value.
--- scripts/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
v2: add CRYPTO_LIBS and CRYPTO_CFLAGS
v3: fix fallback -lcrypto
scripts/Makefile +7 -2
@@ -8,7 +8,11 @@ # conmakehash: Create chartable # conmakehash: Create arrays for initializing the kernel console tables +PKG_CONFIG?= pkg-config + HOST_EXTRACFLAGS += -I$(srctree)/tools/include +CRYPTO_LIBS = $(shell $(PKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto) +CRYPTO_CFLAGS = $(shell $(PKG_CONFIG) --cflags libcrypto 2> /dev/null) hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-$(CONFIG_KALLSYMS) += kallsyms
@@ -23,8 +27,9 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert HOSTCFLAGS_sortextable.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) always := $(hostprogs-y) $(hostprogs-m)
Signature · 11 lines
2.21.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ö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
Quoted 8 lines
From
71e19be4247fbaa2540dfb321e2b148234680a13Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <[email protected]>
Date: Thu, 22 Nov 2018 16:40:49 +0100
Subject: [PATCH] scripts: use pkg-config to locate libcryptoOtherwise 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.
Ping?
Signature · 7 lines
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
Quoted 10 lines · Rolf Eike Beer
Quoted 8 lines
From
71e19be4247fbaa2540dfb321e2b148234680a13Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <[email protected]>
Date: Thu, 22 Nov 2018 16:40:49 +0100
Subject: [PATCH] scripts: use pkg-config to locate libcryptoOtherwise 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.
Ping?
Maybe repost ?
In general i think it's a good idea to use pkg-config.
Actually, I'd prefer exclusively using pkg-config instead of hardcoded pathes - it's a wonderful central knob for doing those kind of site- specific customizations.
--mtx
Signature · 3 lines
Enrico Weigelt, metux IT consult Free software and Linux embedded engineering [email protected] -- +49-151-27565287
PATCH RESEND v3 1/1 scripts: use pkg-config to locate libcrypto
In reply to Rolf Eike BeerOtherwise 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.
--- scripts/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
scripts/Makefile +7 -2
@@ -8,7 +8,11 @@ # conmakehash: Create chartable # conmakehash: Create arrays for initializing the kernel console tables +PKG_CONFIG?= pkg-config + HOST_EXTRACFLAGS += -I$(srctree)/tools/include +CRYPTO_LIBS = $(shell $(PKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto) +CRYPTO_CFLAGS = $(shell $(PKG_CONFIG) --cflags libcrypto 2> /dev/null) hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-$(CONFIG_KALLSYMS) += kallsyms
@@ -23,8 +27,9 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert HOSTCFLAGS_sortextable.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) always := $(hostprogs-y) $(hostprogs-m)
Signature · 1 line
2.23.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Am Dienstag, 10. September 2019, 12:48:30 CEST schrieb Sasha Levin:
Quoted 7 lines
Hi,
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
Quoted 7 lines
The bot has tested the following trees: v5.2.13, v4.19.71, v4.14.142, v4.9.191, v4.4.191.
v5.2.13: Build OK!
v4.19.71: Build OK!
v4.14.142: Failed to apply! Possible dependencies:
8377bd2b9ee1("kbuild: RenameHOST_LOADLIBEStoKBUILD_HOSTLDLIBS")
This one causes the collision, the simple fix would probably be to manually use the old variable names when cherry-picking.
Quoted 1 line
How should we proceed with this patch?
I can send a backport or you manually fix it up when applying, as you wish.
Greetings,
Eike
Signature · 7 lines
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
PATCH RESEND v3 1/1 scripts: use pkg-config to locate libcrypto
In reply to Rolf Eike BeerOtherwise 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.
--- scripts/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
scripts/Makefile +7 -2
@@ -8,7 +8,11 @@ # conmakehash: Create chartable # conmakehash: Create arrays for initializing the kernel console tables +PKG_CONFIG?= pkg-config + HOST_EXTRACFLAGS += -I$(srctree)/tools/include +CRYPTO_LIBS = $(shell $(PKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto) +CRYPTO_CFLAGS = $(shell $(PKG_CONFIG) --cflags libcrypto 2> /dev/null) hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c hostprogs-$(CONFIG_KALLSYMS) += kallsyms
@@ -23,8 +27,9 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert HOSTCFLAGS_sortextable.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) always := $(hostprogs-y) $(hostprogs-m)
Signature · 11 lines
2.24.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ö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
PATCH v4 1/1 scripts: use pkg-config to locate libcrypto
In reply to Rolf Eike BeerFrom 082ba542ca4c710dcf592a6f9233603b9275d05d Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <[email protected]>
Date: Thu, 22 Nov 2018 16:40:49 +0100
Subject: [PATCH 1/2] scripts: use pkg-config to locate libcrypto
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.
--- scripts/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
scripts/Makefile +8 -2
@@ -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) + always-$(CONFIG_BUILD_BIN2C) += bin2c always-$(CONFIG_KALLSYMS) += kallsyms always-$(BUILD_C_RECORDMCOUNT) += recordmcount
@@ -14,8 +19,9 @@ 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)
Signature · 1 line
2.26.1
Am Montag, 27. April 2020, 10:11:28 CEST schrieb Rolf Eike Beer:
Quoted 8 lines
From
082ba542ca4c710dcf592a6f9233603b9275d05dMon Sep 17 00:00:00 2001
From: Rolf Eike Beer <[email protected]>
Date: Thu, 22 Nov 2018 16:40:49 +0100
Subject: [PATCH 1/2] scripts: use pkg-config to locate libcryptoOtherwise 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.
Close to 2 years since the original patch… can this please be applied? It get's annoying to patch every new kernel version the same way again.
Thx
Eike
Signature · 7 lines
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
PATCH v5 1/1 scripts: use pkg-config to locate libcrypto
In reply to Rolf Eike BeerOtherwise 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.
--- 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.
scripts/Makefile +8 -2
@@ -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)
Signature · 9 lines
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
Quoted 4 lines · Rolf Eike Beer
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 <[email protected]>
Quoted 1 line
Cc [email protected] # 5.6.x
Note that keyutils is not in the kernel, so I don't know how useful this is.
--Ben
Quoted 4 lines · Ben Boeckel
Quoted 1 line
Cc [email protected] # 5.6.xNote that keyutils is not in the kernel, so I don't know how useful this is.
Scratch that; I remember a similar patch for keyutils; this is for the kernel.
--Ben
Quoted 5 lines · Rolf Eike Beer
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 <[email protected]>Cc [email protected] # 5.6.x
/Jarkko
Quoted 5 lines · Rolf Eike Beer
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 <[email protected]>Cc [email protected] # 5.6.x
/Jarkko
Am Mittwoch, 13. Januar 2021, 13:49:12 CET schrieb Rolf Eike Beer:
Quoted 3 lines
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.
Can someone please take this through the kbuild-tree? Noone seems to be interested in picking this up so far.
Thanks,
Eike
Signature · 7 lines
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
Quoted 19 lines · Rolf Eike Beer
Am Mittwoch, 13. Januar 2021, 13:49:12 CET schrieb Rolf Eike Beer:
Quoted 3 lines
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.
Can someone please take this through the kbuild-tree? Noone seems to be interested in picking this up so far.
Thanks,
Eike
--
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
Quoted 1 line
emlix - smart embedded open source
Is 'PKG_CONFIG' necessary?
I see many Makefiles hard-coding 'pkg-config'.
Signature · 2 lines
Best Regards Masahiro Yamada
Am Dienstag, 26. Januar 2021, 07:30:03 CET schrieb Masahiro Yamada:
Quoted 7 lines · Rolf Eike Beer
Quoted 6 lines
Am Mittwoch, 13. Januar 2021, 13:49:12 CET schrieb Rolf Eike Beer:
Quoted 4 lines
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.
Quoted 6 lines
Quoted 2 lines
Can someone please take this through the kbuild-tree? Noone seems to be interested in picking this up so far.
Is '
PKG_CONFIG' necessary?I see many Makefiles hard-coding 'pkg-config'.
Well, it depends ;)
When people use pkgconf then this usually installs a pkg-config alias, too, so that would be no problem. The problem comes when other places in the kernel start copying that code over, and then hardcode pkg-config for stuff that needs a prefixed pkg-config because it is about target code.
Given that I would prefer it this way, but YMMV. If it is that variable that blocks integrating I'll change it.
Eike
Signature · 7 lines
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
Quoted 34 lines · Rolf Eike Beer
Am Dienstag, 26. Januar 2021, 07:30:03 CET schrieb Masahiro Yamada:
Quoted 7 lines · Rolf Eike Beer
Quoted 6 lines
Am Mittwoch, 13. Januar 2021, 13:49:12 CET schrieb Rolf Eike Beer:
Quoted 4 lines
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.Quoted 6 lines
Quoted 2 lines
Can someone please take this through the kbuild-tree? Noone seems to be interested in picking this up so far.
Is '
PKG_CONFIG' necessary?I see many Makefiles hard-coding 'pkg-config'.
Well, it depends ;)
When people use pkgconf then this usually installs a pkg-config alias, too, so that would be no problem. The problem comes when other places in the kernel start copying that code over, and then hardcode pkg-config for stuff that needs a prefixed pkg-config because it is about target code.
Given that I would prefer it this way, but YMMV. If it is that variable that blocks integrating I'll change it.
Eike
--
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
Quoted 1 line
emlix - smart embedded open source
What I understood from commit a8a5cd8b472c is
the cross-compile prefix is needed
only for the target CC.
$(CC) -> $(CROSS_COMPILE)pkg-config (i.e. $(PKG_CONFIG)) $(HOSTCC) -> pkg-config
For cross-compiling, the prefixing makes sense
because $(CC) != $(HOSTCC)
In this case, scripts/extract-cert is a host tool
compiled by $(HOSTCC), so I do not see
a good reason to use $(PKG_CONFIG).
If somebody copy-pastes the code without understanding it, that is their problem.
Let's do proper engineering. :-)
--
Best Regards
Masahiro Yamada
PATCH v6 1/1 scripts: use pkg-config to locate libcrypto
In reply to Rolf Eike BeerFrom f467f251e44cd406c9556ea7d68d131f56e0d832 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <[email protected]>
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. While at it also ask pkg-config for the libs, with fallback to the existing value.
--- scripts/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Changes in v6:
- hardcode pkg-config
scripts/Makefile +6 -2
@@ -3,6 +3,9 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. +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 +17,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)
Signature · 10 lines
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ö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
Quoted 47 lines · Rolf Eike Beer
From
f467f251e44cd406c9556ea7d68d131f56e0d832Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <[email protected]>
Date: Thu, 22 Nov 2018 16:40:49 +0100
Subject: [PATCH] scripts: use pkg-config to locate libcryptoOtherwise 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 <[email protected]>Cc [email protected] # 5.6.x--- scripts/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)Changes in v6:
- hardcode pkg-configscripts/Makefile +6
-3@@ -3,6 +3,9 @@ # scripts contains sources for various helper programs used throughout # the kernel for the build process. +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 +17,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.30.0
Quoted 11 lines
--
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 055emlix - smart embedded open source
Applied to linux-kbuild. Thanks.
Signature · 2 lines
Best Regards Masahiro Yamada