From: Ryan Coe <bluemrp9@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 3/8] package/mariadb: add sysroot path to mariadb_config
Date: Mon, 3 Feb 2020 17:21:55 -0800 [thread overview]
Message-ID: <20200204012200.7273-3-bluemrp9@gmail.com> (raw)
In-Reply-To: <20200204012200.7273-1-bluemrp9@gmail.com>
This patch adds @CMAKE_SYSROOT@ to mariadb_config.c.in. Without it,
mariadb_config incorrectly returns host paths for include paths and
library paths.
Reported-by: Alexey Lukyanchuk <skif@skif-web.ru>
Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
---
Changes v2 -> v3:
- remove extra slash between CMAKE_SYSROOT and CMAKE_INSTALL_PREFIX
Changes v1 -> v2:
- no change
---
...3-add-sysroot-path-to-mariadb_config.patch | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
create mode 100644 package/mariadb/0003-add-sysroot-path-to-mariadb_config.patch
diff --git a/package/mariadb/0003-add-sysroot-path-to-mariadb_config.patch b/package/mariadb/0003-add-sysroot-path-to-mariadb_config.patch
new file mode 100644
index 0000000000..a072b37e29
--- /dev/null
+++ b/package/mariadb/0003-add-sysroot-path-to-mariadb_config.patch
@@ -0,0 +1,28 @@
+From 7e1b6aafeb9fe6558da7506b304c0efb5ea82281 Mon Sep 17 00:00:00 2001
+From: Ryan Coe <bluemrp9@gmail.com>
+Date: Fri, 13 Dec 2019 17:13:26 -0800
+Subject: [PATCH 1/1] add sysroot path to mariadb_config
+
+Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
+---
+ libmariadb/mariadb_config/mariadb_config.c.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in
+index 703c9466a1d9214a85f3638d2e3b4ecfef0c7bd6..f5513333e670373f060a3c2574d1d42facfd0337 100644
+--- a/libmariadb/mariadb_config/mariadb_config.c.in
++++ b/libmariadb/mariadb_config/mariadb_config.c.in
+@@ -5,8 +5,8 @@
+
+ static char *mariadb_progname;
+
+-#define INCLUDE "-I at CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I at CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
+-#define LIBS "-L at CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
++#define INCLUDE "-I at CMAKE_SYSROOT@/@CMAKE_INSTALL_PREFIX@@INSTALL_INCLUDEDIR@ -I at CMAKE_SYSROOT@/@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
++#define LIBS "-L at CMAKE_SYSROOT@/@CMAKE_INSTALL_PREFIX@@INSTALL_LIBDIR@/ -lmariadb"
+ #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
+ #define CFLAGS INCLUDE
+ #define VERSION "@MARIADB_CLIENT_VERSION@"
+--
+2.24.1
+
--
2.25.0
next prev parent reply other threads:[~2020-02-04 1:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 1:21 [Buildroot] [PATCH v3 1/8] package/mariadb: fix permissions of data dir when using systemd Ryan Coe
2020-02-04 1:21 ` [Buildroot] [PATCH v3 2/8] package/mariadb: remove mariadb_config from target Ryan Coe
2020-02-04 13:38 ` Peter Korsgaard
2020-03-10 20:30 ` Peter Korsgaard
2020-02-04 1:21 ` Ryan Coe [this message]
2020-02-04 13:45 ` [Buildroot] [PATCH v3 3/8] package/mariadb: add sysroot path to mariadb_config Peter Korsgaard
2020-02-04 1:21 ` [Buildroot] [PATCH v3 4/8] package/mariadb: fix potential error message in sysv startup script Ryan Coe
2020-02-04 13:48 ` Peter Korsgaard
2020-03-10 20:30 ` Peter Korsgaard
2020-02-04 1:21 ` [Buildroot] [PATCH v3 5/8] package/mariadb: rename variable " Ryan Coe
2020-02-04 13:52 ` Peter Korsgaard
2020-02-04 1:21 ` [Buildroot] [PATCH v3 6/8] package/mariadb: explicitly define logging directory to mysqld Ryan Coe
2020-02-04 13:54 ` Peter Korsgaard
2020-02-04 1:21 ` [Buildroot] [PATCH v3 7/8] package/mariadb: do not pass --user=mysql to mysql_install_db Ryan Coe
2020-02-04 13:55 ` Peter Korsgaard
2020-02-04 1:22 ` [Buildroot] [PATCH v3 8/8] package/mariadb: security bump version to 10.4.12 Ryan Coe
2020-02-04 14:02 ` Peter Korsgaard
2020-02-04 13:38 ` [Buildroot] [PATCH v3 1/8] package/mariadb: fix permissions of data dir when using systemd Peter Korsgaard
2020-03-07 21:23 ` Peter Korsgaard
2020-03-08 8:39 ` Baruch Siach
2020-03-08 8:52 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200204012200.7273-3-bluemrp9@gmail.com \
--to=bluemrp9@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.