| 1 |
vapier 10/04/10 19:28:55 |
| 2 |
|
| 3 |
Added: pciutils-3.1.7-install-lib.patch |
| 4 |
pciutils-3.1.7-fbsd.patch |
| 5 |
Log: |
| 6 |
Version bump #314499 by Toffanin. |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: pciutils-3.1.7-install-lib.patch |
| 16 |
=================================================================== |
| 17 |
don't have the install and install-lib targets install the same files |
| 18 |
otherwise we can hit parallel install failures |
| 19 |
|
| 20 |
http://bugs.gentoo.org/273489 |
| 21 |
|
| 22 |
patch by Kevin Pyle |
| 23 |
|
| 24 |
--- Makefile |
| 25 |
+++ Makefile |
| 26 |
@@ -90,6 +90,13 @@ |
| 27 |
|
| 28 |
distclean: clean |
| 29 |
|
| 30 |
+install-pcilib: lib/$(PCILIB) |
| 31 |
+ $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR) |
| 32 |
+ $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) |
| 33 |
+ |
| 34 |
+ifeq ($(SHARED),yes) |
| 35 |
+install: install-pcilib |
| 36 |
+endif |
| 37 |
install: all |
| 38 |
# -c is ignored on Linux, but required on FreeBSD |
| 39 |
$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7 |
| 40 |
@@ -99,15 +103,12 @@ |
| 41 |
$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8 |
| 42 |
$(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7 |
| 43 |
ifeq ($(SHARED),yes) |
| 44 |
- $(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR) |
| 45 |
- $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) |
| 46 |
ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION) |
| 47 |
endif |
| 48 |
|
| 49 |
-install-lib: $(PCIINC_INS) lib/$(PCILIB) lib/$(PCILIBPC) |
| 50 |
- $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR) |
| 51 |
+install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib |
| 52 |
+ $(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR) |
| 53 |
$(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci |
| 54 |
- $(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR) |
| 55 |
$(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR) |
| 56 |
ifeq ($(SHARED),yes) |
| 57 |
ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so |
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
1.1 sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch |
| 62 |
|
| 63 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch?rev=1.1&view=markup |
| 64 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch?rev=1.1&content-type=text/plain |
| 65 |
|
| 66 |
Index: pciutils-3.1.7-fbsd.patch |
| 67 |
=================================================================== |
| 68 |
--- pciutils-3.1.7/lib/configure |
| 69 |
+++ pciutils-3.1.7/lib/configure |
| 70 |
@@ -85,7 +85,7 @@ |
| 71 |
esac |
| 72 |
echo >>$c '#define PCI_HAVE_STDINT_H' |
| 73 |
;; |
| 74 |
- freebsd) |
| 75 |
+ freebsd*) |
| 76 |
echo_n " fbsd-device" |
| 77 |
echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE' |
| 78 |
echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"' |
Archives