Skip to content

Commit

Permalink
apache-log4cxx: Removed SOURCE1 from DETAILS.
Browse files Browse the repository at this point in the history
Future releases of lunar will drop support for SOURCE1.
  • Loading branch information
cavalier38 committed Sep 24, 2013
1 parent ef64fb1 commit 1dfac2e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 19 deletions.
22 changes: 6 additions & 16 deletions web/apache-log4cxx/BUILD
@@ -1,17 +1,7 @@
(
if in_depends $MODULE libiodbc; then
LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/libiodbc"
else
LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/"
fi &&

patch_it $SOURCE_CCACHE/$SOURCE1 0 &&

sed -i "22i #include <cstring>" src/main/cpp/socketoutputstream.cpp src/examples/cpp/console.cpp &&
sed -i "22i #include <cstdio>" src/examples/cpp/console.cpp &&
sed -i "22i #include <string.h>" src/main/cpp/inputstreamreader.cpp src/main/cpp/socketoutputstream.cpp &&

if in_depends $MODULE libiodbc; then
LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/libiodbc"
else
LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/"
fi &&

default_build

) > $C_FIFO 2>&1
default_build
6 changes: 3 additions & 3 deletions web/apache-log4cxx/DETAILS
@@ -1,12 +1,12 @@
MODULE=apache-log4cxx
VERSION=0.10.0
SOURCE=$MODULE-$VERSION.tar.gz
SOURCE1=log4cxx-$VERSION-unixODBC.patch
SOURCE2=log4cxx-$VERSION-unixODBC.patch
# SOURCE_URL=http://mirror.candidhosting.com/pub/apache/logging/log4cxx/$VERSION/
SOURCE_URL=http://apache.cs.utah.edu/logging/log4cxx/$VERSION/
SOURCE1_URL=$PATCH_URL
SOURCE2_URL=$PATCH_URL
SOURCE_VFY=sha1:d79c053e8ac90f66c5e873b712bb359fd42b648d
SOURCE1_VFY=sha1:65769e23a384f01b8f2ebf915f0e055150d55cb6
SOURCE2_VFY=sha1:65769e23a384f01b8f2ebf915f0e055150d55cb6
WEB_SITE=http://logging.apache.org/log4cxx/index.html
ENTERED=20100321
UPDATED=20100321
Expand Down
7 changes: 7 additions & 0 deletions web/apache-log4cxx/PRE_BUILD
@@ -0,0 +1,7 @@
default_pre_build &&

patch_it $SOURCE2 0 &&

sedit "22i #include <cstring>" src/main/cpp/socketoutputstream.cpp src/examples/cpp/console.cpp &&
sedit "22i #include <cstdio>" src/examples/cpp/console.cpp &&
sedit "22i #include <string.h>" src/main/cpp/inputstreamreader.cpp src/main/cpp/socketoutputstream.cpp

0 comments on commit 1dfac2e

Please sign in to comment.