From 96eb8296fea83132afcca2bfccf2de2c9f03e211 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Thu, 23 Sep 2010 14:47:32 -0400 Subject: libvpx: fix 0.9.1 build when prefix="" The configure script was changed in 0.9.1 and introduced some logic that breaks when prefix is an empty string. Also switch to INC_PR for 0.9.0 and 0.9.1. Signed-off-by: Michael Smith --- .../libvpx-configure-support-blank-prefix.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 recipes/webm/libvpx-0.9.1/libvpx-configure-support-blank-prefix.patch (limited to 'recipes/webm/libvpx-0.9.1/libvpx-configure-support-blank-prefix.patch') diff --git a/recipes/webm/libvpx-0.9.1/libvpx-configure-support-blank-prefix.patch b/recipes/webm/libvpx-0.9.1/libvpx-configure-support-blank-prefix.patch new file mode 100644 index 0000000000..1bf863dfa2 --- /dev/null +++ b/recipes/webm/libvpx-0.9.1/libvpx-configure-support-blank-prefix.patch @@ -0,0 +1,43 @@ +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}" +@@ -471,13 +473,23 @@ + + + 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 + } + + -- cgit v1.2.3