?mode=patch&uid=2006111516393112780
Open Patch: 2006111516393112780 (by stf)
+ stf
Votecheck 'core-relaxed': Missing 1 qualified vote(s) (clifford, daja77, fake, stefanp, teha)
misc/config/config-200-crosstools.in
misc/config/postconfig-200-crosstools.in
package/base/gcc/config-300.in
package/base/gcc/postconfig.in
scripts/config.in
Votecheck 'core-strong': Missing 1 qualified vote(s) (clifford, fake, teha)
package/base/gcc/postconfig.in
package/base/gcc/config-300.in
scripts/config.in
Stefan Fiedler:
fix forking of cross toolchain packages:
move pkgfork calls to postconfig.in because e.g. $ROCKCFG_DEFAULT_CC
is not set yet when misc/config/config-200-crosstools.in is called;
move pkgremove gcc to postconfig, so that gcc exists for the pkgfork
calls above;
execute package/*/*/postconfig.in scripts after misc/*/*postconfig*.in,
so that the scripts above are in the right order.
Stefan Fiedler:
fix forking of cross toolchain packages:
move pkgfork calls to postconfig.in because e.g. $ROCKCFG_DEFAULT_CC
is not set yet when misc/config/config-200-crosstools.in is called;
move pkgremove gcc to postconfig, so that gcc exists for the pkgfork
calls above;
execute package/*/*/postconfig.in scripts after misc/*/*postconfig*.in,
so that the scripts above are in the right order.
--- misc/config/config-200-crosstools.in (Revision 78)
+++ misc/config/config-200-crosstools.in (Revision 79)
@@ -30,27 +30,6 @@
for crosstarget in sparc sparc64 mips mipsel mips64 mips64el powerpc i386 x86_64 ; do
[ "$crosstarget-unknown-linux-gnu" == "$arch_target" ] && continue ;
bool "Build $crosstarget cross toolchain" ROCKCFG_PKG_CROSSTOOL_$crosstarget 0
-
- if [ "$ROCKCFG_CROSSBUILD" = "0" ] ; then
- stages="-----5---9"
- else
- stages="-1--------"
- fi
-
- if [ "$( eval echo \$ROCKCFG_PKG_CROSSTOOL_$crosstarget )" == 1 ] ; then
- pkgfork binutils binutils-cross-$crosstarget stages $stages
-
- pkgfork linux-libc-headers linux-libc-headers-cross-$crosstarget \
- stages $stages
-
- if [ "$ROCKCFG_PKG_GLIBC22_USEIT" = 1 ] ; then
- pkgfork glibc glibc22-cross-$crosstarget stages $stages
- else
- pkgfork glibc glibc23-cross-$crosstarget stages $stages
- fi
-
- pkgfork gcc $ROCKCFG_DEFAULT_CC-cross-$crosstarget stages $stages
- fi
done
menu_end
--- misc/config/postconfig-200-crosstools.in (Revision 0)
+++ misc/config/postconfig-200-crosstools.in (Revision 79)
@@ -0,0 +1,45 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/misc/config/config-200-crosstools.in
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+#
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at https://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+for crosstarget in sparc sparc64 mips mipsel mips64 mips64el powerpc i386 x86_64 ; do
+ if [ "$ROCKCFG_CROSSBUILD" = "0" ] ; then
+ stages="-----5---9"
+ else
+ stages="-1--------"
+ fi
+
+ if [ "$( eval echo \$ROCKCFG_PKG_CROSSTOOL_$crosstarget )" == 1 ] ; then
+ pkgfork binutils binutils-cross-$crosstarget stages $stages
+
+ pkgfork linux-libc-headers linux-libc-headers-cross-$crosstarget \
+ stages $stages
+
+ if [ "$ROCKCFG_PKG_GLIBC22_USEIT" = 1 ] ; then
+ pkgfork glibc glibc22-cross-$crosstarget stages $stages
+ else
+ pkgfork glibc glibc23-cross-$crosstarget stages $stages
+ fi
+
+ pkgfork gcc $ROCKCFG_DEFAULT_CC-cross-$crosstarget stages $stages
+ fi
+done
+
--- package/base/gcc/postconfig.in (Revision 0)
+++ package/base/gcc/postconfig.in (Revision 79)
@@ -0,0 +1 @@
+pkgremove gcc
--- package/base/gcc/config-300.in (Revision 78)
+++ package/base/gcc/config-300.in (Revision 79)
@@ -38,7 +38,6 @@
if [ $ROCKCFG_PKG_GCC_GCC34 = 1 ]; then pkgfork gcc gcc34; d="gcc34"; l="$l $d"; fi
if [ $ROCKCFG_PKG_GCC_GCC40 = 1 ]; then pkgfork gcc gcc40; d="gcc40"; l="$l $d"; m="$m $d"; fi
if [ $ROCKCFG_PKG_GCC_GCC41 = 1 ]; then pkgfork gcc gcc41; d="gcc41"; l="$l $d"; m="$m $d"; fi
- pkgremove gcc
k=""; for x in $l; do
k="$k $x Use_${x}_as_standard_C_compiler"
--- scripts/config.in (Revision 79)
+++ scripts/config.in (Revision 80)
@@ -46,14 +46,15 @@
# * package/*/config.in
# * Various common build options
#
+# - misc/*/postconfig-*.in
+# - misc/*/postconfig.in
# - package/*/*/postconfig.in
-# - misc/*/postconfig.in
# - architecture/$ROCKCFG_ARCH/postconfig.in
# - target/$ROCKCFG_TARGET/postconfig.in
#
# Only procedures marked with '*' might interact with the user.
#
-# Naming-scheme for extening config variables:
+# Naming-scheme for extending config variables:
#
# Core: ROCKCFG_*
# Archs: ROCKCFG_ARCH_<Arch-Name>_*
@@ -330,8 +331,9 @@
block_end
expert_end
+include "$(ls misc/*/postconfig{,-*}.in 2>/dev/null \
+ | LC_ALL=C sort -k3,3 -t"/" | tr '\n' ' ')"
include "package/*/*/postconfig.in"
-include "misc/*/postconfig.in"
include architecture/$ROCKCFG_ARCH/postconfig.in
include target/$ROCKCFG_TARGET/postconfig.in
[Download this patch]