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

cmocka: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2019-03-22 21:15:09 +01:00
parent ea38e72027
commit 9ed7848fa7
3 changed files with 57 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dev-util/cmocka/cmocka-1.1.2.recipe → dev-util/cmocka/cmocka-1.1.3.recipe
View File

@@ -7,15 +7,15 @@ COPYRIGHT="2008 Google Inc.
2014-2018 Andreas Schneider
2015 Jakub Hrozek"
LICENSE="Apache v2"
REVISION="5"
REVISION="1"
SOURCE_URI="https://cmocka.org/files/${portVersion%.*}/cmocka-$portVersion.tar.xz"
CHECKSUM_SHA256="d11cd1e129827ff240a501c1c43557e808de89e8fcd8ab9e963c8db419332bdd"
CHECKSUM_SHA256="43eabcf72a9c80e3d03f7c8a1c04e408c18d2db5121eb058a3ef732a9dfabfaf"
PATCHES="cmocka-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
libVersion="0.5.0"
libVersion="0.5.1"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="

25
dev-util/cmocka/patches/cmocka-1.1.2.patchset
View File

@@ -1,25 +0,0 @@
From 03068c5e137d36dfa35e6f9d3e08cf553883a15c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 26 Sep 2018 13:33:44 +0200
Subject: [PATCH] Haiku: include sdint.h to define uintptr_t.
---
include/cmocka.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/cmocka.h b/include/cmocka.h
index e6861c8..32a651a 100644
--- a/include/cmocka.h
+++ b/include/cmocka.h
@@ -117,6 +117,8 @@ typedef uintmax_t LargestIntegralType;
typedef unsigned int uintptr_t;
# elif defined(_WIN64)
typedef unsigned long int uintptr_t
+# elif defined(__HAIKU__)
+ #include <stdint.h>
# else /* _WIN32 */
/* ILP32 and LP64 platforms */
--
2.18.0

54
dev-util/cmocka/patches/cmocka-1.1.3.patchset Normal file
View File

@@ -0,0 +1,54 @@
From c9baba9780c62161b0c60994e967d431c5b82614 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
--- a/include/cmocka.h
+++ b/include/cmocka.h
@@ -117,6 +117,8 @@ typedef uintmax_t LargestIntegralType;
typedef unsigned int uintptr_t;
# elif defined(_WIN64)
typedef unsigned long int uintptr_t
+# elif defined(__HAIKU__)
+ #include <stdint.h>
# else /* _WIN32 */
/* ILP32 and LP64 platforms */
--
2.19.1
From c02eb77ae626a44487461c6c8c7e2d7201e66ba9 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
--- a/CompilerChecks.cmake
+++ b/CompilerChecks.cmake
@@ -62,7 +62,7 @@ if (UNIX)
endif()
endif()
- check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG)
+ #check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG)
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)
list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong")
endif()
else (WITH_STACK_PROTECTOR_STRONG)
- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
+ #check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
if (WITH_STACK_PROTECTOR)
list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
# This is needed as Solaris has a seperate libssp
--
2.19.1