[Tizen] Fix vd's aarch64 gbs build issue

u.bodapati@samsung.com =>
dali-csharp-binder .pc file changes

u.bodapati@ubuntu-243:~/GBS-ROOT-AARCH64/local/repos/OneMain_OscarP_Full64/aarch64/RPMS$ rpm2cpio dali2-csharp-binder-devel-2.1.21-1.aarch64.rpm | cpio -divm
./usr/include/dali-csharp-binder
./usr/include/dali-csharp-binder/common.h
./usr/lib64/pkgconfig/dali2-csharp-binder.pc
33 blocks
u.bodapati@ubuntu-243:~/GBS-ROOT-AARCH64/local/repos/OneMain_OscarP_Full64/aarch64/RPMS$ cat ./usr/lib64/pkgconfig/dali2-csharp-binder.pc

prefix=@PREFIX@
exec_prefix=@EXEC_DIR@
libdir=/usr/lib64
includedir=/usr/include

Name: DALi C# binder
Description: DALi C# binder Libaray
Version: 2.0.0
Requires: dali-core dali-adaptor dali-toolkit
Libs: -L${libdir} -ldali2-csharp-binder
Cflags: -I${includedir}/dali-csharp-binder
u.bodapati@ubuntu-243:~/GBS-ROOT-AARCH64/local/repos/OneMain_OscarP_Full64/aarch64/RPMS$

Change-Id: Ieff2542311e1004cc815bc85230fd9e8e045922b

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 849f8e0..2693c1e 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -113,6 +113,8 @@ AC_SUBST(dataReadWriteDir)
 AC_SUBST(dataReadOnlyDir)
 AC_SUBST(DALI_CSHARP_BINDER_CFLAGS)
 AC_SUBST(DALI_PROFILE_CFLAGS)
+AC_SUBST(LIBDIR)
+AC_SUBST(INCLUDEDIR)
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([dali2-csharp-binder.pc])

diff --git a/build/tizen/dali2-csharp-binder.pc.in b/build/tizen/dali2-csharp-binder.pc.in
index 6a0964b..ff3aa78 100644 (file)
--- a/build/tizen/dali2-csharp-binder.pc.in
+++ b/build/tizen/dali2-csharp-binder.pc.in
@@ -2,8 +2,8 @@
 
 prefix=@PREFIX@
 exec_prefix=@EXEC_DIR@
-libdir=@LIB_DIR@
-includedir=@INC_DIR@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
 
 Name: DALi C# binder
 Description: DALi C# binder Libaray

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 8ec3b88..b0ed9f7 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -176,7 +176,7 @@ LDFLAGS+=" -Wl,--rpath=%{_libdir} "
 %if %{with wayland}
 CFLAGS+=" -DWAYLAND"
 CXXFLAGS+=" -DWAYLAND"
-configure_flags="--enable-wayland"
+configure_flags="--enable-wayland LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}"
 
 # Need Ecore-Wayland2 when Tizen version is 5.x or greater
 %if 0%{?tizen_version_major} >= 5