Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Apr 2021 18:31:37 GMT
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 885cc329af6c - main - devel/apitrace: fix build with CMake 3.20
Message-ID:  <202104161831.13GIVbDw093165@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=885cc329af6ce8db740e4335bf2faf50d769d277

commit 885cc329af6ce8db740e4335bf2faf50d769d277
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2021-04-07 12:25:53 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2021-04-16 18:31:05 +0000

    devel/apitrace: fix build with CMake 3.20
    
    Reported upstream as https://github.com/apitrace/apitrace/issues/727
    
    An internal check that ends up defining HAVE_STDINT_H in CMake
    is no longer done; do this explicitly instead.
---
 devel/apitrace/Makefile                   |  1 +
 devel/apitrace/files/patch-CMakeLists.txt | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/devel/apitrace/Makefile b/devel/apitrace/Makefile
index 6519068734dc..001a9ccc5df2 100644
--- a/devel/apitrace/Makefile
+++ b/devel/apitrace/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	apitrace
 DISTVERSION=	9.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 PATCH_SITES=	https://github.com/a17r/${GH_PROJECT}/commit/
diff --git a/devel/apitrace/files/patch-CMakeLists.txt b/devel/apitrace/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..ed25e71f8bf1
--- /dev/null
+++ b/devel/apitrace/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2021-04-07 12:23:46 UTC
++++ CMakeLists.txt
+@@ -408,6 +408,10 @@ test_big_endian (HAVE_BIGENDIAN)
+ if (HAVE_BIGENDIAN)
+     add_definitions (-DHAVE_BIGENDIAN)
+ endif ()
++# CMake 3.20 doesn't do the tests internally in TestBigEndian
++# that end up setting HAVE_STDINT_H and similar.
++include(CheckTypeSize)
++CHECK_TYPE_SIZE("unsigned short" CMAKE_SIZEOF_UNSIGNED_SHORT LANGUAGE C)
+ 
+ # Force certain components to always be built as release
+ macro (force_release_build)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104161831.13GIVbDw093165>