mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Fix build on Solaris 10 (bug#75451)

Browse source 
* autogen.sh: Avoid bashism.
* configure.ac (AC_PROG_AWK): Use.
* src/Makefile.in (AWK): Set.
(dmpstruct.h): Use "$(AWK)", not "awk".
* src/dired.c (DT_UNKNOWN, DT_DIR, DT_LNK): Define all three constants
or none of them.
This commit is contained in:
Pip Cet 2025-01-17 17:13:29 +00:00
parent 91b2b3654f
commit 2a00bedeae
4 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
autogen.sh
View file

@ -115,7 +115,7 @@ do_check=true
do_autoconf=false do_autoconf=false
do_git=false do_git=false
for arg; do for arg in "$@"; do
case $arg in case $arg in
--help) --help)
exec echo "$0: usage: $0 [--no-check] [target...] exec echo "$0: usage: $0 [--no-check] [target...]

2
configure.ac
View file

@ -2004,6 +2004,8 @@ ARCH_INDEPENDENT_CONFIG_FILES([src/verbose.mk])
dnl Some other nice autoconf tests. dnl Some other nice autoconf tests.
AC_PROG_INSTALL AC_PROG_INSTALL
dnl use "gawk" where possible
AC_PROG_AWK
dnl These are commented out, since gl_EARLY and/or Autoconf already does them. dnl These are commented out, since gl_EARLY and/or Autoconf already does them.
dnl AC_PROG_MKDIR_P dnl AC_PROG_MKDIR_P
dnl if test "x$RANLIB" = x; then dnl if test "x$RANLIB" = x; then

3
src/Makefile.in
View file

@ -60,6 +60,7 @@ LDFLAGS = @LDFLAGS@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
version = @version@ version = @version@
MKDIR_P = @MKDIR_P@ MKDIR_P = @MKDIR_P@
AWK = @AWK@
# Don't use LIBS. configure puts stuff in it that either shouldn't be # Don't use LIBS. configure puts stuff in it that either shouldn't be
# linked with Emacs or is duplicated by the other stuff below. # linked with Emacs or is duplicated by the other stuff below.
# LIBS = @LIBS@ # LIBS = @LIBS@
@ -543,7 +544,7 @@ pdumper.o: dmpstruct.h
endif endif
dmpstruct.h: $(srcdir)/dmpstruct.awk dmpstruct.h: $(srcdir)/dmpstruct.awk
dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers) dmpstruct.h: $(libsrc)/make-fingerprint$(EXEEXT) $(dmpstruct_headers)
$(AM_V_GEN)POSIXLY_CORRECT=1 awk -f $(srcdir)/dmpstruct.awk \ $(AM_V_GEN)POSIXLY_CORRECT=1 $(AWK) -f $(srcdir)/dmpstruct.awk \
$(dmpstruct_headers) > $@ $(dmpstruct_headers) > $@
AUTO_DEPEND = @AUTO_DEPEND@ AUTO_DEPEND = @AUTO_DEPEND@

12
src/dired.c
View file

@ -79,7 +79,17 @@ dirent_namelen (struct dirent *dp)
} }
#ifndef HAVE_STRUCT_DIRENT_D_TYPE #ifndef HAVE_STRUCT_DIRENT_D_TYPE
enum { DT_UNKNOWN, DT_DIR, DT_LNK }; #if !defined (DT_UNKNOWN) && !defined (DT_DIR) && !defined (DT_LNK)
enum {
DT_UNKNOWN,
DT_DIR,
DT_LNK,
};
#elif defined (DT_UNKNOWN) && defined (DT_DIR) && defined (DT_LNK)
/* Nothing to do here, all three are defined as macros. */
#elif defined (DT_UNKNOWN) || defined (DT_DIR) || defined (DT_LNK)
#error "Cannot determine DT_UNKNOWN, DT_DIR, DT_LNK"
#endif
#endif #endif
/* Return the file type of DP. */ /* Return the file type of DP. */