From 6495299576a9c5b319eb9d10f6faa20b0643498f Mon Sep 17 00:00:00 2001
From: helloworld664 <3226476857@qq.com>
Date: Fri, 3 Feb 2023 20:52:41 +0800
Subject: [PATCH] kml install

---
 package/kml/1.4.0/bisheng/install.sh | 16 +++++++++-------
 package/kml/1.4.0/gcc/install.sh     | 13 +++++++------
 package/kml/1.6.0/bisheng/install.sh | 11 ++++++-----
 package/kml/1.6.0/gcc/install.sh     | 10 +++++-----
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/package/kml/1.4.0/bisheng/install.sh b/package/kml/1.4.0/bisheng/install.sh
index f9ae668..a2c5321 100644
--- a/package/kml/1.4.0/bisheng/install.sh
+++ b/package/kml/1.4.0/bisheng/install.sh
@@ -1,14 +1,16 @@
 #!/bin/bash
 set -x
 set -e
-. ${DOWNLOAD_TOOL} -u https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Kunpeng%20BoostKit/Kunpeng%20BoostKit%2021.0.1/BoostKit-kml_1.4.0_bisheng.zip
+kml_version=1.4.0
+. ${DOWNLOAD_TOOL} -u https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Kunpeng%20BoostKit/Kunpeng%20BoostKit%2021.0.0/BoostKit-kml_${kml_version}_bisheng.zip
 . ${DOWNLOAD_TOOL} -u https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.9.1.tar.gz -f lapack-3.9.1.tar.gz
 cd ${JARVIS_TMP}
-#if [ -d /usr/local/kml ];then
-#   rpm -e boostkit-kml
-#fi
-unzip -o ${JARVIS_DOWNLOAD}/BoostKit-kml_1.4.0_bisheng.zip
-rpm --force --nodeps -ivh --relocate /usr/local/kml=$1 --badreloc=$1   boostkit-kml-1.4.0-1.aarch64.rpm
+
+unzip -o ${JARVIS_DOWNLOAD}/BoostKit-kml_${kml_version}_bisheng.zip
+rpm2cpio boostkit-kml-${kml_version}-1.aarch64.rpm | cpio -div
+mkdir -p $1
+cp -r usr/local/kml/* $1
+
 # generate full lapack
 netlib=${JARVIS_DOWNLOAD}/lapack-3.9.1.tar.gz
 klapack=$1/lib/libklapack.a
@@ -50,7 +52,7 @@ while read sym; do \
 done < comm.sym
 
 # (optional) build a full lapack shared library
-clang -o libklapack_full.so -shared -fPIC -Wl,--whole-archive $klapack liblapack_adapt.a $kservice -Wl,--no-whole-archive -fopenmp -lpthread -lgfortran -lm
+clang -o libklapack_full.so -shared -fPIC -Wl,--whole-archive $klapack liblapack_adapt.a $kservice -Wl,--no-whole-archive -fopenmp -lpthread -lflang -lm
 
 \cp libklapack_full.so $1/lib/
 echo "Generated liblapack_adapt.a and libklapack_full.so"
diff --git a/package/kml/1.4.0/gcc/install.sh b/package/kml/1.4.0/gcc/install.sh
index 83f68e8..a5824ce 100644
--- a/package/kml/1.4.0/gcc/install.sh
+++ b/package/kml/1.4.0/gcc/install.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
 set -x
 set -e
-. ${DOWNLOAD_TOOL} -u https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Kunpeng%20BoostKit/Kunpeng%20BoostKit%2021.0.1/BoostKit-kml_1.4.0.zip -f BoostKit-kml_1.4.0-gcc.zip
+kml_version=1.4.0
+. ${DOWNLOAD_TOOL} -u https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Kunpeng%20BoostKit/Kunpeng%20BoostKit%2021.0.1/BoostKit-kml_${kml_version}zip -f BoostKit-kml_${kml_version}-gcc.zip
 . ${DOWNLOAD_TOOL} -u https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.9.1.tar.gz -f lapack-3.9.1.tar.gz
 cd ${JARVIS_TMP}
-#if [ -d /usr/local/kml ];then
-#   rpm -e boostkit-kml
-#fi
-unzip -o ${JARVIS_DOWNLOAD}/BoostKit-kml_1.4.0-gcc.zip
-rpm --force --nodeps -ivh --relocate /usr/local/kml=$1 --badreloc=$1  boostkit-kml-1.4.0-1.aarch64.rpm
+
+unzip -o ${JARVIS_DOWNLOAD}/BoostKit-kml_${kml_version}_bisheng.zip
+rpm2cpio boostkit-kml-${kml_version}-1.aarch64.rpm | cpio -div
+mkdir -p $1
+cp -r usr/local/kml/* $1
 
 # generate full lapack
 netlib=${JARVIS_DOWNLOAD}/lapack-3.9.1.tar.gz
diff --git a/package/kml/1.6.0/bisheng/install.sh b/package/kml/1.6.0/bisheng/install.sh
index 4c3b240..10b896c 100644
--- a/package/kml/1.6.0/bisheng/install.sh
+++ b/package/kml/1.6.0/bisheng/install.sh
@@ -5,11 +5,12 @@ kml_version=1.6.0
 . ${DOWNLOAD_TOOL} -u https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Kunpeng%20BoostKit/Kunpeng%20BoostKit%2022.0.RC3/BoostKit-kml_${kml_version}_bisheng.zip
 . ${DOWNLOAD_TOOL} -u https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.9.1.tar.gz -f lapack-3.9.1.tar.gz
 cd ${JARVIS_TMP}
-#if [ -d /usr/local/kml ];then
-#   rpm -e boostkit-kml
-#fi
+
 unzip -o ${JARVIS_DOWNLOAD}/BoostKit-kml_${kml_version}_bisheng.zip
-rpm --force --nodeps -ivh --relocate /usr/local/kml=$1 --badreloc=$1  boostkit-kml-${kml_version}-1.aarch64.rpm
+rpm2cpio boostkit-kml-${kml_version}-1.aarch64.rpm | cpio -div
+mkdir -p $1
+cp -r usr/local/kml/* $1
+
 # generate full lapack
 netlib=${JARVIS_DOWNLOAD}/lapack-3.9.1.tar.gz
 klapack=$1/lib/libklapack.a
@@ -51,7 +52,7 @@ while read sym; do \
 done < comm.sym
 
 # (optional) build a full lapack shared library
-clang -o libklapack_full.so -shared -fPIC -Wl,--whole-archive $klapack liblapack_adapt.a $kservice -Wl,--no-whole-archive -fopenmp -lpthread -lgfortran -lm
+clang -o libklapack_full.so -shared -fPIC -Wl,--whole-archive $klapack liblapack_adapt.a $kservice -Wl,--no-whole-archive -fopenmp -lpthread -lflang -lm
 
 \cp libklapack_full.so $1/lib/
 echo "Generated liblapack_adapt.a and libklapack_full.so"
diff --git a/package/kml/1.6.0/gcc/install.sh b/package/kml/1.6.0/gcc/install.sh
index 9d6b877..f438555 100644
--- a/package/kml/1.6.0/gcc/install.sh
+++ b/package/kml/1.6.0/gcc/install.sh
@@ -5,11 +5,11 @@ kml_version=1.6.0
 . ${DOWNLOAD_TOOL} -u https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Kunpeng%20BoostKit/Kunpeng%20BoostKit%2022.0.RC3/BoostKit-kml_${kml_version}.zip
 . ${DOWNLOAD_TOOL} -u https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.9.1.tar.gz -f lapack-3.9.1.tar.gz
 cd ${JARVIS_TMP}
-#if [ -d /usr/local/kml ];then
-#   rpm -e boostkit-kml
-#fi
-unzip -o ${JARVIS_DOWNLOAD}/BoostKit-kml_${kml_version}.zip
-rpm --force --nodeps -ivh --relocate /usr/local/kml=$1 --badreloc=$1  boostkit-kml-${kml_version}-1.aarch64.rpm
+
+unzip -o ${JARVIS_DOWNLOAD}/BoostKit-kml_${kml_version}_bisheng.zip
+rpm2cpio boostkit-kml-${kml_version}-1.aarch64.rpm | cpio -div
+mkdir -p $1
+cp -r usr/local/kml/* $1
 
 # generate full lapack
 netlib=${JARVIS_DOWNLOAD}/lapack-3.9.1.tar.gz
-- 
Gitee