diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2015-11-24 22:23:23 +0530 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-11-24 22:23:23 +0530 |
| commit | a89fce35ee16967e7b85e76fb8363b96ac605b27 (patch) | |
| tree | 2ef28ee2c8e6b60b3f934182925e32ff6fe9b320 | |
| parent | 6faa9926272b91405cd2441fdc6f3c899c46be8c (diff) | |
spandps: Don't do a "whereis which"-dance to find which
If which is not in the $PATH, why would whereis be? Fixes the build
on Windows where "whereis" does not exist.
| -rw-r--r-- | recipes/spandsp.recipe | 3 | ||||
| -rw-r--r-- | recipes/spandsp/0001-Don-t-do-a-whereis-which-dance-to-find-which.patch | 28 |
2 files changed, 30 insertions, 1 deletions
diff --git a/recipes/spandsp.recipe b/recipes/spandsp.recipe index e8b1f7cc..3ed52bd5 100644 --- a/recipes/spandsp.recipe +++ b/recipes/spandsp.recipe @@ -12,7 +12,8 @@ class Recipe(recipe.Recipe): config_sh = 'sh ./autogen.sh && sh ./configure' patches = [ 'spandsp/0001-spandsp-do-not-compile-has_X86FEATURE-symbols.patch', 'spandsp/0002-Define-LIBSPANDSP_EXPORTS-when-building-the-spandsp-.patch', - 'spandsp/0003-Use-BUILT_SOURCES-to-generate-extra-headers.patch' ] + 'spandsp/0003-Use-BUILT_SOURCES-to-generate-extra-headers.patch', + 'spandsp/0001-Don-t-do-a-whereis-which-dance-to-find-which.patch'] files_libs = ['libspandsp'] files_devel = ['include/spandsp', 'include/spandsp.h', 'lib/pkgconfig/spandsp.pc'] diff --git a/recipes/spandsp/0001-Don-t-do-a-whereis-which-dance-to-find-which.patch b/recipes/spandsp/0001-Don-t-do-a-whereis-which-dance-to-find-which.patch new file mode 100644 index 00000000..e9da61de --- /dev/null +++ b/recipes/spandsp/0001-Don-t-do-a-whereis-which-dance-to-find-which.patch @@ -0,0 +1,28 @@ +From a676d4018eb5fc0ad7368e4be1b1299b7921837f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Tue, 24 Nov 2015 22:21:42 +0530 +Subject: [PATCH] Don't do a "whereis which" dance to find which + +whereis does not exist on Windows and if which is not in the $PATH, why +would whereis be?! +--- + autogen.sh | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 2d9a067..98464f5 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -59,8 +59,7 @@ version_compare() + + debug "Checking $PROGRAM >= $MAJOR.$MINOR.$MICRO" + +- WHICH_PATH=`whereis which | cut -f2 -d' '` +- COMMAND=`$WHICH_PATH $PROGRAM` ++ COMMAND=`which $PROGRAM` + if [ -z $COMMAND ]; then + echo "$PROGRAM-$MAJOR.$MINOR.$MICRO is required and was not found." + return 1 +-- +2.6.2.409.gb049f0a + |