diff options
| author | Daniel Russel | 2013-10-30 11:59:31 -0700 |
|---|---|---|
| committer | Jack Nagel | 2013-11-07 09:33:39 -0600 |
| commit | 5923bb33f923c7a5fdf841912dbc4ca518af2407 (patch) | |
| tree | 18d14f8c60f51177f27dc4c54f748100ea5789db /Library/Formula | |
| parent | c7e1c3d0a09901e62ef11c48e9620a19032d001b (diff) | |
| download | homebrew-5923bb33f923c7a5fdf841912dbc4ca518af2407.tar.bz2 | |
log4cxx: patch to fix compilation on 10.9
Fixes #23744.
Closes #23798.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/log4cxx.rb | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/Library/Formula/log4cxx.rb b/Library/Formula/log4cxx.rb index b516b3f56..7de0ff5b7 100644 --- a/Library/Formula/log4cxx.rb +++ b/Library/Formula/log4cxx.rb @@ -15,6 +15,11 @@ class Log4cxx < Formula cause "Fails with 'collect2: ld terminated with signal 11 [Segmentation fault]'" end + # Incorporated upstream, remove on next version update + # https://issues.apache.org/jira/browse/LOGCXX-404 + # https://issues.apache.org/jira/browse/LOGCXX-417 + def patches; DATA; end + def install ENV.universal_binary if build.universal? ENV.O2 # Using -Os causes build failures on Snow Leopard. @@ -30,3 +35,26 @@ class Log4cxx < Formula system "make install" end end +__END__ +--- a/src/main/include/log4cxx/helpers/simpledateformat.h ++++ b/src/main/include/log4cxx/helpers/simpledateformat.h +@@ -27,10 +27,9 @@ + + #include <log4cxx/helpers/dateformat.h> + #include <vector> ++#include <locale> + #include <time.h> + +-namespace std { class locale; } +- + namespace log4cxx + { + namespace helpers +--- a/src/main/cpp/stringhelper.cpp ++++ b/src/main/cpp/stringhelper.cpp +@@ -28,6 +28,7 @@ + #endif + #include <log4cxx/private/log4cxx_private.h> + #include <cctype> ++#include <cstdlib> + #include <apr.h> |