r4203 - in people/waldi/linux-2.6/debian: . arch/alpha arch/arm arch/m68k arch/sparc bin lib/python

Bastian Blank waldi at costa.debian.org
Wed Sep 14 18:57:41 UTC 2005 

Author: waldi
Date: 2005-09-14 18:57:40 +0000 (Wed, 14 Sep 2005)
New Revision: 4203

Modified:
   people/waldi/linux-2.6/debian/arch/alpha/Makefile.inc
   people/waldi/linux-2.6/debian/arch/alpha/defines
   people/waldi/linux-2.6/debian/arch/arm/Makefile.inc
   people/waldi/linux-2.6/debian/arch/arm/defines
   people/waldi/linux-2.6/debian/arch/m68k/Makefile.inc
   people/waldi/linux-2.6/debian/arch/m68k/defines
   people/waldi/linux-2.6/debian/arch/sparc/Makefile.inc
   people/waldi/linux-2.6/debian/arch/sparc/defines
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux.py
   people/waldi/linux-2.6/debian/rules.real
Log:
Move compiler setting to package config.

* debian/arch/alpha/Makefile.inc, debian/arch/arm/Makefile.inc,
  debian/arch/m68k/Makefile.inc, debian/arch/sparc/Makefile.inc:
  Remove build_makeflags variable.
* debian/arch/alpha/defines, debian/arch/arm/defines,
  debian/arch/m68k/defines, debian/arch/sparc/defines:
  Add compiler setting.
* debian/bin/gencontrol.py: Set COMPILER argument.
* debian/lib/python/debian_linux.py: Add support for compiler setting.
* debian/rules.real: Change MAKEFLAGS setup.


Modified: people/waldi/linux-2.6/debian/arch/alpha/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/Makefile.inc	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/arch/alpha/Makefile.inc	2005-09-14 18:57:40 UTC (rev 4203)
@@ -2,4 +2,3 @@
 # Variables 
 #
 initrd_modules := kernel/security/capability.ko
-build_makeflags := 'CC=gcc-3.3'

Modified: people/waldi/linux-2.6/debian/arch/alpha/defines
===================================================================
--- people/waldi/linux-2.6/debian/arch/alpha/defines	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/arch/alpha/defines	2005-09-14 18:57:40 UTC (rev 4203)
@@ -1,4 +1,5 @@
 [base]
+compiler: gcc-3.3
 flavours: alpha-generic alpha-smp
 suggests: aboot, fdutils
 

Modified: people/waldi/linux-2.6/debian/arch/arm/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/arm/Makefile.inc	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/arch/arm/Makefile.inc	2005-09-14 18:57:40 UTC (rev 4203)
@@ -4,4 +4,3 @@
 include_common_config := no
 default_config := footbridge
 #initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko
-build_makeflags := 'CC=gcc-3.3'

Modified: people/waldi/linux-2.6/debian/arch/arm/defines
===================================================================
--- people/waldi/linux-2.6/debian/arch/arm/defines	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/arch/arm/defines	2005-09-14 18:57:40 UTC (rev 4203)
@@ -1,4 +1,5 @@
 [base]
+compiler: gcc-3.3
 flavours:
  footbridge
  ixp4xx

Modified: people/waldi/linux-2.6/debian/arch/m68k/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/m68k/Makefile.inc	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/arch/m68k/Makefile.inc	2005-09-14 18:57:40 UTC (rev 4203)
@@ -1,4 +1,3 @@
 #
 # Variables 
 #
-build_makeflags := 'CC=m68k-linux-gnu-gcc-3.3'

Modified: people/waldi/linux-2.6/debian/arch/m68k/defines
===================================================================
--- people/waldi/linux-2.6/debian/arch/m68k/defines	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/arch/m68k/defines	2005-09-14 18:57:40 UTC (rev 4203)
@@ -1,4 +1,5 @@
 [base]
+compiler: gcc-3.3
 flavours:
  amiga
  atari

Modified: people/waldi/linux-2.6/debian/arch/sparc/Makefile.inc
===================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/Makefile.inc	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/arch/sparc/Makefile.inc	2005-09-14 18:57:40 UTC (rev 4203)
@@ -5,4 +5,3 @@
 image_postproc = strip -R .comment -R .note -K sun4u_init -K _end -K _start arch/$(subst 32,,$(subst -smp,,$*))/boot/image
 # image_prefix_flavours := sparc32 sparc32-smp
 # image_prefix := sparc32
-build_makeflags := 'CC=gcc-3.3'

Modified: people/waldi/linux-2.6/debian/arch/sparc/defines
===================================================================
--- people/waldi/linux-2.6/debian/arch/sparc/defines	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/arch/sparc/defines	2005-09-14 18:57:40 UTC (rev 4203)
@@ -1,4 +1,5 @@
 [base]
+compiler: gcc-3.3
 flavours: sparc64 sparc64-smp
 kpkg-subarch: sparc64
 suggests: silo, fdutils

Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
===================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	2005-09-14 18:57:40 UTC (rev 4203)
@@ -320,8 +320,9 @@
         makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
 
     makeflags['FLAVOUR'] = flavour
-    if config_entry.has_key('kpkg-subarch'):
-        makeflags['KPKG_SUBARCH'] = config_entry['kpkg-subarch']
+    for i in (('compiler', 'COMPILER'), ('kpkg-subarch', 'KPKG_SUBARCH')):
+        if config_entry.has_key(i[0]):
+            makeflags[i[1]] = config_entry[i[0]]
     makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
     cmds_binary_arch = []
@@ -413,8 +414,9 @@
         makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch), None))
 
     makeflags['SUBARCH'] = subarch
-    if config_entry.has_key('kpkg-subarch'):
-        makeflags['KPKG_SUBARCH'] = config_entry['kpkg-subarch']
+    for i in (('compiler', 'COMPILER'), ('kpkg-subarch', 'KPKG_SUBARCH')):
+        if config_entry.has_key(i[0]):
+            makeflags[i[1]] = config_entry[i[0]]
     makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
     cmds_binary_arch = []

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux.py
===================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux.py	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux.py	2005-09-14 18:57:40 UTC (rev 4203)
@@ -27,6 +27,7 @@
         'arches': schema_item_list,
         'available': schema_item_boolean,
         'class': schema_item_string,
+        'compiler': schema_item_string,
         'depends': schema_item_string,
         'desc': schema_item_string,
         'flavours': schema_item_list,

Modified: people/waldi/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/linux-2.6/debian/rules.real	2005-09-14 18:53:14 UTC (rev 4202)
+++ people/waldi/linux-2.6/debian/rules.real	2005-09-14 18:57:40 UTC (rev 4203)
@@ -57,11 +57,11 @@
 endif
 setup_env := env -u ABINAME -u ARCH -u SUBARCH -u FLAVOUR -u VERSION
 setup_env += DEBIAN_ABINAME=$(ABINAME) DEBIAN_FLAVOUR=$(FLAVOUR) DEBIAN_VERSION=$(VERSION)
-ifdef build_makeflags
-  setup_env += MAKEFLAGS=$(build_makeflags)
-else
-  setup_env += MAKEFLAGS=
+setup_makeflags =
+ifdef COMPILER
+  setup_makeflags += CC=$(COMPILER)
 endif
+setup_env += MAKEFLAGS="$(setup_makeflags)"
 ifndef headers_dirs
   headers_dirs = $(DEB_HOST_ARCH)
 endif

More information about the Kernel-svn-changes mailing list