Fix build error aarch64 and x86_64

Change-Id: I27fc4abd0c87f7949bbf8ea06e69573389ac88af
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a225ab7..36097f3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,13 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 #comment or remove the above line before release
 
+if ("${ARCH}" MATCHES "aarch64")
+MESSAGE(${ARCH})
+set(LIB_SUFFIX "64")
+else ("${ARCH}" MATCHES "aarch64")
+MESSAGE(${ARCH})
+endif ("${ARCH}" MATCHES "aarch64")
+
 add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wno-unused-variable -Wall )
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )

diff --git a/packaging/zint.spec b/packaging/zint.spec
index d29174d..35ffdce 100644 (file)
--- a/packaging/zint.spec
+++ b/packaging/zint.spec
@@ -1,6 +1,6 @@
 Name:      zint
 Version:   2.4.3
-Release:   10
+Release:   11
 Summary:   Barcode generator library
 License:   BSD-2.0
 URL:       http://www.zint.org.uk
@@ -40,10 +40,16 @@ http://www.zint.org.uk/zintSite/Manual.aspx
 %prep
 %setup -q
 
-
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+
+%ifarch aarch64 x86_64
+ARCH=aarch64
+%else
+ARCH=arm
+%endif
+
+cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=${ARCH}
 make VERBOSE=1