From patchwork Mon Jul 24 00:47:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 108537 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp3476555qge; Sun, 23 Jul 2017 17:48:33 -0700 (PDT) X-Received: by 10.98.209.10 with SMTP id z10mr316273pfg.93.1500857313828; Sun, 23 Jul 2017 17:48:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500857313; cv=none; d=google.com; s=arc-20160816; b=NrEC4wVlMLLUiAU96vMOaHOhUH0yyTpvQvqdRScA8zOm9CHClhLXiLMZptPzTvfohq oPxK/HWsss3Qt8SljQp+PpYOwQbhBvcP73UBLWokPmLRllwEQUsSHH1m0Z7MwNNiNJvY HTRgMmu1ukYYBmPrCnlO8OcSda2F88unCW1R5xPSo3W/iDMrZPRPZAHITd7hx5JrkG8F +HC57/6Cz8j4uu5A45vk29kC/V/cbV4dBCufVvlxt6JtsAuAMOMAdrRyYhZlUQ/INbmU C8RNNbEPRxkS3wouKBhNvbAJDY8v3lFgIhucGbrACz3XOP/an+zpN1jNk/t2jiGk2pw6 xBzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=NQnzTL3fwhsNfvgOT98B+ekROVUhnX73RnLHfK3kHPk=; b=wgff5pN0FgqjgUwI8iObzRpiVXVOfKol9i8O67JEUI1aEBV5yCSLWtUoXXGSOnbAhc hdSzB+WKtnzr8DBj4e1RnaPWnvIVrDodL6OCexudav11wPNHBZbEZTPTdutWGMWM20wQ Cb7S6MU2NBRo2EvHfAGLDPVH9SZFL2Sks9ELccoprjfIxOnAZN99A8mHBb9uLyFxFk5R NnWYISF/wSCbcoOR4IYjtyOJPMCfX9RwdW8c8Nxh7GPomHj17QDeCuFhm3reT7LBZioR xBjsIEcuLF6RW9JT3tePHGe857RZWT8yXxYKKdk+wtC/v7V+nN5WKlmHcHwyDrSvPqXY 25yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=MMmw+QEj; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p1si6390503pld.514.2017.07.23.17.48.33; Sun, 23 Jul 2017 17:48:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=MMmw+QEj; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4D07E78373; Mon, 24 Jul 2017 00:48:31 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id B68FE606D0 for ; Mon, 24 Jul 2017 00:47:58 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id s4so10258166pgr.5 for ; Sun, 23 Jul 2017 17:48:00 -0700 (PDT) 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=1zPnxuDmu2eGn5wSB0AVmFMwIqX8zDGSTRSFh/P4dLM=; b=MMmw+QEjaCkrC5Tn2sKJ8ie7Xjze2u+9lB4srLxFeaGsqZiv/rl1U8rCxqS09R8xws hF9qsIWJSJJpl04+daXL0NtxJKrSABv5U/AsgmmGkVfQzSLodrLoel9vWhRJPJ4A1JmA t1XbAa/FaSDXcls1bC3PjncN6XkvPQ8nfoPUsSfjyJ1txdanoUAmNeyGppvJCVSf09/s W65MH7pgjNhImJeuntiYJHTq1Rye8OPV5kuzDTWzdZSRJG+yNKxA1rhYhj7xgJwjQVKz UmuUK3uAPro2W5N9KKdSz20wcYCc2ctNi1eXNEHWxeZ4+FkyKYVhE5a91ATDK9x8UwIk Xenw== 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=1zPnxuDmu2eGn5wSB0AVmFMwIqX8zDGSTRSFh/P4dLM=; b=d7MeixQbBvPzoY7Co97CZ5c3pWRgLGClPG+PY/jPGkEXDutU08yGraA/OpZ2yea6jY KfF/1u2evJSCCdHqbZtX6jMMNV/HNF624u0fItIeYs9ddOm0LfgZnNtbpoouGrMFefeM e9LYq/s508fWGEw2Exz2rHj8gpCEkuCUuWmYkzdo10Ll/EAGLsv8xDlC6/cMD9kHoRkJ 3Da665QRlPi4RIOvpO+8NdJ7Oh+UAcncppqkd9N0OH3Mln4/GFfdh0auoqJxVhrvlKeC Sre5ZFf2Ed4EWKU+6SWusnXt0kmtnigzONvJbM2mpJ3enH5a1y8l9m02/rVhNiz7OFVM Ahhg== X-Gm-Message-State: AIVw112py7CWNYgAoYMZIMV2wRksvaxXDJamEDmAJOs1x3eC1euXpxfc cSWdjFYTPwi8R9CU X-Received: by 10.99.186.7 with SMTP id k7mr14483894pgf.0.1500857279428; Sun, 23 Jul 2017 17:47:59 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::9b53]) by smtp.gmail.com with ESMTPSA id s3sm18228742pgn.70.2017.07.23.17.47.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Jul 2017 17:47:58 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sun, 23 Jul 2017 17:47:44 -0700 Message-Id: <20170724004748.14778-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170724004748.14778-1-raj.khem@gmail.com> References: <20170724004748.14778-1-raj.khem@gmail.com> Subject: [OE-core] [PATCH 2/6] db: Add --tag parameter to libtool invocation X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Fixes errors like libtool: compile: unable to infer tagged configuration libtool: compile: specify a tag with `--tag' Signed-off-by: Khem Raj --- ...dd-explicit-tag-options-to-libtool-invoca.patch | 42 ++++++++++++++++++++++ meta/recipes-support/db/db_5.3.28.bb | 23 ++++++++---- 2 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch -- 2.13.3 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch b/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch new file mode 100644 index 0000000000..cb28db1343 --- /dev/null +++ b/meta/recipes-support/db/db/0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch @@ -0,0 +1,42 @@ +From 32e5943a3c4637d39e4d65b544dcb99e280210e3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 23 Jul 2017 10:54:26 -0700 +Subject: [PATCH] configure: Add explicit tag options to libtool invocation + +This helps cross compile when tag inference via heuristics +fail because CC variable is having -fPIE -pie and libtool +smartly removes it when building libraries + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + dist/configure.ac | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/dist/configure.ac b/dist/configure.ac +index 689f3b8..9c14bdb 100644 +--- a/dist/configure.ac ++++ b/dist/configure.ac +@@ -366,12 +366,12 @@ LIBTOOL="./libtool" + + INSTALLER="\$(LIBTOOL) --mode=install cp -p" + +-MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}" +-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version" +-MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}" +-MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}" +-MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version" +-MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}" ++MAKEFILE_CC="\$(LIBTOOL) --tag=CC --mode=compile ${MAKEFILE_CC}" ++MAKEFILE_SOLINK="\$(LIBTOOL) --tag=CC --mode=link ${MAKEFILE_CCLINK} -avoid-version" ++MAKEFILE_CCLINK="\$(LIBTOOL) --tag=CC --mode=link ${MAKEFILE_CCLINK}" ++MAKEFILE_CXX="\$(LIBTOOL) --tag=CXX --mode=compile ${MAKEFILE_CXX}" ++MAKEFILE_XSOLINK="\$(LIBTOOL) --tag=CXX --mode=link ${MAKEFILE_CXXLINK} -avoid-version" ++MAKEFILE_CXXLINK="\$(LIBTOOL) --tag=CXX --mode=link ${MAKEFILE_CXXLINK}" + + + case "$host_os" in +-- +2.13.3 + diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb index 7b158e9e2c..ab0d68fce5 100644 --- a/meta/recipes-support/db/db_5.3.28.bb +++ b/meta/recipes-support/db/db_5.3.28.bb @@ -22,6 +22,7 @@ SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" SRC_URI += "file://arm-thumb-mutex_db5.patch \ file://fix-parallel-build.patch \ file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \ + file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \ " # We are not interested in official latest 6.x versions; # let's track what debian is using. @@ -76,22 +77,32 @@ MUTEX = "" MUTEX_arm = "${ARM_MUTEX}" MUTEX_armeb = "${ARM_MUTEX}" EXTRA_OECONF += "${MUTEX} STRIP=true" -EXTRA_OEMAKE_append_class-target = " LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" +EXTRA_OEMAKE_append = " LIBTOOL=${HOST_SYS}-libtool" +EXTRA_AUTORECONF += "--exclude=autoheader -I ${S}/dist/aclocal -I${S}/dist/aclocal_java" AUTOTOOLS_SCRIPT_PATH = "${S}/dist" # Cancel the site stuff - it's set for db3 and destroys the # configure. CONFIG_SITE = "" -do_configure() { - cd ${B} - gnu-configize --force ${AUTOTOOLS_SCRIPT_PATH} - oe_runconf + +oe_runconf_prepend() { + . ${S}/dist/RELEASE + # Edit version information we couldn't pre-compute. + sed -i -e "s/__EDIT_DB_VERSION_FAMILY__/$DB_VERSION_FAMILY/g" \ + -e "s/__EDIT_DB_VERSION_RELEASE__/$DB_VERSION_RELEASE/g" \ + -e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ + -e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ + -e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ + -e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ + -e "s/__EDIT_DB_VERSION_FULL_STRING__/$DB_VERSION_FULL_STRING/g" \ + -e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ + -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" ${S}/dist/configure } do_compile_prepend() { # Stop libtool adding RPATHs - sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/libtool + sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/${HOST_SYS}-libtool } do_install_append() {