summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2007-06-21 23:41:35 +0000
committer Eric Hameleers <alien@slackware.com>2007-06-21 23:41:35 +0000
commit18aaeb3010b1e939b7739bebfa5958b8de09004b (patch)
treedd8820b9771499325b045c9e48df0eb3d1f124aa
parentd329d121cfc9a13615a5dfbe2a1a291eb5d55abc (diff)
downloadasb-18aaeb3010b1e939b7739bebfa5958b8de09004b.tar.gz
asb-18aaeb3010b1e939b7739bebfa5958b8de09004b.tar.xz
This time, really apply the patch to get rid of log() compile errors,
by renaming the log() function to logmsg(). The previous patch came from AltLinux and is an enhancement
-rwxr-xr-xlp_server/build/lp_server.SlackBuild4
1 files changed, 3 insertions, 1 deletions
diff --git a/lp_server/build/lp_server.SlackBuild b/lp_server/build/lp_server.SlackBuild
index 3c632a56..be08744e 100755
--- a/lp_server/build/lp_server.SlackBuild
+++ b/lp_server/build/lp_server.SlackBuild
@@ -147,8 +147,10 @@ elif `file ${SOURCE} | grep -q ": gzip"`; then
fi
cd ${PRGNAM}-${VERSION}
# Patch for gcc4:
-patch -p0 < $SRCDIR/${PRGNAM}-${VERSION}.patch \
+patch -p0 -b -z .log < $SRCDIR/${PRGNAM}-${VERSION}_log.patch \
2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+patch -p0 -b -z .alt < $SRCDIR/${PRGNAM}-${VERSION}_alt.patch \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
chown -R root:root .
chmod -R u+w,go+r-w,a-s .