[Glibc-bsd-commits] r5906 - in trunk/freebsd-libs/debian: . patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Sat Mar 5 04:41:12 UTC 2016
Author: stevenc-guest
Date: 2016-03-05 04:41:12 +0000 (Sat, 05 Mar 2016)
New Revision: 5906
Added:
trunk/freebsd-libs/debian/patches/pkgconfig_dir.diff
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/patches/series
trunk/freebsd-libs/debian/rules
Log:
Set Debian-specific /usr/lib/pkgconfig path
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2016-03-05 04:39:09 UTC (rev 5905)
+++ trunk/freebsd-libs/debian/changelog 2016-03-05 04:41:12 UTC (rev 5906)
@@ -21,6 +21,8 @@
* Build-Depend on kfreebsd-kernel-headers >= 10.3 for cam/scsi/
* Build-Depend on freebsd-mk >= 10.3 for *.test.mk
* Don't yet build WITH_TESTS=yes
+ * Set Debian-specific /usr/lib/pkgconfig path
+ - pkgconfig_dir.diff
* Add myself to Uploaders
-- Steven Chamberlain <steven at pyro.eu.org> Sat, 05 Mar 2016 01:12:41 +0000
Added: trunk/freebsd-libs/debian/patches/pkgconfig_dir.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/pkgconfig_dir.diff (rev 0)
+++ trunk/freebsd-libs/debian/patches/pkgconfig_dir.diff 2016-03-05 04:41:12 UTC (rev 5906)
@@ -0,0 +1,11 @@
+--- a/lib/libusb/Makefile
++++ b/lib/libusb/Makefile
+@@ -39,7 +39,7 @@
+ CFLAGS+= -DCOMPAT_32BIT
+ .else
+ FILES= libusb-0.1.pc libusb-1.0.pc libusb-2.0.pc
+-FILESDIR= ${LIBDATADIR}/pkgconfig
++FILESDIR= ${LIBDIR}/pkgconfig
+ .endif
+
+ #
Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series 2016-03-05 04:39:09 UTC (rev 5905)
+++ trunk/freebsd-libs/debian/patches/series 2016-03-05 04:41:12 UTC (rev 5906)
@@ -31,3 +31,4 @@
pty_decls.diff
libusb_reported_version.diff
libusb_set_auto_detach_kernel_driver.diff
+pkgconfig_dir.diff
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2016-03-05 04:39:09 UTC (rev 5905)
+++ trunk/freebsd-libs/debian/rules 2016-03-05 04:41:12 UTC (rev 5906)
@@ -257,7 +257,12 @@
dh_prep -a
dh_installdirs -a
- mkdir -p $(DESTDIR)/lib $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man3
+ mkdir -p \
+ $(DESTDIR)/lib \
+ $(DESTDIR)/usr/lib \
+ $(DESTDIR)/usr/lib/pkgconfig \
+ $(DESTDIR)/usr/include \
+ $(DESTDIR)/usr/share/man/man3
$(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/lib
$(PMAKE) -C $(CURDIR)/lib/libdwarf install SHLIBDIR=/usr/lib
$(PMAKE) -C $(CURDIR)/lib/libelf install SHLIBDIR=/usr/lib
@@ -276,8 +281,6 @@
$(PMAKE) -C $(CURDIR)/lib/libjail install SHLIBDIR=/lib
$(PMAKE) -C $(CURDIR)/lib/libalias install SHLIBDIR=/usr/lib
- mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
- install -m644 debian/libusb*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig
mkdir -p $(CURDIR)/debian/tmp/usr/bin
install -m755 debian/libusb-config $(CURDIR)/debian/tmp/usr/bin
endif
More information about the Glibc-bsd-commits
mailing list