From patchwork Thu Feb 13 17:46:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Coe X-Patchwork-Id: 1237634 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.133; helo=hemlock.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.a=rsa-sha256 header.s=20161025 header.b=kHBNTWvi; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48JP8j3BCFz9sP7 for ; Fri, 14 Feb 2020 04:47:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 82090870C7; Thu, 13 Feb 2020 17:46:59 +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 Z+UvQtAymftU; Thu, 13 Feb 2020 17:46:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 7F54186CB6; Thu, 13 Feb 2020 17:46:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 556471BF2C7 for ; Thu, 13 Feb 2020 17:46:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 514282152C for ; Thu, 13 Feb 2020 17:46:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xC0Qcf43eJJS for ; Thu, 13 Feb 2020 17:46:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by silver.osuosl.org (Postfix) with ESMTPS id 8C0A920381 for ; Thu, 13 Feb 2020 17:46:56 +0000 (UTC) Received: by mail-pj1-f68.google.com with SMTP id d5so2679484pjz.5 for ; Thu, 13 Feb 2020 09:46:56 -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=3basTApxmicBp4GNZbtbnJVI+p11sJWiCvVInSqhiuU=; b=kHBNTWviX48YklaeudNJSzcNmBq14YDOUurUL+juaoeYuFN4drH9ZSaZSlpGq9DwvH Nm0Ib6QmjLz6Asd4bDsG9G6WEUGP03vcGaQ7JcBn93of5rWH3yOqJQpPGym2WgTQloN6 h3ducYsptS2RWHJHrHV8RUNubKgAgKJFxCUf7m4AHAljaxA+uALfre1+5s7QtVAb6WG5 IMVCVwrUjrGwVv9k7Us0VEPX8/O0SDSgI/M417kquInwNbqlJ1mY5ZH5f3exY+kk/fvL 3JSbW5787bv0EpwFRl0uFmMcRbMNlRhdIVB/nByqng3oihRBYGaFA3Q2YwxdyhLFXhSQ 2MUw== 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=3basTApxmicBp4GNZbtbnJVI+p11sJWiCvVInSqhiuU=; b=RWfXkjVYox/FFvXbN/fwLRyBSk/dyepHuL/JSwCE/0YUNKlZDsOKCxWMogWVkI63uW PhzJ8lvuFETMtEIqBzfJWWqrGiZgJuSlaHQzK8A08mItNW4EPI/h7wnjKf3haPEbNp4K EP3vrcxavAjpGNPX4bHNbBDmsCPsUkMq73VlyYGXsaDDVrFy93roFqCZ8pLWgDFLYX31 cNcjbP/2aEl0gKmywwLrho70iVQs8Q4ALmVS8AziBfjr2jiuh86oJSZ/lNIKmEGo3CKt dtIIwuBjIJE6nb6nWm3O0YB7Orl3shMYBOLn5g9xtfofeH6v2qvHUTWvEwCkOvU+YDYS ENpA== X-Gm-Message-State: APjAAAUeVGYSkmRJkcy4EF2lpS0mccluIu0C4TNsL3Eyt6V8+GxpfKYW LrAIQuG+GT9HPFTmKUshSkr59WEm X-Google-Smtp-Source: APXvYqxFC3SXTXVMjzsfpsmYfonFxm/uHZm3jujnTC5wmLHyxKSayrZJzDZQoPPNMZa/hGcn8MrcLw== X-Received: by 2002:a17:90a:f88:: with SMTP id 8mr6726612pjz.72.1581616015950; Thu, 13 Feb 2020 09:46:55 -0800 (PST) Received: from localhost.localdomain (c-73-59-50-44.hsd1.wa.comcast.net. [73.59.50.44]) by smtp.gmail.com with ESMTPSA id d69sm4169773pfd.72.2020.02.13.09.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 09:46:55 -0800 (PST) From: Ryan Coe To: buildroot@buildroot.org Date: Thu, 13 Feb 2020 09:46:55 -0800 Message-Id: <20200213174655.17309-1-bluemrp9@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 1/1] package/mariadb: patch mariadb_config to add sysroot path 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: bluemrp9@gmail.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch adds @CMAKE_SYSROOT@ to mariadb_config.c.in. Without it, mariadb_config and mysql_config incorrectly returns host paths for include paths and library paths. Upstream report and status: https://jira.mariadb.org/browse/CONC-454 https://github.com/mariadb-corporation/mariadb-connector-c/pull/127 Reported-by: Alexey Lukyanchuk Signed-off-by: Ryan Coe --- Changes v3 -> v4: - add upstream status (suggested by Peter) Changes v2 -> v3: - remove extra slash between CMAKE_SYSROOT and CMAKE_INSTALL_PREFIX Changes v1 -> v2: - no change --- ...2-add-sysroot-path-to-mariadb_config.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch diff --git a/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch b/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch new file mode 100644 index 0000000000..e78434f930 --- /dev/null +++ b/package/mariadb/0002-add-sysroot-path-to-mariadb_config.patch @@ -0,0 +1,32 @@ +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 + +Upstream report and status: +https://jira.mariadb.org/browse/CONC-454 +https://github.com/mariadb-corporation/mariadb-connector-c/pull/127 + +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 +