diff options
| author | Tony Theodore <tonyt@logyst.com> | 2012-05-02 17:16:43 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2012-05-02 17:16:43 (GMT) |
| commit | 760d24e2c2e0a42a76fab102f7e9fb2e087ce7f2 (patch) | |
| tree | fde461ee417152fa93e81c66a69fc007e739f861 /src | |
| parent | 2e14768ff2931730f1e84eff1ee5a5ee28b44235 (diff) | |
| parent | 03e3e411ac2a25378201a10b20688e6589519ef7 (diff) | |
| download | mxe-760d24e2c2e0a42a76fab102f7e9fb2e087ce7f2.zip mxe-760d24e2c2e0a42a76fab102f7e9fb2e087ce7f2.tar.gz mxe-760d24e2c2e0a42a76fab102f7e9fb2e087ce7f2.tar.bz2 | |
Merge pull request #31 from yujinrobot/master
Minor updates to the apr/log4cxx packages
Diffstat (limited to 'src')
| -rw-r--r-- | src/log4cxx-2-pkgconfig.patch | 4 | ||||
| -rw-r--r-- | src/log4cxx-4-mingw.definitions.patch | 4 | ||||
| -rw-r--r-- | src/log4cxx-5-cmake.patch | 14 | ||||
| -rw-r--r-- | src/log4cxx.mk | 2 |
4 files changed, 22 insertions, 2 deletions
diff --git a/src/log4cxx-2-pkgconfig.patch b/src/log4cxx-2-pkgconfig.patch index d6b479e..f86d360 100644 --- a/src/log4cxx-2-pkgconfig.patch +++ b/src/log4cxx-2-pkgconfig.patch @@ -2,7 +2,9 @@ This file is part of MXE. See index.html for further information. This patch ensures that the correct dependencies can always be found for -static mingw builds. Not yet submitted upstream. +static mingw builds. Submitted upstream: + + https://issues.apache.org/jira/browse/LOGCXX-381 diff -NBaur vanilla/liblog4cxx.pc.in mingw_cross/liblog4cxx.pc.in --- vanilla/liblog4cxx.pc.in 2008-04-01 07:34:52.000000000 +0900 diff --git a/src/log4cxx-4-mingw.definitions.patch b/src/log4cxx-4-mingw.definitions.patch index 584256c..3022926 100644 --- a/src/log4cxx-4-mingw.definitions.patch +++ b/src/log4cxx-4-mingw.definitions.patch @@ -3,7 +3,9 @@ See index.html for further information. Fixes a problem with the mismatched calling conventions in apr and log4cxx. See http://www.mail-archive.com/log4cxx-user@logging.apache.org/msg02671.html -Not yet submitted upstream. +Submitted upstream: + + https://issues.apache.org/jira/browse/LOGCXX-382 diff -NBaur vanilla/src/main/include/log4cxx/helpers/thread.h mingw_cross/src/main/include/log4cxx/helpers/thread.h --- vanilla/src/main/include/log4cxx/helpers/thread.h 2008-04-01 07:34:26.000000000 +0900 diff --git a/src/log4cxx-5-cmake.patch b/src/log4cxx-5-cmake.patch new file mode 100644 index 0000000..f1ce0f6 --- /dev/null +++ b/src/log4cxx-5-cmake.patch @@ -0,0 +1,14 @@ +diff -NBaur vanilla/log4cxx-config.cmake mingw_cross/log4cxx-config.cmake +--- vanilla/log4cxx-config.cmake 1970-01-01 09:00:00.000000000 +0900 ++++ mingw_cross/log4cxx-config.cmake 2012-03-14 15:29:54.706247316 +0900 +@@ -0,0 +1,10 @@ ++ ++set(LOG4CXX_VERSION 0.10.0) ++ ++get_filename_component(LOG4CXX_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) ++ ++set(LOG4CXX_INCLUDE_DIR "${LOG4CXX_CMAKE_DIR}/../../../include" CACHE FILEPATH "Log4cxx include directory") ++set(LOG4CXX_INCLUDE_DIRS "${LOG4CXX_INCLUDE_DIR}") ++set(LOG4CXX_LIBRARY_DIRS "${LOG4CXX_CMAKE_DIR}/../../../lib") ++set(LOG4CXX_LIBRARIES "log4cxx;aprutil-1;iconv;expat;apr-1;rpcrt4;shell32;ws2_32;advapi32;kernel32;msvcrt") ++ diff --git a/src/log4cxx.mk b/src/log4cxx.mk index d1a10ab..656c03d 100644 --- a/src/log4cxx.mk +++ b/src/log4cxx.mk @@ -27,6 +27,8 @@ define $(PKG)_BUILD CFLAGS=-D_WIN32_WINNT=0x0500 \ CXXFLAGS=-D_WIN32_WINNT=0x0500 $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= + mkdir -p $(PREFIX)/$(TARGET)/share/cmake/log4cxx + cp $(1)/log4cxx-config.cmake $(PREFIX)/$(TARGET)/share/cmake/log4cxx/log4cxx-config.cmake '$(TARGET)-g++' \ -W -Wall -Werror -ansi -pedantic \ |