summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch')
-rw-r--r--meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch42
1 files changed, 21 insertions, 21 deletions
diff --git a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
index 1bf863dfa2..c7a6e51e76 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
+++ b/meta-oe/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
@@ -13,31 +13,31 @@ Fix configure to accept "--prefix=" (a blank prefix).
13 ;; 13 ;;
14 --libdir=*) 14 --libdir=*)
15 libdir="${optval}" 15 libdir="${optval}"
16@@ -471,13 +473,23 @@ 16@@ -587,13 +587,23 @@ process_cmdline() {
17 17 }
18 18
19 post_process_common_cmdline() { 19 post_process_common_cmdline() {
20- prefix="${prefix:-/usr/local}" 20- prefix="${prefix:-/usr/local}"
21+ if [ "$prefixset" != "1" ] 21+ if [ "$prefixset" != "1" ]
22+ then 22+ then
23+ prefix=/usr/local 23+ prefix=/usr/local
24+ fi 24+ fi
25+ 25+
26+ # Strip trailing slash 26+ # Strip trailing slash
27 prefix="${prefix%/}" 27 prefix="${prefix%/}"
28+ 28+
29 libdir="${libdir:-${prefix}/lib}" 29 libdir="${libdir:-${prefix}/lib}"
30 libdir="${libdir%/}" 30 libdir="${libdir%/}"
31- if [ "${libdir#${prefix}}" = "${libdir}" ]; then 31- if [ "${libdir#${prefix}}" = "${libdir}" ]; then
32- die "Libdir ${libdir} must be a subdirectory of ${prefix}" 32- die "Libdir ${libdir} must be a subdirectory of ${prefix}"
33- fi 33- fi
34+ 34+
35+ case "$libdir" in 35+ case "$libdir" in
36+ "${prefix}/"*) ;; 36+ "${prefix}/"*) ;;
37+ *) 37+ *)
38+ die "Libdir ${libdir} must be a subdirectory of ${prefix}" 38+ die "Libdir ${libdir} must be a subdirectory of ${prefix}"
39+ ;; 39+ ;;
40+ esac 40+ esac
41 } 41 }
42 42
43 43 post_process_cmdline() {