Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 7e0e3c0c6a2cd4e76ebca17ed16a37155992025e / . / meta-openembedded / meta-networking / recipes-support / ntopng / files / 0001-Makefile.in-don-t-use-the-internal-lua.patch
blob: bb5bcfbd63fc60c6decc11ffcd5ede78eb678000 [file] [log] [blame]
William A. Kennington III49e95662021-09-15 16:19:36 -0700[diff] [blame]1From 52953ab99c727a19e88243dda2702d6814f7974d Mon Sep 17 00:00:00 2001
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 4 Nov 2020 08:55:10 +0000
4Subject: [PATCH] Makefile.in: don't use the internal lua
5
6ntopng depends on lua and it will compile the lua under
7third-party sub dir of source tree, but this one supports
8cross-compiling badly, so use the one under RECIPE_SYSROOT.
9
10Upstream-Status: Inappropriate [embedded specific]
11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13---
14 Makefile.in | 2 --
15 1 file changed, 2 deletions(-)
16
17diff --git a/Makefile.in b/Makefile.in
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame^]18index d737e74..a611b16 100755
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]19--- a/Makefile.in
20+++ b/Makefile.in
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame^]21@@ -36,7 +36,6 @@ MONGOOSE_INC=-I$(MONGOOSE_HOME)
22 LUA_PLATFORM=generic
23 LUA_HOME=${PWD}/third-party/lua-5.4.3
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]24 LUA_INC=-I$(LUA_HOME)/src
25-LUA_LIB=$(LUA_HOME)/src/liblua.a
26
William A. Kennington III49e95662021-09-15 16:19:36 -0700[diff] [blame]27 ifeq ($(OS),Linux)
28 LUA_PLATFORM=linux
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame^]29@@ -102,7 +101,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLATFORM).rpm
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]30 RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm
31 ######
32
33-LIB_TARGETS = $(LUA_LIB)
34
35 ifneq ($(HAS_ZEROMQ), 0)
36 LIB_TARGETS += $(ZEROMQ_LIB)
37--
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame^]382.25.1
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]39