emacs{,-x}: Require version alignment between the two
%ci:no-build
This commit is contained in:
parent
a9e333e3d7
commit
2012ed59d4
|
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/
|
||||||
TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
|
TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
|
||||||
TERMUX_PKG_LICENSE="GPL-3.0"
|
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||||
TERMUX_PKG_MAINTAINER="@termux"
|
TERMUX_PKG_MAINTAINER="@termux"
|
||||||
|
# Update both emacs and emacs-x to the same version in one PR.
|
||||||
TERMUX_PKG_VERSION=28.2
|
TERMUX_PKG_VERSION=28.2
|
||||||
TERMUX_PKG_REVISION=1
|
TERMUX_PKG_REVISION=1
|
||||||
TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
|
TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
|
||||||
|
@ -83,6 +84,13 @@ termux_step_post_get_source() {
|
||||||
termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
|
termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Version guard
|
||||||
|
local ver_e=${TERMUX_PKG_VERSION#*:}
|
||||||
|
local ver_x=$(. $TERMUX_SCRIPTDIR/x11-packages/emacs-x/build.sh; echo ${TERMUX_PKG_VERSION#*:})
|
||||||
|
if [ "${ver_e}" != "${ver_x}" ]; then
|
||||||
|
termux_error_exit "Version mismatch between emacs and emacs-x."
|
||||||
|
fi
|
||||||
|
|
||||||
# XXX: We have to start with new host build each time
|
# XXX: We have to start with new host build each time
|
||||||
# to avoid build error when cross compiling.
|
# to avoid build error when cross compiling.
|
||||||
rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
|
rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
|
||||||
|
|
|
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/emacs/
|
||||||
TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
|
TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
|
||||||
TERMUX_PKG_LICENSE="GPL-3.0"
|
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||||
TERMUX_PKG_MAINTAINER="@termux"
|
TERMUX_PKG_MAINTAINER="@termux"
|
||||||
|
# Update both emacs and emacs-x to the same version in one PR.
|
||||||
TERMUX_PKG_VERSION=28.2
|
TERMUX_PKG_VERSION=28.2
|
||||||
TERMUX_PKG_REVISION=2
|
TERMUX_PKG_REVISION=2
|
||||||
TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
|
TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
|
||||||
|
@ -75,6 +76,13 @@ termux_step_post_get_source() {
|
||||||
termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
|
termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Version guard
|
||||||
|
local ver_e=$(. $TERMUX_SCRIPTDIR/packages/emacs/build.sh; echo ${TERMUX_PKG_VERSION#*:})
|
||||||
|
local ver_x=${TERMUX_PKG_VERSION#*:}
|
||||||
|
if [ "${ver_e}" != "${ver_x}" ]; then
|
||||||
|
termux_error_exit "Version mismatch between emacs and emacs-x."
|
||||||
|
fi
|
||||||
|
|
||||||
# XXX: We have to start with new host build each time
|
# XXX: We have to start with new host build each time
|
||||||
# to avoid build error when cross compiling.
|
# to avoid build error when cross compiling.
|
||||||
rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
|
rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
|
||||||
|
|
Loading…
Reference in New Issue