[Glibc-bsd-commits] r3119 - trunk/freebsd-libs/debian
Aurelien Jarno
aurel32 at alioth.debian.org
Thu Jul 29 20:00:59 UTC 2010
Author: aurel32
Date: 2010-07-29 20:00:51 +0000 (Thu, 29 Jul 2010)
New Revision: 3119
Removed:
trunk/freebsd-libs/debian/libgeom-dev.links
trunk/freebsd-libs/debian/libkvm-dev.links
trunk/freebsd-libs/debian/libusb2-dev.links
Modified:
trunk/freebsd-libs/debian/libgeom-dev.install
trunk/freebsd-libs/debian/libgeom0-udeb.install
trunk/freebsd-libs/debian/libgeom0.install
trunk/freebsd-libs/debian/libkvm-dev.install
trunk/freebsd-libs/debian/libkvm0.install
trunk/freebsd-libs/debian/libusb2-dev.install
trunk/freebsd-libs/debian/libusb2-udeb.install
trunk/freebsd-libs/debian/libusb2.install
trunk/freebsd-libs/debian/rules
Log:
* Link all libraries dynamically with each other.
Modified: trunk/freebsd-libs/debian/libgeom-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libgeom-dev.install 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libgeom-dev.install 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1,5 +1,6 @@
usr/include/libgeom.h
usr/lib/libgeom*.a
+usr/lib/libgeom*.so
usr/share/man/man3/g_close.3.gz
usr/share/man/man3/gctl_dump.3.gz
usr/share/man/man3/gctl_free.3.gz
Deleted: trunk/freebsd-libs/debian/libgeom-dev.links
===================================================================
--- trunk/freebsd-libs/debian/libgeom-dev.links 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libgeom-dev.links 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1 +0,0 @@
-lib/libgeom.so.0 usr/lib/libgeom.so
Modified: trunk/freebsd-libs/debian/libgeom0-udeb.install
===================================================================
--- trunk/freebsd-libs/debian/libgeom0-udeb.install 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libgeom0-udeb.install 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1 +1 @@
-usr/lib/libgeom*.so.* lib
+lib/libgeom*.so.*
Modified: trunk/freebsd-libs/debian/libgeom0.install
===================================================================
--- trunk/freebsd-libs/debian/libgeom0.install 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libgeom0.install 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1 +1 @@
-usr/lib/libgeom*.so.* lib
+lib/libgeom*.so.*
Modified: trunk/freebsd-libs/debian/libkvm-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libkvm-dev.install 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libkvm-dev.install 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1,4 +1,5 @@
usr/lib/libkvm*.a
+usr/lib/libkvm*.so
usr/include/kvm.h
usr/share/man/man3/kvm.3.gz
usr/share/man/man3/kvm_getmaxcpu.3.gz
Deleted: trunk/freebsd-libs/debian/libkvm-dev.links
===================================================================
--- trunk/freebsd-libs/debian/libkvm-dev.links 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libkvm-dev.links 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1 +0,0 @@
-lib/libkvm.so.0 usr/lib/libkvm.so
Modified: trunk/freebsd-libs/debian/libkvm0.install
===================================================================
--- trunk/freebsd-libs/debian/libkvm0.install 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libkvm0.install 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1 +1 @@
-usr/lib/libkvm*.so.* lib
+lib/libkvm*.so.*
Modified: trunk/freebsd-libs/debian/libusb2-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2-dev.install 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libusb2-dev.install 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1,5 +1,5 @@
usr/bin/libusb-config
-usr/lib/libusb.so
+usr/lib/libusb*.so
usr/lib/libusb.a
usr/lib/pkgconfig/libusb*.pc
usr/include/usb.h
Deleted: trunk/freebsd-libs/debian/libusb2-dev.links
===================================================================
--- trunk/freebsd-libs/debian/libusb2-dev.links 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libusb2-dev.links 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1 +0,0 @@
-usr/lib/libusb.so usr/lib/libusb-1.0.so
Modified: trunk/freebsd-libs/debian/libusb2-udeb.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2-udeb.install 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libusb2-udeb.install 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1 +1 @@
-usr/lib/libusb.so.* /lib
+lib/libusb.so.*
Modified: trunk/freebsd-libs/debian/libusb2.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2.install 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/libusb2.install 2010-07-29 20:00:51 UTC (rev 3119)
@@ -1 +1 @@
-usr/lib/libusb.so.*
+lib/libusb.so.*
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2010-07-29 19:47:50 UTC (rev 3118)
+++ trunk/freebsd-libs/debian/rules 2010-07-29 20:00:51 UTC (rev 3119)
@@ -25,7 +25,6 @@
DESTDIR=$(CURDIR)/debian/tmp
PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
export SHLIB_MAJOR=0
-export SHLIBDIR=./
get-orig-source:
rm -rf $(ORIGDIR)
@@ -54,57 +53,57 @@
build-cam: build-cam-stamp
build-cam-stamp: patch build-sbuf
- $(PMAKE) -C $(CURDIR)/lib/libcam
+ $(PMAKE) -C $(CURDIR)/lib/libcam SHLIBDIR=./
touch $@
build-geom: build-geom-stamp
build-geom-stamp: patch build-sbuf
- $(PMAKE) -C $(CURDIR)/lib/libgeom
+ $(PMAKE) -C $(CURDIR)/lib/libgeom SHLIBDIR=./
touch $@
build-netgraph: build-netgraph-stamp
build-netgraph-stamp: patch
- $(PMAKE) -C $(CURDIR)/lib/libnetgraph
+ $(PMAKE) -C $(CURDIR)/lib/libnetgraph SHLIBDIR=./
touch $@
build-ipx: build-ipx-stamp
build-ipx-stamp: patch
- $(PMAKE) -C $(CURDIR)/lib/libipx
+ $(PMAKE) -C $(CURDIR)/lib/libipx SHLIBDIR=./
touch $@
build-kiconv: build-kiconv-stamp
build-kiconv-stamp: patch
- $(PMAKE) -C $(CURDIR)/lib/libkiconv
+ $(PMAKE) -C $(CURDIR)/lib/libkiconv SHLIBDIR=./
touch $@
build-kvm: build-kvm-stamp
build-kvm-stamp: patch
- $(PMAKE) -C $(CURDIR)/lib/libkvm
+ $(PMAKE) -C $(CURDIR)/lib/libkvm SHLIBDIR=./
touch $@
build-devstat: build-devstat-stamp
build-devstat-stamp: patch build-kvm
- $(PMAKE) -C $(CURDIR)/lib/libdevstat
+ $(PMAKE) -C $(CURDIR)/lib/libdevstat SHLIBDIR=./
touch $@
build-memstat: build-memstat-stamp
build-memstat-stamp: patch build-kvm
- $(PMAKE) -C $(CURDIR)/lib/libmemstat
+ $(PMAKE) -C $(CURDIR)/lib/libmemstat SHLIBDIR=./
touch $@
build-sbuf: build-sbuf-stamp
build-sbuf-stamp: patch
- $(PMAKE) -C $(CURDIR)/lib/libsbuf
+ $(PMAKE) -C $(CURDIR)/lib/libsbuf SHLIBDIR=./
touch $@
build-usbhid: build-usbhid-stamp
build-usbhid-stamp: patch
- $(PMAKE) -C $(CURDIR)/lib/libusbhid
+ $(PMAKE) -C $(CURDIR)/lib/libusbhid SHLIBDIR=./
touch $@
build-usb: build-usb-stamp
build-usb-stamp: patch
- $(PMAKE) -C $(CURDIR)/lib/libusb
+ $(PMAKE) -C $(CURDIR)/lib/libusb SHLIBDIR=./
touch $@
clean:
@@ -132,18 +131,18 @@
dh_prep
dh_installdirs
- mkdir -p $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man3
- $(PMAKE) -C $(CURDIR)/lib/libsbuf install
- $(PMAKE) -C $(CURDIR)/lib/libcam install
- $(PMAKE) -C $(CURDIR)/lib/libgeom install
- $(PMAKE) -C $(CURDIR)/lib/libipx install
- $(PMAKE) -C $(CURDIR)/lib/libkiconv install
- $(PMAKE) -C $(CURDIR)/lib/libkvm install
- $(PMAKE) -C $(CURDIR)/lib/libdevstat install
- $(PMAKE) -C $(CURDIR)/lib/libmemstat install
- $(PMAKE) -C $(CURDIR)/lib/libnetgraph install
- $(PMAKE) -C $(CURDIR)/lib/libusbhid install
- $(PMAKE) -C $(CURDIR)/lib/libusb install
+ mkdir -p $(DESTDIR)/lib $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man3
+ $(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libcam install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libgeom install SHLIBDIR=/lib
+ $(PMAKE) -C $(CURDIR)/lib/libipx install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libkiconv install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libkvm install SHLIBDIR=/lib
+ $(PMAKE) -C $(CURDIR)/lib/libdevstat install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libmemstat install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libnetgraph install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libusbhid install SHLIBDIR=/usr/lib
+ $(PMAKE) -C $(CURDIR)/lib/libusb install SHLIBDIR=/lib
mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
install -m644 debian/libusb*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig
More information about the Glibc-bsd-commits
mailing list