[Glibc-bsd-commits] r3335 - in trunk/freebsd-buildutils/debian: . patches

[Guillem Jover]

Author: guillem
Date: 2011-05-28 06:35:04 +0000 (Sat, 28 May 2011)
New Revision: 3335

Added:
   trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/patches/series
   trunk/freebsd-buildutils/debian/rules
Log:
Stop Build-Depending on pmake

Bootstrap freebsd-make using GNU make and use it as pmake instead of
using it from the pmake package.


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-05-28 05:22:26 UTC (rev 3334)
+++ trunk/freebsd-buildutils/debian/changelog	2011-05-28 06:35:04 UTC (rev 3335)
@@ -12,6 +12,8 @@
     - Remove now unneeded README.source.
     - Refresh all patches.
   * Use -C option for pmake instead of manually changing dir.
+  * Stop Build-Depending on pmake, bootstrap freebsd-make using GNU make
+    and use it as pmake instead of using it from the pmake package.
 
  -- Robert Millan <rmh at debian.org>  Thu, 13 Jan 2011 18:29:12 +0100
 

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2011-05-28 05:22:26 UTC (rev 3334)
+++ trunk/freebsd-buildutils/debian/control	2011-05-28 06:35:04 UTC (rev 3335)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 5.0.0), pmake, flex, bison, libbsd-dev
+Build-Depends: debhelper (>= 5.0.0), flex, bison, libbsd-dev
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/freebsd-buildutils/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/freebsd-buildutils/
 Standards-Version: 3.9.2

Added: trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/16_bootstrap_pmake.diff	2011-05-28 06:35:04 UTC (rev 3335)
@@ -0,0 +1,25 @@
+Author: Guillem Jover <guillem at debian.org>
+
+---
+ src/usr.bin/make/Makefile.dist |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/src/usr.bin/make/Makefile.dist
++++ b/src/usr.bin/make/Makefile.dist
+@@ -2,9 +2,12 @@
+ # a simple makefile to help builds on !FreeBSD systems
+ pmake:
+ 	@echo 'make started.'
+-	cc -D__dead2="" -D__unused="" -Darc4random=random -D__FBSDID="static const char *id=" -DDEFSHELLNAME=\"sh\" -I. -c *.c
+-	cc *.o -o pmake
++	cc -D__unused="" -D__FBSDID="static const char *id=" -DDEFSHELLNAME=\"sh\" -I. -c *.c
++	cc *.o -lbsd -o pmake
+ 	@echo 'make completed.'
+ 
+-clean:
+-	@rm -f *.o pmake
++mostlyclean:
++	@rm -f *.o
++
++clean: mostlyclean
++	@rm -f pmake

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2011-05-28 05:22:26 UTC (rev 3334)
+++ trunk/freebsd-buildutils/debian/patches/series	2011-05-28 06:35:04 UTC (rev 3335)
@@ -11,3 +11,4 @@
 11_optreset.diff
 14_config.diff
 15_manpages_gzip.diff
+16_bootstrap_pmake.diff

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2011-05-28 05:22:26 UTC (rev 3334)
+++ trunk/freebsd-buildutils/debian/rules	2011-05-28 06:35:04 UTC (rev 3335)
@@ -23,9 +23,11 @@
 PTAG = RELEASE_$(PVERSION)_0
 
 ORIGDIR = freebsd-buildutils-$(VERSION)
-PMAKE = pmake
 CFLAGS = -O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -D_GNU_SOURCE -D'__FBSDID(string)=' -I$(CURDIR)/build-tree/src/sys
 MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
+
+PMAKE_BOOTSTRAP = $(CURDIR)/build-tree/src/usr.bin/make/pmake
+PMAKE = $(CURDIR)/build-tree/src/usr.bin/make/make
 YACC = $(CURDIR)/build-tree/src/usr.bin/yacc/yacc
 
 package = freebsd-buildutils
@@ -79,6 +81,11 @@
 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/yacc
 
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/cksum
@@ -88,8 +95,6 @@
 		$(YACC) -d -o parse.c parse.y ; \
 		$(PMAKE) $(MAKE_BUILD_FLAGS)
 
-	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/make
-
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/mkdep
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.sbin/mtree
 	$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/file2c