tigervnc: source xorg-server-xvfb's build.sh to get configure args
Instead of implementing custom function in the build recipe. %ci:no-build
This commit is contained in:
parent
c996aeccce
commit
34da5307a6
@ -45,13 +45,14 @@ termux_step_pre_configure() {
|
|||||||
CPPFLAGS="${CPPFLAGS} -I${TERMUX_PREFIX}/include/libdrm"
|
CPPFLAGS="${CPPFLAGS} -I${TERMUX_PREFIX}/include/libdrm"
|
||||||
LDFLAGS="${LDFLAGS} -llog"
|
LDFLAGS="${LDFLAGS} -llog"
|
||||||
|
|
||||||
|
local xorg_server_xvfb_configure_args="$(. $TERMUX_SCRIPTDIR/packages/xorg-server-xvfb/build.sh; echo $TERMUX_PKG_EXTRA_CONFIGURE_ARGS)"
|
||||||
./configure \
|
./configure \
|
||||||
--host="${TERMUX_HOST_PLATFORM}" \
|
--host="${TERMUX_HOST_PLATFORM}" \
|
||||||
--prefix="${TERMUX_PREFIX}" \
|
--prefix="${TERMUX_PREFIX}" \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--disable-nls \
|
--disable-nls \
|
||||||
--enable-debug \
|
--enable-debug \
|
||||||
`TERMUX_PREFIX=${TERMUX_PREFIX} bash ${TERMUX_SCRIPTDIR}/packages/xorg-server-xvfb/build.sh xorg_server_flags`
|
${xorg_server_xvfb_configure_args}
|
||||||
|
|
||||||
LDFLAGS="${LDFLAGS} -landroid-shmem"
|
LDFLAGS="${LDFLAGS} -landroid-shmem"
|
||||||
|
|
||||||
|
@ -70,8 +70,3 @@ termux_step_pre_configure() {
|
|||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-debug"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-debug"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
## The following is required for package 'tigervnc'.
|
|
||||||
if [ "${#}" -eq 1 ] && [ "${1}" == "xorg_server_flags" ]; then
|
|
||||||
echo ${TERMUX_PKG_EXTRA_CONFIGURE_ARGS}
|
|
||||||
fi
|
|
||||||
|
Loading…
Reference in New Issue
Block a user