From patchwork Wed Feb 19 08:23:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 24932 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1F6152054E for ; Wed, 19 Feb 2014 08:23:51 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id m5sf91545qaj.9 for ; Wed, 19 Feb 2014 00:23:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=k8bLrnrautEWBZjXYLdgRWWCbpxayTxqbXgr0NmyPuc=; b=fV2qa3pYrZzpqK4pZCK5gMuVX9hHAid59j+jRAJzLtV7PUw8wifCHGIjrd6bEH1+Mu vubW3PtxoVUjfHG8UiSBi6+DIm18ZoDS2+Ps9qYEvnzb0Qq5lQDMitov5ngPNMjs1Jeq u4f9WT5wcKB/769lsyNsX6P45OWGsLUH1tBpIn5SgUzKUQZmKPThiGDeaNbNgwTdWweL EKGBJU7JmJrCWBrFEH9W7NK7wY6mmdxSF2Qb2dGuJxKIH5/6DraFp5H0sS2Wa8d8CdVV AbzYBUrS2Yv7M5eDtIOIVvxhkqZRv0Dx5dLov8q2SAGjqqWOUnQoDyhd9e5AYuGJ9Byu 7RNQ== X-Gm-Message-State: ALoCoQmHSXgFrdwfHQvKIret3vawBKYSO3yCNjV2cl+CQpUHIYbNmsWSbwm/oisiL0tbX2Kgb2ud X-Received: by 10.236.65.136 with SMTP id f8mr13418819yhd.11.1392798230913; Wed, 19 Feb 2014 00:23:50 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.102 with SMTP id l93ls10516qge.93.gmail; Wed, 19 Feb 2014 00:23:50 -0800 (PST) X-Received: by 10.220.192.71 with SMTP id dp7mr971690vcb.45.1392798230831; Wed, 19 Feb 2014 00:23:50 -0800 (PST) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id dp5si6500644vec.109.2014.02.19.00.23.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 19 Feb 2014 00:23:50 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id hq11so58736vcb.14 for ; Wed, 19 Feb 2014 00:23:50 -0800 (PST) X-Received: by 10.220.103.141 with SMTP id k13mr20284658vco.25.1392798230689; Wed, 19 Feb 2014 00:23:50 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp279693vcz; Wed, 19 Feb 2014 00:23:50 -0800 (PST) X-Received: by 10.66.66.66 with SMTP id d2mr721013pat.80.1392798229713; Wed, 19 Feb 2014 00:23:49 -0800 (PST) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id xk2si21063523pab.187.2014.02.19.00.23.48 for ; Wed, 19 Feb 2014 00:23:49 -0800 (PST) Received-SPF: pass (google.com: domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id F390D6E7FE; Wed, 19 Feb 2014 08:23:46 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by mail.openembedded.org (Postfix) with ESMTP id 02DB36CBDF for ; Wed, 19 Feb 2014 08:23:44 +0000 (UTC) Received: by mail-wi0-f173.google.com with SMTP id bs8so252197wib.0 for ; Wed, 19 Feb 2014 00:23:45 -0800 (PST) X-Received: by 10.180.207.10 with SMTP id ls10mr200670wic.4.1392798225544; Wed, 19 Feb 2014 00:23:45 -0800 (PST) Received: from localhost ([2001:610:612:0:5e51:4fff:fec8:7c15]) by mx.google.com with ESMTPSA id ci4sm51968558wjc.21.2014.02.19.00.23.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Feb 2014 00:23:44 -0800 (PST) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Wed, 19 Feb 2014 09:23:38 +0100 Message-Id: <1392798218-17950-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.8.4.2 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCH] mariadb: move linker fix to .inc X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 When using a recent cross-binutils you need this fix as well, so move it from -native to the .inc. Signed-off-by: Koen Kooi --- meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb | 3 --- meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb index 15605d0..942afcc 100644 --- a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb @@ -9,9 +9,6 @@ PACKAGES = "" EXTRA_OEMAKE = "" EXTRA_OECONF = " --with-embedded-server " -SRC_URI += "file://fix-link-error-ub1310.patch \ -" - do_install() { oe_runmake 'DESTDIR=${D}' install mv -f ${D}${libdir}/mysql/* ${D}${libdir} diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc index e311ed7..100b3a7 100644 --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc @@ -17,7 +17,9 @@ SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x8 file://storage-forbids-absolute-addresses-on-IA-32.patch \ file://my.cnf \ file://mysqld.sh \ - file://avoid-plugin-options-warnings.patch" + file://avoid-plugin-options-warnings.patch \ + file://fix-link-error-ub1310.patch \ + " SRC_URI[md5sum] = "44c331fa91943155e4796f89e17a0612" SRC_URI[sha256sum] = "33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8"