mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
Kai Kang
f45881b382
* update SRC_URI * remove re-definition of S * drop backport patch 0001-configure.sh-quote-local-variables.patch * update context of libvpx-configure-support-blank-prefix.patch Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
44 lines
1.0 KiB
Diff
44 lines
1.0 KiB
Diff
Upstream: not yet
|
|
|
|
Fix configure to accept "--prefix=" (a blank prefix).
|
|
|
|
--- libvpx-0.9.1/build/make/configure.sh.orig 2010-06-17 09:08:56.000000000 -0400
|
|
+++ libvpx-0.9.1/build/make/configure.sh 2010-09-23 14:27:48.000000000 -0400
|
|
@@ -444,6 +444,8 @@
|
|
;;
|
|
--prefix=*)
|
|
prefix="${optval}"
|
|
+ # Distinguish between "prefix not set" and "prefix set to ''"
|
|
+ prefixset=1
|
|
;;
|
|
--libdir=*)
|
|
libdir="${optval}"
|
|
@@ -587,13 +587,23 @@ process_cmdline() {
|
|
}
|
|
|
|
post_process_common_cmdline() {
|
|
- prefix="${prefix:-/usr/local}"
|
|
+ if [ "$prefixset" != "1" ]
|
|
+ then
|
|
+ prefix=/usr/local
|
|
+ fi
|
|
+
|
|
+ # Strip trailing slash
|
|
prefix="${prefix%/}"
|
|
+
|
|
libdir="${libdir:-${prefix}/lib}"
|
|
libdir="${libdir%/}"
|
|
- if [ "${libdir#${prefix}}" = "${libdir}" ]; then
|
|
- die "Libdir ${libdir} must be a subdirectory of ${prefix}"
|
|
- fi
|
|
+
|
|
+ case "$libdir" in
|
|
+ "${prefix}/"*) ;;
|
|
+ *)
|
|
+ die "Libdir ${libdir} must be a subdirectory of ${prefix}"
|
|
+ ;;
|
|
+ esac
|
|
}
|
|
|
|
post_process_cmdline() {
|