diff options
| author | Mun, Gwan-gyeong <kk.moon@samsung.com> | 2015-12-28 14:32:27 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2016-01-05 01:00:55 -0800 |
| commit | 449ffd4c96360cf44e2e83b8da9d210bb046fb87 (patch) | |
| tree | 4a4a1c3673c5e707176636edd384c35a164830d3 | |
| parent | 5f790ec2656c311a084534c624334f49741ecae6 (diff) | |
| download | emulator-yagl-449ffd4c96360cf44e2e83b8da9d210bb046fb87.tar.gz emulator-yagl-449ffd4c96360cf44e2e83b8da9d210bb046fb87.tar.bz2 emulator-yagl-449ffd4c96360cf44e2e83b8da9d210bb046fb87.zip | |
YaGL: Fix build configuration for install directory of 64bit architecture.submit/tizen_tv/20160105.110358submit/tizen_mobile/20160105.110407submit/tizen_ivi/20160217.000001submit/tizen_ivi/20160217.000000submit/tizen_common/20160128.052157accepted/tizen/tv/20160108.010521accepted/tizen/mobile/20160108.010156accepted/tizen/ivi/20160218.022900accepted/tizen/common/20160129.173120
32bit: install /usr/lib
64bit: install /usr/lib64
Change-Id: I6c50ea39a7eeaa17abe188aaa48d5ee61615529c
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/emulator-yagl.spec | 35 |
2 files changed, 18 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cdf0dce..1b42e86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,6 @@ option(PLATFORM_X11 "Enable X11 platform" TRUE) option(PLATFORM_GBM "Enable GBM platform" FALSE) option(PLATFORM_WAYLAND "Enable wayland platform" FALSE) -set(INSTALL_LIB_DIR "lib" CACHE STRING "Where to install library files") - # END USER SETTINGS if ((NOT PLATFORM_X11) AND (NOT PLATFORM_GBM) AND (NOT PLATFORM_WAYLAND)) diff --git a/packaging/emulator-yagl.spec b/packaging/emulator-yagl.spec index 810bad8..a262f95 100644 --- a/packaging/emulator-yagl.spec +++ b/packaging/emulator-yagl.spec @@ -56,17 +56,18 @@ Development files for use with Wayland protocol %build cp %{SOURCE1001} . -cmake -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr -DPLATFORM_X11=0 -DPLATFORM_GBM=1 -DPLATFORM_WAYLAND=1 +cmake -DCMAKE_INSTALL_PREFIX=%{buildroot} -DINSTALL_LIB_DIR=%{buildroot}%{_libdir} -DPLATFORM_X11=0 -DPLATFORM_GBM=1 -DPLATFORM_WAYLAND=1 make %install -make install +rm -fr %{buildroot} +mkdir -p %{buildroot} +mkdir -p %{buildroot}%{_libdir} +mkdir -p %{buildroot}%{_libdir}/pkgconfig -mkdir -p %{buildroot}/usr/share/license -cp COPYING %{buildroot}/usr/share/license/%{name} +make install -mkdir -p %{buildroot}/usr/lib/pkgconfig -cp pkgconfig/wayland-egl.pc %{buildroot}/usr/lib/pkgconfig/ +cp pkgconfig/wayland-egl.pc %{buildroot}%{_libdir}/pkgconfig/ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -78,28 +79,28 @@ cp pkgconfig/wayland-egl.pc %{buildroot}/usr/lib/pkgconfig/ %files %manifest %{name}.manifest +%license COPYING %defattr(-,root,root,-) %if %{with wayland} -/usr/lib/libgbm* -/usr/lib/driver/libEGL* -/usr/lib/driver/libGL* +%{_libdir}/libgbm* +%{_libdir}/driver/libEGL* +%{_libdir}/driver/libGL* %else -/usr/lib/libEGL* -/usr/lib/libGLES* -/usr/lib/yagl/* -/usr/lib/dummy-gl/* +%{_libdir}/libEGL* +%{_libdir}/libGLES* +%{_libdir}/yagl/* +%{_libdir}/dummy-gl/* %attr(777,root,root)/etc/emulator/opengl-es-setup-yagl-env.sh %endif -/usr/share/license/%{name} %if %{with wayland} %files -n libwayland-egl %manifest %{name}.manifest +%license COPYING %defattr(-,root,root,-) -/usr/lib/libwayland-egl* -/usr/share/license/%{name} +%{_libdir}/libwayland-egl* %files -n libwayland-egl-devel %defattr(-,root,root,-) -/usr/lib/pkgconfig/wayland-egl.pc +%{_libdir}/pkgconfig/wayland-egl.pc %endif |