CVS commit: pkgsrc/sysutils/pciutils

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon May  8 02:06:37 UTC 2023

Modified Files:
        pkgsrc/sysutils/pciutils: distinfo
        pkgsrc/sysutils/pciutils/patches: patch-aa

Log Message:
sysutils/pciutils: fix build

If pkgsrc is configured to install with -s to strip, leftover settings
in the makefile were causing /usr/bin/install to try to exec "-s" as
the strip program. Patch out those leftovers.

PR 57396


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/sysutils/pciutils/distinfo
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/pciutils/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/pciutils/distinfo
diff -u pkgsrc/sysutils/pciutils/distinfo:1.44 pkgsrc/sysutils/pciutils/distinfo:1.45
--- pkgsrc/sysutils/pciutils/distinfo:1.44      Sun May  7 10:20:44 2023
+++ pkgsrc/sysutils/pciutils/distinfo   Mon May  8 02:06:37 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.44 2023/05/07 10:20:44 wiz Exp $
+$NetBSD: distinfo,v 1.45 2023/05/08 02:06:37 dholland Exp $
 
 BLAKE2s (pciutils-3.10.0.tar.gz) = 9a6ce37e5d34f505da98a98bce794ba0c664ad2a6014edf38970baefea7fb191
 SHA512 (pciutils-3.10.0.tar.gz) = eba9963910854bf7bb2388ed9ea2ff574f3ff710d9cbd42e7763836bea9dfd84ee8839c6a0f1354b56319ba171787a2c55035750154428ae70cab51c0001736e
 Size (pciutils-3.10.0.tar.gz) = 916996 bytes
-SHA1 (patch-aa) = bd5098a2774c2c879f89eef1c574e7c57963e4c3
+SHA1 (patch-aa) = a799af372e1aaba879beb84581d7062f0c6e1bba
 SHA1 (patch-ab) = 55e799d9db8206868540e55feefc47cde1c0ddfc
 SHA1 (patch-ac) = 83fd2d79a7a4a05593ccd69b9d1f38e6ec4763c8
 SHA1 (patch-lib_i386-io-sunos.h) = 4917244d39b48d38b8173cf3031281ad1c7fec24

Index: pkgsrc/sysutils/pciutils/patches/patch-aa
diff -u pkgsrc/sysutils/pciutils/patches/patch-aa:1.30 pkgsrc/sysutils/pciutils/patches/patch-aa:1.31
--- pkgsrc/sysutils/pciutils/patches/patch-aa:1.30      Sun May  7 10:20:44 2023
+++ pkgsrc/sysutils/pciutils/patches/patch-aa   Mon May  8 02:06:37 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.30 2023/05/07 10:20:44 wiz Exp $
+$NetBSD: patch-aa,v 1.31 2023/05/08 02:06:37 dholland Exp $
 
 Adapt the Makefile to make it compliant with pkgsrc.
 
@@ -23,6 +23,19 @@ Adapt the Makefile to make it compliant 
  
  # Support for resolving ID's by DNS (yes/no, default: detect)
  DNS=
+@@ -46,10 +45,10 @@ PKGCFDIR=$(LIBDIR)/pkgconfig
+ INSTALL=install
+ DIRINSTALL=install -d
+ ifdef CROSS_COMPILE
+-STRIP=--strip-program $(CROSS_COMPILE)-strip
++#STRIP=--strip-program $(CROSS_COMPILE)-strip
+ CC=$(CROSS_COMPILE)gcc
+ else
+-STRIP=-s
++#STRIP=-s
+ CC=cc
+ endif
+ AR=$(CROSS_COMPILE)ar
 @@ -148,18 +147,21 @@ distclean: clean
  
  install: all