Merge pull request #14357 from acowley/log4cxx
log4cxx: darwin compatibility
This commit is contained in:
commit
f1beff232d
|
@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
|
||||||
}' src/examples/cpp/console.cpp \
|
}' src/examples/cpp/console.cpp \
|
||||||
src/main/cpp/inputstreamreader.cpp \
|
src/main/cpp/inputstreamreader.cpp \
|
||||||
src/main/cpp/socketoutputstream.cpp
|
src/main/cpp/socketoutputstream.cpp
|
||||||
|
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
|
sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h
|
||||||
|
sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat];
|
buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat];
|
||||||
|
|
Loading…
Reference in a new issue