summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAchmad Fathoni2021-08-15 15:56:02 +0700
committerAchmad Fathoni2021-08-15 15:56:02 +0700
commit8cb689abbabc930cbf0debaa5b00569fbe785efb (patch)
treebc02fc6b026e3576ae491978b2365f7dbfc0e603
parent7cd833eda3c4d9cb13fa52ec7b30e2222a225e5a (diff)
downloadaur-8cb689abbabc930cbf0debaa5b00569fbe785efb.tar.gz
Change backend to glog
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
2 files changed, 6 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 27aa1a4f46f0..abb95fad1a0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-noetic-rosconsole
pkgdesc = ROS - ROS console output library.
pkgver = 1.14.3
- pkgrel = 1
+ pkgrel = 2
url = https://wiki.ros.org/rosconsole
arch = i686
arch = x86_64
@@ -15,18 +15,14 @@ pkgbase = ros-noetic-rosconsole
makedepends = ros-noetic-cpp-common
makedepends = ros-noetic-rosunit
makedepends = ros-noetic-catkin
- makedepends = log4cxx
- makedepends = apr
+ makedepends = google-glog
makedepends = boost
- makedepends = apr-util
depends = ros-noetic-rostime
depends = ros-noetic-cpp-common
depends = ros-noetic-rosbuild
- depends = log4cxx
depends = apr
depends = apr-util
source = ros-noetic-rosconsole-1.14.3.tar.gz::https://github.com/ros/rosconsole/archive/1.14.3.tar.gz
sha256sums = 0b2cbc4f9a92466c0fbae7863482b286ef87692de4941527cb429e6c74639246
pkgname = ros-noetic-rosconsole
-
diff --git a/PKGBUILD b/PKGBUILD
index 8500bbfb51f4..703d09893dc7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ url='https://wiki.ros.org/rosconsole'
pkgname='ros-noetic-rosconsole'
pkgver='1.14.3'
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=1
+pkgrel=2
license=('BSD')
ros_makedepends=(
@@ -18,10 +18,8 @@ makedepends=(
cmake
ros-build-tools
${ros_makedepends[@]}
- log4cxx
- apr
+ google-glog
boost
- apr-util
)
ros_depends=(
@@ -32,7 +30,6 @@ ros_depends=(
depends=(
${ros_depends[@]}
- log4cxx
apr
apr-util
)
@@ -55,7 +52,8 @@ build() {
-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-DPYTHON_EXECUTABLE=/usr/bin/python \
- -DSETUPTOOLS_DEB_LAYOUT=OFF
+ -DSETUPTOOLS_DEB_LAYOUT=OFF \
+ -DROSCONSOLE_BACKEND=glog #log4cxx/glog/print, log4cxx 0.12.0 still broken
make
}