From: Bastian Stender <bst@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bastian Stender <bst@pengutronix.de>
Subject: [ptxdist] [PATCH] php5: add choice for SQL server
Date: Mon, 29 May 2017 14:22:02 +0200 [thread overview]
Message-ID: <20170529122202.28922-1-bst@pengutronix.de> (raw)
MariaDB is a binary drop in replacement for MySQL and satisfies the
dependency. So make this a choice field.
Signed-off-by: Bastian Stender <bst@pengutronix.de>
---
This patch depends on the mariadb package.
rules/php5.in | 21 +++++++++++++++++++--
rules/php5.make | 2 +-
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/rules/php5.in b/rules/php5.in
index 2266fee85..56eee45fe 100644
--- a/rules/php5.in
+++ b/rules/php5.in
@@ -11,7 +11,8 @@ menuconfig PHP5
select LIBXML2_DTD if PHP5_XML_LIBXML2
select LIBXML2_XINCLUDE if PHP5_XML_LIBXML2
select LIBXSLT if PHP5_XML_LIBXML2_XSLT
- select MYSQL if PHP5_EXT_MYSQL
+ select MYSQL if PHP5_EXT_MYSQL
+ select MARIADB if PHP5_EXT_MARIADB
select PHP5_XML if PHP5_EXT_SOAP
select XMLRPC_C if PHP5_XML_LIBXML2_XMLRPC
select SQLITE if PHP5_EXT_SQLITE3
@@ -244,12 +245,28 @@ config PHP5_EXT_CURL
help
Enable CURL support for PHP.
+choice
+ prompt "SQL Server"
+ default PHP5_EXT_WITHOUT_SQL
+
+config PHP5_EXT_WITHOUT_SQL
+ bool
+ prompt "none"
+
config PHP5_EXT_MYSQL
bool
- prompt "mysql"
+ prompt "MySQL"
help
Enable MySQL database support for PHP.
+config PHP5_EXT_MARIADB
+ bool
+ prompt "MariaDB"
+ help
+ Enable MariaDB database support for PHP.
+
+endchoice # SQL Server
+
config PHP5_EXT_SOAP
bool
prompt "soap"
diff --git a/rules/php5.make b/rules/php5.make
index cc9dc8e10..a541dbb32 100644
--- a/rules/php5.make
+++ b/rules/php5.make
@@ -235,7 +235,7 @@ else
PHP5_AUTOCONF += --without-curl
endif
-ifdef PTXCONF_PHP5_EXT_MYSQL
+ifneq ("$(or $(PTXCONF_PHP5_EXT_MYSQL),$(PTXCONF_PHP5_EXT_MARIADB))", "")
PHP5_AUTOCONF += \
--with-mysql=$(SYSROOT)/usr \
--with-pdo-mysql=$(SYSROOT)/usr
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2017-05-29 12:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20170529122202.28922-1-bst@pengutronix.de \
--to=bst@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox