[Glibc-bsd-commits] r2412 - in trunk/freebsd-libs: . debian

[Aurelien Jarno]

Author: aurel32
Date: 2009-04-07 14:59:30 +0000 (Tue, 07 Apr 2009)
New Revision: 2412

Removed:
   trunk/freebsd-libs/fetch
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
Log:
  * Fix parallel build support in debian/rules. 



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2009-04-07 10:15:34 UTC (rev 2411)
+++ trunk/freebsd-libs/debian/changelog	2009-04-07 14:59:30 UTC (rev 2412)
@@ -9,8 +9,9 @@
     - Update patches accordingly.
   * Change patch level to -p1.
   * Fix a few bashisms in debian/rules.
+  * Fix parallel build support in debian/rules. 
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sun, 05 Apr 2009 15:45:14 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Tue, 07 Apr 2009 16:59:04 +0200
 
 freebsd-libs (7.1-1) unreleased; urgency=low
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2009-04-07 10:15:34 UTC (rev 2411)
+++ trunk/freebsd-libs/debian/rules	2009-04-07 14:59:30 UTC (rev 2412)
@@ -42,39 +42,53 @@
 patch: patch-stamp
 patch-stamp:
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch patch-stamp
+	touch $@
 
-build-arch: build-arch-stamp
-build-arch-stamp: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-devstat
-	touch build-arch-stamp
+build-arch: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-devstat
 
-build-cam: build-sbuf patch 
+build-cam: build-cam-stamp
+build-cam-stamp: patch build-sbuf
 	$(PMAKE) -C $(CURDIR)/lib/libcam
+	touch $@
 
-build-geom: build-sbuf patch
+build-geom: build-geom-stamp
+build-geom-stamp: patch build-sbuf
 	$(PMAKE) -C $(CURDIR)/lib/libgeom
+	touch $@
 
-build-ipx: patch
+build-ipx: build-ipx-stamp
+build-ipx-stamp: patch
 	$(PMAKE) -C $(CURDIR)/lib/libipx
+	touch $@
 
-build-kiconv: patch
+build-kiconv: build-kiconv-stamp
+build-kiconv-stamp: patch
 	$(PMAKE) -C $(CURDIR)/lib/libkiconv
+	touch $@
 
-build-kvm: patch
+build-kvm: build-kvm-stamp
+build-kvm-stamp: patch
 	$(PMAKE) -C $(CURDIR)/lib/libkvm
+	touch $@
 
-build-devstat: patch build-kvm
+build-devstat: build-devstat-stamp
+build-devstat-stamp: patch build-kvm
 	$(PMAKE) -C $(CURDIR)/lib/libdevstat
+	touch $@
 
-build-sbuf: patch
+build-sbuf: build-sbuf-stamp
+build-sbuf-stamp: patch
 	$(PMAKE) -C $(CURDIR)/lib/libsbuf
+	touch $@
 
-build-usbhid: patch
+build-usbhid: build-usbhid-stamp
+build-usbhid-stamp: patch
 	$(PMAKE) -C $(CURDIR)/lib/libusbhid
+	touch $@
 
 build-indep: build-indep-stamp
 build-indep-stamp:
-	touch build-indep-stamp
+	touch $@
 
 clean:
 	dh_testdir

Deleted: trunk/freebsd-libs/fetch
===================================================================
--- trunk/freebsd-libs/fetch	2009-04-07 10:15:34 UTC (rev 2411)
+++ trunk/freebsd-libs/fetch	2009-04-07 14:59:30 UTC (rev 2412)
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -ex
-
-ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_7_1_0_RELEASE
-
-rm -rf src
-
-if test -e src.tar.gz ; then
-  tar -xzpf src.tar.gz
-  action="update"
-else
-  action="checkout"
-fi
-
-for i in \
-    src/lib/lib{cam,devstat,geom,ipx,kiconv,kvm,sbuf,usbhid} \
-  ; do
-  cvs -d $ANONCVS ${action} -r $RELENG $i
-  test -e $i
-done
-
-rm -f src.tar.gz
-tar -czpf src.tar.gz src
-rm -rf src