1 |
radhermit 12/01/11 23:01:24 |
2 |
|
3 |
Added: lshw-02.16b-build.patch |
4 |
Log: |
5 |
Version bump. |
6 |
|
7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sys-apps/lshw/files/lshw-02.16b-build.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/lshw/files/lshw-02.16b-build.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/lshw/files/lshw-02.16b-build.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: lshw-02.16b-build.patch |
16 |
=================================================================== |
17 |
--- lshw-B.02.16.orig/src/core/Makefile |
18 |
+++ lshw-B.02.16/src/core/Makefile |
19 |
@@ -1,10 +1,9 @@ |
20 |
PACKAGENAME?=lshw |
21 |
|
22 |
-CXX=c++ |
23 |
+CXX?=c++ |
24 |
INCLUDES= |
25 |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
26 |
-CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
27 |
-LDFLAGS= |
28 |
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
29 |
LDSTATIC= |
30 |
LIBS= |
31 |
|
32 |
--- lshw-B.02.16.orig/src/gui/Makefile |
33 |
+++ lshw-B.02.16/src/gui/Makefile |
34 |
@@ -8,11 +8,10 @@ |
35 |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
36 |
GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) |
37 |
INCLUDES=-I../core $(GTKINCLUDES) |
38 |
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
39 |
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
40 |
CFLAGS=$(CXXFLAGS) $(DEFINES) |
41 |
GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs) |
42 |
LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS) |
43 |
-LDFLAGS= |
44 |
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) |
45 |
LDFLAGS+= -Wl,--as-needed |
46 |
endif |
47 |
@@ -39,7 +38,6 @@ |
48 |
$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) |
49 |
|
50 |
install: all |
51 |
- $(STRIP) gtk-$(PACKAGENAME) |
52 |
|
53 |
clean: |
54 |
rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak |
55 |
--- lshw-B.02.16.orig/src/Makefile |
56 |
+++ lshw-B.02.16/src/Makefile |
57 |
@@ -21,11 +21,11 @@ |
58 |
CXX?=c++ |
59 |
INCLUDES=-I./core/ |
60 |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
61 |
-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
62 |
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
63 |
ifeq ($(SQLITE), 1) |
64 |
CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) |
65 |
endif |
66 |
-LDFLAGS=-L./core/ -g |
67 |
+LDFLAGS += -L./core/ |
68 |
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) |
69 |
LDFLAGS+= -Wl,--as-needed |
70 |
endif |
71 |
@@ -48,18 +48,18 @@ |
72 |
|
73 |
.PHONY: core |
74 |
core: |
75 |
- +make -C core all |
76 |
+ $(MAKE) -C core all |
77 |
|
78 |
$(PACKAGENAME): core $(PACKAGENAME).o |
79 |
$(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) |
80 |
|
81 |
.PHONY: po |
82 |
po: |
83 |
- +make -C po all |
84 |
+ $(MAKE) -C po all |
85 |
|
86 |
.PHONY: gui |
87 |
gui: core |
88 |
- +make -C gui all |
89 |
+ $(MAKE) -C gui all |
90 |
|
91 |
.PHONY: nologo |
92 |
nologo: |
93 |
@@ -70,7 +70,6 @@ |
94 |
|
95 |
$(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o |
96 |
$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) |
97 |
- $(STRIP) $@ |
98 |
|
99 |
.PHONY: compressed |
100 |
compressed: $(PACKAGENAME)-compressed |
101 |
@@ -93,14 +92,14 @@ |
102 |
manuf.txt: |
103 |
wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf |
104 |
|
105 |
-install: all |
106 |
+install: |
107 |
$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) |
108 |
$(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR) |
109 |
$(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1 |
110 |
$(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1 |
111 |
$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) |
112 |
$(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) |
113 |
- make -C po install |
114 |
+ $(MAKE) -C po install |
115 |
|
116 |
install-gui: gui |
117 |
$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) |
118 |
@@ -112,8 +111,8 @@ |
119 |
|
120 |
clean: |
121 |
rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed |
122 |
- make -C core clean |
123 |
- make -C gui clean |
124 |
+ $(MAKE) -C core clean |
125 |
+ $(MAKE) -C gui clean |
126 |
|
127 |
.timestamp: |
128 |
date --utc +%Y%m%d%H%M%S > $@ |