* Provide a rtlibs stage to build a subset of target library packages.

git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8054 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

1 files changed, 33 insertions, 7 deletions

diff --git a/debian/rules.conf b/debian/rules.conf
index 8e1613c..e53cb5d 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -649,6 +649,9 @@ ifeq ($(DEB_CROSS),yes)
 	-DTARGET=$(DEB_TARGET_ARCH) \
 	-DLIBUNWIND_BUILD_DEP="$(LIBUNWIND_BUILD_DEP)" \
 	-DLIBATOMIC_OPS_BUILD_DEP="$(LIBATOMIC_OPS_BUILD_DEP)"
+  ifeq ($(DEB_STAGE),rtlibs)
+    ctrl_flags += -DCROSS_ARCH=$(DEB_TARGET_ARCH)
+  endif
 else
   # add '-DPRI=optional' to ctrl_flags if this is not the default compiler
   # ctrl_flags += \
@@ -668,7 +671,7 @@ endif
 control: control-file readme-bugs-file parameters-file symbols-files copyright-file substvars-file versioned-files check-versions
 
 # stage1 and stage2 compilers are only C
-ifdef DEB_STAGE
+ifneq (,$(filter $(DEB_STAGE),stage1 stage2))
   languages = c
   addons = cdev plugindev
   ifeq ($(multilib),yes)
@@ -690,14 +693,33 @@ ifdef DEB_STAGE
   endif
 else
 languages = c c++ fortran objc objpp
+ifeq ($(DEB_STAGE),rtlibs)
+  ifeq (,$(filter libgfortran, $(with_rtlibs)))
+    languages := $(filter-out fortran, $(languages))
+  endif
+  ifeq (,$(filter libobjc, $(with_rtlibs)))
+    languages := $(filter-out objc objpp, $(languages))
+  endif
+endif
 ifeq ($(with_gccbase),yes)
     addons += gccbase
 endif
 ifeq ($(with_gccxbase),yes)
     addons += gccxbase
 endif
-addons += cdev c++dev fdev objcdev source objppdev multilib
-addons += plugindev
+ifneq ($(DEB_STAGE),rtlibs)
+  addons += cdev c++dev source multilib
+  ifneq (,$(filter fortran, $(languages)))
+      addons += fdev
+  endif
+  ifneq (,$(filter objc, $(languages)))
+      addons += objcdev
+  endif
+  ifneq (,$(filter objpp, $(languages)))
+      addons += objppdev
+  endif
+  addons += plugindev
+endif
 addons += $(if $(findstring armel,$(biarchhfarchs)),armml)
 addons += $(if $(findstring armhf,$(biarchsfarchs)),armml)
 addons += $(if $(findstring amd64,$(biarchx32archs)),x32dev)
@@ -819,25 +841,27 @@ ifeq ($(with_go),yes)
     addons += $(if $(findstring amd64,$(biarchx32archs)),libx32ggo)
   endif
 endif
-
+ifeq ($(with_ada),yes)
   languages += ada
-  addons += libgnat libs source # libgmath libnof lib64gnat ssp
+  addons += libgnat libs # libgmath libnof lib64gnat ssp
   ifeq ($(with_gnatsjlj),yes)
     addons += adasjlj
   endif
-
+endif
+ifeq ($(with_java),yes)
   languages += java
   addons += gcj
   ifneq ($(DEB_CROSS),yes)
     addons += libgcj libgcjdev gcjdoc gcjsrc
   endif
+endif
 
   ifneq ($(DEB_CROSS),yes)
   ifneq (,$(neon_archs))
     addons += libneongcc libneongomp libneonitm libneonobjc libneongfortran libneoncxx
   endif
   ifeq ($(with_fixincl),yes)
-    addons += fixincl
+    addons += $(if $(DEB_STAGE),,fixincl)
   endif
   ifeq ($(with_libgcj_doc),yes)
     addons += gcjdoc
@@ -1297,6 +1321,7 @@ parameters-file:
 
 symbols-files:
 ifeq ($(DEB_CROSS),yes)
+  ifneq ($(DEB_STAGE),rtlibs)
 	for f in debian/*.symbols; do \
 	  [ -f "$$f" ] || continue; \
 	  [ -L "$$f" ] && continue; \
@@ -1309,6 +1334,7 @@ ifeq ($(DEB_CROSS),yes)
 	  b=$$(basename $$f .symbols.$(DEB_TARGET_ARCH)); \
 	  ln -sf $$f debian/$$b$(LS).symbols; \
 	done
+  endif
 endif
 
 versioned-files: