Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/open2300: link with -lz only if needed
Date: Tue, 14 Jul 2020 22:16:30 +0200	[thread overview]
Message-ID: <20200714201630.1407071-1-fontaine.fabrice@gmail.com> (raw)

oracle-mysql won't built its own bundled zlib since commit
6fed83a03047535d4a9c849352f8c21b30177fcd so don't unconditionally link
with zlib

It should be noted that oracle-mysql has a pkg-config file since version
5.7.22 and
https://github.com/mysql/mysql-server/commit/f701787602583464fce4f44d44f67471a06c9b70
but we're stuck in version 5.1.x and can't easily import this commit
because upstream switched to cmake

Fixes:
 - No autobuilder failures yet

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/open2300/open2300.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
index 589d344b97..a9087279eb 100644
--- a/package/open2300/open2300.mk
+++ b/package/open2300/open2300.mk
@@ -21,7 +21,7 @@ OPEN2300_DEPENDENCIES += mysql
 OPEN2300_BINS += mysql2300 mysqlhistlog2300
 OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql
 OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient
-ifeq ($(BR2_STATIC_LIBS),y)
+ifeq ($(BR2_PACKAGE_ZLIB)$(BR2_STATIC_LIBS),yy)
 # mysql needs -lz, so we need to specify it for static builds
 OPEN2300_LDFLAGS += -lz
 endif
-- 
2.27.0

             reply	other threads:[~2020-07-14 20:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-14 20:16 Fabrice Fontaine [this message]
2020-07-14 20:37 ` [Buildroot] [PATCH 1/1] package/open2300: link with -lz only if needed Thomas Petazzoni
2020-07-14 20:41   ` Fabrice Fontaine

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=20200714201630.1407071-1-fontaine.fabrice@gmail.com \
    --to=fontaine.fabrice@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox