* [PATCH 1/5] cmake: reset B from autotools, as this class doesnt like it
2013-02-04 10:44 S != B build fixes Ross Burton
@ 2013-02-04 10:44 ` Ross Burton
2013-02-04 10:44 ` [PATCH 2/5] gdk-pixbuf: use correct build path when installing Ross Burton
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-02-04 10:44 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/cmake.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 54d4519..e64c30c 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -13,6 +13,7 @@ OECMAKE_SOURCEPATH ?= "."
# If declaring this, make sure you also set EXTRA_OEMAKE to
# "-C ${OECMAKE_BUILDPATH}". So it will run the right makefiles.
OECMAKE_BUILDPATH ?= ""
+B="${S}"
# C/C++ Compiler (without cpu arch/tune arguments)
OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/5] gdk-pixbuf: use correct build path when installing
2013-02-04 10:44 S != B build fixes Ross Burton
2013-02-04 10:44 ` [PATCH 1/5] cmake: reset B from autotools, as this class doesnt like it Ross Burton
@ 2013-02-04 10:44 ` Ross Burton
2013-02-04 10:44 ` [PATCH 3/5] gtk+: add missing $S references in do_install Ross Burton
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-02-04 10:44 UTC (permalink / raw)
To: openembedded-core
The native install was invoking a binary in $S, but it's been built into $B.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
index 5a9cd9b..64f1450 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb
@@ -111,7 +111,7 @@ python populate_packages_prepend () {
do_install_append_class-native() {
#Use wrapper script rather than binary as required libtool library is not installed now
- GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${S}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
+ GDK_PIXBUF_MODULEDIR=${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders ${B}/gdk-pixbuf/gdk-pixbuf-query-loaders > ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
sed -i -e 's#${D}##g' ${D}${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders.cache
find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] gtk+: add missing $S references in do_install
2013-02-04 10:44 S != B build fixes Ross Burton
2013-02-04 10:44 ` [PATCH 1/5] cmake: reset B from autotools, as this class doesnt like it Ross Burton
2013-02-04 10:44 ` [PATCH 2/5] gdk-pixbuf: use correct build path when installing Ross Burton
@ 2013-02-04 10:44 ` Ross Burton
2013-02-04 10:44 ` [PATCH 4/5] avahi: fix relative path in do_configure Ross Burton
2013-02-04 10:44 ` [PATCH 5/5] libpcap: fix relative path references Ross Burton
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-02-04 10:44 UTC (permalink / raw)
To: openembedded-core
When $B != $S the relative paths are wrong, so add an explict $S.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gtk+/gtk+.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 3a40409..d8adc11 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -72,9 +72,9 @@ do_install () {
mkdir -p ${D}${libdir}/gtk-2.0/include
install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h
- install -m 0644 gtk/gtkfilechooserprivate.h ${D}${includedir}/gtk-2.0/gtk/
- install -m 0644 gtk/gtkfilechooserutils.h ${D}${includedir}/gtk-2.0/gtk/
- install -m 0644 gtk/gtkfilesystemmodel.h ${D}${includedir}/gtk-2.0/gtk/
+ install -m 0644 ${S}/gtk/gtkfilechooserprivate.h ${D}${includedir}/gtk-2.0/gtk/
+ install -m 0644 ${S}/gtk/gtkfilechooserutils.h ${D}${includedir}/gtk-2.0/gtk/
+ install -m 0644 ${S}/gtk/gtkfilesystemmodel.h ${D}${includedir}/gtk-2.0/gtk/
mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-2.0
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/5] avahi: fix relative path in do_configure
2013-02-04 10:44 S != B build fixes Ross Burton
` (2 preceding siblings ...)
2013-02-04 10:44 ` [PATCH 3/5] gtk+: add missing $S references in do_install Ross Burton
@ 2013-02-04 10:44 ` Ross Burton
2013-02-04 10:44 ` [PATCH 5/5] libpcap: fix relative path references Ross Burton
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-02-04 10:44 UTC (permalink / raw)
To: openembedded-core
do_configure was assuming that $B is $S, so the relative path was wrong. Add a
missing $S.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index d529b37..185207b 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -60,7 +60,7 @@ LDFLAGS_append_libc-uclibc = " -lintl"
LDFLAGS_append_uclinux-uclibc = " -lintl"
do_configure_prepend() {
- sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i configure.ac
+ sed 's:AM_CHECK_PYMOD:echo "no pymod" #AM_CHECK_PYMOD:g' -i ${S}/configure.ac
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/5] libpcap: fix relative path references
2013-02-04 10:44 S != B build fixes Ross Burton
` (3 preceding siblings ...)
2013-02-04 10:44 ` [PATCH 4/5] avahi: fix relative path in do_configure Ross Burton
@ 2013-02-04 10:44 ` Ross Burton
4 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2013-02-04 10:44 UTC (permalink / raw)
To: openembedded-core
do_configure was using relative paths in do_configure with the assumption that
$S is the same as $B. This isn't always true, so explicitly use $S.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-connectivity/libpcap/libpcap.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index c87066c..b9c3640 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -27,8 +27,8 @@ CFLAGS_prepend = "-I${S} "
CXXFLAGS_prepend = "-I${S} "
do_configure_prepend () {
- if [ ! -e acinclude.m4 ]; then
- cat aclocal.m4 > acinclude.m4
+ if [ ! -e ${S}/acinclude.m4 ]; then
+ cat ${S}/aclocal.m4 > ${S}/acinclude.m4
fi
sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread