diff --git a/dev-libs/log4cxx/log4cxx-0.10.0_20180322.recipe b/dev-libs/log4cxx/log4cxx-1.3.1.recipe similarity index 66% rename from dev-libs/log4cxx/log4cxx-0.10.0_20180322.recipe rename to dev-libs/log4cxx/log4cxx-1.3.1.recipe index fbfad29b6..71b82aaa6 100644 --- a/dev-libs/log4cxx/log4cxx-0.10.0_20180322.recipe +++ b/dev-libs/log4cxx/log4cxx-1.3.1.recipe @@ -4,19 +4,18 @@ log messages in a variety of formats to the local console, local files, \ streamed over a socket or even launch an email based on a hierarchy of \ notification levels." HOMEPAGE="https://logging.apache.org/log4cxx/latest_stable/index.html" -COPYRIGHT="2004-2007 The Apache Software Foundation" +COPYRIGHT="2004-20023 The Apache Software Foundation" LICENSE="Apache v2" -REVISION="2" -srcGitRev="5f825186936a1876f92b88b371334ff26e997287" -SOURCE_URI="https://github.com/apache/logging-log4cxx/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="763b07c7a487ff2c42d0e82f7c3fd598083d08dc9f5d8652990295a87d99ddb2" -SOURCE_FILENAME="log4cxx-$portVersion-$srcGitRev.tar.gz" -SOURCE_DIR="logging-log4cxx-$srcGitRev" +REVISION="1" +SOURCE_URI="https://dlcdn.apache.org/logging/log4cxx/$portVersion/apache-log4cxx-$portVersion.tar.gz" +CHECKSUM_SHA256="2c4073c0613af7f59a75d8f26365dc6f5b07a22b9636ee5c5f7bfa9771a2c1d0" +#SOURCE_FILENAME="log4cxx-$portVersion-$srcGitRev.tar.gz" +SOURCE_DIR="apache-log4cxx-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="10.0.0" +libVersion="15.3.1" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -49,34 +48,37 @@ BUILD_REQUIRES=" devel:libxml2$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:autoreconf + cmd:cmake cmd:gcc$secondaryArchSuffix cmd:libtoolize$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:zip " -defineDebugInfoPackage log4cxx$secondaryArchSuffix \ - $libDir/liblog4cxx.so.$libVersion - BUILD() { - ./autogen.sh - runConfigure ./configure --disable-static - make $jobArgs + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DBUILD_TESTING=OFF + + make -C build $jobArgs } INSTALL() { - make install + make -C build install - rm $libDir/lib*.la - - prepareInstalledDevelLibs liblog4cxx + prepareInstalledDevelLib \ + liblog4cxx fixPkgconfig - packageEntries devel $developDir + + packageEntries devel \ + $developDir \ + $libDir/cmake } TEST() { - make check + ctest --test-dir build --output-on-failure }