[Glibc-bsd-commits] r5304 - trunk/freebsd-glue/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-05 22:16:12 +0000 (Sun, 05 Jan 2014)
New Revision: 5304

Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/control
   trunk/freebsd-glue/debian/rules
Log:
Switch to bmake, and finish breaking the circular build-dependency on freebsd-buildutils.

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2014-01-05 21:21:37 UTC (rev 5303)
+++ trunk/freebsd-glue/debian/changelog	2014-01-05 22:16:12 UTC (rev 5304)
@@ -1,6 +1,8 @@
 freebsd-glue (0.2.14) UNRELEASED; urgency=low
 
   * Add <sys/elf.h>.
+  * Switch to bmake, and finish breaking the circular build-dependency
+    on freebsd-buildutils.
 
  -- Robert Millan <rmh at debian.org>  Sun, 05 Jan 2014 22:21:00 +0100
 

Modified: trunk/freebsd-glue/debian/control
===================================================================
--- trunk/freebsd-glue/debian/control	2014-01-05 21:21:37 UTC (rev 5303)
+++ trunk/freebsd-glue/debian/control	2014-01-05 22:16:12 UTC (rev 5304)
@@ -6,7 +6,8 @@
 Build-Depends:
  debhelper (>= 8.0),
  kfreebsd-kernel-headers (>= 9.2~5) [kfreebsd-any],
- freebsd-buildutils (>= 10~svn251967-1~),
+ freebsd-mk,
+ bmake,
  libdb-dev,
  zlib1g-dev,
 # For -Wno-error=maybe-uninitialized

Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2014-01-05 21:21:37 UTC (rev 5303)
+++ trunk/freebsd-glue/debian/rules	2014-01-05 22:16:12 UTC (rev 5304)
@@ -17,7 +17,7 @@
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-deb \
 	CFLAGS="$(CFLAGS) -O2" \
 	DESTDIR="$(DESTDIR)" \
-	fmake \
+	bmake -m /usr/share/mk-freebsd \
 	CC=gcc-4.8 \
 	$(NULL)
 PMAKE_UDEB := \
@@ -25,7 +25,7 @@
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-udeb \
 	CFLAGS="$(CFLAGS) -Os" \
 	DESTDIR="$(DESTDIR)-udeb" \
-	fmake \
+	bmake -m /usr/share/mk-freebsd \
 	CC=gcc-4.8 \
 	RESCUE=yes \
 	$(NULL)