From patchwork Fri Jan 10 08:50:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182776 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp3377982och; Sun, 12 Jan 2020 09:20:19 -0800 (PST) X-Google-Smtp-Source: APXvYqyoXGL/8rU9rG8zqw165JL+RBHwKCV4td2WETniWh3OCYl7rUAfu2FBD85gfY6LHJ/fxvrs X-Received: by 2002:a17:902:ff07:: with SMTP id f7mr16364387plj.12.1578848256466; Sun, 12 Jan 2020 08:57:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578848256; cv=none; d=google.com; s=arc-20160816; b=Vff2RJrhq+dy30LQs9+tHQmlntLNyEmiUMtHc9W9fPrvXcCoDEzT4Tw/AGGehBtZ4b RJh39U0OsypxZGT5eA/qu4JE3tV8K0Q32Au3SPUS7ckRgSoqWx69dkEHWyCz8R7tg4Qt df+COmvdW9BOVvv2kxEaCltWvXIFlUkUejXcefm6BxUodJhcbOjNBXlyW/PU01SbPwRD r917qbjsIMOWlCnGF+DeO5YosGzPAUhpcYsCINApAID7oshu3DdFJyENQe+q73gfxPfs t+8cd+AfZlw184RLRO8OQyR/N8M25kjjtoKMAfQIkYpzAW8vdZIe75KRP/tc+qthQhcT emGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=8Nl+Uaa1V57zFJo1bHx467BqPqY4vXcqqlihu3Q4Zmk=; b=pLk8+xq5uWQQm/+YMNPoS7JC4ZE0ZVlJwq1pK498tEOUOV+hJ+VNOHOeMivo+QqNXr jeiQ1lu+KljtVrT1/sfpQhLJjzajsoNuB3kXSAHTejkIOVnFopVbaAekQ81PhWMuy+nN FARj6Fv2hgyhdFSERjfrNevGg7i03GWccGe+NMcTnBGVEnkiRyWQa9wNDyLJ6OnnwP6E hTKcUfUf9iScoQWrqomdIQ4pW2BL3VbY8BJJLorFMwJBa1EiNRH718MAy774tn6ym7O7 ur/PlFyS7I77jiy1tz2BqwZY3xZnaCn+Q65geBxgB/sIc7ivNOLllvv7iiqOmfmrjQiC Fbug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="vB66RJM/"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE 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 u20si9225494pgi.357.2020.01.12.08.57.36 for ; Sun, 12 Jan 2020 08:57:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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="vB66RJM/"; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 79DD57FF1B; Fri, 10 Jan 2020 08:50:17 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mail.openembedded.org (Postfix) with ESMTP id 866107FD40 for ; Fri, 10 Jan 2020 08:50:14 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id x6so792560pfo.10 for ; Fri, 10 Jan 2020 00:50:15 -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=qqg/YKo5fM1lMWJBAD8koygJq+NJ6XUGRjI4tPqIV4o=; b=vB66RJM/4l825FWuYUKDgP3t6qgZ0EMzCHcOw5ckslpvPIRzaWzQSAx+YKAJCbE3wl 5cwWjoeW7cVYatamB2H75w+sC9tBwxpmORrKZe0S7tM+1NA4nP5Pt+1c0NdMrUpxOCk4 QQ5sJEAly7/cbDLYyThHsHuJ5Uv3DLNIXYb9P3+VEZAeoo+ptEIlKQLSY5dRyBwb+wZp zjAVGCIkMaJBJNhk+3YN8S2sWrcBTKp5/GltTgbO+qsZt4pk+uHyq4vh5FkWz5WRlADw VP1u2iGQhn9XERqDD4blBYjRMe9P0T64PTujasHqDjvSm6tqtyZk3qhunBODorYZybkW ifkQ== 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=qqg/YKo5fM1lMWJBAD8koygJq+NJ6XUGRjI4tPqIV4o=; b=cULbQSc1HHLK59sT60X8zROe2VjW+Ar8r03qAzKR7kgi8EwzWdb/JbVbbcuhQR238k 8V5SChNL0KU/OY4sUKC+JxKJwzQIMqeVSh+MVqh5zSBoxp50nYfXuXFs/FwqfxBZnPRe 8zEYMk9PapzG0lK6KUOXkp0LwyGEHAjYVh8sBSvLYDy0znjWSXOEiBolD7hRlkVUFN+1 7lTiFZm65D1+JAnLV8ffv60MuGS79ZXocC35D3tgET8TyFk0yCtgSiahXTNR/KQ5KVWv tUeSewyzpVnsW33u1i4wxK3SHlmMcKv1vQtBfpzII4tvOoNGVfkWyEVxkvX5Z+Aw0q12 YvVg== X-Gm-Message-State: APjAAAWZ5JM3BobIeTQoMN7Z7aTIBecrLEdM4BY/lmP9Q/0v5au0JDUr 1at3FuHq2bcb0r6nsCyV6IRN3N0wjB8= X-Received: by 2002:a63:cd16:: with SMTP id i22mr3075119pgg.239.1578646214940; Fri, 10 Jan 2020 00:50:14 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::6f71]) by smtp.gmail.com with ESMTPSA id b15sm1887580pft.58.2020.01.10.00.50.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 00:50:14 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 10 Jan 2020 00:50:10 -0800 Message-Id: <20200110085010.2443416-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH V2] cmpi-bindings: append PYTHON_ABI suffix to libpython soname X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org This makes it independent of python vesion 3.7 or 3.8 where with python 3.7 has 'm' as abi suffix but 3.8 wont Signed-off-by: Khem Raj Cc: Alexander Kanavin --- v2: Do not hardcode 'm' ABI suffix ...dd-PYTHON_ABI-suffix-to-the-python-library-name.patch | 9 ++------- .../cmpi-bindings/cmpi-bindings_1.0.1.bb | 4 +++- 2 files changed, 5 insertions(+), 8 deletions(-) -- 2.24.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch index b2a149b0f4..fa029da2b8 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings/0001-Add-PYTHON_ABI-suffix-to-the-python-library-name.patch @@ -9,19 +9,14 @@ Signed-off-by: Alexander Kanavin swig/python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt -index 128798b..391cef7 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt -@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GENERIC_GNU -DCMPI_VERSION=200) +@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DCMPI_PLATFORM_LINUX_GE SET( NAME pyCmpiProvider ) ADD_LIBRARY( ${NAME} SHARED ${SWIG_OUTPUT}) #TARGET_LINK_LIBRARIES( ${NAME} ${PYTHON_LIBRARIES} ) -TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION} ) -+TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}m ) ++TARGET_LINK_LIBRARIES( ${NAME} python${PYTHON_MAJOR_VERSION}.${PYTHON_MINOR_VERSION}${PYTHON_ABI} ) TARGET_LINK_LIBRARIES( ${NAME} pthread ) TARGET_LINK_LIBRARIES( ${NAME} dl ) TARGET_LINK_LIBRARIES( ${NAME} util ) --- -2.8.1 - diff --git a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb index 251c5d0f5a..6c71d534be 100644 --- a/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +++ b/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb @@ -22,7 +22,9 @@ S = "${WORKDIR}/git" inherit cmake python3native EXTRA_OECMAKE = "-DLIB='${baselib}' \ - -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION}" + -DPYTHON_INCLUDE_PATH=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ + -DPYTHON_ABI=${PYTHON_ABI} \ + " # With Ninja it fails with: # ninja: error: build.ninja:282: bad $-escape (literal $ must be written as $$)