|
 |
df7b7f |
From b901d009e9c46affc85aeb01cf04a3a47b21d034 Mon Sep 17 00:00:00 2001
|
|
|
df7b7f |
From: Lianbo Jiang <lijiang@redhat.com>
|
|
|
df7b7f |
Date: Thu, 21 Feb 2019 10:06:07 +0800
|
|
|
df7b7f |
Subject: [PATCH 03/10] Github PR39: support for OpenEmbedded/Yocto
|
|
|
df7b7f |
|
|
|
df7b7f |
Backport this patch from upstream.
|
|
|
df7b7f |
|
|
|
df7b7f |
commit 8486d25cea9b68794504fbd9e5c6e294bac6cb07
|
|
|
df7b7f |
Author: Lyonel Vincent <lyonel@ezix.org>
|
|
|
df7b7f |
Date: Sat Jun 9 12:28:48 2018 +0200
|
|
|
df7b7f |
|
|
|
df7b7f |
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
|
df7b7f |
---
|
|
|
df7b7f |
src/Makefile | 4 ++--
|
|
|
df7b7f |
src/core/Makefile | 2 +-
|
|
|
df7b7f |
src/gui/Makefile | 4 ++--
|
|
|
df7b7f |
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
df7b7f |
|
|
|
df7b7f |
diff --git a/src/Makefile b/src/Makefile
|
|
|
df7b7f |
index a627466..e26941c 100644
|
|
|
df7b7f |
--- a/src/Makefile
|
|
|
df7b7f |
+++ b/src/Makefile
|
|
|
df7b7f |
@@ -20,7 +20,7 @@ export DATADIR
|
|
|
df7b7f |
export SQLITE
|
|
|
df7b7f |
export ZLIB
|
|
|
df7b7f |
|
|
|
df7b7f |
-CXX?=c++
|
|
|
df7b7f |
+CXX?=$(CROSS_COMPILE)c++
|
|
|
df7b7f |
INCLUDES=-I./core/
|
|
|
df7b7f |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
|
|
|
df7b7f |
CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
|
|
df7b7f |
@@ -30,7 +30,7 @@ endif
|
|
|
df7b7f |
ifeq ($(ZLIB), 1)
|
|
|
df7b7f |
CXXFLAGS+= -DZLIB $(shell pkg-config --cflags zlib)
|
|
|
df7b7f |
endif
|
|
|
df7b7f |
-LDFLAGS=-L./core/ -g
|
|
|
df7b7f |
+LDFLAGS+=-L./core/ -g
|
|
|
df7b7f |
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
|
|
|
df7b7f |
LDFLAGS+= -Wl,--as-needed
|
|
|
df7b7f |
endif
|
|
|
df7b7f |
diff --git a/src/core/Makefile b/src/core/Makefile
|
|
|
df7b7f |
index 884a963..fbf6027 100644
|
|
|
df7b7f |
--- a/src/core/Makefile
|
|
|
df7b7f |
+++ b/src/core/Makefile
|
|
|
df7b7f |
@@ -1,6 +1,6 @@
|
|
|
df7b7f |
PACKAGENAME?=lshw
|
|
|
df7b7f |
|
|
|
df7b7f |
-CXX=c++
|
|
|
df7b7f |
+CXX?=$(CROSS_COMPILE)c++
|
|
|
df7b7f |
INCLUDES=
|
|
|
df7b7f |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
|
|
|
df7b7f |
CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
|
|
|
df7b7f |
diff --git a/src/gui/Makefile b/src/gui/Makefile
|
|
|
df7b7f |
index 2526c18..74be693 100644
|
|
|
df7b7f |
--- a/src/gui/Makefile
|
|
|
df7b7f |
+++ b/src/gui/Makefile
|
|
|
df7b7f |
@@ -1,7 +1,7 @@
|
|
|
df7b7f |
PACKAGENAME?=lshw
|
|
|
df7b7f |
|
|
|
df7b7f |
-CXX?=c++
|
|
|
df7b7f |
-CC?=cc
|
|
|
df7b7f |
+CXX?=$(CROSS_COMPILE)c++
|
|
|
df7b7f |
+CC?=$(CROSS_COMPILE)cc
|
|
|
df7b7f |
STRIP?=strip
|
|
|
df7b7f |
OBJCOPY?=objcopy
|
|
|
df7b7f |
|
|
|
df7b7f |
--
|
|
|
df7b7f |
2.17.1
|
|
|
df7b7f |
|