Author: jfrederic.clere(a)jboss.com
Date: 2007-12-11 09:40:47 -0500 (Tue, 11 Dec 2007)
New Revision: 1176
Modified:
trunk/build/unix/build.sh
trunk/build/unix/buildsrc.rhel-httpd.sh
Log:
Allow to build on HP-UX.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-11 14:06:50 UTC (rev 1175)
+++ trunk/build/unix/build.sh 2007-12-11 14:40:47 UTC (rev 1176)
@@ -132,6 +132,14 @@
echo "Using version ${build_version} from `basename ${package_list}`"
fi
+# Check for some gnu mandadory tools.
+patch=`util/find_gnu.sh patch`
+if [ "x" = "x${patch}" ]; then
+ patch=patch
+ echo "Warning missing gnu patch command"
+fi
+export patch
+
# Read apr and openssl version.
parg=`grep -v '^#' ${package_list} | grep "^$PACKAGE|" | grep
$build_version`
apr_version=`echo "${parg}" | ${awk} -F'|' '{print $3}'`
@@ -595,7 +603,7 @@
if [ -f $build_top/../patch/$DIR.patch ];
then
(cd $DIR
- patch -tfs -p0 -i $build_top/../patch/$DIR.patch
+ $patch -tfs -p0 -i $build_top/../patch/$DIR.patch
)
fi
}
Modified: trunk/build/unix/buildsrc.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 14:06:50 UTC (rev 1175)
+++ trunk/build/unix/buildsrc.rhel-httpd.sh 2007-12-11 14:40:47 UTC (rev 1176)
@@ -85,8 +85,8 @@
WHERE=${native_dist}/tools
mkdir -p ${WHERE}
grep "^%patch" ${rhel_loc}/httpd.spec | sed 's:%:@:' | sed 's: :@
:' | awk ' { print $1 " " $2 } ' > ${WHERE}/patch.cmd
-grep "^Patch" ${rhel_loc}/httpd.spec | sed 's:^Patch:@patch:' | sed
's/:/@/' | awk ' { print "s:" $1 ": patch -i @DIR@" $2
":" } ' > ${WHERE}/patch.files
-sed -f ${WHERE}/patch.files ${WHERE}/patch.cmd | sed "s:@DIR@:${rhel_loc}/:"
> ${WHERE}/patch.sh
+grep "^Patch" ${rhel_loc}/httpd.spec | sed 's:^Patch:@patch:' | sed
's/:/@/' | awk ' { print "s:" $1 ": @PATCH@ -i @DIR@" $2
":" } ' > ${WHERE}/patch.files
+sed -f ${WHERE}/patch.files ${WHERE}/patch.cmd | sed "s:@DIR@:${rhel_loc}/:" |
sed "s:@PATCH@:${patch}:" > ${WHERE}/patch.sh
#
# Remove linux specific patches.