[OE-core] [PATCH] python3native, pythonnative: Separate definition and export of PYTHON_LIBRARY and PYTHON_INCLUDE_DIR

Khem Raj raj.khem at gmail.com
Mon Sep 9 03:16:07 UTC 2019


This helps recipes where they need to explicitly pass the variable and
does not entertain the ones from environment

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta/classes/python3native.bbclass | 6 ++++--
 meta/classes/pythonnative.bbclass  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/classes/python3native.bbclass b/meta/classes/python3native.bbclass
index d98fb4c758..bed04bd941 100644
--- a/meta/classes/python3native.bbclass
+++ b/meta/classes/python3native.bbclass
@@ -14,8 +14,8 @@ export STAGING_LIBDIR
 # find_package(PythonLibs REQUIRED)
 # which ends up using libs/includes from build host
 # Therefore pre-empt that effort
-export PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
-export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
+PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
+PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
 
 export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
 
@@ -24,3 +24,5 @@ export PYTHONNOUSERSITE = "1"
 
 # autoconf macros will use their internal default preference otherwise
 export PYTHON
+export PYTHON_LIBRARY
+export PYTHON_INCLUDE_DIR
diff --git a/meta/classes/pythonnative.bbclass b/meta/classes/pythonnative.bbclass
index 0e9019d1e2..5fa42aaeff 100644
--- a/meta/classes/pythonnative.bbclass
+++ b/meta/classes/pythonnative.bbclass
@@ -17,11 +17,13 @@ export STAGING_LIBDIR
 # find_package(PythonLibs REQUIRED)
 # which ends up using libs/includes from build host
 # Therefore pre-empt that effort
-export PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
-export PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
+PYTHON_LIBRARY="${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so"
+PYTHON_INCLUDE_DIR="${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}"
 
 # suppress host user's site-packages dirs.
 export PYTHONNOUSERSITE = "1"
 
 # autoconf macros will use their internal default preference otherwise
 export PYTHON
+export PYTHON_LIBRARY
+export PYTHON_INCLUDE_DIR
-- 
2.23.0



More information about the Openembedded-core mailing list