Skip to contentSkip to conversation

libsecret: add missing dependency on intltool-native

PATCH New Martin Jansa 1 participant 3 messages Apr 27, 2015

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

PATCH 1/3 libsecret: add missing dependency on intltool-native

Signed-off-by Martin Jansa <[email protected]>
---
 meta-gnome/recipes-gnome/libsecret/libsecret_0.18.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/libsecret/libsecret_0.18.bb +1 -1
index dca3350..06e94bd 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6"
 
 inherit gnomebase gtk-doc
 
-DEPENDS = "glib-2.0 libgcrypt"
+DEPENDS = "glib-2.0 libgcrypt intltool-native"
 
 GNOME_COMPRESS_TYPE = "xz"
Signature · 1 line
2.3.5
author
#1 lore raw

PATCH 2/3 gsoap-native: add missing dependency on flex-native

* otherwise fails with:

| gcc  -DHAVE_CONFIG_H -I. -I/work/x86_64-linux/gsoap-native/2.8.12-r1/gsoap-2.8/gsoap/src -I../..   -isystem/sysroots/x86_64-linux/usr/include -DWITH_BISON -DWITH_LEX  -DSOAPCPP_IMPORT_PATH="\"/sysroots/x86_64-linux/usr/share/gsoap/import\"" -DLINUX -isystem/sysroots/x86_64-linux/usr/include -O2 -pipe -c -o soapcpp2-soapcpp2_yacc.o `test -f 'soapcpp2_yacc.c' || echo '/work/x86_64-linux/gsoap-native/2.8.12-r1/gsoap-2.8/gsoap/src/'`soapcpp2_yacc.c
| /bin/bash /work/x86_64-linux/gsoap-native/2.8.12-r1/gsoap-2.8/ylwrap /work/x86_64-linux/gsoap-native/2.8.12-r1/gsoap-2.8/gsoap/src/soapcpp2_lex.l .c soapcpp2_lex.c -- /bin/bash /work/x86_64-linux/gsoap-native/2.8.12-r1/gsoap-2.8/missing flex
| /work/x86_64-linux/gsoap-native/2.8.12-r1/gsoap-2.8/missing: line 81: flex: command not found
| WARNING: 'flex' is missing on your system.
|          You should only need it if you modified a '.l' file.
|          You may want to install the Fast Lexical Analyzer package:
|          <http://flex.sourceforge.net/>
| make[4]: *** [soapcpp2_lex.c] Error 127
| make[4]: Leaving directory `/work/x86_64-linux/gsoap-native/2.8.12-r1/build/gsoap/src'
| make[3]: *** [all-recursive] Error 1
---
 meta-oe/recipes-support/gsoap/gsoap-native_2.8.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-support/gsoap/gsoap-native_2.8.12.bb +1 -1
index 46fabbb..ac90155 100644
@@ -1,6 +1,6 @@
 require gsoap_${PV}.inc
 
-DEPENDS = ""
+DEPENDS = "flex-native"
 EXTRA_OEMAKE = ""
 
 inherit native
Signature · 1 line
2.3.5
author
#2 lore raw

PATCH 3/3 gsoap: fold .inc and -native into one recipe

In reply to Martin Jansa

* use BBCLASSEXTEND instead of separate recipe

Signed-off-by Martin Jansa <[email protected]>
---
 .../recipes-support/gsoap/gsoap-native_2.8.12.bb   | 14 ---------
 meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb      | 35 ++++++++++++++++++----
 meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc     | 23 --------------
 3 files changed, 30 insertions(+), 42 deletions(-)
 delete mode 100644 meta-oe/recipes-support/gsoap/gsoap-native_2.8.12.bb
 delete mode 100644 meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc
meta-oe/recipes-support/gsoap/gsoap-native_2.8.12.bb deleted +0 -14
deleted file mode 100644
index ac90155..0000000
@@ -1,14 +0,0 @@
-require gsoap_${PV}.inc
-
-DEPENDS = "flex-native"
-EXTRA_OEMAKE = ""
-
-inherit native
-
-do_install() {
-    oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install
-}
-
-
-SRC_URI[md5sum] = "5700d26fc6fe3073d038349e19c3640d"
-SRC_URI[sha256sum] = "51eef118544fa846f4d2dea2eedf91c84c46a1abeafc5eee3dcff783f4015a00"
meta-oe/recipes-support/gsoap/gsoap_2.8.12.bb +30 -5
index b85db05..b5c3995 100644
@@ -1,6 +1,27 @@
-require gsoap_${PV}.inc
+DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \
+for the development of SOAP Web Services and clients."
+SECTION = "devel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b338b08b1b61e028e0f399a4de25e58f"
 
-DEPENDS = "gsoap-native openssl zlib"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}2/${BPN}_${PV}.zip"
+SRC_URI[md5sum] = "5700d26fc6fe3073d038349e19c3640d"
+SRC_URI[sha256sum] = "51eef118544fa846f4d2dea2eedf91c84c46a1abeafc5eee3dcff783f4015a00"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
+
+PR = "r1"
+
+S = "${WORKDIR}/${BPN}-2.8"
+
+PARALLEL_MAKE = ""
+
+EXTRA_OEMAKE_class-target = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2"
+
+DEPENDS_class-target = "gsoap-native openssl zlib"
+DEPENDS_class-native = "flex-native"
 
 do_install_append() {
     install -d ${D}${libdir}

@@ -10,8 +31,12 @@ do_install_append() {
     done
 }
 
+do_install_class-native() {
+    oe_runmake DESTDIR=${D} BINDIR=${D}${bindir} install
+}
+
 FILES_${PN} = "${bindir}/wsdl2h ${bindir}/soapcpp2"
 FILES_${PN} += "${datadir}"
-
-SRC_URI[md5sum] = "5700d26fc6fe3073d038349e19c3640d"
-SRC_URI[sha256sum] = "51eef118544fa846f4d2dea2eedf91c84c46a1abeafc5eee3dcff783f4015a00"
+FILES_${PN}-staticdev = "${libdir}"
+FILES_${PN}-dev = "${includedir}"
+RRECOMMENDS_${PN}-dev = "${PN}-staticdev"
meta-oe/recipes-support/gsoap/gsoap_2.8.12.inc deleted +0 -23
deleted file mode 100644
index 9e2a782..0000000
@@ -1,23 +0,0 @@
-DESCRIPTION = "The gSOAP toolkit provides a unique SOAP-to-C/C++ language binding \
-for the development of SOAP Web Services and clients."
-SECTION = "devel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b338b08b1b61e028e0f399a4de25e58f"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.zip \
-"
-
-inherit autotools
-
-PR = "r1"
-
-S = "${WORKDIR}/gsoap-2.8"
-
-FILES_${PN}-dev = "${includedir}"
-RRECOMMENDS_${PN}-dev = "${PN}-staticdev"
-
-FILES_${PN}-staticdev = "${libdir}"
-
-PARALLEL_MAKE = ""
-
-EXTRA_OEMAKE = "SOAP=${STAGING_BINDIR_NATIVE}/soapcpp2"
Signature · 1 line
2.3.5