Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (f2e636dcd2cfde827cbf1504819bd6771eef956e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (f2e636dcd2cfde827cbf1504819bd6771eef956e)
  • Date: Sat, 14 Sep 2013 14:08:58 -0500

GIT changes to master games grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

games-libs/simgear/0001-fix-library-installation-directory.patch | 29
++++++++++
games-libs/simgear/HISTORY | 4 +
games-libs/simgear/PRE_BUILD | 3 -
3 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit f2e636dcd2cfde827cbf1504819bd6771eef956e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

games-libs/simgear: fix installation directory for shared libraries

diff --git a/games-libs/simgear/0001-fix-library-installation-directory.patch
b/games-libs/simgear/0001-fix-library-installation-directory.patch
new file mode 100644
index 0000000..24f9359
--- /dev/null
+++ b/games-libs/simgear/0001-fix-library-installation-directory.patch
@@ -0,0 +1,29 @@
+From 972f3ad11ce98898c89099e51925bf857519bf1f Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sat, 14 Sep 2013 19:00:25 +0200
+Subject: [PATCH] fix library installation directory
+
+---
+ CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ab6191..283ff50 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -61,11 +61,7 @@ endif(NOT CMAKE_BUILD_TYPE)
+ # differs between all Debian-based vs all other Linux distros.
+ # See cmake bug #11964,
http://cmake.org/gitweb?p=cmake.git;a=commit;h=126c993d
+ # GNUInstallDirs requires CMake >= 2.8.5, use own file for older cmake
+-if(${CMAKE_VERSION} VERSION_GREATER 2.8.4)
+- include(GNUInstallDirs)
+-else(${CMAKE_VERSION} VERSION_GREATER 2.8.4)
+- include(OldGNUInstallDirs)
+-endif(${CMAKE_VERSION} VERSION_GREATER 2.8.4)
++include(GNUInstallDirs)
+ message(STATUS "Library installation directory: ${CMAKE_INSTALL_LIBDIR}")
+
+
#####################################################################################
+--
+1.8.4
+
diff --git a/games-libs/simgear/HISTORY b/games-libs/simgear/HISTORY
index d9069f1..215234d 100644
--- a/games-libs/simgear/HISTORY
+++ b/games-libs/simgear/HISTORY
@@ -1,3 +1,7 @@
+2013-09-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-fix-library-installation-directory.patch:
+ fix installation directory for shared libraries
+
2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.10.0
* DEPENDS: added dependency on expat
diff --git a/games-libs/simgear/PRE_BUILD b/games-libs/simgear/PRE_BUILD
index aae639c..58e351d 100755
--- a/games-libs/simgear/PRE_BUILD
+++ b/games-libs/simgear/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
cp ${SCRIPT_DIRECTORY}/singleton.hpp ${SOURCE_DIRECTORY}/simgear/structure/
&&
sedit
's:<boost/pool/detail/singleton.hpp>:<simgear/structure/singleton.hpp>:' \
- ${SOURCE_DIRECTORY}/simgear/structure/Singleton.hxx
+ ${SOURCE_DIRECTORY}/simgear/structure/Singleton.hxx &&
+patch -p1 < $SPELL_DIRECTORY/0001-fix-library-installation-directory.patch



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (f2e636dcd2cfde827cbf1504819bd6771eef956e), Florian Franzmann, 09/14/2013

Archive powered by MHonArc 2.6.24.

Top of Page