diff options
| author | Achmad Fathoni | 2022-05-13 18:47:25 +0700 |
|---|---|---|
| committer | Achmad Fathoni | 2022-05-13 18:47:25 +0700 |
| commit | 87e39fd738b256058449e2485281507f8c49fccb (patch) | |
| tree | f04f00249988e179e0db40d0570caac24e7d6449 | |
| parent | 6b60a4adb6c8a014a465b3dc70ab7cf1eb56f0c0 (diff) | |
| download | aur-87e39fd738b256058449e2485281507f8c49fccb.tar.gz | |
Back to log4cxx backend with proper patch
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
2 files changed, 9 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = ros-noetic-rosconsole pkgdesc = ROS - ROS console output library. pkgver = 1.14.3 - pkgrel = 6 + pkgrel = 7 url = https://wiki.ros.org/rosconsole arch = i686 arch = x86_64 @@ -15,7 +15,7 @@ pkgbase = ros-noetic-rosconsole makedepends = ros-noetic-cpp-common makedepends = ros-noetic-rosunit makedepends = ros-noetic-catkin - makedepends = google-glog + makedepends = log4cxx makedepends = boost depends = ros-noetic-rostime depends = ros-noetic-cpp-common @@ -24,7 +24,7 @@ pkgbase = ros-noetic-rosconsole depends = apr-util depends = google-glog source = ros-noetic-rosconsole-1.14.3.tar.gz::https://github.com/ros/rosconsole/archive/1.14.3.tar.gz - source = https://github.com/ros/rosconsole/pull/51.patch + source = https://github.com/ros/rosconsole/pull/54.patch sha256sums = 0b2cbc4f9a92466c0fbae7863482b286ef87692de4941527cb429e6c74639246 sha256sums = SKIP @@ -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=6 +pkgrel=7 license=('BSD') ros_makedepends=( @@ -18,7 +18,7 @@ makedepends=( cmake ros-build-tools ${ros_makedepends[@]} - google-glog + log4cxx boost ) @@ -37,12 +37,13 @@ depends=( _dir="rosconsole-${pkgver}/" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros/rosconsole/archive/${pkgver}.tar.gz" - "https://github.com/ros/rosconsole/pull/51.patch") + "https://github.com/ros/rosconsole/pull/54.patch") sha256sums=('0b2cbc4f9a92466c0fbae7863482b286ef87692de4941527cb429e6c74639246' 'SKIP') prepare() { cd "$_dir" - patch --forward --strip=1 --input="${srcdir}/51.patch" + #This patch is only for log4cxx + patch --forward --strip=1 --input="${srcdir}/54.patch" } build() { @@ -60,7 +61,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \ -DPYTHON_EXECUTABLE=/usr/bin/python \ -DSETUPTOOLS_DEB_LAYOUT=OFF \ - -DROSCONSOLE_BACKEND=glog #log4cxx/glog/print, for now log4cxx is broken + -DROSCONSOLE_BACKEND=log4cxx #log4cxx/glog/print make } |