diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 6cd6f738b..bbc750304 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -1,4 +1,10 @@ +*) 2003-11-10 (2.0.0-rc2 - 2.0.0-rc3) + + - Clifford Wolf: added Check-Deps-3 and added a dependency-counter to + Create-ErrList + fixed bacterium_gui in bacterium package for newer gnu linker + *) 2003-11-09 (2.0.0-rc2 - 2.0.0-rc3) - fixed stage-9 horror by removing dstructive code from readline.conf diff --git a/package/clifford/bacterium/bacterium.conf b/package/clifford/bacterium/bacterium.conf index 857501d2a..9f84993a6 100644 --- a/package/clifford/bacterium/bacterium.conf +++ b/package/clifford/bacterium/bacterium.conf @@ -22,7 +22,8 @@ pkg_bacterium_main() { postmake="cp -r examples $docdir/" build_this_package - srctar="bacterium_gui-0.2.tar.bz2" build_this_package + srctar="bacterium_gui-0.2.tar.bz2" \ + patchfiles="$confdir/bacterium_gui.diff" build_this_package } mainfunction=pkg_bacterium_main diff --git a/package/clifford/bacterium/bacterium_gui.diff b/package/clifford/bacterium/bacterium_gui.diff new file mode 100644 index 000000000..bb8a39de3 --- /dev/null +++ b/package/clifford/bacterium/bacterium_gui.diff @@ -0,0 +1,13 @@ +--- ./Makefile.orig 2003-11-09 13:50:16.061560752 +0100 ++++ ./Makefile 2003-11-09 13:51:45.827914192 +0100 +@@ -7,6 +7,10 @@ + + all: bacterium_ffd bacterium_gui + ++# place -lncurses after bacterium_ffd.c ++bacterium_ffd: bacterium_ffd.c ++ $(CC) -Wall bacterium_ffd.c -lncurses -o bacterium_ffd ++ + bacterium_gui: bacterium_gui.sh + sed 's,./\(bacterium_ffd\),\1,' < bacterium_gui.sh > bacterium_gui + chmod +x bacterium_gui diff --git a/scripts/Check-Deps-3 b/scripts/Check-Deps-3 new file mode 100644 index 000000000..16611d89a --- /dev/null +++ b/scripts/Check-Deps-3 @@ -0,0 +1,74 @@ +#!/usr/bin/gawk -f +# +# --- 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/scripts/Check-Deps-3 +# ROCK Linux is Copyright (C) 1998 - 2003 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 http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +function check_package() { + split(pkgline, a); + package = a[5]; + + if ( package == ARGV[2] ) running = 1; + + if ( ! running ) return; + if ( ! index(a[2], stagelevel) ) return; + + split(depdb[package], a); + for (c=1; a[c] != ""; c++) { + if ( a[c] == package ) continue; + if ( broken[a[c]] ) { + print "[" stagelevel "] package " \ + package " depends on " a[c]; + broken[package]=1; + } + } +} + +BEGIN { + if ( ! ARGV[3] ) { + print "Usage: ./scripts/Check-Dep-3 " \ + " "; + exit 1; + } + + running = 0; + broken[ARGV[2]] = 1; + + while ( (getline depline < "scripts/dep_db.txt") > 0 ) { + p=depline; sub(":.*", "", p); + d=depline; sub("^[^ ] [^ ] [^ ] ", "", d); + depdb[p] = d; + } + + for (stagelevel=ARGV[1]; stagelevel<=9; stagelevel++) { + while ( (getline pkgline < ARGV[3]) > 0 ) { + check_package(); + } + close(ARGV[3]); + } + + if ( ! running ) { + print "Package " ARGV[2] " not found!"; + exit 1; + } + exit 0; +} + diff --git a/scripts/Create-ErrList b/scripts/Create-ErrList index 6eba4eeca..83319940c 100755 --- a/scripts/Create-ErrList +++ b/scripts/Create-ErrList @@ -211,7 +211,11 @@ for stagelevel in $( echo $stages | tr -d '[]' | sed 's,.,& ,g' ) ; do if [ $this_is_error = 1 ] ; then if [ $showerr = 0 ] ; then - echo "[$stagelevel] ${tree:0:15}/${pkg:0:20}" + d=$( ./scripts/Check-Deps-3 $stagelevel \ + $pkg config/$config/packages | \ + cut -f3 -d' ' | sort -u | wc -l ) + d="$( printf "%3d" $d )" + echo "[$stagelevel] $d ${tree:0:13}/${pkg:0:18}" else echo ; echo "== $stagelevel-$pkg.err ==" tail -20 "$logdir/$stagelevel-$pkg.err" | \