summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-06-24 05:44:20 +0000
committerMike Frysinger <vapier@gentoo.org>2006-06-24 05:44:20 +0000
commit12af7ab6ef14eb2e7852ad30738ee2ea7c068737 (patch)
tree5362727624a63d0c318952389148ce5cce8175d6 /sys-apps/lshw/files
parentFix cleanup ebuild #137576 by Tristan Heaven. (diff)
downloadgentoo-2-12af7ab6ef14eb2e7852ad30738ee2ea7c068737.tar.gz
gentoo-2-12af7ab6ef14eb2e7852ad30738ee2ea7c068737.tar.bz2
gentoo-2-12af7ab6ef14eb2e7852ad30738ee2ea7c068737.zip
Fix cleanup ebuild #137537 by Tristan Heaven.
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'sys-apps/lshw/files')
-rw-r--r--sys-apps/lshw/files/lshw-02.08.01b-build.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/sys-apps/lshw/files/lshw-02.08.01b-build.patch b/sys-apps/lshw/files/lshw-02.08.01b-build.patch
index b30dcf4410f2..04b4b771d7bb 100644
--- a/sys-apps/lshw/files/lshw-02.08.01b-build.patch
+++ b/sys-apps/lshw/files/lshw-02.08.01b-build.patch
@@ -17,6 +17,32 @@
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
LDFLAGS+= -Wl,--as-needed
endif
+@@ -48,7 +49,6 @@
+
+ $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
+ $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
+- strip $@
+
+ .PHONY: compressed
+ compressed: $(PACKAGENAME)-compressed
+@@ -73,7 +73,7 @@
+
+ install: all
+ $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
+- $(INSTALL) -m 0755 -s $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
++ $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
+ $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
+ $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
+ $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
+@@ -81,7 +81,7 @@
+
+ install-gui: gui
+ $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
+- $(INSTALL) -m 0755 -s gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
++ $(INSTALL) -m 0755 gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
+ $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork
+ $(INSTALL) -m 0644 gui/artwork/*.svg $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork
+
--- lshw-B.02.08.01/src/core/Makefile
+++ lshw-B.02.08.01/src/core/Makefile
@@ -1,9 +1,10 @@
@@ -58,3 +84,11 @@
ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
LDFLAGS+= -Wl,--as-needed
endif
+@@ -33,7 +35,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