f466b9305f
Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0" reduced the fuzz factor.
Due to this change, exim fails to build with output:
Applying 0004-exim_lock-fix-lstat-related-build-errors.patch using patch:
patching file src/exim_lock.c
Hunk #1 FAILED at 13.
Hunk #2 succeeded at 27 (offset 1 line).
1 out of 2 hunks FAILED -- saving rejects to file src/exim_lock.c.rej
This commit rebases the package patches on the current package version
when needed.
Fixes:
http://autobuild.buildroot.net/results/ff27d5ebd7f24ac8cb236b83c67c2c75255e51c6/
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: Yann E. MORIN <yann.morin@orange.com>
Tested-by: Yann E. MORIN <yann.morin@orange.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 20973140c14d528d91ecea12ebac6428d78d3340)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
The exim install script installs a binary named exim-<version>, plus a symlink
|
|
to it named exim.
|
|
In order to achieve this "feature" (of dubious usefulness) it runs the
|
|
executable (on the host) and then filters its output to grab the version number.
|
|
This clearly cannot work if the executable is cross-compiled, so get rid of all
|
|
of it and just install an executable file called exim.
|
|
|
|
Inspired by:
|
|
http://patch-tracker.debian.org/patch/series/view/exim4/4.76-2/35_install.dpatch
|
|
|
|
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
|
|
[Bernd: rebased for version 4.89 & 4.97.1]
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
---
|
|
scripts/exim_install | 7 +++++--
|
|
1 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/scripts/exim_install b/scripts/exim_install
|
|
index e68e7d5..487a4e1 100755
|
|
--- a/scripts/exim_install
|
|
+++ b/scripts/exim_install
|
|
@@ -61,6 +61,8 @@
|
|
shift
|
|
done
|
|
|
|
+do_symlink=no
|
|
+
|
|
# Get the values of BIN_DIRECTORY, CONFIGURE_FILE, INFO_DIRECTORY, NO_SYMLINK,
|
|
# SYSTEM_ALIASES_FILE, and EXE from the global Makefile (in the build
|
|
# directory). EXE is empty except in the Cygwin environment. In each case, keep
|
|
@@ -220,9 +223,7 @@
|
|
# The exim binary is handled specially
|
|
|
|
if [ $name = exim${EXE} ]; then
|
|
- exim="./exim -bV -C /dev/null"
|
|
- version=exim-`$exim 2>/dev/null | \
|
|
- awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
|
|
+ version=exim
|
|
|
|
if [ "${version}" = "exim-${EXE}" ]; then
|
|
echo $com ""
|