Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/pciutils/files: pciutils-3.1.4-install-lib.patch
Date: Sun, 23 Aug 2009 09:45:41
Message-Id: E1Mf9dr-0005Mf-Fr@stork.gentoo.org
1 vapier 09/08/23 09:45:39
2
3 Added: pciutils-3.1.4-install-lib.patch
4 Log:
5 Fix by Kevin Pyle for parallel install failures #273489 by Peter Alfredsen.
6 (Portage version: 2.2_rc38/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch?rev=1.1&content-type=text/plain
13
14 Index: pciutils-3.1.4-install-lib.patch
15 ===================================================================
16 don't have the install and install-lib targets install the same files
17 otherwise we can hit parallel install failures
18
19 http://bugs.gentoo.org/273489
20
21 patch by Kevin Pyle
22
23 --- Makefile
24 +++ Makefile
25 @@ -90,7 +90,11 @@
26
27 distclean: clean
28
29 -install: all
30 +install-pcilib: lib/$(PCILIB)
31 + $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
32 + $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
33 +
34 +install: all install-pcilib
35 # -c is ignored on Linux, but required on FreeBSD
36 $(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
37 $(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
38 @@ -99,15 +103,12 @@
39 $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
40 $(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
41 ifeq ($(SHARED),yes)
42 - $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
43 - $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
44 ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION)
45 endif
46
47 -install-lib: $(PCIINC_INS) lib/$(PCILIB) lib/$(PCILIBPC)
48 - $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR)
49 +install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib
50 + $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR)
51 $(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
52 - $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
53 $(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
54 ifeq ($(SHARED),yes)
55 ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so