diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-12-24 13:15:04 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-12-24 13:15:04 +0000 |
| commit | ee93578361daae3f519b4790180e7f0ec89883fb (patch) | |
| tree | 5a1a13baef8cf94f2504bbd5b9a7134df7338d31 /sys-apps/lshw/files | |
| parent | Cleaning out some unused, old versions. (diff) | |
| download | historical-ee93578361daae3f519b4790180e7f0ec89883fb.tar.gz historical-ee93578361daae3f519b4790180e7f0ec89883fb.tar.bz2 historical-ee93578361daae3f519b4790180e7f0ec89883fb.zip | |
Version bump #195824.
Package-Manager: portage-2.1.4_rc11
Diffstat (limited to 'sys-apps/lshw/files')
| -rw-r--r-- | sys-apps/lshw/files/digest-lshw-02.12.01b | 3 | ||||
| -rw-r--r-- | sys-apps/lshw/files/lshw-02.12.01b-build.patch | 63 |
2 files changed, 66 insertions, 0 deletions
diff --git a/sys-apps/lshw/files/digest-lshw-02.12.01b b/sys-apps/lshw/files/digest-lshw-02.12.01b new file mode 100644 index 000000000000..ea86cb57693d --- /dev/null +++ b/sys-apps/lshw/files/digest-lshw-02.12.01b @@ -0,0 +1,3 @@ +MD5 7aeacdd0b86ae03acbc168d8ecdf6fd6 lshw-B.02.12.01.tar.gz 1230882 +RMD160 475b42cf09aa8c53ce2514187cc659547cff89c7 lshw-B.02.12.01.tar.gz 1230882 +SHA256 9cfeafe18ee78b72cc6aaeeba7ad1ca61d7dc725cc4981bcd985845d9e09645d lshw-B.02.12.01.tar.gz 1230882 diff --git a/sys-apps/lshw/files/lshw-02.12.01b-build.patch b/sys-apps/lshw/files/lshw-02.12.01b-build.patch new file mode 100644 index 000000000000..75ae23847e6f --- /dev/null +++ b/sys-apps/lshw/files/lshw-02.12.01b-build.patch @@ -0,0 +1,63 @@ +--- lshw/src/core/Makefile ++++ lshw/src/core/Makefile +@@ -1,9 +1,9 @@ + PACKAGENAME?=lshw + +-CXX=c++ ++CXX?=c++ + INCLUDES= + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CXXFLAGS ?= -g ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) +-LDFLAGS= + LDSTATIC= + LIBS= +--- lshw/src/gui/Makefile ++++ lshw/src/gui/Makefile +@@ -7,11 +7,11 @@ + 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 ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + GTKLIBS=$(shell pkg-config gtk+-2.0 --libs) + LIBS=-L../core -llshw -lresolv $(GTKLIBS) +-LDFLAGS= + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif +@@ -34,7 +34,6 @@ + $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) + + install: all +- $(STRIP) gtk-$(PACKAGENAME) + + clean: + 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 +--- lshw/src/Makefile ++++ lshw/src/Makefile +@@ -18,8 +18,10 @@ + 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 ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++LDFLAGS ?= -g ++LDFLAGS += -L./core/ + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif +@@ -49,7 +51,6 @@ + + $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o + $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) +- $(STRIP) $@ + + .PHONY: compressed + compressed: $(PACKAGENAME)-compressed |