3.0.0-2: patched bear to use /usr/lib/bear

3 files changed, 70 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf005ae5181f..6f410f9816c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bear
 	pkgdesc = tool to generate compilation database for clang tooling
 	pkgver = 3.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/rizsotto/Bear
 	arch = i686
 	arch = x86_64
@@ -17,7 +17,9 @@ pkgbase = bear
 	conflicts = bear
 	options = !buildflags
 	source = Bear-3.0.0.tar.gz::https://github.com/rizsotto/Bear/archive/3.0.0.tar.gz
+	source = 00-libexec-fix.patch
 	sha256sums = 7b68aad69e887d945ad20f8e9f3a8c33cf2d59cc80da7e52d931d8c685fe2f79
+	sha256sums = a759e7b9d7e6b4e776fc224b62decda5460bd654e716ab9be39b55f56947e3a7
 
 pkgname = bear
 
diff --git a/00-libexec-fix.patch b/00-libexec-fix.patch
new file mode 100644
index 000000000000..dfb13fe037e0
--- /dev/null
+++ b/00-libexec-fix.patch
@@ -0,0 +1,45 @@
+From 7d7bb418584fa487baeae3d8b1fffed5499ba4f2 Mon Sep 17 00:00:00 2001
+From: Laszlo Nagy <rizsotto@gmail.com>
+Date: Thu, 1 Oct 2020 18:26:16 +1000
+Subject: [PATCH] cmake: CMAKE_INSTALL_LIBEXECDIR forwarded to subproject
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01cfa447..cf08d63f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,6 +51,7 @@ ExternalProject_Add(BearSource
+         CMAKE_CACHE_ARGS
+             -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
+             -DCMAKE_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
++	    -DCMAKE_INSTALL_LIBEXECDIR:PATH=${CMAKE_INSTALL_LIBEXECDIR}
+             -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
+             -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+             -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
+From 4c42f83be702ca437588e89ea6fa172955a5ce22 Mon Sep 17 00:00:00 2001
+From: Laszlo Nagy <rizsotto@gmail.com>
+Date: Tue, 13 Oct 2020 22:08:21 +1100
+Subject: [PATCH] cmake: CMAKE_INSTALL_LIBEXECDIR defined if not specified when
+ forwarded to subproject (#301)
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7d9e13e4..7eecde0c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,6 +29,9 @@ include(ExternalProject)
+ set_property(DIRECTORY PROPERTY EP_BASE ${CMAKE_BINARY_DIR}/subprojects)
+ set(STAGED_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/stage)
+ set(DEPENDENCIES_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/subprojects/Install)
++if (NOT CMAKE_INSTALL_LIBEXECDIR)
++    include(GNUInstallDirs)
++endif ()
+ 
+ # Verify or install dependencies
+ add_subdirectory(third_party)
diff --git a/PKGBUILD b/PKGBUILD
index fcc6b8238db4..ff47b675216c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=bear
 _pkgname=Bear
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="tool to generate compilation database for clang tooling"
 arch=('i686' 'x86_64')
 url="https://github.com/rizsotto/Bear"
@@ -15,25 +15,37 @@ depends=('python' 'grpc' 'fmt' 'spdlog' 'nlohmann-json')
 options=('!buildflags')
 conflicts=('bear')
 provides=('bear')
-source=($_pkgname-$pkgver.tar.gz::https://github.com/rizsotto/$_pkgname/archive/$pkgver.tar.gz)
-sha256sums=('7b68aad69e887d945ad20f8e9f3a8c33cf2d59cc80da7e52d931d8c685fe2f79')
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/rizsotto/$_pkgname/archive/$pkgver.tar.gz"
+        "00-libexec-fix.patch")
+sha256sums=('7b68aad69e887d945ad20f8e9f3a8c33cf2d59cc80da7e52d931d8c685fe2f79'
+            'a759e7b9d7e6b4e776fc224b62decda5460bd654e716ab9be39b55f56947e3a7')
+
+prepare() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    # Patch for fixing Bear 3.0.0 not exporting CMAKE_LIBEXEC_DIR
+    # Thanks to ArchLinuxCN for pointing this out!
+    for p in ${srcdir}/*.patch; do
+        patch -Np1 -i "$p"
+    done
+}
 
 build() {
-    cd "$srcdir/$_pkgname-$pkgver"
+    cd "${srcdir}/${_pkgname}-${pkgver}"
     cmake -DCMAKE_INSTALL_PREFIX=/usr \
+          -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+          -DCMAKE_INSTALL_LIBEXECDIR="lib/${pkgname}" \
           -DENABLE_UNIT_TESTS=OFF \
           -DENABLE_FUNC_TESTS=OFF \
           .
+
     make all
 }
 
 package() {
-    cd "$srcdir/$_pkgname-$pkgver"
-    DESTDIR="$pkgdir" make install
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    DESTDIR="${pkgdir}" make install
 
-    # No idea why this is generated in the pkgbuild since it behaves normally
-    # outside of PKGBUILD. Dirty hack until I have time to fix this and
-    # the !buildflags issue
-    rm -r "$pkgdir/${srcdir:1}"
+    # Workaround for including compile dir in package
+    rm -rf "$pkgdir/${srcdir:1}"
     find "$pkgdir" -empty -type d -delete
 }