From: Denis Khalikov Date: Fri, 26 May 2017 08:55:13 +0000 (+0300) Subject: Rename library name for cxx11 abi X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5808fe9749ab4f65dd55d5d779c7e120de9703e3;p=platform%2Fcore%2Fuifw%2Fdali-core.git Rename library name for cxx11 abi libnamex_cxx11.so -> libname-cxx11.so Change-Id: I0e59004688f738f138b32e410afe5a11a6d9dbcc --- diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am index 0d0e063..9c1b042 100644 --- a/build/tizen/dali-core/Makefile.am +++ b/build/tizen/dali-core/Makefile.am @@ -60,7 +60,7 @@ libdali_core_la_LIBADD = $(DALI_LDFLAGS) \ else -lib_LTLIBRARIES = libdali-core_cxx11.la +lib_LTLIBRARIES = libdali-core-cxx11.la libdali_core_cxx11_la_SOURCES = $(internal_src_files) \ $(platform_abstraction_src_files) \ @@ -177,8 +177,8 @@ linker_test_LDADD = \ else -linker_test_DEPENDENCIES = libdali-core_cxx11.la +linker_test_DEPENDENCIES = libdali-core-cxx11.la linker_test_LDADD = \ - libdali-core_cxx11.la + libdali-core-cxx11.la endif diff --git a/packaging/dali.spec b/packaging/dali.spec index e7a9e7b..f645223 100644 --- a/packaging/dali.spec +++ b/packaging/dali.spec @@ -148,7 +148,7 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen popd pushd %{buildroot}%{_libdir} -for FILE in libdali-core_cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done +for FILE in libdali-core-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done mv pkgconfig/dali-core.pc %{_builddir}/%{name}-%{version}/build/tizen/dali-core.pc popd @@ -196,9 +196,9 @@ popd ############################# pushd %{buildroot}%{_libdir} rm -rf libdali-core.so -rm -rf libdali-core_cxx11.so +rm -rf libdali-core-cxx11.so ln -s libdali-core.so.0.0.* libdali-core-cxx03.so -ln -s libdali-core_cxx11.so.0.0.* libdali-core.so +ln -s libdali-core-cxx11.so.0.0.* libdali-core.so popd @@ -239,7 +239,7 @@ exit 0 %manifest dali.manifest %endif %defattr(-,root,root,-) -%{_libdir}/libdali-core_cxx11.so.* +%{_libdir}/libdali-core-cxx11.so.* %{_libdir}/libdali-core.so %defattr(-,app,app,-) %license LICENSE