From patchwork Sat Dec 14 03:46:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Coe X-Patchwork-Id: 1209658 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vMxs8FVT"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47ZYRk0Ffmz9sPW for ; Sat, 14 Dec 2019 14:48:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 90CA788187; Sat, 14 Dec 2019 03:48:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LIE1W3y8hg1u; Sat, 14 Dec 2019 03:48:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id AAA9C88012; Sat, 14 Dec 2019 03:48:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 74A591BF94B for ; Sat, 14 Dec 2019 03:48:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 712B288056 for ; Sat, 14 Dec 2019 03:48:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l8xAeEBeP9qE for ; Sat, 14 Dec 2019 03:48:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id BE3F587FD8 for ; Sat, 14 Dec 2019 03:48:39 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id x13so2045657plr.9 for ; Fri, 13 Dec 2019 19:48:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5CtcDPTXDD1RK9t5Ft5YhdrZu79El2mDP5nOtEplvkA=; b=vMxs8FVT8HouLTF4g0+IUhjRoiPwng4NzPfA7dJH7blr92o3VzpRxhB9QQ2daimfNq CYoCmM1OpLsT0rB3RUMKtZE2igQtI+rd8xMDZkuqh/zECVF6ydXLMOexE7NxWiCtd19G u5Ui5jYXw2T15wAb5MRCI0WvsOBxo2Hovz61oMgc2/oz7qyjxB2VfjG+ocwYr3DZCjgC JM60wpV4tdWfhW971VLweK8kn08cqMz8/d8X/BK6NjHo7spi02dK4bjiJesluJGfV2w5 T72THFShEGNRxW+vNNpEQw+6sDBECU5MFk5qc4ilU6JOn5EglFlG6MGIEYkg6Slfgpdb c+7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=5CtcDPTXDD1RK9t5Ft5YhdrZu79El2mDP5nOtEplvkA=; b=GB0QBJtLgBiVhlg1IoPQKU7u8QIe7npMkPCdujO40K9oQ6ajWiYP9+VycVqwgMuUgY IdaIxk8+19+OZXCUz7hk5vqSO0URkzHGohjYJA2g7teB3R6XBt+4Mbs8a01j6TWR3p8F nflWz4UTHpXOIjPIAHdlclL6GotZgK5VrQ06cNGTepez2RokyjgRp2jk9W90gUWnNxB7 XkC7OrweGW+pGiagmktEC+Z+d9sZFPz8hv3m6XiPXyOhu/SNb4273fQ/PPTJbnfMaizW h0d3VjAbhfP4OP9Fv+egE/G3A3PuUSa8IdSjRmN6V/Q0IZ4Gmlu61Py7acvhWssUdZ2d xVCQ== X-Gm-Message-State: APjAAAXf8hpEg+DxwJeGUfJ/qwlIYlfEAa3BDLUaD1BV64NSbxpPRZ8W 5iG+bYdXdIETEGw3Nv5V1XFRSAK2 X-Google-Smtp-Source: APXvYqwZH2f1SYEUU+8+Kc694w13E2QQPW/OrbkFbVkRLZE0imtc1vz6t6vQZjurnaz3+tcLLyOc1g== X-Received: by 2002:a17:90b:f0f:: with SMTP id br15mr3455857pjb.138.1576295319016; Fri, 13 Dec 2019 19:48:39 -0800 (PST) Received: from raptor.ryco.dev (c-73-221-112-208.hsd1.wa.comcast.net. [73.221.112.208]) by smtp.gmail.com with ESMTPSA id 68sm12669136pge.14.2019.12.13.19.48.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 19:48:38 -0800 (PST) From: Ryan Coe To: buildroot@buildroot.org Date: Fri, 13 Dec 2019 19:46:09 -0800 Message-Id: <20191214034609.12829-1-bluemrp9@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/mariadb: prefix sysroot in mariadb_config X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Lukyanchuk , Ryan Coe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch adds @CMAKE_SYSROOT@ to mariadb_config.c.in. Without it, mariadb_config incorrectly returns host paths for include paths and library paths. This also removes mariadb_config from the target like is done for mysql_config. Reported-by: Alexey Lukyanchuk Signed-off-by: Ryan Coe --- ...3-add-sysroot-path-to-mariadb_config.patch | 28 +++++++++++++++++++ package/mariadb/mariadb.mk | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) 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..5eca8ec402 --- /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 +Date: Fri, 13 Dec 2019 17:13:26 -0800 +Subject: [PATCH 1/1] add sysroot path to mariadb_config + +Signed-off-by: Ryan Coe +--- + 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@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" +-#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" ++#define INCLUDE "-I@CMAKE_SYSROOT@/@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_SYSROOT@/@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" ++#define LIBS "-L@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 + diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 82e3c16daf..d08909d35c 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -126,11 +126,12 @@ define MARIADB_INSTALL_INIT_SYSTEMD endef 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 +# We don't need mysql_config or mariadb_config on the target as it's +# only useful in staging. We also don't need the test suite on the target. define MARIADB_POST_INSTALL mkdir -p $(TARGET_DIR)/var/lib/mysql $(RM) $(TARGET_DIR)/usr/bin/mysql_config + $(RM) $(TARGET_DIR)/usr/bin/mariadb_config $(RM) -r $(TARGET_DIR)/usr/share/mysql/test endef