[Glibc-bsd-commits] r5279 - trunk/freebsd-buildutils/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-30 17:51:45 +0000 (Mon, 30 Dec 2013)
New Revision: 5279

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/rules
Log:
Remove bootstrap magic. bmake is the default in upstream now: just use it to build fmake.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2013-12-30 17:35:20 UTC (rev 5278)
+++ trunk/freebsd-buildutils/debian/changelog	2013-12-30 17:51:45 UTC (rev 5279)
@@ -6,6 +6,8 @@
   * Install file2c and brandelf directly to /usr/bin.
   * Move /usr/share/mk to /usr/share/mk-freebsd. This allows
     freebsd-buildutils to be installed alongside bmake.
+  * Remove bootstrap magic. bmake is the default in upstream now: just
+    use it to build fmake.
 
  -- Robert Millan <rmh at debian.org>  Sun, 29 Dec 2013 20:38:18 +0100
 

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2013-12-30 17:35:20 UTC (rev 5278)
+++ trunk/freebsd-buildutils/debian/control	2013-12-30 17:51:45 UTC (rev 5279)
@@ -5,8 +5,8 @@
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Robert Millan <rmh at debian.org>
 Build-Depends: debhelper (>= 7), flex | flex-old, bison,
  libbsd-dev (>= 0.3.0),
- pkg-config,
  freebsd-glue (>= 0.0.9),
+ bmake,
  byacc (>= 20120115~),
 # for freebsd-config
  libsbuf-dev,

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2013-12-30 17:35:20 UTC (rev 5278)
+++ trunk/freebsd-buildutils/debian/rules	2013-12-30 17:51:45 UTC (rev 5279)
@@ -63,12 +63,9 @@
 MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
 
 PMAKE_FLAGS = -m $(CURDIR)/src/share/mk
-PMAKE_BOOTSTRAP = \
-	MAKEFLAGS=$(BSD_MAKEFLAGS) \
-	$(CURDIR)/build-tree/src/usr.bin/make/pmake $(PMAKE_FLAGS)
 PMAKE = \
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
-	$(CURDIR)/build-tree/src/usr.bin/make/fmake $(PMAKE_FLAGS)
+	bmake $(PMAKE_FLAGS)
 YACC = byacc
 
 package = $(SOURCE)
@@ -109,10 +106,7 @@
 build-stamp: unpack-stamp
 	dh_testdir
 
-	# Bootstrap pmake using GNU make
-	$(MAKE) -C build-tree/src/usr.bin/make -f Makefile.dist
-	$(MAKE) -C build-tree/src/usr.bin/make -f Makefile.dist mostlyclean
-	$(PMAKE_BOOTSTRAP) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/make
+	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/make
 
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/cksum