diff mbox series

linuxptp: add patch to fix build failures with make 4.4

Message ID 20221203101803.23169-1-heiko.thiery@gmail.com
State Accepted
Headers show
Series linuxptp: add patch to fix build failures with make 4.4 | expand

Commit Message

Heiko Thiery Dec. 3, 2022, 10:18 a.m. UTC 
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.

Fixes: http://autobuild.buildroot.net/results/5294fac7ed04945d47ea4eb2d1448bcbea5352bb/

Cc: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
---
 ...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

Comments

Heiko Thiery Dec. 3, 2022, 10:21 a.m. UTC | #1 
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?
Thomas Petazzoni Dec. 3, 2022, 2:43 p.m. UTC | #2 
On Sat,  3 Dec 2022 11:18:04 +0100
Heiko Thiery <heiko.thiery@gmail.com> wrote:

> 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.
> 
> Fixes: http://autobuild.buildroot.net/results/5294fac7ed04945d47ea4eb2d1448bcbea5352bb/
> 
> Cc: James Hilliard <james.hilliard1@gmail.com>
> Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
> ---
>  ...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
diff mbox series

Patch

diff --git a/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch b/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch
new file mode 100644
index 0000000000..73cd34f744
--- /dev/null
+++ b/package/linuxptp/0002-makefile-use-conditional-assignment-for-KBUILD_OUTPUT.patch
@@ -0,0 +1,43 @@ 
+From: Changqing Li <changqing.li@windriver.com>
+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 <changqing.li@windriver.com>
+
+[Retrieved from mailing list. The patch was not yet accepted and applied:
+https://www.mail-archive.com/linuxptp-devel@lists.sourceforge.net/msg06151.html]
+Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
+
+---
+ 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