[hedgewars] Handle multilib for hedgewar's physfs helper library
Bruno Wolff III
bruno at fedoraproject.org
Sun Jan 4 05:18:27 UTC 2015
commit f7e6067674e5fc80cc54c4858d95f17c7784e3dd
Author: Bruno Wolff III <bruno at wolff.to>
Date: Sat Jan 3 23:18:08 2015 -0600
Handle multilib for hedgewar's physfs helper library
hedgewars-multilib.patch | 11 +++++++++++
hedgewars.spec | 5 ++++-
2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/hedgewars-multilib.patch b/hedgewars-multilib.patch
new file mode 100644
index 0000000..38ede1f
--- /dev/null
+++ b/hedgewars-multilib.patch
@@ -0,0 +1,11 @@
+--- cmake_modules/paths.cmake.orig 2015-01-03 23:11:50.455837007 -0600
++++ cmake_modules/paths.cmake 2015-01-03 23:14:19.209742864 -0600
+@@ -15,7 +15,7 @@
+ #resource paths
+ if(UNIX AND NOT APPLE)
+ set(target_binary_install_dir "bin" CACHE PATH "install dest for binaries")
+- set(target_library_install_dir "lib" CACHE PATH "install dest for libs")
++ set(target_library_install_dir "lib${LIB_SUFFIX}" CACHE PATH "install dest for libs")
+
+ string(SUBSTRING "${DATA_INSTALL_DIR}" 0 1 sharepath_start)
+ if(${sharepath_start} MATCHES "/")
diff --git a/hedgewars.spec b/hedgewars.spec
index b24849e..48f474b 100644
--- a/hedgewars.spec
+++ b/hedgewars.spec
@@ -16,7 +16,9 @@ Source2: %{name}.appdata.xml
# avoid the same issue. The original patch is available from:
# https://launchpadlibrarian.net/85736468/hedgewars_0.9.17-1~maverick0.1.debdiff
Patch1: hedgewars-no-bytestring.patch
-# ghc does not support -dynamic on arm
+# The hedgewars physfs helper library needs to be installed in the correct
+# library directory according to arch
+Patch5: hedgewars-multilib.patch
BuildRequires: fpc qt4-devel SDL_mixer-devel SDL_net-devel SDL_image-devel
BuildRequires: SDL_ttf-devel openssl-devel cmake desktop-file-utils
BuildRequires: libpng-devel physfs-devel
@@ -62,6 +64,7 @@ A standalone server that can be used for LAN play or a private internet server.
%prep
%setup -q -n %{name}-src-%{version}
%patch1 -p0
+%patch5 -p0
# Make sure that we don't use bundled libraries
rm -r misc/liblua misc/libphysfs
More information about the scm-commits
mailing list