all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 526141d86eaac1a312a51d4d1fc897646b75e43a 4603 bytes (raw)
name: admin/merge-gnulib 	 # note: path name is non-authoritative(*)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
 
#! /bin/sh
# Merge gnulib sources into Emacs sources.
# Typical usage:
#
#	admin/merge-gnulib

# Copyright 2012-2024 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=https://git.savannah.gnu.org/git/gnulib.git

GNULIB_MODULES='
  alignasof alloca-opt binary-io boot-time byteswap c-ctype c-strcase
  canonicalize-lgpl
  careadlinkat close-stream copy-file-range
  crypto/md5 crypto/md5-buffer
  crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer
  d-type diffseq double-slash-root dtoastr dtotimespec dup2
  environ execinfo faccessat
  fchmodat fcntl fcntl-h fdopendir file-has-acl
  filemode filename filevercmp flexmember fpieee
  free-posix fstatat fsusage fsync futimens
  getline getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog
  ieee754-h ignore-value intprops largefile libgmp lstat
  manywarnings memmem-simple mempcpy memrchr memset_explicit
  minmax mkostemp mktime
  nanosleep nproc nstrftime
  pathmax pipe2 pselect pthread_sigmask
  qcopy-acl readlink readlinkat regex
  sig2str sigdescr_np socklen stat-time std-gnu11
  stdbit stdbool stdckdint stddef stdio
  stpcpy strnlen strnlen strtoimax symlink sys_stat sys_time
  tempname time-h time_r time_rz timegm timer-time timespec-add timespec-sub
  update-copyright unlocked-io utimensat
  vla warnings year2038
'

AVOIDED_MODULES='
  access btowc chmod close crypto/af_alg dup fchdir fstat
  iswblank iswctype iswdigit iswxdigit langinfo localename-unsafe-limited lock
  mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
  openat-die opendir pthread-h raise
  save-cwd select setenv sigprocmask stat stdarg
  threadlib tzset unsetenv utime utime-h
  wchar wcrtomb wctype wctype-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
}

# gnulib-tool has problems with a bare checkout (Bug#32452#65).
test -f configure || ./autogen.sh || exit

avoided_flags=
for module in $AVOIDED_MODULES; do
  avoided_flags="$avoided_flags --avoid=$module"
done

# Clean the lib directory as well.
if [ -e "$src"/lib/Makefile ]; then
   make -C "$src"/lib maintainer-clean
fi

"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
	$avoided_flags $GNULIB_MODULES &&
rm -- "$src"lib/gl_openssl.h \
      "$src"lib/stdio-read.c "$src"lib/stdio-write.c \
      "$src"m4/fcntl-o.m4 \
      "$src"m4/gl-openssl.m4 \
      "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
      "$src"m4/locale-fr.m4 \
      "$src"m4/manywarnings-c++.m4 \
      "$src"m4/off64_t.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 &&
cp -- "$gnulib_srcdir"/lib/af_alg.h \
      "$gnulib_srcdir"/lib/save-cwd.h \
   "$src"lib &&
cp -- "$gnulib_srcdir"/m4/codeset.m4 \
   "$src"m4 &&
{ test -z "$src" || cd "$src"; } &&
./autogen.sh

debug log:

solving 526141d86ea ...
found 526141d86ea in https://yhetil.org/emacs/d4343052-d2f4-4615-8a1a-aac76c405fde@cs.ucla.edu/
found c4daaded015 in https://git.savannah.gnu.org/cgit/emacs.git
preparing index
index prepared:
100755 c4daaded0156ee7b74f5fcfe11cd74203ae971c7	admin/merge-gnulib

applying [1/1] https://yhetil.org/emacs/d4343052-d2f4-4615-8a1a-aac76c405fde@cs.ucla.edu/
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index c4daaded015..526141d86ea 100755

Checking patch admin/merge-gnulib...
Applied patch admin/merge-gnulib cleanly.

index at:
100755 526141d86eaac1a312a51d4d1fc897646b75e43a	admin/merge-gnulib

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.