[Glibc-bsd-commits] r2106 - trunk/freebsd-libs/debian

aurel32 at alioth.debian.org aurel32 at alioth.debian.org
Thu Jan 10 17:24:24 UTC 2008 

Author: aurel32
Date: 2008-01-10 17:24:24 +0000 (Thu, 10 Jan 2008)
New Revision: 2106

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/rules
Log:
  * Don't use ${shlibs:Depends} ofr -dev packages.
  * Only link with needed libraries.



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2008-01-10 13:07:24 UTC (rev 2105)
+++ trunk/freebsd-libs/debian/changelog	2008-01-10 17:24:24 UTC (rev 2106)
@@ -6,9 +6,11 @@
 
   [ Aurelien Jarno ]
   * Bumped Standards-Version to 3.7.3 (no changes).
-  * Change ${Source-Version} into ${binary:Version}. 
+  * Change ${Source-Version} into ${binary:Version}.
+  * Don't use ${shlibs:Depends} ofr -dev packages.
+  * Only link with needed libraries.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 10 Jan 2008 13:42:20 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 10 Jan 2008 18:23:48 +0100
 
 freebsd-libs (6.2-1) unreleased; urgency=low
 

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2008-01-10 13:07:24 UTC (rev 2105)
+++ trunk/freebsd-libs/debian/control	2008-01-10 17:24:24 UTC (rev 2106)
@@ -18,7 +18,7 @@
 Package: libsbuf-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libsbuf0 (>= ${binary:Version}), libc0.1-dev | libc-dev
+Depends: libsbuf0 (>= ${binary:Version}), libc0.1-dev | libc-dev
 Description: Development files for libsbuf
  This package contains the header files and static library needed to
  compile applications that use libsbuf.
@@ -33,7 +33,7 @@
 Package: libcam-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libcam0 (>= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
+Depends: libcam0 (>= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
 Description: Development files for libcam 
  This package contains the header files and static library needed to
  compile applications that use libcam.
@@ -48,7 +48,7 @@
 Package: libgeom-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libgeom0 (>= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
+Depends: libgeom0 (>= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
 Description: Development files for libgeom
  This package contains the header files and static library needed to
  compile applications that use libcam.
@@ -68,7 +68,7 @@
 Package: libusbhid-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libusbhid2 (>= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
+Depends: libusbhid2 (>= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
 Description: Development files for libusbhid
  This package contains the header files and static library needed to
  compile applications that use libusbhid.
@@ -83,7 +83,7 @@
 Package: libkvm-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libkvm0 (>= ${binary:Version}), libc0.1-dev | libc-dev, libfreebsd-dev, libbsd-dev
+Depends: libkvm0 (>= ${binary:Version}), libc0.1-dev | libc-dev, libfreebsd-dev, libbsd-dev
 Description: Development files for libkvm
  This package contains the header files and static library needed to
  compile applications that use libkvm.
@@ -98,7 +98,7 @@
 Package: libdevstat-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libdevstat5 (>= ${binary:Version}), libkvm-dev, libc0.1-dev | libc-dev, libfreebsd-dev, libbsd-dev
+Depends: libdevstat5 (>= ${binary:Version}), libkvm-dev, libc0.1-dev | libc-dev, libfreebsd-dev, libbsd-dev
 Description: Development files for libdevstat
  This package contains the header files and static library needed to
  compile applications that use libdevstat.
@@ -112,7 +112,7 @@
 Package: libipx-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libipx2 (>= ${binary:Version}), libc0.1-dev | libc-dev
+Depends: libipx2 (>= ${binary:Version}), libc0.1-dev | libc-dev
 Description: Development files for libipx
  This package contains the header files and static library needed to
  compile applications that use libipx.
@@ -127,7 +127,7 @@
 Package: libkiconv-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: ${shlibs:Depends}, libkiconv2 (>= ${binary:Version}), libc0.1-dev | libc-dev
+Depends: libkiconv2 (>= ${binary:Version}), libc0.1-dev | libc-dev
 Description: Development files for libkiconv
  This package contains the header files and static library needed to
  compile applications that use libkiconv.

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2008-01-10 13:07:24 UTC (rev 2105)
+++ trunk/freebsd-libs/debian/rules	2008-01-10 17:24:24 UTC (rev 2106)
@@ -22,7 +22,6 @@
 PATH:=/usr/lib/freebsd:$(PATH)
 DESTDIR=$(CURDIR)/debian/tmp
 PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
-export LDADD=-lbsd -lfreebsd
 export SHLIB_MAJOR=0
 export SHLIBDIR=/usr/lib
 
@@ -51,28 +50,28 @@
 	touch build-arch-stamp
 
 build-cam: build-sbuf $(SRC_DIR)
-	cd $(SRC_DIR)/lib/libcam && $(PMAKE)
+	LDADD="-lbsd" $(PMAKE) -C $(SRC_DIR)/lib/libcam
 
 build-geom: build-sbuf $(SRC_DIR)
-	cd $(SRC_DIR)/lib/libgeom && $(PMAKE)
+	LDADD="-lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libgeom
 
 build-ipx: $(SRC_DIR)
-	cd $(SRC_DIR)/lib/libipx && $(PMAKE)
+	$(PMAKE) -C $(SRC_DIR)/lib/libipx
 
 build-kiconv: $(SRC_DIR)
-	cd $(SRC_DIR)/lib/libkiconv && $(PMAKE)
+	LDADD="-lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libkiconv
 
 build-kvm: $(SRC_DIR)
-	cd $(SRC_DIR)/lib/libkvm && $(PMAKE)
+	LDADD="-lbsd -lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libkvm
 
 build-devstat: $(SRC_DIR) build-kvm
-	cd $(SRC_DIR)/lib/libdevstat && $(PMAKE)
+	LDADD="-lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libdevstat
 
 build-sbuf: $(SRC_DIR)
-	cd $(SRC_DIR)/lib/libsbuf && $(PMAKE)
+	$(PMAKE) -C $(SRC_DIR)/lib/libsbuf
 
 build-usbhid: $(SRC_DIR)
-	cd $(SRC_DIR)/lib/libusbhid && $(PMAKE)
+	LDADD="-lbsd" $(PMAKE) -C $(SRC_DIR)/lib/libusbhid
 
 build-indep: build-indep-stamp
 build-indep-stamp:
@@ -98,14 +97,14 @@
 	dh_installdirs -s
 
 	mkdir -p $(DESTDIR)/usr/{lib,include,share/man/man3}
-	cd $(SRC_DIR)/lib/libsbuf && $(PMAKE) install
-	cd $(SRC_DIR)/lib/libcam && $(PMAKE) install
-	cd $(SRC_DIR)/lib/libgeom && $(PMAKE) install
-	cd $(SRC_DIR)/lib/libipx && $(PMAKE) install
-	cd $(SRC_DIR)/lib/libkiconv && $(PMAKE) install
-	cd $(SRC_DIR)/lib/libkvm && $(PMAKE) install
-	cd $(SRC_DIR)/lib/libdevstat && $(PMAKE) install
-	cd $(SRC_DIR)/lib/libusbhid && $(PMAKE) install
+	$(PMAKE) -C $(SRC_DIR)/lib/libsbuf install
+	$(PMAKE) -C $(SRC_DIR)/lib/libcam install
+	$(PMAKE) -C $(SRC_DIR)/lib/libgeom install
+	$(PMAKE) -C $(SRC_DIR)/lib/libipx install
+	$(PMAKE) -C $(SRC_DIR)/lib/libkiconv install
+	$(PMAKE) -C $(SRC_DIR)/lib/libkvm install
+	$(PMAKE) -C $(SRC_DIR)/lib/libdevstat install
+	$(PMAKE) -C $(SRC_DIR)/lib/libusbhid install
 
 	dh_install -s --list-missing --sourcedir=debian/tmp

More information about the Glibc-bsd-commits mailing list