[PATCH 1/2] azy: add mysql5 to depends it's used in azy/src/tests/T_SQL.azy_server_stubs.h if mysql-config is found

[PATCH 1/2] azy: add mysql5 to depends it's used in azy/src/tests/T_SQL.azy_server_stubs.h if mysql-config is found

[Martin Jansa]

---
 recipes/efl1/azy_svn.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/efl1/azy_svn.bb b/recipes/efl1/azy_svn.bb
index 5d6cb00..7e96c60 100644
--- a/recipes/efl1/azy_svn.bb
+++ b/recipes/efl1/azy_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Azy is a library meant for implementing rpc clients and servers in a simple manner."
-DEPENDS = "pkgconfig zlib openssl eina gnutls ecore libxml2 re2c-native azy-native"
-DEPENDS_virtclass-native = "pkgconfig-native zlib-native openssl-native eina-native gnutls-native ecore-native libxml2-native re2c-native"
+DEPENDS = "pkgconfig zlib openssl eina gnutls ecore libxml2 re2c-native mysql5 azy-native"
+DEPENDS_virtclass-native = "pkgconfig-native zlib-native openssl-native eina-native gnutls-native ecore-native libxml2-native re2c-native mysql5-native"
 LICENSE = "LGPLv2.1+"
 PV = "1.0.0+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
-- 
1.7.3.4

[PATCH 2/2] mysql5-native: put make install to do_install after autotools_stage_all was removed with do_stage in eaf0fc03acfb262bcd614a14086a1b28ec850f46

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/recipes/mysql/mysql5-native_5.1.40.bb b/recipes/mysql/mysql5-native_5.1.40.bb
index 40d07ec..8001783 100644
--- a/recipes/mysql/mysql5-native_5.1.40.bb
+++ b/recipes/mysql/mysql5-native_5.1.40.bb
@@ -12,6 +12,10 @@ EXTRA_OEMAKE = ""
 EXTRA_OECONF = " --with-embedded-server "
 
 do_install() {
+        oe_runmake 'DESTDIR=${D}' install
+        mv -f ${D}${libdir}/mysql/* ${D}${libdir}
+        rmdir ${D}${libdir}/mysql
+
         install -d ${D}${bindir}
         install -m 0755 sql/gen_lex_hash ${D}${bindir}/
 }
-- 
1.7.3.4

Re: [PATCH 2/2] mysql5-native: put make install to do_install after autotools_stage_all was removed with do_stage in eaf0fc03acfb262bcd614a14086a1b28ec850f46

[Frans Meulenbroeks]

2011/1/5 Martin Jansa <martin.jansa@gmail.com>:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/recipes/mysql/mysql5-native_5.1.40.bb b/recipes/mysql/mysql5-native_5.1.40.bb
> index 40d07ec..8001783 100644
> --- a/recipes/mysql/mysql5-native_5.1.40.bb
> +++ b/recipes/mysql/mysql5-native_5.1.40.bb
> @@ -12,6 +12,10 @@ EXTRA_OEMAKE = ""
>  EXTRA_OECONF = " --with-embedded-server "
>
>  do_install() {
> +        oe_runmake 'DESTDIR=${D}' install
> +        mv -f ${D}${libdir}/mysql/* ${D}${libdir}
> +        rmdir ${D}${libdir}/mysql
> +
>         install -d ${D}${bindir}
>         install -m 0755 sql/gen_lex_hash ${D}${bindir}/
>  }
> --

Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

who wished people removing do-stage would actually verify their work
(like they expect others to do).

Re: [PATCH 2/2] mysql5-native: put make install to do_install after autotools_stage_all was removed with do_stage in eaf0fc03acfb262bcd614a14086a1b28ec850f46

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 05-01-11 16:33, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/recipes/mysql/mysql5-native_5.1.40.bb b/recipes/mysql/mysql5-native_5.1.40.bb
> index 40d07ec..8001783 100644
> --- a/recipes/mysql/mysql5-native_5.1.40.bb
> +++ b/recipes/mysql/mysql5-native_5.1.40.bb
> @@ -12,6 +12,10 @@ EXTRA_OEMAKE = ""
>  EXTRA_OECONF = " --with-embedded-server "
>  
>  do_install() {
> +        oe_runmake 'DESTDIR=${D}' install
> +        mv -f ${D}${libdir}/mysql/* ${D}${libdir}
> +        rmdir ${D}${libdir}/mysql
> +
>          install -d ${D}${bindir}
>          install -m 0755 sql/gen_lex_hash ${D}${bindir}/
>  }

Weird, I saw no build errors with my builds from scratch, but I guess my
builds only needed gen_lex_hash and target headers.

Which recipes actually need the native libs and headers?

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNJXc9MkyGM64RGpERAgMXAJ9ckZii9ViSichd3Whc8G8VuoHJ/wCeKkxo
ueOBrSWg2ghV2Z7IiXSlF3U=
=uit1
-----END PGP SIGNATURE-----

Re: [PATCH 2/2] mysql5-native: put make install to do_install after autotools_stage_all was removed with do_stage in eaf0fc03acfb262bcd614a14086a1b28ec850f46

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]

On Thu, Jan 06, 2011 at 09:03:10AM +0100, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> On 05-01-11 16:33, Martin Jansa wrote:
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++
> >  1 files changed, 4 insertions(+), 0 deletions(-)
> > 
> > diff --git a/recipes/mysql/mysql5-native_5.1.40.bb b/recipes/mysql/mysql5-native_5.1.40.bb
> > index 40d07ec..8001783 100644
> > --- a/recipes/mysql/mysql5-native_5.1.40.bb
> > +++ b/recipes/mysql/mysql5-native_5.1.40.bb
> > @@ -12,6 +12,10 @@ EXTRA_OEMAKE = ""
> >  EXTRA_OECONF = " --with-embedded-server "
> >  
> >  do_install() {
> > +        oe_runmake 'DESTDIR=${D}' install
> > +        mv -f ${D}${libdir}/mysql/* ${D}${libdir}
> > +        rmdir ${D}${libdir}/mysql
> > +
> >          install -d ${D}${bindir}
> >          install -m 0755 sql/gen_lex_hash ${D}${bindir}/
> >  }
> 
> Weird, I saw no build errors with my builds from scratch, but I guess my
> builds only needed gen_lex_hash and target headers.
> 
> Which recipes actually need the native libs and headers?

I've noticed it in azy-native (see 1st patch).

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/2] mysql5-native: put make install to do_install after autotools_stage_all was removed with do_stage in eaf0fc03acfb262bcd614a14086a1b28ec850f46

[Khem Raj]

On 1/5/2011 7:33 AM, Martin Jansa wrote:
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>

Acked-by: Khem Raj <raj.khem@gmail.com>

> ---
>   recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/recipes/mysql/mysql5-native_5.1.40.bb b/recipes/mysql/mysql5-native_5.1.40.bb
> index 40d07ec..8001783 100644
> --- a/recipes/mysql/mysql5-native_5.1.40.bb
> +++ b/recipes/mysql/mysql5-native_5.1.40.bb
> @@ -12,6 +12,10 @@ EXTRA_OEMAKE = ""
>   EXTRA_OECONF = " --with-embedded-server "
>
>   do_install() {
> +        oe_runmake 'DESTDIR=${D}' install
> +        mv -f ${D}${libdir}/mysql/* ${D}${libdir}
> +        rmdir ${D}${libdir}/mysql
> +
>           install -d ${D}${bindir}
>           install -m 0755 sql/gen_lex_hash ${D}${bindir}/
>   }

Re: [PATCH 1/2] azy: add mysql5 to depends it's used in azy/src/tests/T_SQL.azy_server_stubs.h if mysql-config is found

[Khem Raj]

On 1/5/2011 7:33 AM, Martin Jansa wrote:
> ---
>   recipes/efl1/azy_svn.bb |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/efl1/azy_svn.bb b/recipes/efl1/azy_svn.bb
> index 5d6cb00..7e96c60 100644
> --- a/recipes/efl1/azy_svn.bb
> +++ b/recipes/efl1/azy_svn.bb
> @@ -1,6 +1,6 @@
>   DESCRIPTION = "Azy is a library meant for implementing rpc clients and servers in a simple manner."
> -DEPENDS = "pkgconfig zlib openssl eina gnutls ecore libxml2 re2c-native azy-native"
> -DEPENDS_virtclass-native = "pkgconfig-native zlib-native openssl-native eina-native gnutls-native ecore-native libxml2-native re2c-native"
> +DEPENDS = "pkgconfig zlib openssl eina gnutls ecore libxml2 re2c-native mysql5 azy-native"
> +DEPENDS_virtclass-native = "pkgconfig-native zlib-native openssl-native eina-native gnutls-native ecore-native libxml2-native re2c-native mysql5-native"
>   LICENSE = "LGPLv2.1+"
>   PV = "1.0.0+svnr${SRCPV}"
>   SRCREV = "${EFL_SRCREV}"

Looks ok.

Acked-by: Khem Raj <raj.khem@gmail.com>

please add your sign-off before installing it.