| 1 |
vapier 07/12/24 13:15:04 |
| 2 |
|
| 3 |
Added: lshw-02.12.01b-build.patch digest-lshw-02.12.01b |
| 4 |
Log: |
| 5 |
Version bump #195824. |
| 6 |
(Portage version: 2.1.4_rc11) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-apps/lshw/files/lshw-02.12.01b-build.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lshw/files/lshw-02.12.01b-build.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lshw/files/lshw-02.12.01b-build.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: lshw-02.12.01b-build.patch |
| 15 |
=================================================================== |
| 16 |
--- lshw/src/core/Makefile |
| 17 |
+++ lshw/src/core/Makefile |
| 18 |
@@ -1,9 +1,9 @@ |
| 19 |
PACKAGENAME?=lshw |
| 20 |
|
| 21 |
-CXX=c++ |
| 22 |
+CXX?=c++ |
| 23 |
INCLUDES= |
| 24 |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
| 25 |
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 26 |
+CXXFLAGS ?= -g |
| 27 |
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 28 |
-LDFLAGS= |
| 29 |
LDSTATIC= |
| 30 |
LIBS= |
| 31 |
--- lshw/src/gui/Makefile |
| 32 |
+++ lshw/src/gui/Makefile |
| 33 |
@@ -7,11 +7,11 @@ |
| 34 |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
| 35 |
GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) |
| 36 |
INCLUDES=-I../core $(GTKINCLUDES) |
| 37 |
-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 38 |
-CFLAGS=$(CXXFLAGS) $(DEFINES) |
| 39 |
+CXXFLAGS ?= -g |
| 40 |
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 41 |
+CFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 42 |
GTKLIBS=$(shell pkg-config gtk+-2.0 --libs) |
| 43 |
LIBS=-L../core -llshw -lresolv $(GTKLIBS) |
| 44 |
-LDFLAGS= |
| 45 |
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) |
| 46 |
LDFLAGS+= -Wl,--as-needed |
| 47 |
endif |
| 48 |
@@ -34,7 +34,6 @@ |
| 49 |
$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 50 |
|
| 51 |
install: all |
| 52 |
- $(STRIP) gtk-$(PACKAGENAME) |
| 53 |
|
| 54 |
clean: |
| 55 |
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 |
| 56 |
--- lshw/src/Makefile |
| 57 |
+++ lshw/src/Makefile |
| 58 |
@@ -18,8 +18,10 @@ |
| 59 |
CXX?=c++ |
| 60 |
INCLUDES=-I./core/ |
| 61 |
DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
| 62 |
-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 63 |
-LDFLAGS=-L./core/ -g |
| 64 |
+CXXFLAGS ?= -g |
| 65 |
+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 66 |
+LDFLAGS ?= -g |
| 67 |
+LDFLAGS += -L./core/ |
| 68 |
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) |
| 69 |
LDFLAGS+= -Wl,--as-needed |
| 70 |
endif |
| 71 |
@@ -49,7 +51,6 @@ |
| 72 |
|
| 73 |
$(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o |
| 74 |
$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) |
| 75 |
- $(STRIP) $@ |
| 76 |
|
| 77 |
.PHONY: compressed |
| 78 |
compressed: $(PACKAGENAME)-compressed |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.1 sys-apps/lshw/files/digest-lshw-02.12.01b |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lshw/files/digest-lshw-02.12.01b?rev=1.1&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/lshw/files/digest-lshw-02.12.01b?rev=1.1&content-type=text/plain |
| 86 |
|
| 87 |
Index: digest-lshw-02.12.01b |
| 88 |
=================================================================== |
| 89 |
MD5 7aeacdd0b86ae03acbc168d8ecdf6fd6 lshw-B.02.12.01.tar.gz 1230882 |
| 90 |
RMD160 475b42cf09aa8c53ce2514187cc659547cff89c7 lshw-B.02.12.01.tar.gz 1230882 |
| 91 |
SHA256 9cfeafe18ee78b72cc6aaeeba7ad1ca61d7dc725cc4981bcd985845d9e09645d lshw-B.02.12.01.tar.gz 1230882 |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
-- |
| 96 |
gentoo-commits@g.o mailing list |
Archives