Better handling if uClibc version string

arc-init.sh used to depend on variable version_str, which was set in
build-uclibc.sh. Name was bad, since this is uclibc-specific, and this
dependency overall looked not nice. This commit improves that, although
still we have a dependency in arc-init, but now it depends on build-all.sh
instead.

Signed-off-by: Anton Kolesov <[email protected]>

Author: anthony-kolesov

arc-init.sh

@@ -380,7 +380,7 @@ configure_uclibc_stage1() {
 	--without-newlib \
 	--disable-c99 \
 	--disable-libgomp \
-	--with-pkgversion="$version_str" \
+	--with-pkgversion="$UCLIBC_TOOLS_VERSION" \
 	--with-bugurl="$ARC_COMMON_BUGURL" \
 	$CONFIG_EXTRA \
 	--with-sysroot="$SYSROOTDIR" \
@@ -413,7 +413,7 @@ configure_uclibc_stage2() {
 	--target=$triplet \
 	--with-cpu=${ISA_CPU} \
 	$UCLIBC_DISABLE_MULTILIB \
-	--with-pkgversion="$version_str" \
+	--with-pkgversion="$UCLIBC_TOOLS_VERSION" \
 	--with-bugurl="$ARC_COMMON_BUGURL" \
 	--enable-fast-install=N/A \
 	--with-endian=$ARC_ENDIAN \
@@ -455,7 +455,7 @@ configure_for_arc() {
     # calling "make install". Note - prefix is set to /usr, DESTDIR should
     # point to sysroot.
     if ! $srcdir/configure --prefix=/usr --host=$triplet \
-	    --with-pkgversion="${version_str}"\
+	    --with-pkgversion="$UCLIBC_TOOLS_VERSION"\
 	    --with-bugurl="$ARC_COMMON_BUGURL" \
 	    CFLAGS="$CFLAGS_FOR_TARGET" $* \
 	    >> "$logfile" 2>&1

build-all.sh

@@ -754,6 +754,18 @@ fi
 
 PARALLEL="-j ${jobs} -l ${load}"
 
+# Set version string for Linux uClibc toolchain, it will be used by arc-init. I
+# do not like this cross-file dependency, but otherwise it happens that
+# arc-init depends on either UCLIBC_TOOLS_VERSION, or on ISA_CPU+RELEASE_NAME.
+# Probably that stuff should be centralized is some better way or uClibc
+# configure procedures should take version string as an argument.
+if [ $ISA_CPU = arc700 ]
+then
+    UCLIBC_TOOLS_VERSION="ARCompact ISA Linux uClibc toolchain $RELEASE_NAME"
+else
+    UCLIBC_TOOLS_VERSION="ARCv2 ISA Linux uClibc toolchain $RELEASE_NAME"
+fi
+
 # Standard setup
 . "${ARC_GNU}/toolchain/arc-init.sh"
 
@@ -783,6 +795,7 @@ export NPTL_SUPPORT
 export CHECKOUT_CONFIG
 # Used by configure funcs in arc-init.sh
 export TOOLCHAIN_HOST
+export UCLIBC_TOOLS_VERSION
 
 # Set up a logfile
 logfile="${LOGDIR}/all-build-$(date -u +%F-%H%M).log"

build-uclibc.sh

@@ -188,13 +188,6 @@ fi
 arch=arc
 triplet=${arche}-snps-linux-uclibc
 
-if [ $ISA_CPU = arc700 ]
-then
-    version_str="ARCompact ISA Linux uClibc toolchain $RELEASE_NAME"
-else
-    version_str="ARCv2 ISA Linux uClibc toolchain $RELEASE_NAME"
-fi
-
 # Set up a logfile
 logfile="${LOGDIR}/uclibc-build-$(date -u +%F-%H%M).log"
 rm -f "${logfile}"