diff --git a/common/shlibs b/common/shlibs index 48770869300..bba9a0eb193 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3970,3 +3970,4 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1 libwayland-egl++.so.0 libwaylandpp-0.2.8_1 libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1 +libspdlog.so.1 libspdlog-1.8.2_2 diff --git a/srcpkgs/libspdlog b/srcpkgs/libspdlog new file mode 120000 index 00000000000..b624c8477e8 --- /dev/null +++ b/srcpkgs/libspdlog @@ -0,0 +1 @@ +spdlog \ No newline at end of file diff --git a/srcpkgs/spdlog/patches/fix-pkgconfig.patch b/srcpkgs/spdlog/patches/fix-pkgconfig.patch new file mode 100644 index 00000000000..99c8b7ff106 --- /dev/null +++ b/srcpkgs/spdlog/patches/fix-pkgconfig.patch @@ -0,0 +1,12 @@ +Index: spdlog-1.8.2/cmake/spdlog.pc.in +=================================================================== +--- spdlog-1.8.2.orig/cmake/spdlog.pc.in ++++ spdlog-1.8.2/cmake/spdlog.pc.in +@@ -8,6 +8,6 @@ Description: Fast C++ logging library. + URL: https://github.com/gabime/@PROJECT_NAME@ + Version: @SPDLOG_VERSION@ + CFlags: -I${includedir} @PKG_CONFIG_DEFINES@ +-Libs: -L${libdir} -lspdlog -pthread ++Libs: -L${libdir} -lspdlog -lfmt -pthread + Requires: @PKG_CONFIG_REQUIRES@ + diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template index 2a8e1c9e8f1..ecf3e97a14c 100644 --- a/srcpkgs/spdlog/template +++ b/srcpkgs/spdlog/template @@ -1,22 +1,29 @@ # Template file for 'spdlog' pkgname=spdlog version=1.8.2 -revision=1 +revision=2 build_style=cmake -configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON" +configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON + -DSPDLOG_BUILD_SHARED=ON" hostmakedepends="pkg-config" makedepends="fmt-devel" +depends="libspdlog>=${version}_${revision} fmt-devel" short_desc="Fast C++ logging library" maintainer="Orphaned " license="MIT" homepage="https://github.com/gabime/spdlog" distfiles="https://github.com/gabime/spdlog/archive/v${version}.tar.gz" checksum=e20e6bd8f57e866eaf25a5417f0a38a116e537f1a77ac7b5409ca2b180cec0d5 +patch_args=-Np1 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DSPDLOG_BUILD_TESTS_HO=ON" fi -post_install() { - vlicense LICENSE +libspdlog_package() { + short_desc+=" - libraries" + pkg_install() { + vmove "usr/lib/*.so.*" + vlicense LICENSE + } }