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