* 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

10 files changed, 165 insertions, 141 deletions

diff --git a/debian/rules.d/binary-base.mk b/debian/rules.d/binary-base.mk
index 8e4664e..8842834 100644
--- a/debian/rules.d/binary-base.mk
+++ b/debian/rules.d/binary-base.mk
@@ -18,19 +18,21 @@ $(binary_stamp)-base: $(install_dependencies)
 	dh_installdirs -p$(p_base) \
 		$(gcc_lexec_dir)
 
+ifneq ($(DEB_STAGE),rtlibs)
 	ln -sf $(BASE_VERSION) \
 	    $(d_base)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lib_dir))
 	for link in $(additional_links); do \
 	  ln -sf $(BASE_VERSION) \
 	    $(d_base)/$$(dirname $(gcc_lib_dir))/$$link; \
         done
-ifneq ($(gcc_lib_dir),$(gcc_lexec_dir))
+  ifneq ($(gcc_lib_dir),$(gcc_lexec_dir))
 	ln -sf $(BASE_VERSION) \
 	    $(d_base)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lexec_dir))
 	for link in $(additional_links); do \
 	  ln -sf $(BASE_VERSION) \
 	    $(d_base)/$$(dirname $(gcc_lexec_dir))/$$link; \
         done
+  endif
 endif
 
 ifeq ($(with_base_only),yes)
@@ -42,7 +44,11 @@ endif
 	dh_installchangelogs -p$(p_base)
 	dh_compress -p$(p_base)
 	dh_fixperms -p$(p_base)
+ifeq ($(DEB_STAGE)-$(DEB_CROSS),rtlibs-yes)
+	$(cross_gencontrol) dh_gencontrol -p$(p_base) -- -v$(DEB_VERSION) $(common_substvars)
+else
 	dh_gencontrol -p$(p_base) -- -v$(DEB_VERSION) $(common_substvars)
+endif
 	dh_installdeb -p$(p_base)
 	dh_md5sums -p$(p_base)
 	dh_builddeb -p$(p_base)
diff --git a/debian/rules.d/binary-cpp.mk b/debian/rules.d/binary-cpp.mk
index 7a600b8..d20b482 100644
--- a/debian/rules.d/binary-cpp.mk
+++ b/debian/rules.d/binary-cpp.mk
@@ -1,7 +1,9 @@
-arch_binaries  := $(arch_binaries) cpp
-ifneq ($(DEB_CROSS),yes)
-  ifneq ($(GFDL_INVARIANT_FREE),yes)
-    indep_binaries := $(indep_binaries) cpp-doc
+ifneq ($(DEB_STAGE),rtlibs)
+  arch_binaries  := $(arch_binaries) cpp
+  ifneq ($(DEB_CROSS),yes)
+    ifneq ($(GFDL_INVARIANT_FREE),yes)
+      indep_binaries := $(indep_binaries) cpp-doc
+    endif
   endif
 endif
 
diff --git a/debian/rules.d/binary-cxx.mk b/debian/rules.d/binary-cxx.mk
index dcb7803..8a2136b 100644
--- a/debian/rules.d/binary-cxx.mk
+++ b/debian/rules.d/binary-cxx.mk
@@ -1,7 +1,9 @@
-ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf)))
-  arch_binaries  := $(arch_binaries) cxx-multi
+ifneq ($(DEB_STAGE),rtlibs)
+  ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf)))
+    arch_binaries  := $(arch_binaries) cxx-multi
+  endif
+  arch_binaries  := $(arch_binaries) cxx
 endif
-arch_binaries  := $(arch_binaries) cxx
 
 dirs_cxx = \
 	$(docdir)/$(p_xbase)/C++ \
diff --git a/debian/rules.d/binary-d.mk b/debian/rules.d/binary-d.mk
index 855ebcf..ffa943f 100644
--- a/debian/rules.d/binary-d.mk
+++ b/debian/rules.d/binary-d.mk
@@ -1,50 +1,52 @@
-ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchsf)))
-  arch_binaries  := $(arch_binaries) gdc-multi
-endif
-arch_binaries := $(arch_binaries) gdc
+ifneq ($(DEB_STAGE),rtlibs)
+  ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchsf)))
+    arch_binaries  := $(arch_binaries) gdc-multi
+  endif
+  arch_binaries := $(arch_binaries) gdc
 
-ifeq ($(with_libphobos),yes)
-  arch_binaries += libphobos-dev
-endif
+  ifeq ($(with_libphobos),yes)
+    arch_binaries += libphobos-dev
+  endif
 
-ifeq ($(with_lib64phobosdev),yes)
-  $(lib_binaries)	+= lib64phobos-dev
-endif
-ifeq ($(with_lib32phobosdev),yes)
-  $(lib_binaries)	+= lib32phobos-dev
-endif
-ifeq ($(with_libn32phobosdev),yes)
-  $(lib_binaries)	+= libn32phobos-dev
-endif
-ifeq ($(with_libx32phobosdev),yes)
-  $(lib_binaries)	+= libx32phobos-dev
-endif
-ifeq ($(with_libhfphobosdev),yes)
-  $(lib_binaries)	+= libhfphobos-dev
-endif
-ifeq ($(with_libsfphobosdev),yes)
-  $(lib_binaries)	+= libsfphobos-dev
-endif
+  ifeq ($(with_lib64phobosdev),yes)
+    $(lib_binaries)	+= lib64phobos-dev
+  endif
+  ifeq ($(with_lib32phobosdev),yes)
+    $(lib_binaries)	+= lib32phobos-dev
+  endif
+  ifeq ($(with_libn32phobosdev),yes)
+    $(lib_binaries)	+= libn32phobos-dev
+  endif
+  ifeq ($(with_libx32phobosdev),yes)
+    $(lib_binaries)	+= libx32phobos-dev
+  endif
+  ifeq ($(with_libhfphobosdev),yes)
+    $(lib_binaries)	+= libhfphobos-dev
+  endif
+  ifeq ($(with_libsfphobosdev),yes)
+    $(lib_binaries)	+= libsfphobos-dev
+  endif
 
-ifeq (0,1)
-ifeq ($(with_lib64phobos),yes)
-  $(lib_binaries)	+= lib64phobos
-endif
-ifeq ($(with_lib32phobos),yes)
-  $(lib_binaries)	+= lib32phobos
-endif
-ifeq ($(with_libn32phobos),yes)
-  $(lib_binaries)	+= libn32phobos
-endif
-ifeq ($(with_libx32phobos),yes)
-  $(lib_binaries)	+= libx32phobos
-endif
-ifeq ($(with_libhfphobos),yes)
-  $(lib_binaries)	+= libhfphobos
-endif
-ifeq ($(with_libsfphobos),yes)
-  $(lib_binaries)	+= libsfphobos
-endif
+  ifeq (0,1)
+  ifeq ($(with_lib64phobos),yes)
+    $(lib_binaries)	+= lib64phobos
+  endif
+  ifeq ($(with_lib32phobos),yes)
+    $(lib_binaries)	+= lib32phobos
+  endif
+  ifeq ($(with_libn32phobos),yes)
+    $(lib_binaries)	+= libn32phobos
+  endif
+  ifeq ($(with_libx32phobos),yes)
+    $(lib_binaries)	+= libx32phobos
+  endif
+  ifeq ($(with_libhfphobos),yes)
+    $(lib_binaries)	+= libhfphobos
+  endif
+  ifeq ($(with_libsfphobos),yes)
+    $(lib_binaries)	+= libsfphobos
+  endif
+  endif
 endif
 
 p_gdc           = gdc$(pkg_ver)$(cross_bin_arch)
diff --git a/debian/rules.d/binary-gcc.mk b/debian/rules.d/binary-gcc.mk
index 6194456..f09467d 100644
--- a/debian/rules.d/binary-gcc.mk
+++ b/debian/rules.d/binary-gcc.mk
@@ -1,18 +1,20 @@
-ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf)))
-  arch_binaries  := $(arch_binaries) gcc-multi
-endif
-ifeq ($(with_plugins),yes)
-  arch_binaries  := $(arch_binaries) gcc-plugindev
-endif
+ifneq ($(DEB_STAGE),rtlibs)
+  ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf)))
+    arch_binaries  := $(arch_binaries) gcc-multi
+  endif
+  ifeq ($(with_plugins),yes)
+    arch_binaries  := $(arch_binaries) gcc-plugindev
+  endif
 
-arch_binaries  := $(arch_binaries) gcc
+  arch_binaries  := $(arch_binaries) gcc
 
-ifneq ($(DEB_CROSS),yes)
-  ifneq ($(GFDL_INVARIANT_FREE),yes)
-    indep_binaries := $(indep_binaries) gcc-doc
-  endif
-  ifeq ($(with_nls),yes)
-    indep_binaries := $(indep_binaries) gcc-locales
+  ifneq ($(DEB_CROSS),yes)
+    ifneq ($(GFDL_INVARIANT_FREE),yes)
+      indep_binaries := $(indep_binaries) gcc-doc
+    endif
+    ifeq ($(with_nls),yes)
+      indep_binaries := $(indep_binaries) gcc-locales
+    endif
   endif
 endif
 
diff --git a/debian/rules.d/binary-go.mk b/debian/rules.d/binary-go.mk
index a9542f7..b62e48a 100644
--- a/debian/rules.d/binary-go.mk
+++ b/debian/rules.d/binary-go.mk
@@ -14,13 +14,15 @@ ifeq ($(with_libx32go),yes)
   $(lib_binaries) += libx32go
 endif
 
-arch_binaries  := $(arch_binaries) gccgo
-ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32)))
-  arch_binaries  := $(arch_binaries) gccgo-multi
-endif
-ifneq ($(DEB_CROSS),yes)
-  ifneq ($(GFDL_INVARIANT_FREE),yes)
-    indep_binaries := $(indep_binaries) go-doc
+ifneq ($(DEB_STAGE),rtlibs)
+  arch_binaries  := $(arch_binaries) gccgo
+  ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32)))
+    arch_binaries  := $(arch_binaries) gccgo-multi
+  endif
+  ifneq ($(DEB_CROSS),yes)
+    ifneq ($(GFDL_INVARIANT_FREE),yes)
+      indep_binaries := $(indep_binaries) go-doc
+    endif
   endif
 endif
 
diff --git a/debian/rules.d/binary-libgcc.mk b/debian/rules.d/binary-libgcc.mk
index e264606..e353c85 100644
--- a/debian/rules.d/binary-libgcc.mk
+++ b/debian/rules.d/binary-libgcc.mk
@@ -1,45 +1,47 @@
 ifeq ($(with_libgcc),yes)
   $(lib_binaries)	+= libgcc
 endif
-ifeq ($(with_cdev),yes)
-  $(lib_binaries)  += libgcc-dev
-endif
-
 ifeq ($(with_lib64gcc),yes)
   $(lib_binaries)	+= lib64gcc
 endif
-ifeq ($(with_lib64gccdev),yes)
-  $(lib_binaries)  += lib64gcc-dev
-endif
 ifeq ($(with_lib32gcc),yes)
   $(lib_binaries)	+= lib32gcc
 endif
-ifeq ($(with_lib32gccdev),yes)
-  $(lib_binaries)  += lib32gcc-dev
-endif
 ifeq ($(with_libn32gcc),yes)
   $(lib_binaries)	+= libn32gcc
 endif
-ifeq ($(with_libn32gccdev),yes)
-  $(lib_binaries)  += libn32gcc-dev
-endif
 ifeq ($(with_libx32gcc),yes)
   $(lib_binaries)	+= libx32gcc
 endif
-ifeq ($(with_libx32gccdev),yes)
-  $(lib_binaries)  += libx32gcc-dev
-endif
 ifeq ($(with_libhfgcc),yes)
   $(lib_binaries)	+= libhfgcc
 endif
-ifeq ($(with_libhfgccdev),yes)
-  $(lib_binaries)  += libhfgcc-dev
-endif
 ifeq ($(with_libsfgcc),yes)
   $(lib_binaries)	+= libsfgcc
 endif
-ifeq ($(with_libsfgccdev),yes)
-  $(lib_binaries)  += libsfgcc-dev
+
+ifneq ($(DEB_STAGE),rtlibs)
+  ifeq ($(with_cdev),yes)
+    $(lib_binaries)  += libgcc-dev
+  endif
+  ifeq ($(with_lib64gccdev),yes)
+    $(lib_binaries)  += lib64gcc-dev
+  endif
+  ifeq ($(with_lib32gccdev),yes)
+    $(lib_binaries)  += lib32gcc-dev
+  endif
+  ifeq ($(with_libn32gccdev),yes)
+    $(lib_binaries)  += libn32gcc-dev
+  endif
+  ifeq ($(with_libx32gccdev),yes)
+    $(lib_binaries)  += libx32gcc-dev
+  endif
+  ifeq ($(with_libhfgccdev),yes)
+    $(lib_binaries)  += libhfgcc-dev
+  endif
+  ifeq ($(with_libsfgccdev),yes)
+    $(lib_binaries)  += libsfgcc-dev
+  endif
 endif
 
 header_files = \
diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk
index 29f21d5..b9ea030 100644
--- a/debian/rules.d/binary-libstdcxx.mk
+++ b/debian/rules.d/binary-libstdcxx.mk
@@ -1,66 +1,68 @@
-
 ifeq ($(with_libcxx),yes)
   $(lib_binaries)  += libstdcxx
 endif
 ifeq ($(with_lib64cxx),yes)
   $(lib_binaries)  += lib64stdcxx
 endif
-ifeq ($(with_lib64cxxdev),yes)
-  $(lib_binaries)	+= lib64stdcxx-dev
-endif
-ifeq ($(with_lib64cxxdbg),yes)
-  $(lib_binaries)	+= lib64stdcxxdbg
-endif
 ifeq ($(with_lib32cxx),yes)
   $(lib_binaries)	+= lib32stdcxx
 endif
-ifeq ($(with_lib32cxxdev),yes)
-  $(lib_binaries)	+= lib32stdcxx-dev
-endif
-ifeq ($(with_lib32cxxdbg),yes)
-  $(lib_binaries)	+= lib32stdcxxdbg
-endif
 ifeq ($(with_libn32cxx),yes)
   $(lib_binaries)	+= libn32stdcxx
 endif
-ifeq ($(with_libn32cxxdev),yes)
-  $(lib_binaries)	+= libn32stdcxx-dev
-endif
-ifeq ($(with_libn32cxxdbg),yes)
-  $(lib_binaries)	+= libn32stdcxxdbg
-endif
 ifeq ($(with_libx32cxx),yes)
   $(lib_binaries)	+= libx32stdcxx
 endif
-ifeq ($(with_libx32cxxdev),yes)
-  $(lib_binaries)	+= libx32stdcxx-dev
-endif
-ifeq ($(with_libx32cxxdbg),yes)
-  $(lib_binaries)	+= libx32stdcxxdbg
-endif
 ifeq ($(with_libhfcxx),yes)
   $(lib_binaries)	+= libhfstdcxx
 endif
-ifeq ($(with_libhfcxxdev),yes)
-    $(lib_binaries)	+= libhfstdcxx-dev
-endif
-ifeq ($(with_libhfcxxdbg),yes)
-  $(lib_binaries)	+= libhfstdcxxdbg
-endif
 ifeq ($(with_libsfcxx),yes)
   $(lib_binaries)	+= libsfstdcxx
 endif
-ifeq ($(with_libsfcxxdev),yes)
-  $(lib_binaries)	+= libsfstdcxx-dev
-endif
-ifeq ($(with_libsfcxxdbg),yes)
-  $(lib_binaries)	+= libsfstdcxxdbg
-endif
 
-ifeq ($(with_cxxdev),yes)
-  $(lib_binaries)  += libstdcxx-dev
-  ifneq ($(DEB_CROSS),yes)
-    indep_binaries := $(indep_binaries) libstdcxx-doc
+ifneq ($(DEB_STAGE),rtlibs)
+  ifeq ($(with_lib64cxxdev),yes)
+    $(lib_binaries)	+= lib64stdcxx-dev
+  endif
+  ifeq ($(with_lib64cxxdbg),yes)
+    $(lib_binaries)	+= lib64stdcxxdbg
+  endif
+  ifeq ($(with_lib32cxxdev),yes)
+    $(lib_binaries)	+= lib32stdcxx-dev
+  endif
+  ifeq ($(with_lib32cxxdbg),yes)
+    $(lib_binaries)	+= lib32stdcxxdbg
+  endif
+  ifeq ($(with_libn32cxxdev),yes)
+    $(lib_binaries)	+= libn32stdcxx-dev
+  endif
+  ifeq ($(with_libn32cxxdbg),yes)
+    $(lib_binaries)	+= libn32stdcxxdbg
+  endif
+  ifeq ($(with_libx32cxxdev),yes)
+    $(lib_binaries)	+= libx32stdcxx-dev
+  endif
+  ifeq ($(with_libx32cxxdbg),yes)
+    $(lib_binaries)	+= libx32stdcxxdbg
+  endif
+  ifeq ($(with_libhfcxxdev),yes)
+    $(lib_binaries)	+= libhfstdcxx-dev
+  endif
+  ifeq ($(with_libhfcxxdbg),yes)
+    $(lib_binaries)	+= libhfstdcxxdbg
+  endif
+  ifeq ($(with_libsfcxxdev),yes)
+    $(lib_binaries)	+= libsfstdcxx-dev
+  endif
+  ifeq ($(with_libsfcxxdbg),yes)
+    $(lib_binaries)	+= libsfstdcxxdbg
+  endif
+
+  ifeq ($(with_cxxdev),yes)
+    $(lib_binaries)  += libstdcxx-dev
+    ifneq ($(DEB_CROSS),yes)
+      indep_binaries := $(indep_binaries) libstdcxx-doc
+    endif
   endif
 endif
 
@@ -200,7 +202,7 @@ define __do_libstdcxx
 	debian/dh_doclink -p$(p_l) $(p_base)
 	debian/dh_rmemptydirs -p$(p_l)
 
-	dh_strip -p$(p_l) --dbg-package=$(1)-$(BASE_VERSION)-dbg$(cross_lib_arch)
+	dh_strip -p$(p_l) $(if $(filter rtlibs,$(DEB_STAGE)),,--dbg-package=$(1)-$(BASE_VERSION)-dbg$(cross_lib_arch))
 	dh_compress -p$(p_l)
 	dh_fixperms -p$(p_l)
 
diff --git a/debian/rules.d/binary-objc.mk b/debian/rules.d/binary-objc.mk
index d803358..7b4d891 100644
--- a/debian/rules.d/binary-objc.mk
+++ b/debian/rules.d/binary-objc.mk
@@ -1,7 +1,9 @@
-ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf)))
-  arch_binaries  := $(arch_binaries) objc-multi
+ifneq ($(DEB_STAGE),rtlibs)
+  ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf)))
+    arch_binaries  := $(arch_binaries) objc-multi
+  endif
+  arch_binaries := $(arch_binaries) objc
 endif
-arch_binaries := $(arch_binaries) objc
 
 p_objc	= gobjc$(pkg_ver)$(cross_bin_arch)
 d_objc	= debian/$(p_objc)
diff --git a/debian/rules.d/binary-objcxx.mk b/debian/rules.d/binary-objcxx.mk
index f27d183..1c3ad27 100644
--- a/debian/rules.d/binary-objcxx.mk
+++ b/debian/rules.d/binary-objcxx.mk
@@ -1,7 +1,9 @@
-ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf)))
-  arch_binaries  := $(arch_binaries) objcxx-multi
+ifneq ($(DEB_STAGE),rtlibs)
+  ifneq (,$(filter yes, $(biarch64) $(biarch32) $(biarchn32) $(biarchx32) $(biarchhf) $(biarchsf)))
+    arch_binaries  := $(arch_binaries) objcxx-multi
+  endif
+  arch_binaries := $(arch_binaries) objcxx
 endif
-arch_binaries := $(arch_binaries) objcxx
 
 p_objcx		= gobjc++$(pkg_ver)$(cross_bin_arch)
 d_objcx		= debian/$(p_objcx)