Update 2020.0.0-alpha1 --> 2020.0.0-beta1

2020.0.0-beta1 resolves gcc9 build issues in PR/239644.

PR:		239644
This commit is contained in:
Cy Schubert 2019-08-30 20:05:27 +00:00
parent 17d2eb5848
commit 2c6ede3563
14 changed files with 22 additions and 4032 deletions

View file

@ -1,9 +1,8 @@
# $FreeBSD$
PORTNAME= ksh93
DISTVERSION= 2020.0.0-alpha1
DISTVERSION= 2020.0.0-beta1
PORTEPOCH= 1
PORTREVISION= 3
CATEGORIES= shells
MAINTAINER= cy@freebsd.org
@ -43,7 +42,7 @@ post-patch:
@${REINPLACE_CMD} -e '/for name in/ s|python.*|${PYTHON_CMD}|g' ${WRKSRC}/scripts/python.sh
@${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' ${WRKSRC}/src/lib/libast/include/sfio*.h ${WRKSRC}/src/lib/libast/sfio/*.c
.if ${PORT_OPTIONS:MKSH93}
@${MV} ${WRKSRC}/src/cmd/ksh93/ksh.1 ${WRKSRC}/src/cmd/ksh93/ksh93.1
@${MV} ${WRKSRC}/src/cmd/ksh93/docs/ksh.1 ${WRKSRC}/src/cmd/ksh93/docs/ksh93.1
.endif
.if ${PORT_OPTIONS:MKSH}
@# Keep portlint happy

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1556307803
SHA256 (att-ast-2020.0.0-alpha1_GH0.tar.gz) = a9c6a9291ee1a2a5169cdebfe601124e53ae15f83d0857c166d9f2d86c1d4294
SIZE (att-ast-2020.0.0-alpha1_GH0.tar.gz) = 2041318
TIMESTAMP = 1567192601
SHA256 (att-ast-2020.0.0-beta1_GH0.tar.gz) = bc63b59be0087299f9e933d7f32806995e3e3ba57b887ca0d2517275972711e2
SIZE (att-ast-2020.0.0-beta1_GH0.tar.gz) = 2022260

View file

@ -1,8 +1,8 @@
--- src/cmd/ksh93/meson.build.orig 2018-09-25 15:33:55.000000000 -0700
+++ src/cmd/ksh93/meson.build 2018-09-25 19:00:44.313649000 -0700
--- ./src/cmd/ksh93/meson.build.orig 2019-08-25 15:52:12.000000000 -0700
+++ ./src/cmd/ksh93/meson.build 2019-08-28 12:34:47.804820000 -0700
@@ -26,19 +26,19 @@
dependencies: [libm_dep, libexecinfo_dep, libdl_dep],
install: false)
dependencies: [libm_dep, libexecinfo_dep, libdl_dep, libsocket_dep, libnsl_dep],
install: get_option('default_library') == 'shared')
-ksh93_exe = executable('ksh', ['sh/pmain.c'], c_args: shared_c_args,
+ksh93_exe = executable('ksh93', ['sh/pmain.c'], c_args: shared_c_args,
@ -15,11 +15,11 @@
+shcomp_exe = executable('shcomp93', ['sh/shcomp.c'], c_args: shared_c_args,
include_directories: [configuration_incdir, ksh93_incdir],
link_with: [libksh, libast, libcmd, libdll],
dependencies: [libm_dep, libexecinfo_dep, libdl_dep],
dependencies: [libm_dep, libexecinfo_dep, libdl_dep, libsocket_dep, libnsl_dep],
install: true)
-install_man('ksh.1')
+install_man('ksh93.1')
-install_man('docs/ksh.1')
+install_man('docs/ksh93.1')
test_dir = join_paths(meson.current_source_dir(), 'tests')
test_driver = join_paths(test_dir, 'util', 'run_test.sh')

View file

@ -1,33 +0,0 @@
--- files/patch-scripts_libast__prereq.sh.orig 2019-08-04 16:51:09 UTC
+++ files/patch-scripts_libast__prereq.sh
@@ -0,0 +1,30 @@
+--- scripts/libast_prereq.sh.orig 2019-08-04 11:56:35 UTC
++++ scripts/libast_prereq.sh
+@@ -10,7 +10,6 @@
+ #
+ set -e
+ bin_dir="$MESON_SOURCE_ROOT/bin"
+-comp_dir="$MESON_SOURCE_ROOT/src/lib/libast/comp"
+ PATH=$bin_dir:$PATH
+ INC_DIRS=""
+ INC_DIRS="$INC_DIRS -I$MESON_BUILD_ROOT"
+@@ -24,19 +23,6 @@ then
+ fi
+
+ cd "$MESON_BUILD_ROOT"
+-
+-if cc --version | grep -q "GCC"
+-then
+- gcc_major_version=$(cc -dumpversion | cut -d. -f1)
+- if [ "$gcc_major_version" -ge 9 ]
+- then
+- extra_flags="-fno-diagnostics-show-line-numbers"
+- fi
+-fi
+-
+-# Generate the conftab.[ch] source files.
+-# shellcheck disable=SC2086
+-"$comp_dir/conf.sh" $CC -std=gnu99 -D_BLD_DLL $INC_DIRS $extra_flags
+
+ # Generate header files whose content depends on the current platform.
+ "$MESON_SOURCE_ROOT/scripts/siglist.sh" > features/siglist.h

View file

@ -1,37 +0,0 @@
--- files/patch-scripts_sort__symbols.py.orig 2019-08-04 16:51:09 UTC
+++ files/patch-scripts_sort__symbols.py
@@ -0,0 +1,34 @@
+--- scripts/sort_symbols.py.orig 2019-04-16 20:04:19 UTC
++++ scripts/sort_symbols.py
+@@ -1,31 +0,0 @@
+-# This replaces the following pipeline in the original .../libast/comp.conf.sh
+-# script. We're now using a python program not for efficiency but because we
+-# need to sort the strings from longest to shortest to work around a bug with
+-# the macOS `fgrep -x -v` behavior.
+-#
+-# sed "s/[^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789][^_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]*/${snl}/g" $tmp.e |
+-# grep '^[_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz][_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789]*$' |
+-# sort -u > $tmp.n
+-#
+-from __future__ import print_function # in case we're being run by python2
+-import re
+-import sys
+-
+-
+-def sort_key(k):
+- return (len(k), k)
+-
+-
+-# Capture all the lines consisting solely of single tokens that are valid
+-# C symbols.
+-lines = []
+-for line in sys.stdin:
+- m = re.match(r'^\s*(\w+),$', line)
+- if m:
+- lines.append(m.group(1))
+-
+-# Sort by line length then lexicographically for lines of the same length.
+-lines.sort(key=sort_key, reverse=True)
+-
+-for line in lines:
+- print(line)

View file

@ -0,0 +1,10 @@
--- scripts/builtin_documentation.sh.orig 2019-08-30 05:32:36.000000000 -0700
+++ scripts/builtin_documentation.sh 2019-08-30 12:40:24.125856000 -0700
@@ -8,6 +8,6 @@
cmd_name=$(basename "$in_file" .1)
[ "$cmd_name" = ksh ] && continue
echo "const char sh_opt${cmd_name}[] ="
- sed -e 's/\(.*\)/ "\1\\n"/' < "$in_file"
+ sed -e 's/"//g;s/\(.*\)/ "\1\\n"/' < "$in_file"
echo ";"
done

File diff suppressed because it is too large Load diff

View file

@ -1,490 +0,0 @@
--- files/patch-src_lib_libast_comp_conf.tab.orig 2019-08-04 16:51:09 UTC
+++ files/patch-src_lib_libast_comp_conf.tab
@@ -0,0 +1,487 @@
+--- src/lib/libast/comp/conf.tab.orig 2019-04-16 20:04:19 UTC
++++ src/lib/libast/comp/conf.tab
+@@ -1,484 +0,0 @@
+-#
+-# posix { getconf limits } macro table
+-#
+-# @(#)conf.tab (AT&T Research) 2013-12-01
+-#
+-# name standard section call flags [ header ... ] [ value ... ]
+-#
+-# name: sans prefix
+-# standard: AST, C, POSIX, SVID, XOPEN, <vendor> { SCO, SGI, SUN, ... }
+-# section: section number in standard
+-# call: CS=confstr PC=pathconf SC=sysconf SI=sysinfo QQ=query XX=none
+-# flags: 0 no flags
+-# C defer call to native getconf(1)
+-# D defer minmax to native getconf(1)
+-# F unistd.h feature
+-# L limits.h constant
+-# M has _<standard><section>_<name> minmax value
+-# N _<call>_<name>
+-# O use original name and definition
+-# R _<standard>_<call>_<section>_<name>
+-# S _<call>_<standard><section>_<name>
+-# U <standard><section>_<name> prefixed by underscore
+-# V _ prefix not allowed
+-# W standard required
+-# X define even if native is dynamic (ast special)
+-#
+-# default names if <section> <= 1
+-#
+-# _<call>_<name>
+-# <standard>_<name>
+-#
+-# default names if <section> > 1
+-#
+-# _<call>_<section>_<name>
+-# <standard><section>_<name>
+-#
+-# the [NSU] flags modify the default names
+-#
+-
+-ABI_AIO_XFER_MAX C QQ 1 L
+-ABI_ASYNCHRONOUS_IO C QQ 1 L
+-ABI_ASYNC_IO C QQ 1 L
+-ACL_ENABLED SUN PC 1 0
+-ADVISORY_INFO POSIX SC 1 FUW
+-AIO_LISTIO_MAX POSIX SC 1 LMU 2
+-AIO_MAX POSIX SC 1 LMU 1
+-AIO_PRIO_DELTA_MAX POSIX SC 1 LMU
+-ALLOC_SIZE_MIN POSIX PC 1 LUVW
+-ARCHITECTURE SVID SI 1 O
+-ARG_MAX POSIX SC 1 CDLMUX NCARGS 4096
+-ASYNCHRONOUS_IO POSIX SC 1 CDFUW
+-ASYNC_IO POSIX PC 1 FUW
+-ATEXIT_MAX XOPEN SC 1 LMU 32
+-AUDIT C QQ 1 L
+-AVAIL_PROCESSORS C QQ 1 L
+-AVPHYS_PAGES SUN SC 1 0
+-BARRIERS POSIX SC 1 FUW
+-BC_BASE_MAX POSIX SC 2 LMN 99
+-BC_DIM_MAX POSIX SC 2 LMN 2048
+-BC_SCALE_MAX POSIX SC 2 LMN 99
+-BC_STRING_MAX POSIX SC 2 LMN 1000
+-BUSTYPES SVID SI 1 O
+-CHARCLASS_NAME_MAX XOPEN XX 1 L 14
+-CHAR_BIT C XX 1 L 8
+-CHAR_MAX C XX 1 L
+-CHAR_MIN C XX 1 L
+-CHAR_TERM POSIX SC 2 FUW
+-CHILD_MAX POSIX SC 1 CDLMUX 6 cc{
+- #define child() fork()
+- extern int spawnve(const char*, char* const[], char* const[]);
+- static char* cmd[] = { "/bin/echo", 0 };
+- #define child() spawnve(cmd[0],cmd,(char**)0)
+- #endif
+- int main()
+- {
+- int i;
+- int n;
+- for (i = 3; i < 512 && (n = child()) >= 0; i++)
+- if (!n) _exit(0);
+- while (wait((int*)0) > 0);
+- for (n = 8; n < i; n <<= 1);
+- printf("%d", n);
+- return 0;
+- }
+-}
+-CHOWN_RESTRICTED POSIX PC 1 FUW
+-CKPT POSIX SC 1 FU
+-CLK_TCK POSIX SC 1 L HZ 60
+-CLOCKRES_MIN POSIX SC 1 MUW 1
+-CLOCKS_PER_SEC C QQ 1 L
+-CLOCK_SELECTION POSIX SC 1 FUVW
+-COLL_WEIGHTS_MAX POSIX SC 2 DLMN 2
+-CPUTIME POSIX SC 1 FUW
+-CPU_KEYBITS1 C QQ 1 L
+-CPU_VERSION C QQ 1 L
+-CRYPT XOPEN SC 1 FSUW
+-C_BIND POSIX SC 2 CFU
+-C_DEV POSIX SC 2 CFU
+-C_VERSION POSIX SC 2 CDFU
+-DATAKEYS_MAX C QQ 1 0
+-DELAYTIMER_MAX POSIX SC 1 LMU 32
+-ENH_I18N XOPEN SC 1 FSUW
+-EQUIV_CLASS_MAX C QQ 1 L
+-EXEC_INTERPRETER_LENGTH C QQ 1 L
+-EXPR_NEST_MAX POSIX SC 2 LMN 32
+-FCHR_MAX SVID SC 1 LMU LONG_MAX 2147483647
+-FILESIZEBITS POSIX PC 1 LMU (8*sizeof(off_t)) 32
+-FILE_LOCKING POSIX SC 1 FU
+-FORT_DEV POSIX SC 2 CFUW
+-FORT_RUN POSIX SC 2 CFUW
+-FSYNC POSIX SC 1 CDFUW _lib_fsync
+-GETGR_R_SIZE_MAX C QQ 1 L
+-GETPW_R_SIZE_MAX C QQ 1 L
+-HOSTID C QQ 1 L
+-HOSTNAME SVID SI 1 O
+-HOST_NAME_MAX POSIX SC 1 LMU 255
+-HW_PROVIDER SVID SI 1 O
+-HW_SERIAL C QQ 1 L
+-INITTAB_NAME SVID SI 1 O
+-INT_MAX C XX 1 L 32767
+-INT_MIN C XX 1 L -32767
+-IOV_MAX XOPEN SC 1 LMU 16
+-IO_TYPE C QQ 1 L
+-IPV6 POSIX SC 1 FUW
+-IP_SECOPTS C QQ 1 L
+-JOB_CONTROL POSIX SC 1 FUW cc{
+- int main()
+- {
+- printf("1");
+- return 0;
+- }
+-}
+-KERNEL_CLIST SCO SC 1 0
+-KERNEL_CLIST_MAX SCO SC 1 0
+-KERNEL_DISK SCO SC 1 0
+-KERNEL_DISK_MAX SCO SC 1 0
+-KERNEL_DMABUF SCO SC 1 0
+-KERNEL_DMABUF_MAX SCO SC 1 0
+-KERNEL_FILE SCO SC 1 0
+-KERNEL_FILE_MAX SCO SC 1 0
+-KERNEL_FLCKREC SCO SC 1 0
+-KERNEL_FLCKREC_MAX SCO SC 1 0
+-KERNEL_INODE SCO SC 1 0
+-KERNEL_INODE_MAX SCO SC 1 0
+-KERNEL_MOUNT SCO SC 1 0
+-KERNEL_MOUNT_MAX SCO SC 1 0
+-KERNEL_PINODE SCO SC 1 0
+-KERNEL_PINODE_MAX SCO SC 1 0
+-KERNEL_PROC SCO SC 1 0
+-KERNEL_PROC_MAX SCO SC 1 0
+-KERNEL_REGION SCO SC 1 0
+-KERNEL_REGION_MAX SCO SC 1 0
+-KERNEL_S5INODE SCO SC 1 0
+-KERNEL_S5INODE_MAX SCO SC 1 0
+-KERNEL_STAMP SVID SI 1 O
+-KERN_POINTERS C QQ 1 L
+-KERN_SIM C QQ 1 L
+-LEGACY XOPEN SC 1 FU
+-LINE_MAX POSIX SC 2 LMN 2048
+-LINK_MAX POSIX PC 1 LMU MAXLINK SHRT_MAX 8
+-LLONG_MAX C XX 1 L
+-LLONG_MIN C XX 1 L
+-LOCALEDEF POSIX SC 1 FUW
+-LOCALEDEF POSIX SC 2 CFUW
+-LOGIN_NAME_MAX POSIX SC 1 LMU
+-LOGNAME_MAX SVID SC 1 MU 8
+-LONG_BIT XOPEN XX 1 L (8*sizeof(long)) 32
+-LONG_MAX C XX 1 L 2147483647
+-LONG_MIN C XX 1 L -2147483647
+-MACHINE SVID SI 1 O
+-MAPPED_FILES POSIX SC 1 CDFUW _lib_mmap
+-MAX_CANON POSIX PC 1 LMU CANBSIZ 255
+-MAX_INPUT POSIX PC 1 LMU MAX_CANON 255
+-MB_LEN_MAX C XX 1 L 1
+-MCAS_OFFSET C QQ 1 L
+-MEMLOCK POSIX SC 1 CDFUW
+-MEMLOCK_RANGE POSIX SC 1 CDFUW
+-MEMORY_PROTECTION POSIX SC 1 CDFUW
+-MESSAGE_PASSING POSIX SC 1 CDFUW
+-MIN_HOLE_SIZE POSIX PC 1 LMU
+-MMAP_FIXED_ALIGNMENT C QQ 1 L _AST_PAGESIZE
+-MONOTONIC_CLOCK POSIX SC 1 FUW
+-MQ_OPEN_MAX POSIX SC 1 LMU 8
+-MQ_PRIO_MAX POSIX SC 1 LMU 32
+-MSEM_LOCKID C QQ 1 L
+-MULTI_PROCESS POSIX SC 1 FU
+-NACLS_MAX SVID SC 1 0
+-NAME_MAX POSIX PC 1 LMU 14 cc{
+- int main()
+- {
+- #ifdef MAXNAMLEN
+- printf("%d", MAXNAMLEN);
+- #else
+- #if !defined(remove)
+- #define remove unlink
+- #endif
+- int i;
+- int n;
+- int v;
+- char name[256];
+- for (i = 0; i < sizeof(name); i++)
+- name[i] = 'F';
+- name[8] = '.';
+- name[sizeof(name) - 1] = 0;
+- if ((n = creat(name, 0666)) >= 0)
+- {
+- close(n);
+- for (v = 12; v < sizeof(name); v++)
+- {
+- name[v] = 0;
+- if (remove(name) >= 0) break;
+- name[v] = 'F';
+- }
+- }
+- else for (v = 12; v < sizeof(name); v++)
+- {
+- name[v] = 0;
+- if ((n = creat(name, 0666)) >= 0)
+- {
+- close(n);
+- remove(name);
+- name[v] = 'F';
+- }
+- else
+- {
+- v--;
+- break;
+- }
+- }
+- printf("%d", v);
+- return 0;
+- }
+- #endif
+-}
+-NGROUPS_MAX POSIX SC 1 CDLMU 8 cc{
+- int main()
+- {
+- int n;
+- gid_t g;
+- if ((n = getgroups(0, &g)) < 0)
+- #if defined(NGROUPS) && (NGROUPS-0) > 0
+- n = NGROUPS;
+- #else
+- return 1;
+- #endif
+- printf("%d", n);
+- return 0;
+- }
+-}
+-NL_ARGMAX XOPEN XX 1 L 9
+-NL_LANGMAX XOPEN XX 1 L 14
+-NL_MAX C QQ 1 L
+-NL_MSGMAX XOPEN XX 1 L 32767
+-NL_NMAX XOPEN XX 1 L 1
+-NL_SETMAX XOPEN XX 1 L 255
+-NL_SPECMAX C QQ 1 L
+-NL_TEXTMAX XOPEN XX 1 L LINE_MAX
+-NO_TRUNC POSIX PC 1 FUW
+-NPROCESSORS_CONF SVID SC 1 0
+-NPROCESSORS_MAX SVID SC 1 0
+-NPROCESSORS_ONLN SVID SC 1 0
+-NPROC_CONF C QQ 1 L
+-NPROC_ONLN C QQ 1 L
+-NSS_BUFLEN_GROUP C QQ 1 L
+-NSS_BUFLEN_PASSWD C QQ 1 L
+-NUM_PROCESSORS C QQ 1 L
+-NZERO XOPEN XX 1 L 20
+-OPEN_MAX POSIX SC 1 CDLMUX 16 cc{
+- extern int getdtablesize(void);
+- int main()
+- {
+- printf("%d", getdtablesize());
+- return 0;
+- }
+-}
+-OPEN_MAX_CEIL AST XX 1 L OPEN_MAX
+-OSREL_MAJ C QQ 1 L
+-OSREL_MIN C QQ 1 L
+-OSREL_PATCH C QQ 1 L
+-OS_BASE SVID SI 1 O
+-OS_PROVIDER SVID SI 1 O
+-OS_VERSION AES SC 1 FSU
+-PAGESIZE POSIX SC 1 MU PAGESIZE PAGE_SIZE 4096
+-PAGE_SIZE POSIX SC 1 MU _AST_PAGESIZE
+-PASS_MAX SVID SC 1 CDLMU 8
+-PATH POSIX CS 1 CMU "/bin:/usr/bin"
+-PATH_MAX POSIX PC 1 CDLMUX MAXPATHLEN 1024
+-PBS POSIX SC 2 FUW
+-PBS_ACCOUNTING POSIX SC 2 FUW
+-PBS_CHECKPOINT POSIX SC 2 FUW
+-PBS_LOCATE POSIX SC 2 FUW
+-PBS_MESSAGE POSIX SC 2 FUW
+-PBS_TRACK POSIX SC 2 FUW
+-PHYS_PAGES SUN SC 1 0
+-PID_MAX SVID SC 1 LMU 30000 cc{
+- int main()
+- {
+- long v;
+- int fd;
+- int n;
+- char buf[1024];
+-#ifdef PID_MAX
+- v = PID_MAX;
+-#else
+- v = 99999;
+-#endif
+- if ((fd = open("/proc/sys/kernel/pid_max", 0)) >= 0 && (n = read(fd, buf, sizeof(buf)-1)) > 1)
+- {
+- buf[n] = 0;
+- v = strtol(buf, (char**)0, 0);
+- }
+- else
+- {
+-#ifdef __sgi
+- v = 0x7fffffff;
+-#endif
+- }
+- printf("%ld", v);
+- return 0;
+- }
+-}
+-PII POSIX SC 1 FU
+-PII_INTERNET POSIX SC 1 FU
+-PII_INTERNET_DGRAM POSIX SC 1 FU
+-PII_INTERNET_STREAM POSIX SC 1 FU
+-PII_OSI POSIX SC 1 FU
+-PII_OSI_CLTS POSIX SC 1 FU
+-PII_OSI_COTS POSIX SC 1 FU
+-PII_OSI_M POSIX SC 1 FU
+-PII_SOCKET POSIX SC 1 FU
+-PII_XTI POSIX SC 1 FU
+-PIPE_BUF POSIX PC 1 LMU 512
+-POLL POSIX SC 1 FU
+-PRIORITIZED_IO POSIX SC 1 FUW
+-PRIORITY_SCHEDULING POSIX SC 1 CDFUW
+-PRIO_IO POSIX PC 1 FUW
+-PROC_RSRC_MGR C QQ 1 L
+-PTHREAD_DESTRUCTOR_ITERATIONS C QQ 1 L
+-PTHREAD_KEYS_MAX C QQ 1 L
+-PTHREAD_STACK_MIN C QQ 1 L
+-PTHREAD_THREADS_MAX C QQ 1 L
+-PTRDIFF_MAX C XX 1 LMU stdint.h 65535
+-PTRDIFF_MIN C XX 1 LMU stdint.h -65535
+-RAW_SOCKETS POSIX SC 1 FUW
+-READER_WRITER_LOCKS POSIX SC 1 FUW
+-REALTIME XOPEN SC 1 FU
+-REALTIME_SIGNALS POSIX SC 1 CDFUW
+-REALTIME_THREADS XOPEN SC 1 FU
+-REC_INCR_XFER_SIZE POSIX PC 1 LVW
+-REC_MAX_XFER_SIZE POSIX PC 1 LVW
+-REC_MIN_XFER_SIZE POSIX PC 1 LVW
+-REC_XFER_ALIGN POSIX PC 1 LVW
+-REENTRANT_FUNCTIONS POSIX SC 1 FU
+-REGEXP POSIX SC 1 FUW
+-REGEX_VERSION POSIX SC 1 F 20030916
+-RELEASE AST XX 1 L
+-RESOURCE_LIMITS POSIX SC 1 FU
+-RE_DUP_MAX POSIX SC 2 LMN 255
+-RTSIG_MAX POSIX SC 1 LMU 8
+-SATTR_ENABLED SUN PC 1 0
+-SAVED_IDS POSIX SC 1 FUW cc{
+-}
+-SCHAR_MAX C XX 1 L 127
+-SCHAR_MIN C XX 1 L -127
+-SECURITY_CLASS C QQ 1 L
+-SELECT POSIX SC 1 FU
+-SEMAPHORES POSIX SC 1 CDFUW
+-SEM_NSEMS_MAX POSIX SC 1 LMU 256
+-SEM_VALUE_MAX POSIX SC 1 LMU 32767
+-SHARED_MEMORY_OBJECTS POSIX SC 1 CDFUW
+-SHELL POSIX SC 1 FUVW
+-SHM XOPEN SC 1 FSUW
+-SHRT_MAX C XX 1 L 32767
+-SHRT_MIN C XX 1 L -32767
+-SIG_ATOMIC_MAX C XX 1 L signal.h
+-SIG_ATOMIC_MIN C XX 1 L signal.h
+-SIGQUEUE_MAX POSIX SC 1 LMU 32
+-SIGQUEUE_MAX POSIX SC 1 LMU 32
+-SIGRT_MAX SVID SC 1 0
+-SIGRT_MIN SVID SC 1 0
+-SIZE_MAX C XX 1 LMX stdint.h UINT_MAX 65535
+-SLVM_MAXNODES C QQ 1 L
+-SOCK_MAXBUF C QQ 1 0
+-SOFTPOWER C QQ 1 L
+-SPAWN POSIX SC 1 FUW
+-SPIN_LOCKS POSIX SC 1 FUW
+-SPORADIC_SERVER POSIX SC 1 FUW
+-SRPC_DOMAIN C QQ 1 0
+-SS_REPL_MAX POSIX SC 1 FUW
+-SSIZE_MAX POSIX XX 1 LMUX INT_MAX 32767
+-STD_BLK SVID SC 1 LMU 1024
+-STREAM_MAX POSIX SC 1 LMU OPEN_MAX 8
+-STREAMS XOPEN SC 1 FSUW
+-SW_DEV POSIX SC 2 CFUW
+-SYMLINK_MAX POSIX PC 1 LMU 255 cc{
+- int main()
+- {
+- printf("%d", PATH_MAX-1);
+- return 0;
+- }
+-}
+-SYMLINKS POSIX PC 2 FUW
+-SYMLOOP_MAX POSIX SC 1 LMU 8
+-SYNCHRONIZED_IO POSIX SC 1 CDFUW
+-SYNC_IO POSIX PC 1 FUW
+-SYSNAME SVID SI 1 O
+-SYSPID_MAX SVID SC 1 LMU 2
+-THREADS POSIX SC 1 CDFUW
+-THREADS_PRIO_CEILING POSIX SC 1 FUW
+-THREADS_PRIO_INHERIT POSIX SC 1 FUW
+-THREAD_ATTR_STACKADDR POSIX SC 1 CDFUW
+-THREAD_ATTR_STACKSIZE POSIX SC 1 CDFUW
+-THREAD_CPUTIME POSIX SC 1 FUW
+-THREAD_DESTRUCTOR_ITERATIONS POSIX SC 1 LMUW PTHREAD_DESTRUCTOR_ITERATIONS 4
+-THREAD_KEYS_MAX POSIX SC 1 LMUW PTHREAD_KEYS_MAX 128
+-THREAD_PRIORITY_SCHEDULING POSIX SC 1 CDFUW
+-THREAD_PRIO_INHERIT POSIX SC 1 CDFUW
+-THREAD_PRIO_PROTECT POSIX SC 1 CDFUW
+-THREAD_PROCESS_SHARED POSIX SC 1 CDFUW
+-THREAD_SAFE_FUNCTIONS POSIX SC 1 CDFUW
+-THREAD_SPORADIC_SERVER POSIX SC 1 FUW
+-THREAD_STACK_MIN POSIX SC 1 LUW PTHREAD_STACK_MIN
+-THREAD_THREADS_MAX POSIX SC 1 LMUW PTHREAD_THREADS_MAX 64
+-TIMEOUTS POSIX SC 1 FUW
+-TIMERS POSIX SC 1 CDFUW
+-TIMER_MAX POSIX SC 1 LMU 32
+-TMP AST CS 1 MU "/tmp"
+-TMP_MAX C SC 1 LMU 10000
+-TRACE POSIX SC 1 FUW
+-TRACE_EVENT_FILTER POSIX SC 1 FUW
+-TRACE_EVENT_NAME_MAX POSIX SC 1 FUVW
+-TRACE_INHERIT POSIX SC 1 FUW
+-TRACE_LOG POSIX SC 1 FUW
+-TRACE_NAME_MAX POSIX SC 1 FUVW
+-TRACE_SYS_MAX POSIX SC 1 FUVW
+-TRACE_USER_EVENT_MAX POSIX SC 1 FUVW
+-TTY_NAME_MAX POSIX SC 1 LMU 9
+-TYPED_MEMORY_OBJECTS POSIX SC 1 FUW
+-TZNAME_MAX POSIX SC 1 CDLMU 6
+-T_IOV_MAX C QQ 1 0
+-UCHAR_MAX C XX 1 L 255
+-UCHAR_MIN C XX 1 L
+-UID_MAX SVID SC 1 LMU 60002
+-UINT_MAX C XX 1 L 65535
+-UIO_MAXIOV C QQ 1 0
+-ULLONG_MAX C XX 1 L
+-ULONG_MAX C XX 1 L 4294967295
+-UNIX XOPEN SC 1 FSUW
+-UPE POSIX SC 2 CFUW
+-USER_LIMIT SVID SI 1 O
+-USHRT_MAX C XX 1 L 65535
+-V6_ILP32_OFF32 POSIX SC 1 W
+-V6_ILP32_OFFBIG POSIX SC 1 W
+-V6_LP64_OFF64 POSIX SC 1 W
+-V6_LPBIG_OFFBIG POSIX SC 1 W
+-VDISABLE POSIX PC 1 FUW
+-VERSION POSIX SC 1 CDFSU 200112
+-VERSION POSIX SC 2 CDFSU 200112
+-VERSION XOPEN SC 1 CDFSU 600
+-VERSION SVID SI 1 S
+-VERSION XPG SC 3 DFSU
+-VERSION XPG SC 4 DFSU
+-VERSION_88 C XX 1 L
+-VERSION_88 POSIX SC 1 FSU
+-VERSION_90 C XX 1 L
+-VERSION_90 POSIX SC 1 FSU
+-VERSION_93 C XX 1 L
+-VERSION_93 POSIX SC 1 FSU
+-WCHAR_MAX C XX 1 L stddef.h
+-WCHAR_MIN C XX 1 L stddef.h
+-WINT_MIN C XX 1 L wchar.h
+-WINT_MAX C XX 1 L wchar.h
+-WORD_BIT XOPEN XX 1 L (8*sizeof(int))
+-XATTR_ENABLED SUN PC 1 0
+-XATTR_EXISTS SUN PC 1 0
+-XCU_VERSION XOPEN SC 1 CDFSU
+-XPG2 XOPEN XX 1 FU
+-XPG3 XOPEN XX 1 FU
+-XPG4 XOPEN XX 1 FU
+-
+-# vendor prefixes
+-
+-VERSION GNU XX 1 S
+-VERSION TRUSTEDBSD XX 1 S

File diff suppressed because it is too large Load diff

View file

@ -1,42 +0,0 @@
--- files/patch-src_lib_libast_comp_conftab.c.in.orig 2019-08-04 16:51:09 UTC
+++ files/patch-src_lib_libast_comp_conftab.c.in
@@ -0,0 +1,39 @@
+--- src/lib/libast/comp/conftab.c.in.orig 2019-04-16 20:04:19 UTC
++++ src/lib/libast/comp/conftab.c.in
+@@ -1,36 +0,0 @@
+-#include <config_ast.h>
+-
+-{headers}
+-
+-#include <limits.h>
+-#include <stdbool.h>
+-#include <stdint.h>
+-#include <sys/types.h>
+-#include <unistd.h>
+-#include <sys/param.h>
+-#include <sys/stat.h>
+-
+-#include "conftab.h"
+-
+-//
+-// Prefix strings -- the first few are indexed by Conf_t.standard.
+-//
+-const Prefix_t prefix[] = {{
+- {prefix_standards}
+- {{"XX", 2, CONF_POSIX, CONF_nop}},
+- {{"CS", 2, CONF_POSIX, CONF_confstr}},
+- {{"PC", 2, CONF_POSIX, CONF_pathconf}},
+- {{"SC", 2, CONF_POSIX, CONF_sysconf}},
+- {{"SI", 2, CONF_SVID, CONF_sysinfo}},
+-}};
+-
+-const int prefix_elements = (int)sizeof(prefix) / (int)sizeof(prefix[0]);
+-
+-//
+-// Conf strings sorted in ascending order.
+-//
+-const Conf_t conf[] = {{
+-{getconf}
+-}};
+-
+-const int conf_elements = (int)sizeof(conf) / (int)sizeof(conf[0]);

View file

@ -1,80 +0,0 @@
--- files/patch-src_lib_libast_comp_conftab.h.in.orig 2019-08-04 16:51:09 UTC
+++ files/patch-src_lib_libast_comp_conftab.h.in
@@ -0,0 +1,77 @@
+--- src/lib/libast/comp/conftab.h.in.orig 2019-04-16 20:04:19 UTC
++++ src/lib/libast/comp/conftab.h.in
+@@ -1,74 +0,0 @@
+-#ifndef _CONFTAB_H
+-#define _CONFTAB_H
+-
+-#include <config_ast.h>
+-
+-#if !defined(const) && !defined(__STDC__) && !defined(__cplusplus) && !defined(c_plusplus)
+-#define const
+-#endif
+-
+-#define conf _ast_conf_data
+-#define conf_elements _ast_conf_ndata
+-
+-#define prefix _ast_conf_prefix
+-#define prefix_elements _ast_conf_nprefix
+-
+-#define CONF_nop 0
+-#define CONF_confstr 1
+-#define CONF_pathconf 2
+-#define CONF_sysconf 3
+-#define CONF_sysinfo 4
+-
+-{conf_standards}
+-
+-{getconf}
+-
+-#define CONF_DEFER_CALL 0x0001
+-#define CONF_DEFER_MM 0x0002
+-#define CONF_FEATURE 0x0004
+-#define CONF_LIMIT 0x0008
+-#define CONF_LIMIT_DEF 0x0010
+-#define CONF_MINMAX 0x0020
+-#define CONF_MINMAX_DEF 0x0040
+-#define CONF_NOSECTION 0x0080
+-#define CONF_NOUNDERSCORE 0x0100
+-#define CONF_PREFIX_ONLY 0x0200
+-#define CONF_PREFIXED 0x0400
+-#define CONF_STANDARD 0x0800
+-#define CONF_STRING 0x1000
+-#define CONF_UNDERSCORE 0x2000
+-#define CONF_USER 0x4000
+-
+-struct Conf_s;
+-typedef struct Conf_s Conf_t;
+-
+-typedef struct Value_s {{
+- int64_t number;
+- const char *string;
+- }} Value_t;
+-
+-struct Conf_s {{
+- const char name[{name_max}];
+- Value_t limit;
+- Value_t minmax;
+- unsigned int flags;
+- short standard;
+- short section;
+- short call;
+- short op;
+- }};
+-
+-typedef struct Prefix_s {{
+- const char name[16];
+- short length;
+- short standard;
+- short call;
+- }} Prefix_t;
+-
+-extern const Conf_t conf[];
+-extern const int conf_elements;
+-
+-extern const Prefix_t prefix[];
+-extern const int prefix_elements;
+-
+-#endif

View file

@ -1,92 +0,0 @@
--- files/patch-src_lib_libast_include_conftab.h.orig 2019-08-04 16:51:09 UTC
+++ files/patch-src_lib_libast_include_conftab.h
@@ -0,0 +1,89 @@
+--- src/lib/libast/include/conftab.h.orig 2019-08-04 14:58:29 UTC
++++ src/lib/libast/include/conftab.h
+@@ -0,0 +1,86 @@
++#ifndef _CONFTAB_H
++#define _CONFTAB_H
++
++#include <config_ast.h>
++
++#if !defined(const) && !defined(__STDC__) && !defined(__cplusplus) && !defined(c_plusplus)
++#define const
++#endif
++
++#define conf _ast_conf_data
++#define conf_elements _ast_conf_ndata
++
++#define prefix _ast_conf_prefix
++#define prefix_elements _ast_conf_nprefix
++
++#define CONF_nop 0
++#define CONF_confstr 1
++#define CONF_pathconf 2
++#define CONF_sysconf 3
++#define CONF_sysinfo 4
++
++#define CONF_C 0
++#define CONF_SUN 1
++#define CONF_POSIX 2
++#define CONF_SVID 3
++#define CONF_XOPEN 4
++#define CONF_SCO 5
++#define CONF_AST 6
++#define CONF_AES 7
++#define CONF_XPG 8
++#define CONF_GNU 9
++#define CONF_TRUSTEDBSD 10
++#define CONF_call 11
++
++#define _pth_getconf "/usr/bin/getconf"
++#define _pth_getconf_a "-a"
++
++#define CONF_DEFER_CALL 0x0001
++#define CONF_DEFER_MM 0x0002
++#define CONF_FEATURE 0x0004
++#define CONF_LIMIT 0x0008
++#define CONF_LIMIT_DEF 0x0010
++#define CONF_MINMAX 0x0020
++#define CONF_MINMAX_DEF 0x0040
++#define CONF_NOSECTION 0x0080
++#define CONF_NOUNDERSCORE 0x0100
++#define CONF_PREFIX_ONLY 0x0200
++#define CONF_PREFIXED 0x0400
++#define CONF_STANDARD 0x0800
++#define CONF_STRING 0x1000
++#define CONF_UNDERSCORE 0x2000
++#define CONF_USER 0x4000
++
++struct Conf_s;
++typedef struct Conf_s Conf_t;
++
++typedef struct Value_s {
++ int64_t number;
++ const char *string;
++} Value_t;
++
++struct Conf_s {
++ const char name[32];
++ Value_t limit;
++ Value_t minmax;
++ unsigned int flags;
++ short standard;
++ short section;
++ short call;
++ short op;
++};
++
++typedef struct Prefix_s {
++ const char name[16];
++ short length;
++ short standard;
++ short call;
++} Prefix_t;
++
++extern const Conf_t conf[];
++extern const int conf_elements;
++
++extern const Prefix_t prefix[];
++extern const int prefix_elements;
++
++#endif

View file

@ -1,13 +0,0 @@
--- files/patch-src_lib_libast_meson.build.orig 2019-08-04 16:51:09 UTC
+++ files/patch-src_lib_libast_meson.build
@@ -0,0 +1,10 @@
+--- src/lib/libast/meson.build.orig 2019-08-04 14:59:43 UTC
++++ src/lib/libast/meson.build
+@@ -1,6 +1,4 @@
+-# The conftab.c file is unusual in that it is dynamically generated during the Meson config step
+-# and is placed in the build tree.
+-libast_files = [meson.build_root() + '/src/lib/libast/comp/conftab.c']
++libast_files = ['comp/conftab.c']
+ libast_incdir = include_directories('include', 'aso', 'cdt', 'comp',
+ 'sfio', 'path', 'port', 'string', 'misc',
+ 'tm')

View file

@ -1,11 +0,0 @@
--- src/cmd/ksh93/sh/xec.c.orig 2019-04-16 20:04:19 UTC
+++ src/cmd/ksh93/sh/xec.c
@@ -2167,7 +2167,7 @@ int sh_exec(Shell_t *shp, const Shnode_t *t, int flags
}
#ifdef timeofday
times(&after);
- timeofday(&ta);
+ timeofday(&tb);
assert(tb.tv_sec);
at = shp->gd->lim.clk_tck * (ta.tv_sec - tb.tv_sec);
at += ((shp->gd->lim.clk_tck *