Skip to contentSkip to conversation

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

PATCH In review Martin Jansa 4 participants 7 messages Jan 5, 2011 – Jan 8, 2011

lore
Share & tools
lore
#0 lore raw

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

---
 recipes/efl1/azy_svn.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
recipes/efl1/azy_svn.bb +2 -2
index 5d6cb00..7e96c60 100644
@@ -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}"
Signature · 1 line
1.7.3.4
#1 lore raw

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

---
 recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
recipes/mysql/mysql5-native_5.1.40.bb +4 -0
index 40d07ec..8001783 100644
@@ -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}/
 }
Signature · 1 line
1.7.3.4
Acked-by on v1 2/2
#2 lore raw

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

2011/1/5 Martin Jansa <[email protected]>:

Quoted 12 lines

---
 recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++

 1 files changed, 4 insertions(+), 0 deletions(-)
recipes/mysql/mysql5-native_5.1.40.bb +0 -0
index 40d07ec..8001783 100644
@@ -12,6 +12,10 @@ EXTRA_OEMAKE = ""

 EXTRA_OECONF = " --with-embedded-server "

Quoted 9 lines

 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}/ }
--

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

#3 lore raw

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

In reply to Martin Jansa

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

Quoted 10 lines · Martin Jansa
---
 recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
recipes/mysql/mysql5-native_5.1.40.bb +0 -0
index 40d07ec..8001783 100644

recipes/mysql/mysql5-native_5.1.40.bb EXTRA_OEMAKE = "" · line 21

Quoted 10 lines
recipes/mysql/mysql5-native_5.1.40.bb +4 -0
@@ -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-----

#4 lore raw

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

Quoted 28 lines · Koen Kooi

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

Quoted 10 lines · Martin Jansa
---
 recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
recipes/mysql/mysql5-native_5.1.40.bb +0 -0
index 40d07ec..8001783 100644

recipes/mysql/mysql5-native_5.1.40.bb EXTRA_OEMAKE = "" · line 21

Quoted 10 lines
recipes/mysql/mysql5-native_5.1.40.bb +4 -0
@@ -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.

Quoted 1 line

Which recipes actually need the native libs and headers?

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

Regards,

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
Acked-by on v1 2/2
#5 lore raw

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

In reply to Martin Jansa
Quoted 1 line · Martin Jansa
Quoted 19 lines
---
  recipes/mysql/mysql5-native_5.1.40.bb |    4 ++++
  1 files changed, 4 insertions(+), 0 deletions(-)
recipes/mysql/mysql5-native_5.1.40.bb +4 -0
index 40d07ec..8001783 100644
@@ -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 on v1 1/2
#6 lore raw
In reply to Martin Jansa
Quoted 9 lines · Martin Jansa
---
  recipes/efl1/azy_svn.bb |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
recipes/efl1/azy_svn.bb +0 -0
index 5d6cb00..7e96c60 100644

recipes/efl1/azy_svn.bb line 6

Quoted 8 lines
recipes/efl1/azy_svn.bb +2 -2
@@ -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.

please add your sign-off before installing it.