Skip to content

Commit 720bc86

Browse files
fix(codeserver): build libxkbfile with meson instead of autotools (opendatahub-io#2475)
* build libxkbfile with meson instead of autotools Signed-off-by: Md. Shafi Hussain <[email protected]> * Build specific release versions of xkbfile Signed-off-by: Md. Shafi Hussain <[email protected]> --------- Signed-off-by: Md. Shafi Hussain <[email protected]>
1 parent ea678da commit 720bc86

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

codeserver/ubi9-python-3.12/get_code_server_rpm.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,23 @@ if [[ "$ARCH" == "amd64" || "$ARCH" == "arm64" ||"$ARCH" == "ppc64le" ]]; then
2929
export ELECTRON_SKIP_BINARY_DOWNLOAD=1 PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
3030

3131
# install build dependencies
32-
# dnf install -y \
33-
# git automake
3432
dnf install -y jq patch libtool rsync gettext gcc-toolset-13 krb5-devel libX11-devel
3533

3634
. /opt/rh/gcc-toolset-13/enable
3735

3836
# build libxkbfile
39-
git clone https://gitlab.freedesktop.org/xorg/util/macros.git
40-
cd macros/
41-
./autogen.sh && make install -j ${MAX_JOBS}
42-
export ACLOCAL_PATH=/usr/local/share/aclocal/
43-
cd .. && rm -rf macros
44-
git clone https://gitlab.freedesktop.org/xorg/lib/libxkbfile.git
45-
cd libxkbfile/
46-
./autogen.sh && make install -j ${MAX_JOBS}
47-
cd .. && rm -rf libxkbfile
48-
export PKG_CONFIG_PATH=$(find / -type d -name "pkgconfig" 2>/dev/null | tr '\n' ':')
37+
export UTIL_MACROS_VERSION=1.20.2
38+
curl -L https://www.x.org/releases/individual/util/util-macros-${UTIL_MACROS_VERSION}.tar.gz | tar xz
39+
cd util-macros-${UTIL_MACROS_VERSION}/
40+
./configure --prefix=/usr && make install -j ${MAX_JOBS}
41+
cd .. && rm -rf util-macros-${UTIL_MACROS_VERSION}/
42+
43+
export X_KB_FILE_VERSION=1.1.3
44+
curl -L https://www.x.org/releases/individual/lib/libxkbfile-${X_KB_FILE_VERSION}.tar.gz | tar xz
45+
cd libxkbfile-${X_KB_FILE_VERSION}/
46+
./configure --prefix=/usr && make install -j ${MAX_JOBS}
47+
cd .. && rm -rf libxkbfile-${X_KB_FILE_VERSION}/
48+
export PKG_CONFIG_PATH=$(find / -type d -name "pkgconfig" 2>/dev/null | tr '\n' ':')
4949

5050
# install nfpm to build rpm
5151
NFPM_VERSION=$(curl -s "https://api.github.com/repos/goreleaser/nfpm/releases/latest" | jq -r '.tag_name') \

0 commit comments

Comments
 (0)