openmp: recipe cleanup

Remove perlnative inherit, this recipe does not depend on non-standard
perl (or any perl, in fact).

Remove python3native inherit, this recipe does not depend on non-standard
Python modules. python3-native will still be pulled into the sysroot via
python3targetconfig however.

Remove PACKAGECONFIG:remove:powerpc, as powerpc is explicitly marked as
not compatible later in the recipe.

Remove LLVM_ENABLE_PER_TARGET_RUNTIME_DIR, this is only used during
monolithic builds of llvm.

Remove OPENMP_STANDALONE_BUILD, this is automatically detected when
building.

Remove CMAKE_POSITION_INDEPENDENT_CODE, this is the default value.

Remove all _TOOL, these are not used.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/clang/openmp_git.bb b/meta/recipes-devtools/clang/openmp_git.bb
index b6b1cc29785ca88fe0aeacd57da0807d90e8ee8c..2ba83d48c644f73b0c899a2218914da53ea98770 100644 (file)
--- a/meta/recipes-devtools/clang/openmp_git.bb
+++ b/meta/recipes-devtools/clang/openmp_git.bb
@@ -13,21 +13,12 @@ CVE_PRODUCT += "openmp"
 
 LIC_FILES_CHKSUM = "file://openmp/LICENSE.TXT;md5=d75288d1ce0450b28b8d58a284c09c79"
 
-inherit cmake pkgconfig perlnative python3native python3targetconfig
+inherit cmake pkgconfig python3targetconfig
 
 DEPENDS += "elfutils libffi clang"
 
 EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-                  -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF \
                   -DOPENMP_LIBDIR_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
-                  -DOPENMP_STANDALONE_BUILD=ON \
-                  -DCLANG_TOOL=${STAGING_BINDIR_NATIVE}/clang \
-                  -DLINK_TOOL=${STAGING_BINDIR_NATIVE}/llvm-link \
-                  -DOPT_TOOL=${STAGING_BINDIR_NATIVE}/opt \
-                  -DOPENMP_LLVM_LIT_EXECUTABLE=${STAGING_BINDIR_NATIVE}/llvm-lit \
-                  -DEXTRACT_TOOL=${STAGING_BINDIR_NATIVE}/llvm-extract \
-                  -DPACKAGER_TOOL=${STAGING_BINDIR_NATIVE}/clang-offload-packager \
-                  -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
                   "
 
 OECMAKE_SOURCEPATH = "${S}/openmp"
@@ -35,8 +26,6 @@ OECMAKE_SOURCEPATH = "${S}/openmp"
 PACKAGECONFIG ?= "ompt-tools offloading-plugin"
 
 PACKAGECONFIG:remove:arm = "ompt-tools offloading-plugin"
-PACKAGECONFIG:remove:powerpc = "ompt-tools offloading-plugin"
-
 PACKAGECONFIG:append:mipsarcho32 = " no-atomics"
 
 PACKAGECONFIG[ompt-tools] = "-DOPENMP_ENABLE_OMPT_TOOLS=ON,-DOPENMP_ENABLE_OMPT_TOOLS=OFF,"