summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD17
1 files changed, 5 insertions, 12 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 1e4aa5940ac7..1db6ca182609 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=7
+pkgrel=8
license=('BSD')
ros_makedepends=(
@@ -31,19 +31,12 @@ depends=(
${ros_depends[@]}
apr
apr-util
- log4cxx
+ google-glog
)
_dir="rosconsole-${pkgver}/"
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/rosconsole/archive/${pkgver}.tar.gz"
- "https://github.com/ros/rosconsole/pull/54.patch")
-sha256sums=('0b2cbc4f9a92466c0fbae7863482b286ef87692de4941527cb429e6c74639246'
- 'SKIP')
-prepare() {
- cd "$_dir"
- #This patch is only for log4cxx
- patch --forward --strip=1 --input="${srcdir}/54.patch"
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/rosconsole/archive/${pkgver}.tar.gz")
+sha256sums=('0b2cbc4f9a92466c0fbae7863482b286ef87692de4941527cb429e6c74639246')
build() {
# Use ROS environment variables.
@@ -60,7 +53,7 @@ build() {
-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-DPYTHON_EXECUTABLE=/usr/bin/python \
-DSETUPTOOLS_DEB_LAYOUT=OFF \
- -DROSCONSOLE_BACKEND=log4cxx #log4cxx/glog/print
+ -DROSCONSOLE_BACKEND=glog #log4cxx/glog/print
make
}