haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

muscle: fix build, enable x86_64.

Browse Source 
* fix #227
This commit is contained in:
Jerome Duval
2015-06-13 10:43:16 +00:00
parent 4b504f1998
commit 53214b351a
2 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net-misc/muscle/muscle-6.00.recipe
View File

@@ -18,11 +18,11 @@ LICENSE="BSD (3-clause)"
HOMEPAGE="https://public.msli.com/lcs/muscle/index.html"
SRC_URI="https://public.msli.com/lcs/muscle/muscle6.00.zip"
CHECKSUM_SHA256="b12abe12b5cc4aa93126f86ae07a4bcd02ee8d89d692789435debd5becc53437"
REVISION="1"
REVISION="2"
#TODO:enable multithreading for the devel package!
ARCHITECTURES="x86 ?x86_64"
ARCHITECTURES="x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
@@ -37,6 +37,8 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libstdc++$secondaryArchSuffix
lib:libgcc_s$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
@@ -54,6 +56,10 @@ PATCHES="muscle-6.00.patchset"
BUILD()
{
if [ $effectiveTargetArchitecture == x86_64 ]; then
CXXFLAGS="-DMUSCLE_64_BIT_PLATFORM"
fi
export CXXFLAGS="-D_BSD_SOURCE $CXXFLAGS"
cd server
make $jobArgs all libmuscle.a
}

39
net-misc/muscle/patches/muscle-6.00.patchset
View File

@@ -1,12 +1,9 @@
From 0b94a1c6c87f5a3ef44b5989a9f8f440061a23f4 Mon Sep 17 00:00:00 2001
From 076fd57c597d56cf064237e3fb487cbff02565b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 26 Jul 2014 18:14:25 +0200
Subject: [PATCH] Just use int32 for atomics on Haiku now
Subject: Just use int32 for atomics on Haiku now
We dropped the volatile requirement.
---
system/AtomicCounter.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/AtomicCounter.h b/system/AtomicCounter.h
index 465bce2..bd720e7 100644
@@ -24,3 +21,35 @@ index 465bce2..bd720e7 100644
--
1.8.3.4
From 81eeba21d85ff5279e2166a3a489dbecbf255951 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 13 Jun 2015 10:32:08 +0000
Subject: Haiku x86_64 patch
diff --git a/util/FilePathInfo.cpp b/util/FilePathInfo.cpp
index 2037bb8..4af598b 100644
--- a/util/FilePathInfo.cpp
+++ b/util/FilePathInfo.cpp
@@ -59,7 +59,7 @@ void FilePathInfo :: SetFilePath(const char * optFilePath)
CloseHandle(hFile);
}
#else
-# if defined(MUSCLE_64_BIT_PLATFORM) && !defined(__APPLE__)
+# if defined(MUSCLE_64_BIT_PLATFORM) && !defined(__APPLE__) && !defined(__HAIKU__)
struct stat64 statInfo;
if (stat64(optFilePath, &statInfo) == 0)
# else
@@ -72,7 +72,7 @@ void FilePathInfo :: SetFilePath(const char * optFilePath)
if (S_ISREG(statInfo.st_mode)) _flags |= (1L<<FPI_FLAG_ISREGULARFILE);
_size = statInfo.st_size;
-# if defined(MUSCLE_64_BIT_PLATFORM) && !defined(_POSIX_SOURCE)
+# if defined(MUSCLE_64_BIT_PLATFORM) && !defined(_POSIX_SOURCE) && !defined(__HAIKU__)
_atime = InternalizeTimeSpec(statInfo.st_atimespec);
# if !defined(__APPLE__) || (__DARWIN_64_BIT_INO_T == 1)
_ctime = InternalizeTimeSpec(statInfo.st_birthtimespec);
--
1.8.3.4