Skip to content

Commit

Permalink
use queue.h from host libc6-dev (#140)
Browse files Browse the repository at this point in the history
  • Loading branch information
neoaggelos authored Feb 16, 2024
1 parent e4c61f2 commit f42f01a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/k8s/hack/compile-dynamic-dqlite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ BUILD_DIR="$(realpath "${BUILD_DIR}")"
INSTALL_DIR="$(realpath "${INSTALL_DIR}")"

# dependencies
sudo apt install -y build-essential automake libtool gettext autopoint tclsh tcl libsqlite3-dev pkg-config libsqlite3-dev git curl > /dev/null
sudo apt install -y build-essential automake libtool gettext autopoint tclsh tcl libsqlite3-dev pkg-config libsqlite3-dev git > /dev/null

# build libtirpc
if [ ! -f "${BUILD_DIR}/libtirpc/src/libtirpc.la" ]; then
Expand Down
6 changes: 3 additions & 3 deletions src/k8s/hack/compile-static-dqlite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [ "${MACHINE_TYPE}" = "ppc64le" ]; then
fi

# dependencies
sudo apt install -y build-essential automake libtool gettext autopoint tclsh tcl libsqlite3-dev pkg-config libsqlite3-dev git curl > /dev/null
sudo apt install -y build-essential automake libtool gettext autopoint tclsh tcl libsqlite3-dev pkg-config libsqlite3-dev git > /dev/null

# build musl
if [ ! -f "${INSTALL_DIR}/musl/bin/musl-gcc" ]; then
Expand All @@ -32,10 +32,10 @@ if [ ! -f "${INSTALL_DIR}/musl/bin/musl-gcc" ]; then
make -j install > /dev/null || true

# missing musl header files
ln -s /usr/include/${MACHINE_TYPE}-linux-gnu/asm "${INSTALL_DIR}/musl/include/asm" || true
ln -s "/usr/include/${MACHINE_TYPE}-linux-gnu/sys/queue.h" "${INSTALL_DIR}/musl/include/sys/queue.h" || true
ln -s "/usr/include/${MACHINE_TYPE}-linux-gnu/asm" "${INSTALL_DIR}/musl/include/asm" || true
ln -s /usr/include/asm-generic "${INSTALL_DIR}/musl/include/asm-generic" || true
ln -s /usr/include/linux "${INSTALL_DIR}/musl/include/linux" || true
curl -k --silent https://dev.midipix.org/compat/musl-compat/raw/main/f/include/sys/queue.h -o "${INSTALL_DIR}/musl/include/sys/queue.h"
)
fi

Expand Down

0 comments on commit f42f01a

Please sign in to comment.