diff options
author | Tae-Young Chung <ty83.chung@samsung.com> | 2015-08-26 16:38:58 +0900 |
---|---|---|
committer | Tae-Young Chung <ty83.chung@samsung.com> | 2015-08-26 16:38:58 +0900 |
commit | 944bd1c1f1c5bdd8843732dc5159cd66a9a0817a (patch) | |
tree | 0a7330964142fadf001deb54b5aa8d782e4c0a50 | |
parent | 6b95e4f11a5ac5c9fbc89f9d0982787ddc24f929 (diff) | |
download | libzint-944bd1c1f1c5bdd8843732dc5159cd66a9a0817a.tar.gz libzint-944bd1c1f1c5bdd8843732dc5159cd66a9a0817a.tar.bz2 libzint-944bd1c1f1c5bdd8843732dc5159cd66a9a0817a.zip |
Fix build error aarch64 and x86_64submit/tizen/20150904.074427accepted/tizen/wearable/20150904.105532accepted/tizen/tv/20150904.104953accepted/tizen/mobile/20150904.104719
Change-Id: I27fc4abd0c87f7949bbf8ea06e69573389ac88af
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
-rw-r--r-- | CMakeLists.txt | 7 | ||||
-rw-r--r-- | packaging/zint.spec | 12 |
2 files changed, 16 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a225ab7..36097f3 100644 --- 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 --- 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 |