haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

VCMI: get it to build.

Browse Source 
Fix boost to not try using XSI shared memory as we don't support that.
Fix VCMI to link to libnetwork where it uses it.

Now failing at install because there is no 'make install'. Will write a
manual copy of relevant files to the package later.
This commit is contained in:
Adrien Destugues
2014-01-07 23:14:20 +01:00
parent 7a5b5cac58
commit e035f6fc18
6 changed files with 28 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dev-libs/boost/patches/boost-1.55.0.patchset
View File

@@ -1,4 +1,4 @@
From f194ab93c5c29020d5f0f4915b1f554645986587 Mon Sep 17 00:00:00 2001
From c0848cd5528c0623d360be34004a411955ce6c98 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sun, 22 Dec 2013 10:01:12 -0800
Subject: applying patch boost-1.55.0.patch
@@ -360,14 +360,14 @@ index d48bb78..070f5d2 100644
1.8.3.4
From 0d11043b05a45a1bc8091387ba45f1fe41fe2e55 Mon Sep 17 00:00:00 2001
From 03631bc8fb6cff21669ca0cb87188c2c3b0d4928 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sun, 22 Dec 2013 10:01:23 -0800
Subject: applying patch type_traits.patch
diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
index 1b15c7e..9a3becd 100644
index 1b15c7e..899765d 100644
--- a/boost/config/platform/haiku.hpp
+++ b/boost/config/platform/haiku.hpp
@@ -9,18 +9,26 @@
@@ -401,3 +401,26 @@ index 1b15c7e..9a3becd 100644
--
1.8.3.4
From f2a0265af90e6c7bac9b7627fd0049f7479e5ab3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 7 Jan 2014 21:49:28 +0100
Subject: We don't have XSI shared memory, so don't try to use it.
diff --git a/boost/interprocess/detail/workaround.hpp b/boost/interprocess/detail/workaround.hpp
index 6ce2ea1..3b303eb 100644
--- a/boost/interprocess/detail/workaround.hpp
+++ b/boost/interprocess/detail/workaround.hpp
@@ -73,7 +73,7 @@
#endif
//Check for XSI shared memory objects. They are available in nearly all UNIX platforms
- #if !defined(__QNXNTO__)
+ #if !defined(__QNXNTO__) && !defined(__HAIKU__)
#define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS
#endif
--
1.8.3.4