[dist/debian] Update sleef for GCC10

Ubuntu 22.04 uses GCC10, incurring build errors with older sleef.

Change-Id: I629a14c8b7060654c6ba125d39433570f952b7ee
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/debian/rules b/debian/rules
index 9c22766..399a02c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ THP18=python-six.tar.gz
 THP19=onnx.tar.gz
 THP20=onnx-tensorrt.tar.gz
 THP21=sleef.tar.gz
+THP21_NEW=sleef.3.5.1.tar.gz
 THP22=ideep.tar.gz
 THP23=nccl.tar.gz
 THP24=gemmlowp.tar.gz
@@ -77,6 +78,7 @@ OS_MAJOR_VER := $(word 1, $(subst ., ,${OS_VER}))
 OS_LT_18_04 := $(shell [ $(OS_MAJOR_VER) -lt $(MIN_OS_MAJOR_VER) ] && \
        [ $(OS_NAME) = $(UBUNTU) ] && \
        echo true)
+OS_GE_22_04 := $(shell [ $(OS_MAJOR_VER) -ge 22 ] && echo true)
 
 # Default python versions for ubuntu 18.04 and higher is at least 3.6.*
 GENCONTROL_PYTHON_VER = python3
@@ -86,6 +88,10 @@ ifneq ($(strip $(OS_LT_18_04)),)
        GENCONTROL_PYTHON_VER = python3.6
        PYTHON_VER_ARG = -p 3.6
 endif
+THP21_PATH = ${THP21}
+ifneq ($(strip $(OS_GE_22_04)),)
+       THP21_PATH = ${THP21_NEW}
+endif
 
 %:
        dh $@ --with python3 --buildsystem=pybuild
@@ -129,7 +135,7 @@ override_dh_auto_configure:
        tar -xf ${packagingdir}/${THP18} -C ${topdir}/third_party/
        tar -xf ${packagingdir}/${THP19} -C ${topdir}/third_party/
        tar -xf ${packagingdir}/${THP20} -C ${topdir}/third_party/
-       tar -xf ${packagingdir}/${THP21} -C ${topdir}/third_party/
+       tar -xf ${packagingdir}/${THP21_PATH} -C ${topdir}/third_party/
        tar -xf ${packagingdir}/${THP22} -C ${topdir}/third_party/
        tar -xf ${packagingdir}/${THP23} -C ${topdir}/third_party/
        tar -xf ${packagingdir}/${THP24} -C ${topdir}/third_party/

diff --git a/packaging/sleef.3.5.1.tar.gz b/packaging/sleef.3.5.1.tar.gz
new file mode 100644 (file)
index 0000000..9e1689d
Binary files /dev/null and b/packaging/sleef.3.5.1.tar.gz differ

diff --git a/third_party/sleef b/third_party/sleef
deleted file mode 160000 (submodule)
index 7f523de..0000000
--- a/third_party/sleef
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7f523de651585fe25cade462efccca647dcc8d02