[Glibc-bsd-commits] r4692 - trunk/kfreebsd-10/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-07-07 11:58:32 +0000 (Sun, 07 Jul 2013)
New Revision: 4692

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/control.in
   trunk/kfreebsd-10/debian/rules
Log:
Split kernel_cc into cc_cmd and cc_pkg (this makes it easier to enable clang when desired).

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-07-07 11:56:28 UTC (rev 4691)
+++ trunk/kfreebsd-10/debian/changelog	2013-07-07 11:58:32 UTC (rev 4692)
@@ -1,6 +1,8 @@
 kfreebsd-10 (10.0~svn252032-2) UNRELEASED; urgency=low
 
   * Remove 951_disable_mk_magic.diff, use -DWITHOUT_CTF instead.
+  * Split kernel_cc into cc_cmd and cc_pkg (this makes it easier to
+    enable clang when desired).
 
  -- Robert Millan <rmh at debian.org>  Tue, 02 Jul 2013 17:05:10 +0200
 

Modified: trunk/kfreebsd-10/debian/control.in
===================================================================
--- trunk/kfreebsd-10/debian/control.in	2013-07-07 11:56:28 UTC (rev 4691)
+++ trunk/kfreebsd-10/debian/control.in	2013-07-07 11:58:32 UTC (rev 4692)
@@ -8,7 +8,7 @@
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
  freebsd-buildutils (>= 10~svn241078-1~),
  byacc,
- @kernel_cc@, libdb-dev,
+ @cc_pkg@, libdb-dev,
  libbsd-dev (>= 0.3.0), pkg-config,
  libsbuf-dev (>= 9.0+ds1-2),
  kernel-wedge (>= 2.79) [kfreebsd-any],

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-07-07 11:56:28 UTC (rev 4691)
+++ trunk/kfreebsd-10/debian/rules	2013-07-07 11:58:32 UTC (rev 4692)
@@ -22,7 +22,8 @@
 configfile	:= DEBCUSTOM
 abiname		:= 0
 ld_target	:= $(shell ld --help | sed -ne "s/[^ :]*: supported targets: \([^ ]*\) .*/\1/p")
-kernel_cc	:= gcc-4.8
+cc_cmd		:= gcc-4.8
+cc_pkg		:= gcc-4.8
 
 ifeq ($(cpu), mipsel)
 kfreebsd_cpu	:= mips
@@ -84,7 +85,8 @@
 		fi ; \
 		echo ; \
 	done
-	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@kernel_cc@/$(kernel_cc)/g" \
+	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
+		-e "s/@cc_pkg@/$(cc_pkg)/g" \
 		$(CURDIR)/debian/control.in > $(CURDIR)/debian/control
 	echo >> $(CURDIR)/debian/control
 	for arch in `ls $(CURDIR)/debian/arch/` ; do \
@@ -184,8 +186,8 @@
 		&& config $(configfile)
 
 	# Build it
-	$(MAKE) CC=$(kernel_cc) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/ depend
-	$(MAKE) CC=$(kernel_cc) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/
+	$(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/ depend
+	$(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile)/
 
 	touch build-flavor-$*-stamp
 
@@ -240,7 +242,7 @@
 		$(IMAGE_PACKAGE)-$*/boot/config-$(version)-$(abiname)-$*
 
 	# now install the kernel
-	$(MAKE) CC=$(kernel_cc) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile) DESTDIR=$(IMAGE_PACKAGE)-$* install
+	$(MAKE) CC=$(cc_cmd) -C $(FLAVOR_DIR)-$*/sys/$(kfreebsd_cpu)/compile/$(configfile) DESTDIR=$(IMAGE_PACKAGE)-$* install
 	mv $(IMAGE_PACKAGE)-$*/lib/modules/$(version)-$(abiname)-$*/kernel $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
 	chmod 644 $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*
 	gzip -9 $(IMAGE_PACKAGE)-$*/boot/kfreebsd-$(version)-$(abiname)-$*