mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
cmocka: bump version.
This commit is contained in:
@@ -9,13 +9,13 @@ COPYRIGHT="2008 Google Inc.
|
||||
LICENSE="Apache v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://cmocka.org/files/${portVersion%.*}/cmocka-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="43eabcf72a9c80e3d03f7c8a1c04e408c18d2db5121eb058a3ef732a9dfabfaf"
|
||||
CHECKSUM_SHA256="f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6"
|
||||
PATCHES="cmocka-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="0.5.1"
|
||||
libVersion="0.7.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
@@ -1,37 +1,37 @@
|
||||
From c9baba9780c62161b0c60994e967d431c5b82614 Mon Sep 17 00:00:00 2001
|
||||
From e998618a66374bcd29069dbc794e45597496f996 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 26 Sep 2018 13:33:44 +0200
|
||||
Subject: Haiku: include sdint.h to define uintptr_t.
|
||||
|
||||
|
||||
diff --git a/include/cmocka.h b/include/cmocka.h
|
||||
index e6861c8..32a651a 100644
|
||||
index 9b47ceb..e88c9f8 100644
|
||||
--- a/include/cmocka.h
|
||||
+++ b/include/cmocka.h
|
||||
@@ -117,6 +117,8 @@ typedef uintmax_t LargestIntegralType;
|
||||
@@ -122,6 +122,8 @@ typedef uintmax_t LargestIntegralType;
|
||||
typedef unsigned int uintptr_t;
|
||||
# elif defined(_WIN64)
|
||||
typedef unsigned long int uintptr_t
|
||||
typedef unsigned long int uintptr_t;
|
||||
+# elif defined(__HAIKU__)
|
||||
+ #include <stdint.h>
|
||||
# else /* _WIN32 */
|
||||
|
||||
/* ILP32 and LP64 platforms */
|
||||
--
|
||||
2.19.1
|
||||
2.21.0
|
||||
|
||||
|
||||
From c02eb77ae626a44487461c6c8c7e2d7201e66ba9 Mon Sep 17 00:00:00 2001
|
||||
From d184362784d72fb2a2ac7b5d1e4aaff99417bdaa Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 22 Mar 2019 21:14:31 +0100
|
||||
Subject: disable stack protector for Haiku
|
||||
|
||||
|
||||
diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake
|
||||
index f07929c..4c5f9ff 100644
|
||||
index b326807..70ff254 100644
|
||||
--- a/CompilerChecks.cmake
|
||||
+++ b/CompilerChecks.cmake
|
||||
@@ -62,7 +62,7 @@ if (UNIX)
|
||||
@@ -66,7 +66,7 @@ if (UNIX)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -40,7 +40,7 @@ index f07929c..4c5f9ff 100644
|
||||
if (WITH_STACK_PROTECTOR_STRONG)
|
||||
list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong")
|
||||
# This is needed as Solaris has a seperate libssp
|
||||
@@ -70,7 +70,7 @@ if (UNIX)
|
||||
@@ -74,7 +74,7 @@ if (UNIX)
|
||||
list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong")
|
||||
endif()
|
||||
else (WITH_STACK_PROTECTOR_STRONG)
|
||||
@@ -50,5 +50,5 @@ index f07929c..4c5f9ff 100644
|
||||
list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
|
||||
# This is needed as Solaris has a seperate libssp
|
||||
--
|
||||
2.19.1
|
||||
2.21.0
|
||||
|
||||
Reference in New Issue
Block a user