Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 17 years ago
parent
commit
9d299644e9
5 changed files with 16 additions and 19 deletions
  1. +4
    -4
      scripts/Build-Pkg
  2. +2
    -2
      scripts/Build-Target
  3. +2
    -0
      scripts/Build-Tools
  4. +0
    -8
      scripts/Check-System
  5. +8
    -5
      scripts/functions

+ 4
- 4
scripts/Build-Pkg

@ -846,11 +846,11 @@ exec 202>&1
# Create PID file
#
# The builtin-variable '$$' is not this pid because this proc
# The builtin variable '$$' is not this pid because this proc
# is just a sub-proc of $$. That's why the $builddir/strace.tmp
# hack is required to get the right pid to trace.
#
# We also conntect filedescriptor 3 with the pid file. So the command
# We also connect file descriptor 3 with the pid file. So the command
# 'fuser' can be used to create a list of all processes which are part
# of this build process.
#
@ -1032,7 +1032,7 @@ exec 202>&1
echo "Calculating run-time package dependencies from pkg-config files..."
grep "\.pc$" "$builddir/flist.split" | while read dummy x ; do
x="/$x"
x="$root/$x"
# Only three tags are of interest here. Version: is mandatory.
version="`grep -e"^Version:" $x | cut -f2- -d' '`"
@ -1070,7 +1070,7 @@ exec 202>&1
echo "<$spkg> Calculating run-time package dependencies from ELF files..."
grep "^$spkg: " "$builddir/flist.split" | while read dummy x ; do
x="/$x"
x="$root/$x"
# Symbolic links (to ELF files) and non-regular files
# are ignored.

+ 2
- 2
scripts/Build-Target

@ -237,8 +237,8 @@ fi
sleep 2; rm -rf $qdir
else
if [ "$build_only_this_job" ] ; then
rm -f "${build_root}"/var/adm/logs/${build_only_this_job}.log"
rm -f "${build_root}"/var/adm/logs/${build_only_this_job}.err"
rm -f "${build_root}"/var/adm/logs/${build_only_this_job}.log
rm -f "${build_root}"/var/adm/logs/${build_only_this_job}.err
next="$( awk 'BEGIN { FS=" "; }
$0 ~ /[ =]'${build_only_this_job#*-}' / && \
$2 ~ /'${build_only_this_job%%-*}'/ \

+ 2
- 0
scripts/Build-Tools

@ -178,6 +178,8 @@ if [ ! -f build/$ROCKCFG_ID/ROCK/$toolsdir/.lastupdate ] ; then
echo -n "${z}\$${y}_WRAPPER_FILTER"; z="|"
done ; echo '"'
echo '[ -z "$CMD_WRAPPER_MYPATH" ] && export CMD_WRAPPER_MYPATH="$( dirname "`type -p $0`"; )"'
echo -n 'exec cmd_wrapper $( basename $0 ) "$@"'
eval "outputfilter=\"\$${y}_WRAPPER_OUTPUTFILTER\""
[ -n "${outputfilter}" ] && echo -n " | ${outputfilter}"

+ 0
- 8
scripts/Check-System

@ -82,14 +82,6 @@ if [ ! -L /dev/fd/0 ] ; then
found_error=1
fi
if [ -z "`type -p curl`" ] ; then
echo
echo "System Check: Program 'curl' not found!"
echo "The curl utility is needed for Downloading the package"
echo "source tars. Install the latest curl version."
found_error=1
fi
if [ -z "`type -p bzip2`" ] ; then
echo
echo "System Check: Program 'bzip2' not found!"

+ 8
- 5
scripts/functions

@ -252,7 +252,7 @@ set_confopt() {
# eval_config_command $( eval echo $confopt )
#
function eval_config_command() {
local config_command
local config_command x sub_scripts
for x in /usr/share/automake/*
do
@ -357,7 +357,7 @@ postflist_libs() {
#
parse_desc() {
local descfilename=$1 ; shift
local parser="$( which descparser )" tag tagdata
local parser="$( type -p descparser )" tag tagdata
[ -z "${parser}" ] && parser="$base/src/descparser"
if [ ! -x "${parser}" ] ; then
@ -776,12 +776,15 @@ build_this_package() {
#
hook_eval premake
if [ "$makeopt" ]
then eval "$MAKE $makeopt"; fi
then
eval echo "Running: $MAKE ${makeopt//\"/\\\"}"
eval "$MAKE $makeopt"; fi
hook_eval inmake
if [ "$makeinstopt" ]
then eval "$MAKE $makeinstopt"; fi
then
eval echo "Running: $MAKE ${makeinstopt//\"/\\\"}"
eval "$MAKE $makeinstopt"; fi
hook_eval postmake
fi
else
eval "$custmain"

Loading…
Cancel
Save