diff --git a/common/shlibs b/common/shlibs index 1ea3584ce11..4ff73dace83 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2415,7 +2415,7 @@ libtermkey.so.1 libtermkey-0.17_1 libicu4lua.so.0 icu4lua-0.2B_1 libKF5I18n.so.5 ki18n-5.26.0_1 libKF5I18nLocaleData.so.5 ki18n-5.88.0_1 -libglog.so.0 glog-0.3.4_1 +libglog.so.1 glog-0.6.0_1 libzita-convolver.so.4 zita-convolver-4.0.3_1 libzita-alsa-pcmi.so.0 zita-alsa-pcmi-0.2.0_1 libpugixml.so.1 pugixml-1.6_1 diff --git a/srcpkgs/glog-doc b/srcpkgs/glog-doc deleted file mode 120000 index b3051bde1a4..00000000000 --- a/srcpkgs/glog-doc +++ /dev/null @@ -1 +0,0 @@ -glog \ No newline at end of file diff --git a/srcpkgs/glog/template b/srcpkgs/glog/template index 8c1d1af9357..a85b560fcb1 100644 --- a/srcpkgs/glog/template +++ b/srcpkgs/glog/template @@ -1,14 +1,21 @@ # Template file for 'glog' pkgname=glog -version=0.3.5 -revision=3 -build_style=gnu-configure +version=0.6.0 +revision=1 +build_style=cmake +makedepends="gflags-devel libunwind-devel" +checkdepends="gtest-devel" short_desc="Logging library for C++" -maintainer="John Regan " +maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/google/glog" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=7580e408a2c0b5a89ca214739978ce6ff480b5e7d8d7698a2aa92fadc484d1e0 +distfiles="https://github.com/google/glog/archive/v${version}.tar.gz" +checksum=8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6 + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" libucontext-devel" + configure_args+=" -DPRINT_UNSYMBOLIZED_STACK_TRACES=OFF" +fi post_install() { vlicense COPYING @@ -16,18 +23,12 @@ post_install() { glog-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} gflags-devel" pkg_install() { vmove usr/include - vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/lib/pkgconfig - } -} - -glog-doc_package() { - short_desc+=" - documentation" - pkg_install() { - vmove usr/share/doc + vmove usr/lib/cmake + vmove usr/share/glog/cmake } }