Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (494eb3ed1dc2eaf2b7630492398c24093f191bc4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (494eb3ed1dc2eaf2b7630492398c24093f191bc4)
  • Date: Sun, 3 Jul 2022 03:05:28 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

utils/pciutils/HISTORY | 4 ++++
utils/pciutils/PRE_BUILD | 4 ++++
utils/pciutils/patches/no-which.patch | 21 +++++++++++++++++++++
3 files changed, 29 insertions(+)

New commits:
commit 494eb3ed1dc2eaf2b7630492398c24093f191bc4
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

utils/pciutils: disabled usage of which in build scripts

diff --git a/utils/pciutils/HISTORY b/utils/pciutils/HISTORY
index f928d2b..8efc130 100644
--- a/utils/pciutils/HISTORY
+++ b/utils/pciutils/HISTORY
@@ -1,3 +1,7 @@
+2022-07-02 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches/no-which.patch: added patch to disable which
usage
+ in building process, still needed for update-pciids script
+
2022-07-01 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.8.0

diff --git a/utils/pciutils/PRE_BUILD b/utils/pciutils/PRE_BUILD
new file mode 100755
index 0000000..f80ee7d
--- /dev/null
+++ b/utils/pciutils/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/utils/pciutils/patches/no-which.patch
b/utils/pciutils/patches/no-which.patch
new file mode 100644
index 0000000..d495d10
--- /dev/null
+++ b/utils/pciutils/patches/no-which.patch
@@ -0,0 +1,21 @@
+diff --git a/lib/configure b/lib/configure
+--- a/lib/configure
++++ b/lib/configure
+@@ -238,7 +238,7 @@ if [ "$sys" = linux ] ; then
+ PKG_CONFIG=pkg-config
+ fi
+ if [ "$LIBKMOD" != no ] ; then
+- if ! which $PKG_CONFIG >/dev/null ; then
++ if ! type -p $PKG_CONFIG >/dev/null ; then
+ echo_n "($PKG_CONFIG not found) "
+ elif $PKG_CONFIG libkmod ; then
+ LIBKMOD_DETECTED=1
+@@ -268,7 +268,7 @@ if [ "$sys" = linux ] ; then
+ if [ "$HWDB" = yes -o "$HWDB" = no ] ; then
+ echo "$HWDB (set manually)"
+ else
+- if `which pkg-config >/dev/null && pkg-config
--atleast-version=196 libudev` ; then
++ if `type -p pkg-config >/dev/null && pkg-config
--atleast-version=196 libudev` ; then
+ HWDB=yes
+ else
+ HWDB=no



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (494eb3ed1dc2eaf2b7630492398c24093f191bc4), Pavel Vinogradov, 07/02/2022

Archive powered by MHonArc 2.6.24.

Top of Page