diff options
Diffstat (limited to 'sys-apps/lshw/files/lshw-02.11b-build.patch')
-rw-r--r-- | sys-apps/lshw/files/lshw-02.11b-build.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/sys-apps/lshw/files/lshw-02.11b-build.patch b/sys-apps/lshw/files/lshw-02.11b-build.patch new file mode 100644 index 000000000000..9bfec0f5a373 --- /dev/null +++ b/sys-apps/lshw/files/lshw-02.11b-build.patch @@ -0,0 +1,75 @@ +diff -ur lshw-B.02.11.orig/src/core/Makefile lshw-B.02.11/src/core/Makefile +--- lshw-B.02.11.orig/src/core/Makefile 2007-07-19 18:42:20.000000000 -0400 ++++ lshw-B.02.11/src/core/Makefile 2007-08-25 11:31:01.000000000 -0400 +@@ -1,9 +1,10 @@ + 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= +diff -ur lshw-B.02.11.orig/src/gui/Makefile lshw-B.02.11/src/gui/Makefile +--- lshw-B.02.11.orig/src/gui/Makefile 2007-07-19 18:42:20.000000000 -0400 ++++ lshw-B.02.11/src/gui/Makefile 2007-08-25 11:31:52.000000000 -0400 +@@ -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 $(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 +diff -ur lshw-B.02.11.orig/src/Makefile lshw-B.02.11/src/Makefile +--- lshw-B.02.11.orig/src/Makefile 2007-07-19 18:42:20.000000000 -0400 ++++ lshw-B.02.11/src/Makefile 2007-08-25 11:32:27.000000000 -0400 +@@ -7,7 +7,7 @@ + SBINDIR=$(PREFIX)/sbin + MANDIR=$(PREFIX)/share/man + DATADIR=$(PREFIX)/share +-INSTALL?=install -p -s ++INSTALL?=install -p + STRIP?=strip + export DESTDIR + export PREFIX +@@ -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 |