From patchwork Thu Nov 8 17:09:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher McCrory X-Patchwork-Id: 995045 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.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="L4GmY0fR"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42rVCS5fh1z9s9J for ; Fri, 9 Nov 2018 04:10:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D6E708464C; Thu, 8 Nov 2018 17:10:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eKFfhWU8BuPw; Thu, 8 Nov 2018 17:10:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D9B3384594; Thu, 8 Nov 2018 17:10:06 +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 554C21BF417 for ; Thu, 8 Nov 2018 17:10:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 52B38882C3 for ; Thu, 8 Nov 2018 17:10:06 +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 zcyqMP8ToJm5 for ; Thu, 8 Nov 2018 17:10:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3EC1B8829F for ; Thu, 8 Nov 2018 17:10:04 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id g7-v6so7313325pfo.10 for ; Thu, 08 Nov 2018 09:10:04 -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:in-reply-to:references; bh=ixTjJmjuyMiwMWIx5YPeyBAgg6CIKQ8TeOp8LS9N8ZA=; b=L4GmY0fRkPE/amxP3yRqBdbGtX2gHKbRKZ52Y2sQTub5v8U3FpfVyiQaxIq0CcHGWl ctr0Y3KPmhxO9ZdGXMk2AKlhpSKZxNBnnW883MfEuGKW43FYMb72uzjwaXhJ8LMD9Rww Kwufy0zTjbZtLdBTvIOcF8r16+Xa6AmepcCLK20Az2oZd6/7z2CKOZUGQmTui4H8BtmC 6bjofW85m5CFv7LrcZillDxBUi/i0qj4c4YUlPDDWGnUI1+UWPJ7odrmNoUgxzfSI0DW UiSM8cb0EE+sme2N2XEUFPvXA5IWFnBiPHYGufET1CDfjct83oDRFn4x1zdNuGM4L02M Qp3Q== 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:in-reply-to :references; bh=ixTjJmjuyMiwMWIx5YPeyBAgg6CIKQ8TeOp8LS9N8ZA=; b=DCgAKq/qlwmellfRqUTkKUf5dgsKlRJeuvLb4S8VdSqWLoNZT6i90y11VT/1SgrejQ L8LtGtkDQDW4uo1twv8ZrLqtyGyKLlUizUgNrmNLpROg3o9J6/istvpPl24latrLlF4S SPGenWAB85NREkOW+EbwhtcoafTFo0oQTWKA67oJreD3E4vdswT9z6GJzQpYivL5lApM xWWY9f0g0JH+fJKOrOAipgCcB+nFzQA2Kz7rtky4+aUrfeIVrwrb+Y+qP08NgNotXIjG el0ZDMk4RhrdIWT6DKm1TO01dg/recL3dALiW+eVGFWYSuhTNpHOy03t1I9N7RuSUwY2 hssA== X-Gm-Message-State: AGRZ1gLSVv17YvHpZ05/SQiqcn8xrn+fweWFNWNO4rCSb1OR4pLoWehR zeaNF3FNE1sF10mJEnQ4DuKwHccO X-Google-Smtp-Source: AJdET5eStKaAf52TnMGz3PhOg9eOVXzifDRO64kkFhrzqYkeP4Wkqy/TKQG7eoilq8EQC3Gk0BbAkw== X-Received: by 2002:a63:741:: with SMTP id 62mr4327676pgh.352.1541697003421; Thu, 08 Nov 2018 09:10:03 -0800 (PST) Received: from localhost.localdomain ([2600:1012:b02e:8d59:6dfc:a685:f992:9821]) by smtp.gmail.com with ESMTPSA id b77-v6sm5589705pfm.3.2018.11.08.09.10.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 09:10:02 -0800 (PST) From: Christopher McCrory To: buildroot@buildroot.org Date: Thu, 8 Nov 2018 09:09:50 -0800 Message-Id: <20181108170950.30189-2-chrismcc@gmail.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20181108170950.30189-1-chrismcc@gmail.com> References: <20181108170950.30189-1-chrismcc@gmail.com> Subject: [Buildroot] [PATCH 1/1] mariadb: fix mysql_config when cross compiling 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: Christopher McCrory , Ryan Coe MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Mariadb_config in staging is not a shell script, this breaks mysql_config when cross-compiling. This in turn breaks package builds needing the location of the include and library files. So remove it after installation into $TARGET_DIR Signed-off-by: Christopher McCrory --- package/mariadb/mariadb.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 06d6365fab..52d47f98fc 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -125,10 +125,15 @@ 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 +# Also mariadb_config in staging is not a shell script, this breaks +# mysql_config when cross-compiling. This in turn breaks package builds +# needing the location of the include and library files. So remove it after +# installation into $TARGET_DIR define MARIADB_POST_INSTALL mkdir -p $(TARGET_DIR)/var/lib/mysql $(RM) $(TARGET_DIR)/usr/bin/mysql_config $(RM) -r $(TARGET_DIR)/usr/share/mysql/test + $(RM) $(STAGING_DIR)/usr/bin/mariadb_config endef MARIADB_POST_INSTALL_TARGET_HOOKS += MARIADB_POST_INSTALL