[packages/CEGUI] - fix install on x32

baggins baggins at pld-linux.org
Tue Jun 23 01:30:21 CEST 2015


commit f67ea62bfb9ec469e263b6ddb12321ef607319ee
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jun 22 23:30:03 2015 +0000

    - fix install on x32

 CEGUI.spec |  2 ++
 x32.patch  | 13 +++++++++++++
 2 files changed, 15 insertions(+)
---
diff --git a/CEGUI.spec b/CEGUI.spec
index 5732e09..a92427c 100644
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -20,6 +20,7 @@ Source1:	http://downloads.sourceforge.net/crayzedsgui/cegui-docs-%{version}.tar.
 Patch0:		pthread.patch
 Patch1:		%{name}-glfw3.patch
 Patch2:		%{name}-python.patch
+Patch3:		x32.patch
 URL:		http://www.cegui.org.uk/
 BuildRequires:	DevIL-devel
 %{?with_directfb:BuildRequires:	DirectFB-devel >= 1.2.0}
@@ -431,6 +432,7 @@ Wiązania Pythona do biblioteki CEGUI OpenGLRenderer.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..14dd1e3
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,13 @@
+--- cegui-0.8.4/CMakeLists.txt~	2015-06-22 20:36:23.000000000 +0000
++++ cegui-0.8.4/CMakeLists.txt	2015-06-22 21:21:28.758070773 +0000
+@@ -447,8 +447,8 @@
+ # set up install sub-directories
+ if (CMAKE_SIZEOF_VOID_P EQUAL 8 AND EXISTS "${CMAKE_INSTALL_PREFIX}/lib64")
+     set( CEGUI_LIB_INSTALL_DIR lib64 )
+-elseif (CMAKE_SIZEOF_VOID_P EQUAL 4 AND EXISTS "${CMAKE_INSTALL_PREFIX}/lib32")
+-    set( CEGUI_LIB_INSTALL_DIR lib32 )
++elseif (CMAKE_SIZEOF_VOID_P EQUAL 4 AND EXISTS "${CMAKE_INSTALL_PREFIX}/libx32")
++    set( CEGUI_LIB_INSTALL_DIR libx32 )
+ else()
+     set( CEGUI_LIB_INSTALL_DIR lib )
+ endif()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/CEGUI.git/commitdiff/f67ea62bfb9ec469e263b6ddb12321ef607319ee



More information about the pld-cvs-commit mailing list