From ad91ba674fbf14a7ac08df0bc897617fe2c0623f Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Sat, 2 Aug 2003 14:39:17 +0000 Subject: [PATCH] some initial cleanups - but some debugging is still turned on ... git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@976 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- .../base/binutils-cross/binutils-cross.conf | 3 --- package/base/gcc3-cross/cross.conf | 20 +++++++++++++++++++ package/base/gcc3-cross/gcc3-cross.conf | 3 --- package/base/glibc23-cross/glibc23-cross.conf | 2 -- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/package/base/binutils-cross/binutils-cross.conf b/package/base/binutils-cross/binutils-cross.conf index 10b614e71..c9b317d11 100644 --- a/package/base/binutils-cross/binutils-cross.conf +++ b/package/base/binutils-cross/binutils-cross.conf @@ -23,9 +23,6 @@ # include the cross configuration . $base/package/base/gcc3-cross/cross.conf -srctar="$realpkg-$ver.tar.bz2" -patchfiles="$base/package/$repository/$realpkg/*.patch" - # always append the cross arch as program prefix var_append confopt " " "--program-prefix=${arch_target}-" diff --git a/package/base/gcc3-cross/cross.conf b/package/base/gcc3-cross/cross.conf index 4b35d56fd..83323e280 100644 --- a/package/base/gcc3-cross/cross.conf +++ b/package/base/gcc3-cross/cross.conf @@ -1,4 +1,6 @@ +# common prefix + if [ $prefix_auto = 1 ] ; then if [ "$ROCKCFG_CROSS_PREFIX" ] ; then prefix="$ROCKCFG_CROSS_PREFIX" @@ -12,6 +14,24 @@ set_confopt archdir="${archdir/-cross/}" realpkg="${pkg/-cross/}" +# real package's download files +set -x +tag=D +tagdata="`egrep "^\[($tag)\]" $base/package/$repository/$realpkg/$realpkg.desc | \ + cut -f2- -d']' | sed 's,^ ,,'`" +tag="`echo $tag | cut -f1 -d'|' | tr - _`" +eval "desc_$tag=\"\$tagdata\"" + +# detect patch files ... + +patchfiles="$base/package/$repository/${pkg/-cross/}/*.patch" + +for x in $patchfiles ; do + [ -e $x ] || var_remove patchfiles $x +done + +set +x + #arch=sparc64 arch_machine="sparc64" arch_target="sparc64-unknown-linux-gnu" diff --git a/package/base/gcc3-cross/gcc3-cross.conf b/package/base/gcc3-cross/gcc3-cross.conf index e0f64810d..86adef604 100644 --- a/package/base/gcc3-cross/gcc3-cross.conf +++ b/package/base/gcc3-cross/gcc3-cross.conf @@ -27,9 +27,6 @@ confopt="--preifx=$root/$prefix --target=\$arch_target --host=\$arch_build \ --disable-nls" -patchfiles="$base/package/$repository/$realpkg/*.patch" -srctar="gcc-$ver.tar.bz2" # no $realpkg since it includes a version ... - # do the same as gcc3 . $base/package/base/gcc3/gcc3.conf diff --git a/package/base/glibc23-cross/glibc23-cross.conf b/package/base/glibc23-cross/glibc23-cross.conf index 1c7b51990..0aa8a6836 100644 --- a/package/base/glibc23-cross/glibc23-cross.conf +++ b/package/base/glibc23-cross/glibc23-cross.conf @@ -23,8 +23,6 @@ # include the cross configuration . $base/package/base/gcc3-cross/cross.conf -patchfiles="$base/package/$repository/${pkg/-cross/}/*.patch" - # include the functions the glibc23 package provides ... . $base/package/base/glibc23/glibc23.conf