commit c7d9a623dbc7302c1a46edfa8c1eaa1c75bdf8ba
parent a2778d5216e83917b0e2ce1aab3e1cb3336a126f
Author: aabacchus <ben@bvnf.space>
Date: Wed, 8 Sep 2021 02:02:27 +0100
log4cxx: 0.12.0
This reverts commit 0f0382ca9a73a57f82dc9551cf2a988f656cb303.
Diffstat:
6 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ log4cxx 0.12.0 has been released upstream, including some changes to the version
of C++ being used, and MiKTeX's build is currently incompatible with it (see the
[issue upstream]).
Therefore, log4cxx has not been updated (yet).
+**This seems to be fixed now. log4cxx has been updated and it all builds for me.**
### gettext-tiny
This package of MiKTeX now uses [gettext-tiny] instead of gettext. This is much
diff --git a/log4cxx/build b/log4cxx/build
@@ -1,7 +1,15 @@
#!/bin/sh -e
-./autogen.sh
-./configure --prefix=/usr
+export DESTDIR="$1"
+cmake -B build \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_TESTING=off
-make
-make DESTDIR="$1" install
+cmake --build build
+cmake --install build
+
+# correct location of cmake and pkgconfig files
+mv "$1/usr/share/cmake" "$1/usr/share/pkgconfig" \
+ "$1/usr/lib/"
+rmdir "$1/usr/share/"
diff --git a/log4cxx/checksums b/log4cxx/checksums
@@ -1 +1 @@
-c316705ee3c4e5b919d3561d5f305162d21687aa6ae1f31f02f6cdadc958b393
+bd5b5009ca914c8fa7944b92ea6b4ca6fb7d146f65d526f21bf8b3c6a0520e44
diff --git a/log4cxx/depends b/log4cxx/depends
@@ -1,7 +1,5 @@
apr
apr-util
-autoconf make
-automake make
+cmake make
expat
-libtool make
util-linux
diff --git a/log4cxx/sources b/log4cxx/sources
@@ -1 +1 @@
-https://archive.apache.org/dist/logging/log4cxx/0.11.0/apache-log4cxx-0.11.0.tar.gz
+https://apache.mirrors.nublue.co.uk/logging/log4cxx/0.12.0/apache-log4cxx-0.12.0.tar.gz
diff --git a/log4cxx/version b/log4cxx/version
@@ -1 +1 @@
-0.11.0 1
+0.12.0 1
