Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Jan 2024 13:22:37 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 80ca2bd47129 - main - x11/libxkbcommon: fix with latest lld
Message-ID:  <202401031322.403DMb6M096529@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=80ca2bd471290603061fbf8182fc5b8a4d295c9c

commit 80ca2bd471290603061fbf8182fc5b8a4d295c9c
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-01-03 13:19:30 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-01-03 13:22:35 +0000

    x11/libxkbcommon: fix with latest lld
    
    during the configure phase upstream test if the linker support version
    scripts by testing a simple "int main(void) {}" compilation with a
    general map file
    
    Which ends up with recent lld into errors: because the map files
    contained symbols which are actually non existing.
    
    Bump portrevision, has it breaks incremental upgrades on head, so the
    package needs to be rebuilt
---
 x11/libxkbcommon/Makefile                |  1 +
 x11/libxkbcommon/files/patch-meson.build | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index d3ce4abd1f06..82dd54941dec 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libxkbcommon
 PORTVERSION=	1.6.0
+PORTVERSION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 
diff --git a/x11/libxkbcommon/files/patch-meson.build b/x11/libxkbcommon/files/patch-meson.build
new file mode 100644
index 000000000000..67323a645fb6
--- /dev/null
+++ b/x11/libxkbcommon/files/patch-meson.build
@@ -0,0 +1,11 @@
+--- meson.build.orig	2023-10-08 20:46:48 UTC
++++ meson.build
+@@ -145,7 +145,7 @@ have_version_script = cc.links(
+ # Supports -Wl,--version-script?
+ have_version_script = cc.links(
+     'int main(){}',
+-    args: '-Wl,--version-script=' + meson.current_source_dir()/'xkbcommon.map',
++    args: '-Wl,--undefined-version,--version-script=' + meson.current_source_dir()/'xkbcommon.map',
+     name: '-Wl,--version-script',
+ )
+ 



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