From patchwork Wed Aug 16 03:33:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 110198 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp247485qge; Tue, 15 Aug 2017 20:33:44 -0700 (PDT) X-Received: by 10.84.236.4 with SMTP id q4mr332794plk.423.1502854424102; Tue, 15 Aug 2017 20:33:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502854424; cv=none; d=google.com; s=arc-20160816; b=M+kCxpq55rjw0uzYlnLmBv1IaI7XiILM+GCc7XGlmt1YLgGjRNMx2aqPADve9BoVNy PjEPgwGVc3++bvKh89KOOL9qTvUPRm0NKozUoZ8fK2r5MUbmb9TlcXOB5swqIVdLi6GE FHOtzRSO/kI5fN1w8dkEwT3AmABPCnzkGTZ694Ovkdn3CV7pRCv4l9IkvjhS+C3kgkS8 jJKpXZxL5pj7oLYGpHTsWKNksD3Nw6MRCjgYdwN97JWur87Yc79vAePH5+/XNLNaSeeO XZdPfZLkgdhGOeid8S5PyKnAuhSggC3flEg2vTzlqsJhrwd3mbv9tikR/+eJ1Y/geMZ2 qXEw== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=kJGEnKHN+QhKlzFif7Ezda/Y7jGXCU1y9cT57VI/+MI=; b=U6M3aZOF6o90xb97cn4QMksSOtAwPDtRlfJqQGWpYckw/g1U6QTBjikDLAwBQlYuS3 HHZwKFzHvnmImIir7/gGrystn6zjvlggQU2mdgIMZTFB5obXBwjQrM74vGKrp/3T6I0e s4eS7kNVjtMLAwXKyXc+G4ymK/O1TbDIRkK/FlcJQIy949pY7axgxFcMlTB8hEoQv/ux PTFarFxUXZWgZrHLl8o7qR6jwIzgoiNuUd/OBfDUpIPYIH/YCXQoQXl6xLqM4dw6j5y+ YuQEgXwll16eY55aaYXlz8Bvdw+VJ9fiXo3ZmA/ZgDtl3FeioK/++EP9I4OIN0p6UHYh tFCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=txsBNAEm; 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 m16si7089951plk.786.2017.08.15.20.33.43; Tue, 15 Aug 2017 20:33:44 -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.s=20161025 header.b=txsBNAEm; 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 2F2E778603; Wed, 16 Aug 2017 03:33:41 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f46.google.com (mail-pg0-f46.google.com [74.125.83.46]) by mail.openembedded.org (Postfix) with ESMTP id 2AC47785E6 for ; Wed, 16 Aug 2017 03:33:39 +0000 (UTC) Received: by mail-pg0-f46.google.com with SMTP id i12so17247642pgr.3 for ; Tue, 15 Aug 2017 20:33:41 -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; bh=l7AZ1R1ty9YqCWr7tcvHMjjEywVoqPpPget0xX3kOQ0=; b=txsBNAEmCtvh12R0PtY2WS1wfkwYXrofO4XanI+TVui82MJHkZ4S3pfkSsIvLcNMKA eNJ5XZ8m5f1naAzSFC1WvraWmOVUlkiql3ykyMQ4Ap/QhqVEpgKY+c4HeaWWmkHUeX7n iSlavJptvAE0wD8qAIUtSi39iXwCGNLCG4/Bl0XVAQHth2/HGzX7nPP9ekk1wG0g/0Fh g358vyKfyycOPGzeHyhGG1oAZMr83vGNLnRukjnN8KAgwFLkRhbjTO7Y9ObkXqeDMxiz /+7Oy8bxNDYoBfKbGokPOi8QhxePnLeOdXq6bXvzKGFV97W/E0fo0TH068GB51IyEUdW Th9Q== 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; bh=l7AZ1R1ty9YqCWr7tcvHMjjEywVoqPpPget0xX3kOQ0=; b=aF1URSa3avI0z4HieLNxUzAlSimvLBF2gw51oM2JizvbbL2g2O+lYFEuuSAJG/776E NKLr/gx+CqdSUfPIohIqxnsXy3QcSnVRBpEDm7G+fH3O40zbeUomNzFQAovaZ//fohYJ e/358f0zzhF1J+gbDzA2qDJPQTfHYihJCoBn8oOZevww1+/4pE5iLiwNV+vgkcSlFV0f Rq+Ua2VHV5P/TuxcJ224KVDuikGrgz6YWqKt0mmklr5iJAIGfUdxwU7yu+Siek6MhHvZ TQQhP6V6YRRr266S6dP0PNbOVRw/mDGdOcmqnkdu09ozQu1fhMxddgjc+FBx+KRlyaC/ 2yKg== X-Gm-Message-State: AHYfb5iWvRhSeL6PGUam38Tp7Iz+rdAKYO9DpDAltpGtSDfD1RJBPmOi GZ+VEcgsPrjz+BAX X-Received: by 10.99.2.148 with SMTP id 142mr331416pgc.164.1502854421365; Tue, 15 Aug 2017 20:33:41 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::8319]) by smtp.gmail.com with ESMTPSA id 73sm18766778pfj.136.2017.08.15.20.33.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Aug 2017 20:33:40 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Tue, 15 Aug 2017 20:33:30 -0700 Message-Id: <20170816033330.43146-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [OE-core] [PATCH] 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.14.1 -- _______________________________________________ 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() {