Skip to contentSkip to conversation

mysql: fix shared-only builds (branch yem/fixes)

PATCH New Yann E. MORIN 2 participants 4 messages Dec 22, 2014

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

cover mysql: fix shared-only builds (branch yem/fixes)

Hello All!

This series fixes builds of mysql in a shared-only build.

The first patch is just a rename of patches to the new naming scheme, and the second patch eventually introduces the actual fix.

Regards,
Yann E. MORIN.

The following changes since commit aa36fc34612fcf221e3076fdcb4a39c83c0c397b:

pinentry: remove non-existent configure options for Qt3 and GTK+1 (2014-12-21 23:49:13 +0100)

are available in the git repository at:

git://git.busybox.net/~ymorin/git/buildroot yem/fixes

for you to fetch changes up to 50cf5f364ad786ec508c78609467cbcef6b7bd86:

package/mysql: do not force a static build for internal programs (2014-12-22 00:16:58 +0100)

----------------------------------------------------------------
Yann E. MORIN (2):
package/mysql: rename patches to the new convention package/mysql: do not force a static build for internal programs

 ...-ac_cache_check.patch => 0000-ac_cache_check.patch} |  0
 ...check.patch => 0001-configure-ps-cache-check.patch} |  0
 ...e-iface.patch => 0002-use-new-readline-iface.patch} |  0
 ...et.patch => 0003-ac_stack_direction-is-unset.patch} |  0
 ...ion.patch => 0004-Fix-gen_lex_hash-execution.patch} |  0
 ...ch => 0005-bison_3_breaks_mysql_server_build.patch} |  0
 package/mysql/0006-no-force-static-build.patch         | 18 ++++++++++++++++++
 7 files changed, 18 insertions(+)
 rename package/mysql/{mysql-0000-ac_cache_check.patch => 0000-ac_cache_check.patch} (100%)
 rename package/mysql/{mysql-0001-configure-ps-cache-check.patch => 0001-configure-ps-cache-check.patch} (100%)
 rename package/mysql/{mysql-0002-use-new-readline-iface.patch => 0002-use-new-readline-iface.patch} (100%)
 rename package/mysql/{mysql-0003-ac_stack_direction-is-unset.patch => 0003-ac_stack_direction-is-unset.patch} (100%)
 rename package/mysql/{mysql-0004-Fix-gen_lex_hash-execution.patch => 0004-Fix-gen_lex_hash-execution.patch} (100%)
 rename package/mysql/{mysql-0005-bison_3_breaks_mysql_server_build.patch => 0005-bison_3_breaks_mysql_server_build.patch} (100%)
 create mode 100644 package/mysql/0006-no-force-static-build.patch
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH 1/2 package/mysql: rename patches to the new convention

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 .../mysql/{mysql-0000-ac_cache_check.patch => 0000-ac_cache_check.patch}  | 0
 ...configure-ps-cache-check.patch => 0001-configure-ps-cache-check.patch} | 0
 ...002-use-new-readline-iface.patch => 0002-use-new-readline-iface.patch} | 0
 ...ck_direction-is-unset.patch => 0003-ac_stack_direction-is-unset.patch} | 0
 ...gen_lex_hash-execution.patch => 0004-Fix-gen_lex_hash-execution.patch} | 0
 ...ql_server_build.patch => 0005-bison_3_breaks_mysql_server_build.patch} | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename package/mysql/{mysql-0000-ac_cache_check.patch => 0000-ac_cache_check.patch} (100%)
 rename package/mysql/{mysql-0001-configure-ps-cache-check.patch => 0001-configure-ps-cache-check.patch} (100%)
 rename package/mysql/{mysql-0002-use-new-readline-iface.patch => 0002-use-new-readline-iface.patch} (100%)
 rename package/mysql/{mysql-0003-ac_stack_direction-is-unset.patch => 0003-ac_stack_direction-is-unset.patch} (100%)
 rename package/mysql/{mysql-0004-Fix-gen_lex_hash-execution.patch => 0004-Fix-gen_lex_hash-execution.patch} (100%)
 rename package/mysql/{mysql-0005-bison_3_breaks_mysql_server_build.patch => 0005-bison_3_breaks_mysql_server_build.patch} (100%)
package/mysql/0000-ac_cache_check.patch renamed from package/mysql/mysql-0000-ac_cache_check.patch +0 -0
similarity index 100%
rename from package/mysql/mysql-0000-ac_cache_check.patch
rename to package/mysql/0000-ac_cache_check.patch
package/mysql/0001-configure-ps-cache-check.patch renamed from package/mysql/mysql-0001-configure-ps-cache-check.patch +0 -0
similarity index 100%
rename from package/mysql/mysql-0001-configure-ps-cache-check.patch
rename to package/mysql/0001-configure-ps-cache-check.patch
package/mysql/0002-use-new-readline-iface.patch renamed from package/mysql/mysql-0002-use-new-readline-iface.patch +0 -0
similarity index 100%
rename from package/mysql/mysql-0002-use-new-readline-iface.patch
rename to package/mysql/0002-use-new-readline-iface.patch
package/mysql/0003-ac_stack_direction-is-unset.patch renamed from package/mysql/mysql-0003-ac_stack_direction-is-unset.patch +0 -0
similarity index 100%
rename from package/mysql/mysql-0003-ac_stack_direction-is-unset.patch
rename to package/mysql/0003-ac_stack_direction-is-unset.patch
package/mysql/0004-Fix-gen_lex_hash-execution.patch renamed from package/mysql/mysql-0004-Fix-gen_lex_hash-execution.patch +0 -0
similarity index 100%
rename from package/mysql/mysql-0004-Fix-gen_lex_hash-execution.patch
rename to package/mysql/0004-Fix-gen_lex_hash-execution.patch
package/mysql/0005-bison_3_breaks_mysql_server_build.patch renamed from package/mysql/mysql-0005-bison_3_breaks_mysql_server_build.patch +0 -0
similarity index 100%
rename from package/mysql/mysql-0005-bison_3_breaks_mysql_server_build.patch
rename to package/mysql/0005-bison_3_breaks_mysql_server_build.patch
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/2 package/mysql: do not force a static build for internal programs

In reply to Yann E. MORIN

mysql wants to statically link some of the programs it uses internally, like conf_to_src (whatever it is used for) which links against -lz.

This does not work for a shared-only build, as we would be missing libz.a in that case.

Fix that by not forcing static builds for internal programs.

Fixes a slew of autobuild failures:

    http://autobuild.buildroot.net/results/018/018a579f37c9c8eca5a36fc76e93508dcf9bba35/
    http://autobuild.buildroot.net/results/2cc/2cc481b0ae43713a6fc50a1ca720f91384892af7/
    http://autobuild.buildroot.net/results/d98/d985c5824f9012374d64e6085d6c8ec9b3cd932b/
    ...
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/mysql/0006-no-force-static-build.patch | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 package/mysql/0006-no-force-static-build.patch
package/mysql/0006-no-force-static-build.patch new file +18 -0
new file mode 100644
index 0000000..8172a98
@@ -0,0 +1,18 @@
+configure: do not force a static link for non-installed programs
+
+Otherwise, it tries to link against a static libz, which may not exist
+in a shared-only system.
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+diff -durN mysql-5.1.73.orig/configure.in mysql-5.1.73/configure.in
+--- mysql-5.1.73.orig/configure.in	2014-12-22 00:04:46.550508208 +0100
++++ mysql-5.1.73/configure.in	2014-12-22 00:05:56.415307480 +0100
+@@ -562,7 +562,6 @@
+   AC_MSG_ERROR([MySQL requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
+ fi
+ 
+-NOINST_LDFLAGS="-static"
+ 
+ static_nss=""
+ STATIC_NSS_FLAGS=""
Signature · 1 line
1.9.1
Applied
#3 lore raw

cover mysql: fix shared-only builds (branch yem/fixes)

In reply to Yann E. MORIN

Dear Yann E. MORIN,

Quoted 3 lines · Yann E. MORIN

Yann E. MORIN (2):
package/mysql: rename patches to the new convention package/mysql: do not force a static build for internal programs

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com