Skip to contentSkip to conversation

mariadb and mysql

PATCH New Christopher McCrory 3 participants 4 messages Nov 8, 2018 – Nov 9, 2018

lore
Share & tools
lore
#0 lore raw

cover mariadb and mysql

I ran into this again when testing perl-termreadkey. I started with an existing config that used perl-dbd-mysql. Thought I would send the patch I generated a while ago. As an aside, used mariadb because the oracle-mysql 5.1 version was EOL 5 ish years ago.

Hopefully my commit messages are getting better :)

Christopher McCrory (1):
mariadb: fix mysql_config when cross compiling

 package/mariadb/mariadb.mk | 5 +++++
 1 file changed, 5 insertions(+)
Signature · 1 line
2.14.5
#1 lore raw

PATCH 1/1 mariadb: fix mysql_config when cross compiling

Mariadb_config in staging is not a shell script, this breaks mysql_config when cross-compiling. This in turn breaks package builds needing the location of the include and library files. So remove it after installation into $TARGET_DIR

---
 package/mariadb/mariadb.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/mariadb/mariadb.mk +5 -0
index 06d6365fab..52d47f98fc 100644
@@ -125,10 +125,15 @@ endif
 
 # We don't need mysql_config on the target as it's only useful in staging
 # We also don't need the test suite on the target
+# Also mariadb_config in staging is not a shell script, this breaks
+# mysql_config when cross-compiling.  This in turn breaks package builds
+# needing the location of the include and library files. So remove it after
+# installation into $TARGET_DIR
 define MARIADB_POST_INSTALL
 	mkdir -p $(TARGET_DIR)/var/lib/mysql
 	$(RM) $(TARGET_DIR)/usr/bin/mysql_config
 	$(RM) -r $(TARGET_DIR)/usr/share/mysql/test
+	$(RM) $(STAGING_DIR)/usr/bin/mariadb_config
 endef
 
 MARIADB_POST_INSTALL_TARGET_HOOKS += MARIADB_POST_INSTALL
Signature · 1 line
2.14.5
#2 lore raw

PATCH 1/1 mariadb: fix mysql_config when cross compiling

Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Christopher" == Christopher McCrory <[email protected]> writes:

Mariadb_config in staging is not a shell script, this breaks mysql_config when cross-compiling. This in turn breaks package builds needing the location of the include and library files. So remove it after installation into $TARGET_DIR

---
 package/mariadb/mariadb.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/mariadb/mariadb.mk +0 -0
index 06d6365fab..52d47f98fc 100644

package/mariadb/mariadb.mk endif · line 131

Quoted 7 lines
package/mariadb/mariadb.mk +4 -0
@@ -125,10 +125,15 @@ endif
 
 # We don't need mysql_config on the target as it's only useful in staging
 # We also don't need the test suite on the target
+# Also mariadb_config in staging is not a shell script, this breaks
+# mysql_config when cross-compiling.  This in turn breaks package builds
+# needing the location of the include and library files. So remove it after
+# installation into $TARGET_DIR

Ehh, STAGING_DIR or TARGET_DIR?

What then happens when those packages try to run mariadb_config to get the include/library locations? What if the build machine already has mariadb_config in the path?

package/mariadb/mariadb.mk endif · line 136

Quoted 5 lines
package/mariadb/mariadb.mk +1 -0
 define MARIADB_POST_INSTALL
 	mkdir -p $(TARGET_DIR)/var/lib/mysql
 	$(RM) $(TARGET_DIR)/usr/bin/mysql_config
 	$(RM) -r $(TARGET_DIR)/usr/share/mysql/test
+	$(RM) $(STAGING_DIR)/usr/bin/mariadb_config

Fixups to STAGING_DIR should not be mixed up wiith the TARGET_DIR installation logic, please add a POST_INSTALL_STAGING_HOOK instead.

Quoted 10 lines
package/mariadb/mariadb.mk +0 -0
 endef
 
 MARIADB_POST_INSTALL_TARGET_HOOKS += MARIADB_POST_INSTALL
Signature · 6 lines
2.14.5

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

cover mariadb and mysql

In reply to Christopher McCrory
Quoted 4 lines · Christopher McCrory

I ran into this again when testing perl-termreadkey. I started with an existing config that used perl-dbd-mysql. Thought I would send the patch I generated a while ago. As an aside, used mariadb because the oracle-mysql 5.1 version was EOL 5 ish years ago.

Feel free to bump it :-)

However, note that at the moment, there is a huge size difference between
oracle-mysql and mariadb: oracle-mysql server is just around 10MB, while mariadb is over 100MB.

Regards,
Arnout

Quoted 11 lines

Hopefully my commit messages are getting better :)

Christopher McCrory (1):
mariadb: fix mysql_config when cross compiling

 package/mariadb/mariadb.mk | 5 +++++
 1 file changed, 5 insertions(+)