aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-18 08:23:22 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-22 00:01:55 +0200
commit141aedb403e4bb91dac6ffb109ee74dfaee59f81 (patch)
treecd062726923db211a2b4546725a5bf15e0449206 /meta-oe
parente5925b868e364ff61bb890efe1b10e31644268d3 (diff)
downloadmeta-openembedded-contrib-141aedb403e4bb91dac6ffb109ee74dfaee59f81.tar.gz
meta-openembedded-contrib-141aedb403e4bb91dac6ffb109ee74dfaee59f81.tar.bz2
meta-openembedded-contrib-141aedb403e4bb91dac6ffb109ee74dfaee59f81.zip
subsurface: Fix libxml and libm build failures
Use pkg-config to find libxml2 and also link against libm to avoid build failures. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-extended/subsurface/subsurface/libm.patch17
-rw-r--r--meta-oe/recipes-extended/subsurface/subsurface/pkgconfig.patch22
-rw-r--r--meta-oe/recipes-extended/subsurface/subsurface_git.bb4
3 files changed, 42 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/subsurface/subsurface/libm.patch b/meta-oe/recipes-extended/subsurface/subsurface/libm.patch
new file mode 100644
index 0000000000..79956089df
--- /dev/null
+++ b/meta-oe/recipes-extended/subsurface/subsurface/libm.patch
@@ -0,0 +1,17 @@
+| /media/build1/poky/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.9.0/ld: divelist.o: undefined reference to symbol 'pow@@GLIBC_2.0'
+| /media/build1/poky/build1/tmp/sysroots/qemux86/lib/libm.so.6: error adding symbols: DSO missing from command line
+| collect2: error: ld returned 1 exit status
+
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile 2014-07-17 20:59:03.152489041 +0000
++++ git/Makefile 2014-07-17 20:59:19.020489473 +0000
+@@ -50,7 +50,7 @@
+ LIBDIVECOMPUTERCFLAGS = -I$(LIBDIVECOMPUTERINCLUDES)
+ LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
+
+-LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread
++LIBS = $(LIBXML2) $(LIBGTK) $(LIBDIVECOMPUTER) -lpthread -lm
+
+ OBJS = main.o dive.o profile.o info.o equipment.o divelist.o \
+ parse-xml.o save-xml.o libdivecomputer.o print.o uemis.o \
diff --git a/meta-oe/recipes-extended/subsurface/subsurface/pkgconfig.patch b/meta-oe/recipes-extended/subsurface/subsurface/pkgconfig.patch
new file mode 100644
index 0000000000..1f294fc88f
--- /dev/null
+++ b/meta-oe/recipes-extended/subsurface/subsurface/pkgconfig.patch
@@ -0,0 +1,22 @@
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile 2014-07-17 20:53:23.620479788 +0000
++++ git/Makefile 2014-07-17 20:56:07.992484267 +0000
+@@ -45,7 +45,7 @@
+ # about it if it doesn't.
+ LIBUSB = $(shell pkg-config --libs libusb-1.0 2> /dev/null)
+
+-LIBXML2 = $(shell xml2-config --libs)
++LIBXML2 = $(shell pkg-config --libs libxml-2.0)
+ LIBGTK = $(shell pkg-config --libs gtk+-2.0 glib-2.0 gconf-2.0)
+ LIBDIVECOMPUTERCFLAGS = -I$(LIBDIVECOMPUTERINCLUDES)
+ LIBDIVECOMPUTER = $(LIBDIVECOMPUTERARCHIVE) $(LIBUSB)
+@@ -71,7 +71,7 @@
+ $(INSTALL) $(MANFILES) $(MANDIR)
+
+ parse-xml.o: parse-xml.c dive.h
+- $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags` parse-xml.c
++ $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `pkg-config --cflags libxml-2.0` parse-xml.c
+
+ save-xml.o: save-xml.c dive.h
+ $(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c save-xml.c
diff --git a/meta-oe/recipes-extended/subsurface/subsurface_git.bb b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
index eb4536aa61..0632f2120d 100644
--- a/meta-oe/recipes-extended/subsurface/subsurface_git.bb
+++ b/meta-oe/recipes-extended/subsurface/subsurface_git.bb
@@ -11,7 +11,9 @@ PKGV = "${GITPKGVTAG}"
PV = "1.1"
SRCREV = "bd275d73ac06823619230915a3aa29deddc996fb"
-SRC_URI = "git://subsurface.hohndel.org/subsurface.git"
+SRC_URI = "git://subsurface.hohndel.org/subsurface.git \
+ file://pkgconfig.patch \
+ file://libm.patch"
S = "${WORKDIR}/git"
EXTRA_OEMAKE = "CC='${CC}' \