Skip to content

Commit

Permalink
Add libxkbcommon port and ensure that some other ports do not acciden…
Browse files Browse the repository at this point in the history
…tally link against host libraries
  • Loading branch information
mintsuki committed Jul 12, 2022
1 parent d43d6f1 commit 30e5eb4
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 3 deletions.
6 changes: 6 additions & 0 deletions build-support/checklibs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#! /bin/sh

set -e

./jinx sysroot
for i in $(find ./sysroot/usr/lib -name '*.so*'); do readelf -d $i 2>/dev/null | grep NEEDED | grep libc.so.6 && echo $i; done
3 changes: 2 additions & 1 deletion recipes/libgmp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ configure() {
--host=x86_64-vinix \
--prefix=${prefix} \
--enable-cxx \
--disable-static
--disable-static \
--with-sysroot=${sysroot_dir}
}

build() {
Expand Down
3 changes: 2 additions & 1 deletion recipes/libxcb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ configure() {
--prefix=${prefix} \
--sysconfdir=/etc \
--localstatedir=/var \
--disable-static
--disable-static \
--with-sysroot=${sysroot_dir}
}

build() {
Expand Down
27 changes: 27 additions & 0 deletions recipes/libxkbcommon
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name=libxkbcommon
from_source=libxkbcommon
revision=1
hostdeps="gcc pkg-config"
deps="mlibc libxcb libxml xkeyboard-config"
imagedeps="meson ninja"

configure() {
meson \
--cross-file "${base_dir}/build-support/cross_file.txt" \
--prefix=/usr \
--libdir=lib \
--buildtype=release \
-Denable-docs=false \
-Denable-x11=true \
-Denable-wayland=false \
"${source_dir}"
}

build() {
ninja
}

install() {
DESTDIR="${dest_dir}" ninja install
mkdir -p "${dest_dir}${prefix}/share/X11/xkb"
}
3 changes: 2 additions & 1 deletion recipes/pcre
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ configure() {
--enable-pcre8 \
--enable-pcre16 \
--enable-pcre32 \
--disable-static
--disable-static \
--with-sysroot=${sysroot_dir}
}

build() {
Expand Down
9 changes: 9 additions & 0 deletions source-recipes/libxkbcommon
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name=libxkbcommon
version=1.4.1
source_method=git
clone_url="https://github.com/xkbcommon/libxkbcommon.git"
tag="xkbcommon-${version}"

regenerate() {
true
}

0 comments on commit 30e5eb4

Please sign in to comment.