Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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 <msmith@cbnco.com>
  • Loading branch information
Michael Smith committed Sep 27, 2010
1 parent 3619711 commit 96eb829
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 2 deletions.
@@ -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
}


2 changes: 1 addition & 1 deletion recipes/webm/libvpx.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "vpx Multi-Format Codec SDK"
LICENSE = "BSD"

PR = "r1"
INC_PR = "r4"

SRC_URI = "http://webm.googlecode.com/files/libvpx-${PV}.tar.bz2"

Expand Down
2 changes: 1 addition & 1 deletion recipes/webm/libvpx_0.9.0.bb
Expand Up @@ -2,7 +2,7 @@ require libvpx.inc

LICENSE = "VP8"

PR = "r3"
PR = "${INC_PR}.0"

SRC_URI[md5sum] = "9eb8e818d2f3263623c258fe66924082"
SRC_URI[sha256sum] = "a0096ac6859cfb61cf06dd9bc0a79a3333a4ec389ba311911d84df8ff2a1b9dc"
Expand Down
9 changes: 9 additions & 0 deletions recipes/webm/libvpx_0.9.1.bb
@@ -1,5 +1,14 @@
require libvpx.inc

PR = "${INC_PR}.0"

SRC_URI += "file://libvpx-configure-support-blank-prefix.patch;apply=yes"

CONFIGUREOPTS += " \
--prefix=${prefix} \
--libdir=${libdir} \
"

SRC_URI[md5sum] = "e1442e74d0cca228785083fa520735a2"
SRC_URI[sha256sum] = "c4e8e463e079ffde5b6948366a1d0873f1bf685dccd89ca137585c2b8247ec59"

0 comments on commit 96eb829

Please sign in to comment.