Skip to content

Commit

Permalink
libxkbcommon: fix executable linkages
Browse files Browse the repository at this point in the history
meson.build needs to declare that these
executables link against libxkbcommon.0.dylib in order
for meson to know to rewrite these linkages
on installation.

closes: https://trac.macports.org/ticket/67349
  • Loading branch information
kencu authored and ryandesign committed May 4, 2023
1 parent f1fb3d5 commit add4ae4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
7 changes: 5 additions & 2 deletions devel/libxkbcommon/Portfile
Expand Up @@ -31,6 +31,9 @@ homepage https://xkbcommon.org
master_sites ${homepage}/download/
use_xz yes

# https://trac.macports.org/ticket/67349
patchfiles patch-libxkbcommon-mesonbuild-linkages.diff

depends_build-append \
port:bison \
port:pkgconfig \
Expand All @@ -44,15 +47,15 @@ configure.args -Ddefault_library=both \
-Denable-x11=false

if {${subport} eq ${name}} {
revision 0
revision 1

depends_lib-append \
port:libxml2 \
port:xkeyboard-config
}

subport ${name}-x11 {
revision 0
revision 1

PortGroup legacysupport 1.0

Expand Down
@@ -0,0 +1,10 @@
--- meson.build.orig 2023-05-02 18:42:33
+++ meson.build 2023-05-02 18:46:02
@@ -414,6 +414,7 @@
tools_dep = declare_dependency(
include_directories: [include_directories('tools', 'include')],
link_with: libxkbcommon_tools_internal,
+ dependencies: dep_libxkbcommon,
)

executable('xkbcli', 'tools/xkbcli.c',

0 comments on commit add4ae4

Please sign in to comment.