summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-11 22:23:42 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-11 22:23:42 +0000
commit71969e2e7662ec11147a8ebb1d3a7d55f39a16ea (patch)
treed850648bb8bae8fe958ac3db003a1350c276dcb9 /meta
parent63e19b2629827229a9d3c963705171fd64d985ca (diff)
downloadopenembedded-core-71969e2e7662ec11147a8ebb1d3a7d55f39a16ea.tar.gz
openembedded-core-71969e2e7662ec11147a8ebb1d3a7d55f39a16ea.tar.bz2
openembedded-core-71969e2e7662ec11147a8ebb1d3a7d55f39a16ea.zip
libmatchbox: Fix so reconfiguring works (cp, not mv files). Add configure patch to generate better .pc file
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3112 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libmatchbox/libmatchbox_1.7.bb2
-rw-r--r--meta/packages/libmatchbox/libmatchbox_1.9.bb7
-rw-r--r--meta/packages/libmatchbox/libmatchbox_svn.bb6
3 files changed, 9 insertions, 6 deletions
diff --git a/meta/packages/libmatchbox/libmatchbox_1.7.bb b/meta/packages/libmatchbox/libmatchbox_1.7.bb
index 52b320d661..be6d1884d6 100644
--- a/meta/packages/libmatchbox/libmatchbox_1.7.bb
+++ b/meta/packages/libmatchbox/libmatchbox_1.7.bb
@@ -4,5 +4,5 @@ SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.t
file://check.m4"
do_configure_prepend () {
- mv ${WORKDIR}/check.m4 ${S}/
+ cp ${WORKDIR}/check.m4 ${S}/
}
diff --git a/meta/packages/libmatchbox/libmatchbox_1.9.bb b/meta/packages/libmatchbox/libmatchbox_1.9.bb
index 03be54a075..a0c5e272c0 100644
--- a/meta/packages/libmatchbox/libmatchbox_1.9.bb
+++ b/meta/packages/libmatchbox/libmatchbox_1.9.bb
@@ -1,11 +1,12 @@
require libmatchbox.inc
-PR = "r4"
+PR = "r5"
SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/${PV}/${PN}-${PV}.tar.gz \
file://16bppfixes.patch;patch=1 \
- file://check.m4"
+ file://configure_fixes.patch;patch=1 \
+ file://check.m4"
do_configure_prepend () {
- mv ${WORKDIR}/check.m4 ${S}/
+ cp ${WORKDIR}/check.m4 ${S}/
}
diff --git a/meta/packages/libmatchbox/libmatchbox_svn.bb b/meta/packages/libmatchbox/libmatchbox_svn.bb
index c16ea3cf43..f203da56c5 100644
--- a/meta/packages/libmatchbox/libmatchbox_svn.bb
+++ b/meta/packages/libmatchbox/libmatchbox_svn.bb
@@ -3,11 +3,13 @@ require libmatchbox.inc
PV = "1.7+svnr${SRCREV}"
DEFAULT_PREFERENCE = "-1"
-SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+ file://configure_fixes.patch;patch=1 \
file://check.m4 \
file://16bppfixes.patch;patch=1"
+
S = "${WORKDIR}/libmatchbox"
do_configure_prepend () {
- mv ${WORKDIR}/check.m4 ${S}/
+ cp ${WORKDIR}/check.m4 ${S}/
}