sys-apps/lshw/files/lshw-02.08.01b-build.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

--- lshw-B.02.08.01/src/Makefile
+++ lshw-B.02.08.01/src/Makefile
@@ -13,11 +13,13 @@
 export MANDIR
 export DATADIR
 
-CXX=c++
+CXX ?= c++
 INCLUDES=-I./core/
 DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES)
-LDFLAGS=-L./core/ -g
+CXXFLAGS ?= -g -Os
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
+LDFLAGS ?= -s
+LDFLAGS += -L./core/
 ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
 	LDFLAGS+= -Wl,--as-needed
 endif
--- lshw-B.02.08.01/src/core/Makefile
+++ lshw-B.02.08.01/src/core/Makefile
@@ -1,9 +1,10 @@
 PACKAGENAME?=lshw
 
-CXX=c++
+CXX ?= c++
 INCLUDES=
 DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
-CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES)
+CXXFLAGS ?= -g -Os
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
 LDFLAGS=
 LDSTATIC=
 LIBS=
--- lshw-B.02.08.01/src/gui/Makefile
+++ lshw-B.02.08.01/src/gui/Makefile
@@ -1,16 +1,18 @@
 PACKAGENAME?=lshw
 
-CXX=c++
-CC=cc
+CXX ?= c++
+CC ?= cc
 
 DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
 GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
 INCLUDES=-I../core $(GTKINCLUDES)
-CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES)
-CFLAGS=$(CXXFLAGS) $(DEFINES)
+CXXFLAGS ?= -g -Os
+CFLAGS ?= $(CXXFLAGS)
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
+CFLAGS += -Wall $(INCLUDES) $(DEFINES)
 GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
 LIBS=-L../core -llshw $(GTKLIBS)
-LDFLAGS= -Os -s
+LDFLAGS ?= -Os -s
 ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
 	LDFLAGS+= -Wl,--as-needed
 endif