From 21867f06dec72d23839511b20ac306ce1e7722ca Mon Sep 17 00:00:00 2001 From: MyoungJune Park Date: Thu, 1 Dec 2016 14:27:44 +0900 Subject: [PATCH] Added so file path for aarch64 and x86_64 Change-Id: I0597432c087b5947530ba25f4782d8622ed90c1a Signed-off-by: MyoungJune Park --- collation.c | 5 +++++ packaging/libslp-db-util.spec | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/collation.c b/collation.c index 799db55..b950c33 100644 --- a/collation.c +++ b/collation.c @@ -54,7 +54,12 @@ }while(0) #define DB_UTIL_ERR_COL_FUNC_RET DB_UTIL_ERROR + +#ifdef DB_UTIL_ARCH_64 +#define ICUI18N_LIBPATH "/usr/lib64/libicui18n.so" +#else #define ICUI18N_LIBPATH "/usr/lib/libicui18n.so" +#endif enum { DB_UTIL_ERR_DLOPEN = -10, diff --git a/packaging/libslp-db-util.spec b/packaging/libslp-db-util.spec index 52d98d9..3bdc14c 100755 --- a/packaging/libslp-db-util.spec +++ b/packaging/libslp-db-util.spec @@ -27,6 +27,22 @@ Devel package for libslp-db-util (devel) cp %{SOURCE1001} %{SOURCE1002} . %build + +%ifarch aarch64 +export CFLAGS+="$CFLAGS -DDB_UTIL_ARCH_64" +export CXXFLAGS+="$CXXFLAGS -DDB_UTIL_ARCH_64" +export FFLAGS+="$FFLAGS -DDB_UTIL_ARCH_64" +%endif + +%ifarch x86_64 +export CFLAGS+="$CFLAGS -DDB_UTIL_ARCH_64" +export CXXFLAGS+="$CXXFLAGS -DDB_UTIL_ARCH_64" +export FFLAGS+="$FFLAGS -DDB_UTIL_ARCH_64" +%endif + + + + %cmake . make %{?_smp_mflags} -- 2.7.4