diff options
| author | Inki Dae <inki.dae@samsung.com> | 2020-07-31 14:39:13 +0900 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2020-07-31 14:39:13 +0900 |
| commit | a5ede2282c1fb9efccb4cd5f4328576586267809 (patch) | |
| tree | 3441bd88ffaeb3bc2d62041d527e6aeee29c4240 | |
| parent | 93416cc4b87f70a493109ba65f03fd14add79120 (diff) | |
| download | armnn-a5ede2282c1fb9efccb4cd5f4328576586267809.tar.gz armnn-a5ede2282c1fb9efccb4cd5f4328576586267809.tar.bz2 armnn-a5ede2282c1fb9efccb4cd5f4328576586267809.zip | |
packaging: Add xxd binary for aarch64 and fix pathsubmit/tizen/20200731.060745accepted/tizen/unified/20200803.122228
Change-Id: I139ca1fcbff020985e6d0f1a165f53ecbdcf9d32
Signed-off-by: Inki Dae <inki.dae@samsung.com>
| -rw-r--r-- | packaging/armnn.spec | 15 | ||||
| -rwxr-xr-x[-rw-r--r--] | packaging/xxd | bin | 38544 -> 38544 bytes | |||
| -rwxr-xr-x | packaging/xxd64 | bin | 0 -> 18448 bytes |
3 files changed, 11 insertions, 4 deletions
diff --git a/packaging/armnn.spec b/packaging/armnn.spec index 35e112418..9ff541622 100644 --- a/packaging/armnn.spec +++ b/packaging/armnn.spec @@ -76,8 +76,15 @@ cp %{SOURCE1001} . # ARMNN needs xxd to dump a given file with hex type when compiling. mkdir -p %{buildroot}%{_bindir} + +%ifarch aarch64 +cp packaging/xxd64 %{buildroot}/%{_bindir}/xxd +chmod 777 %{buildroot}/%{_bindir}/xxd +%else cp packaging/xxd %{buildroot}/%{_bindir}/ chmod 777 %{buildroot}/%{_bindir}/xxd +%endif + export PATH=$PATH:%{buildroot}/%{_bindir} cp packaging/%{name}.manifest ./ @@ -115,10 +122,10 @@ cmake -DARMCOMPUTENEON=1 \ -DFLATC=/usr/bin/flatc \ %endif # TF_LITE_SUPPORT -DBUILD_TESTS=1 \ - -DARMCOMPUTE_CORE_LIBRARY_DEBUG=/usr/lib/libarm_compute_core.so \ - -DARMCOMPUTE_CORE_LIBRARY_RELEASE=/usr/lib/libarm_compute_core.so \ - -DARMCOMPUTE_LIBRARY_DEBUG=/usr/lib/libarm_compute.so \ - -DARMCOMPUTE_LIBRARY_RELEASE=/usr/lib/libarm_compute.so + -DARMCOMPUTE_CORE_LIBRARY_DEBUG=%{_libdir}/libarm_compute_core.so \ + -DARMCOMPUTE_CORE_LIBRARY_RELEASE=%{_libdir}/libarm_compute_core.so \ + -DARMCOMPUTE_LIBRARY_DEBUG=%{_libdir}/libarm_compute.so \ + -DARMCOMPUTE_LIBRARY_RELEASE=%{_libdir}/libarm_compute.so CPU_JOB_NUM=`grep processor /proc/cpuinfo | awk '{field=$NF};END{print field+1}'` make -j ${CPU_JOB_NUM} diff --git a/packaging/xxd b/packaging/xxd Binary files differindex d68d05c03..d68d05c03 100644..100755 --- a/packaging/xxd +++ b/packaging/xxd diff --git a/packaging/xxd64 b/packaging/xxd64 Binary files differnew file mode 100755 index 000000000..39f99840e --- /dev/null +++ b/packaging/xxd64 |