mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-09 15:50:21 +00:00
79f15092b9
This incorporates:
2018-05-21 crypto: omit stream ops Emacs doesn’t need
2018-05-13 truncate: Fix compilation error on Android
2018-05-13 imaxdiv: Fix compilation error on Android
2018-05-13 Support selective inclusion of recent mingw.org headers
2018-05-13 Add cross-compilation guesses for Linux systems sans glibc
2018-05-13 stdioext: Fix compilation errors with newer Android headers
2018-05-07 af_alg: Pacify --enable-gcc-warnings
2018-05-06 af_alg: Fix bug with streams that are not at position 0
2018-05-06 Followup to 'af_alg: New module'
2018-05-05 crypto/{md5,sha1,sha256,sha512}: simplify
2018-05-05 af_alg: New module
2018-05-05 af_alg: Improve function signature
2018-04-28 md5sum: Use AF_ALG when available
2018-04-28 sha512sum: Use AF_ALG when available
2018-04-28 sha256sum: Use AF_ALG when available
2018-04-28 sha1sum: Use AF_ALG when available
2018-05-05 all: Replace more http URLs by https URLs
2018-05-03 maint: port more modules to GCC 8
2018-05-03 Simplify code; drop support for Borland C++ on Windows
* admin/merge-gnulib (GNULIB_MODULES): Use crypto/md5-buffer
rather than crypto/md5, since Emacs doesn’t use the stream
operations that in recent Gnulib pull in other stuff Emacs doesn’t
need. Similarly for crypto/sha1-buffer, crypto/sha256-buffer,
crypto/sha512-buffer.
* build-aux/config.guess, build-aux/config.sub, lib/dosname.h:
* lib/dup2.c, lib/errno.in.h, lib/euidaccess.c, lib/fcntl.c:
* lib/fcntl.in.h, lib/fpending.c, lib/fsync.c, lib/getdtablesize.c:
* lib/getopt.c, lib/gettimeofday.c, lib/inttypes.in.h, lib/md5.c:
* lib/md5.h, lib/open.c, lib/pipe2.c, lib/putenv.c, lib/sha1.c:
* lib/sha1.h, lib/sha256.c, lib/sha256.h, lib/sha512.c:
* lib/sha512.h, lib/stat-time.h, lib/stdio-impl.h, lib/stdio.in.h:
* lib/stdlib.in.h, lib/sys_stat.in.h, lib/sys_types.in.h:
* lib/timespec.h, lib/unistd.in.h, lib/utimens.c, m4/c-strtod.m4:
* m4/gnulib-common.m4, m4/inttypes.m4, m4/lstat.m4, m4/nocrash.m4:
* m4/pselect.m4, m4/readlink.m4, m4/stdio_h.m4, m4/symlink.m4:
* m4/unistd_h.m4, m4/utimens.m4:
Copy from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
119 lines
3.6 KiB
Bash
Executable File
119 lines
3.6 KiB
Bash
Executable File
#! /bin/sh
|
|
# Merge gnulib sources into Emacs sources.
|
|
# Typical usage:
|
|
#
|
|
# admin/merge-gnulib
|
|
|
|
# Copyright 2012-2018 Free Software Foundation, Inc.
|
|
|
|
# This file is part of GNU Emacs.
|
|
|
|
# GNU Emacs is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# GNU Emacs is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
# written by Paul Eggert
|
|
|
|
GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
|
|
|
|
GNULIB_MODULES='
|
|
alloca-opt binary-io byteswap c-ctype c-strcase
|
|
careadlinkat close-stream
|
|
count-leading-zeros count-one-bits count-trailing-zeros
|
|
crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer
|
|
d-type diffseq dtoastr dtotimespec dup2
|
|
environ execinfo explicit_bzero faccessat
|
|
fcntl fcntl-h fdatasync fdopendir
|
|
filemode filevercmp flexmember fstatat fsusage fsync
|
|
getloadavg getopt-gnu gettime gettimeofday gitlog-to-changelog
|
|
ignore-value intprops largefile lstat
|
|
manywarnings memrchr minmax mkostemp mktime nstrftime
|
|
pipe2 pselect pthread_sigmask putenv qcopy-acl readlink readlinkat
|
|
sig2str socklen stat-time std-gnu11 stdalign stddef stdio
|
|
stpcpy strtoimax symlink sys_stat sys_time
|
|
tempname time time_r time_rz timegm timer-time timespec-add timespec-sub
|
|
update-copyright unlocked-io utimens
|
|
vla warnings
|
|
'
|
|
|
|
AVOIDED_MODULES='
|
|
close dup fchdir fstat
|
|
malloc-posix msvc-inval msvc-nothrow
|
|
openat-die opendir raise
|
|
save-cwd select setenv sigprocmask stat stdarg stdbool
|
|
threadlib tzset unsetenv utime utime-h
|
|
'
|
|
|
|
GNULIB_TOOL_FLAGS='
|
|
--conditional-dependencies --import --no-changelog --no-vc-files
|
|
--gnu-make
|
|
--makefile-name=gnulib.mk.in
|
|
'
|
|
|
|
# The source directory, with a trailing '/'.
|
|
# If empty, the source directory is the working directory.
|
|
src=$2
|
|
case $src in
|
|
*/ | '') ;;
|
|
*) src=$src/ ;;
|
|
esac
|
|
|
|
# Gnulib's source directory.
|
|
gnulib_srcdir=${1-$src../gnulib}
|
|
|
|
case $gnulib_srcdir in
|
|
-*) src=- ;;
|
|
esac
|
|
case $src in
|
|
-*)
|
|
printf '%s\n' >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
|
|
|
|
SRCDIR is the Emacs source directory (default: working directory).
|
|
GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
|
|
exit 1 ;;
|
|
esac
|
|
|
|
test -x "$src"autogen.sh || {
|
|
printf '%s\n' >&2 "$0: '${src:-.}' is not an Emacs source directory."
|
|
exit 1
|
|
}
|
|
|
|
test -d "$gnulib_srcdir" ||
|
|
git clone -- "$GNULIB_URL" "$gnulib_srcdir" ||
|
|
exit
|
|
|
|
test -x "$gnulib_srcdir"/gnulib-tool || {
|
|
printf '%s\n' >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
|
|
exit 1
|
|
}
|
|
|
|
avoided_flags=
|
|
for module in $AVOIDED_MODULES; do
|
|
avoided_flags="$avoided_flags --avoid=$module"
|
|
done
|
|
|
|
"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
|
|
$avoided_flags $GNULIB_MODULES &&
|
|
rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \
|
|
"$src"m4/gl-openssl.m4 \
|
|
"$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
|
|
"$src"m4/manywarnings-c++.m4 \
|
|
"$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 &&
|
|
cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
|
|
cp -- "$gnulib_srcdir"/build-aux/config.guess \
|
|
"$gnulib_srcdir"/build-aux/config.sub \
|
|
"$gnulib_srcdir"/build-aux/install-sh \
|
|
"$gnulib_srcdir"/build-aux/move-if-change \
|
|
"$src"build-aux &&
|
|
{ test -z "$src" || cd "$src"; } &&
|
|
./autogen.sh
|