Skip to content

Commit

Permalink
uuid lib is required on linux builds
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Dec 12, 2022
1 parent 1ac5aaf commit 3d91ac7
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions bootstrap-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if [ "${LINUX}" -eq 1 ]; then
elif [ "${LINUX_TARGET}" = "linux-x86_64" ]; then
export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
fi
if ! pkg-config --exists alsa dbus-1 gl glib-2.0 libpcre pthread-stubs x11 xcb xcursor xext xfixes xproto xrandr xrender; then
if ! pkg-config --exists alsa dbus-1 gl glib-2.0 libpcre pthread-stubs uuid x11 xcb xcursor xext xfixes xproto xrandr xrender; then
echo "some system libs are not available, cannot continue"
exit 2
fi
Expand Down Expand Up @@ -88,6 +88,10 @@ if [ "${LINUX}" -eq 1 ]; then
cp $(pkg-config --variable=pcfiledir pthread-stubs)/pthread-stubs.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/pthread-stubs.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/uuid.pc" ]; then
cp $(pkg-config --variable=pcfiledir uuid)/uuid.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/uuid.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/x11.pc" ]; then
cp $(pkg-config --variable=pcfiledir x11)/x11.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/x11.pc
Expand Down Expand Up @@ -120,10 +124,6 @@ if [ "${LINUX}" -eq 1 ]; then
cp $(pkg-config --variable=pcfiledir xrender)/xrender.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/xrender.pc
fi
if [ ! -e "${TARGET_PKG_CONFIG_PATH}/uuid.pc" ]; then
cp $(pkg-config --variable=pcfiledir uuid)/uuid.pc ${TARGET_PKG_CONFIG_PATH}/
sed -i '/Libs.private/d' ${TARGET_PKG_CONFIG_PATH}/uuid.pc
fi
fi

# ---------------------------------------------------------------------------------------------------------------------
Expand All @@ -132,7 +132,7 @@ fi
download pkg-config "${PKG_CONFIG_VERSION}" "${PKG_CONFIG_URL}"
build_host_autoconf pkg-config "${PKG_CONFIG_VERSION}" "--enable-indirect-deps --with-internal-glib --with-pc-path=${TARGET_PKG_CONFIG_PATH}"

if [ "${CROSS_COMPILING}" -eq 1 ] && [ ! -e "${PAWPAW_PREFIX}/bin/${TOOLCHAIN_PREFIX_}pkg-config" ]; then
if [ -n "${TOOLCHAIN_PREFIX_}" ] && [ ! -e "${PAWPAW_PREFIX}/bin/${TOOLCHAIN_PREFIX_}pkg-config" ]; then
ln -s pkg-config "${PAWPAW_PREFIX}/bin/${TOOLCHAIN_PREFIX_}pkg-config"
fi

Expand Down

0 comments on commit 3d91ac7

Please sign in to comment.