linuxptp: add patch to fix build failures with make 4.4
PATCH 1/1 linuxptp: add patch to fix build failures with make 4.4
When using make 4.4 the KBOUD_OUTPUT environment variable provided to the linuxptp makefile is not utilized. The added patch will fix that behavior.
Cc James Hilliard <[email protected]>
Signed-off-by Heiko Thiery <[email protected]>
--- ...itional-assignment-for-KBUILD_OUTPUT.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch
package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch new file +43 -0
@@ -0,0 +1,43 @@ +From: Changqing Li <[email protected]> +Date: Wed, 23 Nov 2022 08:23:46 +0800 +Subject: [Linuxptp-devel] [PATCH] makefile: use conditional assignment for KBUILD_OUTPUT + +Refer [1],from make 4.4, all variables that are marked as export will +also be passed to the shell started by the shell function. use "=" will +make KBUILD_OUTPUT always empty for shell function, use "?=" to make +"export KBUILD_OUTPUT" in enrironment can work. + +[snip of 4.4 NEWS] +* WARNING: Backward-incompatibility! + Previously makefile variables marked as export were not exported to commands + started by the $(shell ...) function. Now, all exported variables are + exported to $(shell ...). +[snip] + +[1] https://git.savannah.gnu.org/cgit/make.git/tree/NEWS?h=4.4&id=ed493f6c9116cc217b99c2cfa6a95f15803235a2#n74 + +Signed-off-by: Changqing Li <[email protected]> + +[Retrieved from mailing list. The patch was not yet accepted and applied: +https://www.mail-archive.com/[email protected]/msg06151.html] +Signed-off-by: Heiko Thiery <[email protected]> + +--- + makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefile b/makefile +index 9aed383..ba3fb38 100644 +--- a/makefile ++++ b/makefile +@@ -15,7 +15,7 @@ + # with this program; if not, write to the Free Software Foundation, Inc., + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-KBUILD_OUTPUT = ++KBUILD_OUTPUT ?= + + DEBUG = + CC = $(CROSS_COMPILE)gcc +-- +2.25.1
Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi,
just realized that I forgot to add the "package/" prefix in the subject line. Can this be changed before applying or should I resend v2?
Signature · 3 lines
Heiko Am Sa., 3. Dez. 2022 um 11:18 Uhr schrieb Heiko Thiery <[email protected]>:
Quoted 64 lines
When using make 4.4 the
KBOUD_OUTPUTenvironment variable provided to the linuxptp makefile is not utilized. The added patch will fix that behavior.Cc James Hilliard <[email protected]>Signed-off-by Heiko Thiery <[email protected]>--- ...itional-assignment-for-KBUILD_OUTPUT.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patchpackage/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch new file +43
-1@@ -0,0 +1,43 @@ +From: Changqing Li <[email protected]> +Date: Wed, 23 Nov 2022 08:23:46 +0800 +Subject: [Linuxptp-devel] [PATCH] makefile: use conditional assignment for KBUILD_OUTPUT + +Refer [1],from make 4.4, all variables that are marked as export will +also be passed to the shell started by the shell function. use "=" will +make KBUILD_OUTPUT always empty for shell function, use "?=" to make +"export KBUILD_OUTPUT" in enrironment can work. + +[snip of 4.4 NEWS] +* WARNING: Backward-incompatibility! + Previously makefile variables marked as export were not exported to commands + started by the $(shell ...) function. Now, all exported variables are + exported to $(shell ...). +[snip] + +[1] https://git.savannah.gnu.org/cgit/make.git/tree/NEWS?h=4.4&id=ed493f6c9116cc217b99c2cfa6a95f15803235a2#n74 + +Signed-off-by: Changqing Li <[email protected]> + +[Retrieved from mailing list. The patch was not yet accepted and applied: +https://www.mail-archive.com/[email protected]/msg06151.html] +Signed-off-by: Heiko Thiery <[email protected]> + +--- + makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/makefile b/makefile +index 9aed383..ba3fb38 100644 +--- a/makefile ++++ b/makefile +@@ -15,7 +15,7 @@ + # with this program; if not, write to the Free Software Foundation, Inc., + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-KBUILD_OUTPUT = ++KBUILD_OUTPUT ?= + + DEBUG = + CC = $(CROSS_COMPILE)gcc +-- +2.25.1 --
Quoted 2 lines
2.20.1
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedQuoted 4 lines · On Sat, 3 Dec 2022 11:18:04 +0100 Heiko Thiery <[email protected]> wrote:
When using make 4.4 the
KBOUD_OUTPUTenvironment variable provided to the linuxptp makefile is not utilized. The added patch will fix that behavior.
Quoted 8 lines
Cc James Hilliard <[email protected]>Signed-off-by Heiko Thiery <[email protected]>--- ...itional-assignment-for-KBUILD_OUTPUT.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch
Applied to master, thanks (yes, after fixing the commit title).
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot