[lshw] improve cross compilation fixes

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

4 files changed, 84 insertions, 52 deletions

diff --git a/patches/lshw-B.02.14/0001-fix-cross-compilation.patch b/patches/lshw-B.02.14/0001-fix-cross-compilation.patch
new file mode 100644
index 000000000..3e9974d15
--- /dev/null
+++ b/patches/lshw-B.02.14/0001-fix-cross-compilation.patch
@@ -0,0 +1,69 @@
+From cb3fbcd551017645b092743e2b48c27514829196 Mon Sep 17 00:00:00 2001
+From: Remy Bohmer <linux@bohmer.net>
+Date: Sun, 20 Jun 2010 22:48:09 +0200
+Subject: [PATCH 1/2] fix cross-compilation
+
+Signed-off-by: Remy Bohmer <linux@bohmer.net>
+[mkl: improve fix]
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ src/Makefile      |    4 ++--
+ src/core/Makefile |    6 +++---
+ src/gui/Makefile  |    6 +++---
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 93c3ead..ea20184 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -18,8 +18,8 @@ export DATADIR
+ CXX?=c++
+ INCLUDES=-I./core/
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+-LDFLAGS=-L./core/ -g
++CXXFLAGS+=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS)
++LDFLAGS+=-L./core/ -g
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+ 	LDFLAGS+= -Wl,--as-needed
+ endif
+diff --git a/src/core/Makefile b/src/core/Makefile
+index 024b921..b108a6e 100644
+--- a/src/core/Makefile
++++ b/src/core/Makefile
+@@ -1,10 +1,10 @@
+ PACKAGENAME?=lshw
+ 
+-CXX=c++
++CXX?=c++
+ INCLUDES=
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+-LDFLAGS=
++CXXFLAGS+=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS)
++LDFLAGS+=
+ LDSTATIC=
+ LIBS=
+ 
+diff --git a/src/gui/Makefile b/src/gui/Makefile
+index 05fbbfd..d410a1d 100644
+--- a/src/gui/Makefile
++++ b/src/gui/Makefile
+@@ -8,11 +8,11 @@ OBJCOPY?=objcopy
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+ GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
+ INCLUDES=-I../core $(GTKINCLUDES)
+-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+-CFLAGS=$(CXXFLAGS) $(DEFINES)
++CXXFLAGS+=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) $(CPPFLAGS)
++CFLAGS+=$(CXXFLAGS) $(DEFINES)
+ GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
+ LIBS=-L../core -llshw -lresolv $(GTKLIBS)
+-LDFLAGS=
++LDFLAGS+=
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+ 	LDFLAGS+= -Wl,--as-needed
+ endif
+-- 
+1.7.1
+
diff --git a/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch b/patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch
index f508ce732..eb9abb671 100644
--- a/patches/lshw-B.02.14/replace_reserved_xml_keyword.patch
+++ b/patches/lshw-B.02.14/0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch
@@ -1,4 +1,7 @@
-Replace keyword node with hwnode for TinyXpath compatibility
+From 0eea91e31ed90c82acc45c221be689c10e4f779c Mon Sep 17 00:00:00 2001
+From: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
+Date: Sun, 20 Jun 2010 22:48:09 +0200
+Subject: [PATCH 2/2] Replace keyword node with hwnode for TinyXpath compatibility
 
 It turns out that within TinyXpath 'node' is a reserved key-word.
 Replace it with 'hwnode' when printing to xml.
@@ -7,12 +10,12 @@ Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
 Signed-off-by: Remy Bohmer <linux@bohmer.net>
 ---
  src/core/hw.cc |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 1 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: lshw-B.02.14/src/core/hw.cc
-===================================================================
---- lshw-B.02.14.orig/src/core/hw.cc	2009-10-14 14:49:33.000000000 +0200
-+++ lshw-B.02.14/src/core/hw.cc	2009-10-14 14:49:49.000000000 +0200
+diff --git a/src/core/hw.cc b/src/core/hw.cc
+index 36679d3..367729b 100644
+--- a/src/core/hw.cc
++++ b/src/core/hw.cc
 @@ -1343,7 +1343,7 @@ string hwNode::asXML(unsigned level)
    if(visible(getClassName()))
    {
@@ -29,5 +32,8 @@ Index: lshw-B.02.14/src/core/hw.cc
 -    out << "</node>" << endl;
 +    out << "</hwnode>" << endl;
    }
-
+ 
    return out.str();
+-- 
+1.7.1
+
diff --git a/patches/lshw-B.02.14/fix-cross-compile.patch b/patches/lshw-B.02.14/fix-cross-compile.patch
deleted file mode 100644
index bfcce62b9..000000000
--- a/patches/lshw-B.02.14/fix-cross-compile.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-fix cross-compilation
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
----
- src/Makefile |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: lshw-B.02.14/src/Makefile
-===================================================================
---- lshw-B.02.14.orig/src/Makefile
-+++ lshw-B.02.14/src/Makefile
-@@ -18,10 +18,10 @@ export DATADIR
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=-L./core/ -g
-+CXXFLAGS= ${CPPFLAGS} -g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+MYLDFLAGS:= ${LDFLAGS} -L./core/ -g
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
--	LDFLAGS+= -Wl,--as-needed
-+	MYLDFLAGS+= -Wl,--as-needed
- endif
- LDSTATIC=-static
- LIBS=-llshw -lresolv
-@@ -38,7 +38,7 @@ core:
- 	+make -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
--	$(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-+	$(CXX) $(MYLDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: gui
- gui: core
-@@ -52,7 +52,7 @@ nologo:
- static: $(PACKAGENAME)-static
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
--	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-+	$(CXX) $(LDSTATIC) $(MYLDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
- 	$(STRIP) $@
- 
- .PHONY: compressed
diff --git a/patches/lshw-B.02.14/series b/patches/lshw-B.02.14/series
index 4b21b9958..c41c259fd 100644
--- a/patches/lshw-B.02.14/series
+++ b/patches/lshw-B.02.14/series
@@ -1,2 +1,2 @@
-fix-cross-compile.patch
-replace_reserved_xml_keyword.patch
+0001-fix-cross-compilation.patch
+0002-Replace-keyword-node-with-hwnode-for-TinyXpath-compa.patch