[arch-commits] Commit in hwloc/trunk (PKGBUILD fix_completion_dir.patch)

Levente Polyak anthraxx at archlinux.org
Wed Nov 20 00:45:20 UTC 2019


    Date: Wednesday, November 20, 2019 @ 00:45:19
  Author: anthraxx
Revision: 369449

upgpkg: hwloc 2.1.0-2 properly handle completion (drop useless patch)

The patch achieves absolutely void, not only does it not get use and
still install it to /usr/etc but it is also totally wrong to do in the
first place. The combined auto-load completions of bash go to
/etc/bash_completion.d/ as they will be literally useless in
/usr/share/bash-completion/completions besides consuming disc space.

Modified:
  hwloc/trunk/PKGBUILD
Deleted:
  hwloc/trunk/fix_completion_dir.patch

--------------------------+
 PKGBUILD                 |   14 ++++++--------
 fix_completion_dir.patch |   13 -------------
 2 files changed, 6 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-20 00:44:50 UTC (rev 369448)
+++ PKGBUILD	2019-11-20 00:45:19 UTC (rev 369449)
@@ -5,7 +5,7 @@
 
 pkgname=hwloc
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Portable Hardware Locality is a portable abstraction of hierarchical architectures'
 url='https://www.open-mpi.org/projects/hwloc/'
 arch=('x86_64')
@@ -14,15 +14,12 @@
 makedepends=('cairo' 'libxml2' 'pciutils' 'systemd')
 optdepends=('cairo' 'libxml2' 'pciutils')
 options=('!docs')
-source=(https://www.open-mpi.org/software/hwloc/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2
-        fix_completion_dir.patch)
-sha256sums=('19429752f772cf68321196970ffb10dafd7e02ab38d2b3382b157c78efd10862'
-            '3487e1f7819eba4131ae70140a624f0fff6ec9761ed3944eb6beebdf73f5147f')
+source=(https://www.open-mpi.org/software/hwloc/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('19429752f772cf68321196970ffb10dafd7e02ab38d2b3382b157c78efd10862')
 
 prepare() {
   cd hwloc-${pkgver}
-  patch -p1 < ../fix_completion_dir.patch
-  autoconf -f -i
+  autoreconf -fiv
 }
 
 build() {
@@ -30,7 +27,8 @@
   ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
-    --enable-plugins
+    --enable-plugins \
+    --sysconfdir=/etc
   make
 }
 

Deleted: fix_completion_dir.patch
===================================================================
--- fix_completion_dir.patch	2019-11-20 00:44:50 UTC (rev 369448)
+++ fix_completion_dir.patch	2019-11-20 00:45:19 UTC (rev 369449)
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 089dcc7a..dae7aba3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -56,7 +56,7 @@ endif HWLOC_BUILD_STANDALONE
- # Only install the valgrind suppressions file if we're building in
- # standalone mode
- if HWLOC_BUILD_STANDALONE
--bashcompdir = $(sysconfdir)/bash_completion.d
-+bashcompdir = /usr/share/bash-completion/completions
- dist_bashcomp_DATA = contrib/completion/hwloc-completion.bash
- dist_pkgdata_DATA = contrib/hwloc-valgrind.supp
- dist_doc_DATA = contrib/misc/dynamic_SVG_example.html



More information about the arch-commits mailing list