[Glibc-bsd-commits] r3422 - trunk/kfreebsd-8/debian

[Robert Millan]

Author: rmh
Date: 2011-06-07 14:08:28 +0000 (Tue, 07 Jun 2011)
New Revision: 3422

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/control.in
   trunk/kfreebsd-8/debian/rules
Log:
Automatically propagate GCC version dependency to debian/control.

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-06-07 14:03:32 UTC (rev 3421)
+++ trunk/kfreebsd-8/debian/changelog	2011-06-07 14:08:28 UTC (rev 3422)
@@ -10,6 +10,7 @@
 
   [ Robert Millan ]
   * Add lintian override for "embedded-library" (zlib.ko).
+  * Automatically propagate GCC version dependency to debian/control.
 
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 19 Feb 2011 23:01:52 +0100
 

Modified: trunk/kfreebsd-8/debian/control.in
===================================================================
--- trunk/kfreebsd-8/debian/control.in	2011-06-07 14:03:32 UTC (rev 3421)
+++ trunk/kfreebsd-8/debian/control.in	2011-06-07 14:08:28 UTC (rev 3422)
@@ -7,7 +7,7 @@
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
  freebsd-buildutils (>= 8.1-2) [!kfreebsd-any] | freebsd-buildutils (>= 7) [kfreebsd-any],
- gcc-4.3, libdb-dev,
+ gcc- at gcc_version@, libdb-dev,
  libbsd-dev, libsbuf-dev
 Standards-Version: 3.9.2
 

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2011-06-07 14:03:32 UTC (rev 3421)
+++ trunk/kfreebsd-8/debian/rules	2011-06-07 14:08:28 UTC (rev 3422)
@@ -18,6 +18,7 @@
 configfile	:= DEBCUSTOM
 abiname		:= 1
 ld_target	:= $(shell ld --help | sed -ne "s/^ld: supported targets: \([^ ]*\) .*/\1/p")
+gcc_version	:= 4.3
 
 ifeq ($(cpu), mipsel)
 kfreebsd_cpu	:= mips
@@ -37,7 +38,7 @@
 FLAVOR_DIR	:= flavor-$(version)-$(abiname)
 ORIG_DIR	:= kfreebsd-$(major)-$(tar_version)
 ORIG_TAR	:= kfreebsd-$(major)_$(tar_version).orig.tar.gz
-MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) CC=gcc-4.3 WERROR=
+MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) CC=gcc-$(gcc_version) WERROR=
 PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
 
 get-orig-source:
@@ -50,7 +51,7 @@
 	rm -rf $(ORIG_DIR)
 
 control: clean
-	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" \
+	sed -e "s/@major@/$(major)/g" -e "s/@version@/$(version)/g" -e "s/@abiname@/$(abiname)/g" -e "s/@flavor@/$$flavor/g" -e "s/@gcc_version@/$(gcc_version)/g" \
 		$(CURDIR)/debian/control.in > $(CURDIR)/debian/control
 	echo >> $(CURDIR)/debian/control
 	for arch in `ls $(CURDIR)/debian/arch/` ; do \