From owner-svn-ports-all@freebsd.org Sat Aug 29 05:13:29 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DFDCB3CDAA5; Sat, 29 Aug 2020 05:13:29 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bdl3s5zWYz3gML; Sat, 29 Aug 2020 05:13:29 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B18EF20AD4; Sat, 29 Aug 2020 05:13:29 +0000 (UTC) (envelope-from vanilla@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07T5DTMo038084; Sat, 29 Aug 2020 05:13:29 GMT (envelope-from vanilla@FreeBSD.org) Received: (from vanilla@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07T5DRuK038070; Sat, 29 Aug 2020 05:13:27 GMT (envelope-from vanilla@FreeBSD.org) Message-Id: <202008290513.07T5DRuK038070@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vanilla set sender to vanilla@FreeBSD.org using -f From: "Vanilla I. Shu" Date: Sat, 29 Aug 2020 05:13:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546869 - head/misc/rump/files X-SVN-Group: ports-head X-SVN-Commit-Author: vanilla X-SVN-Commit-Paths: head/misc/rump/files X-SVN-Commit-Revision: 546869 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Aug 2020 05:13:29 -0000 Author: vanilla Date: Sat Aug 29 05:13:27 2020 New Revision: 546869 URL: https://svnweb.freebsd.org/changeset/ports/546869 Log: Fix building with -head. Added: head/misc/rump/files/patch-src_sys_kern_kern__proc.c (contents, props changed) head/misc/rump/files/patch-src_sys_kern_uipc__socket.c (contents, props changed) head/misc/rump/files/patch-src_sys_kern_vfs__init.c (contents, props changed) head/misc/rump/files/patch-src_sys_net_if.c (contents, props changed) head/misc/rump/files/patch-src_sys_netsmb_smb__conn.c (contents, props changed) head/misc/rump/files/patch-src_sys_secmodel_suser_secmodel__suser.c (contents, props changed) head/misc/rump/files/patch-src_usr.bin_config_defs.h (contents, props changed) head/misc/rump/files/patch-src_usr.bin_config_main.c (contents, props changed) head/misc/rump/files/patch-src_usr.bin_config_scan.l (contents, props changed) head/misc/rump/files/patch-src_usr.bin_make_main.c (contents, props changed) head/misc/rump/files/patch-src_usr.bin_make_make.h (contents, props changed) Added: head/misc/rump/files/patch-src_sys_kern_kern__proc.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_sys_kern_kern__proc.c Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,11 @@ +--- src/sys/kern/kern_proc.c.orig 2020-08-29 04:55:58 UTC ++++ src/sys/kern/kern_proc.c +@@ -252,7 +252,7 @@ proc_listener_cb(kauth_cred_t cred, kauth_action_t act + case KAUTH_PROCESS_CANSEE: { + enum kauth_process_req req; + +- req = (enum kauth_process_req)arg1; ++ req = (enum kauth_process_req)(uintptr_t)arg1; + + switch (req) { + case KAUTH_REQ_PROCESS_CANSEE_ARGS: Added: head/misc/rump/files/patch-src_sys_kern_uipc__socket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_sys_kern_uipc__socket.c Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,11 @@ +--- src/sys/kern/uipc_socket.c.orig 2020-08-29 05:02:44 UTC ++++ src/sys/kern/uipc_socket.c +@@ -411,7 +411,7 @@ socket_listener_cb(kauth_cred_t cred, kauth_action_t a + enum kauth_network_req req; + + result = KAUTH_RESULT_DEFER; +- req = (enum kauth_network_req)arg0; ++ req = (enum kauth_network_req)(uintptr_t)arg0; + + if ((action != KAUTH_NETWORK_SOCKET) && + (action != KAUTH_NETWORK_BIND)) Added: head/misc/rump/files/patch-src_sys_kern_vfs__init.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_sys_kern_vfs__init.c Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,11 @@ +--- src/sys/kern/vfs_init.c.orig 2020-08-29 05:04:12 UTC ++++ src/sys/kern/vfs_init.c +@@ -366,7 +366,7 @@ mount_listener_cb(kauth_cred_t cred, kauth_action_t ac + enum kauth_system_req req; + + result = KAUTH_RESULT_DEFER; +- req = (enum kauth_system_req)arg0; ++ req = (enum kauth_system_req)(uintptr_t)arg0; + + if (action != KAUTH_SYSTEM_MOUNT) + return result; Added: head/misc/rump/files/patch-src_sys_net_if.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_sys_net_if.c Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,11 @@ +--- src/sys/net/if.c.orig 2020-08-29 05:07:31 UTC ++++ src/sys/net/if.c +@@ -233,7 +233,7 @@ if_listener_cb(kauth_cred_t cred, kauth_action_t actio + enum kauth_network_req req; + + result = KAUTH_RESULT_DEFER; +- req = (enum kauth_network_req)arg1; ++ req = (enum kauth_network_req)(uintptr_t)arg1; + + if (action != KAUTH_NETWORK_INTERFACE) + return result; Added: head/misc/rump/files/patch-src_sys_netsmb_smb__conn.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_sys_netsmb_smb__conn.c Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,11 @@ +--- src/sys/netsmb/smb_conn.c.orig 2020-08-29 05:05:52 UTC ++++ src/sys/netsmb/smb_conn.c +@@ -112,7 +112,7 @@ smb_listener_cb(kauth_cred_t cred, kauth_action_t acti + return KAUTH_RESULT_DEFER; + + result = KAUTH_RESULT_DEFER; +- req = (enum kauth_network_req)arg0; ++ req = (enum kauth_network_req)(uintptr_t)arg0; + + switch (req) { + case KAUTH_REQ_NETWORK_SMB_SHARE_ACCESS: { Added: head/misc/rump/files/patch-src_sys_secmodel_suser_secmodel__suser.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_sys_secmodel_suser_secmodel__suser.c Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,29 @@ +--- src/sys/secmodel/suser/secmodel_suser.c.orig 2020-08-29 04:57:51 UTC ++++ src/sys/secmodel/suser/secmodel_suser.c +@@ -236,7 +236,7 @@ secmodel_suser_system_cb(kauth_cred_t cred, kauth_acti + + isroot = suser_isroot(cred); + result = KAUTH_RESULT_DEFER; +- req = (enum kauth_system_req)arg0; ++ req = (enum kauth_system_req)(uintptr_t)arg0; + + switch (action) { + case KAUTH_SYSTEM_CPU: +@@ -575,7 +575,7 @@ secmodel_suser_network_cb(kauth_cred_t cred, kauth_act + + isroot = suser_isroot(cred); + result = KAUTH_RESULT_DEFER; +- req = (enum kauth_network_req)arg0; ++ req = (enum kauth_network_req)(uintptr_t)arg0; + + switch (action) { + case KAUTH_NETWORK_ALTQ: +@@ -903,7 +903,7 @@ secmodel_suser_device_cb(kauth_cred_t cred, kauth_acti + case KAUTH_DEVICE_BLUETOOTH_BTUART: { + enum kauth_device_req req; + +- req = (enum kauth_device_req)arg0; ++ req = (enum kauth_device_req)(uintptr_t)arg0; + switch (req) { + case KAUTH_REQ_DEVICE_BLUETOOTH_BCSP_ADD: + case KAUTH_REQ_DEVICE_BLUETOOTH_BTUART_ADD: Added: head/misc/rump/files/patch-src_usr.bin_config_defs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_usr.bin_config_defs.h Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,157 @@ +--- src/usr.bin/config/defs.h.orig 2016-08-02 11:51:10 UTC ++++ src/usr.bin/config/defs.h +@@ -428,80 +428,87 @@ struct devm { + */ + struct hashtab; + +-int lkmmode; +-const char *conffile; /* source file, e.g., "GENERIC.sparc" */ +-const char *machine; /* machine type, e.g., "sparc" or "sun3" */ +-const char *machinearch; /* machine arch, e.g., "sparc" or "m68k" */ +-struct nvlist *machinesubarches; ++extern int lkmmode; ++extern const char *conffile; /* source file, e.g., "GENERIC.sparc" */ ++extern const char *machine; /* machine type, e.g., "sparc" or "sun3" */ ++extern const char *machinearch; /* machine arch, e.g., "sparc" or "m68k" */ ++extern struct nvlist *machinesubarches; + /* machine subarches, e.g., "sun68k" or "hpc" */ +-const char *ioconfname; /* ioconf name, mutually exclusive to machine */ +-const char *srcdir; /* path to source directory (rel. to build) */ +-const char *builddir; /* path to build directory */ +-const char *defbuilddir; /* default build directory */ +-const char *ident; /* kernel "ident"ification string */ +-int errors; /* counts calls to error() */ +-int minmaxusers; /* minimum "maxusers" parameter */ +-int defmaxusers; /* default "maxusers" parameter */ +-int maxmaxusers; /* default "maxusers" parameter */ +-int maxusers; /* configuration's "maxusers" parameter */ +-int maxpartitions; /* configuration's "maxpartitions" parameter */ +-int version; /* version of the configuration file */ +-struct nvlist *options; /* options */ +-struct nvlist *fsoptions; /* filesystems */ +-struct nvlist *mkoptions; /* makeoptions */ +-struct nvlist *appmkoptions; /* appending mkoptions */ +-struct nvlist *condmkoptions; /* conditional makeoption table */ +-struct hashtab *devbasetab; /* devbase lookup */ +-struct hashtab *devroottab; /* attach at root lookup */ +-struct hashtab *devatab; /* devbase attachment lookup */ +-struct hashtab *devitab; /* device instance lookup */ +-struct hashtab *deaddevitab; /* removed instances lookup */ +-struct hashtab *selecttab; /* selects things that are "optional foo" */ +-struct hashtab *needcnttab; /* retains names marked "needs-count" */ +-struct hashtab *opttab; /* table of configured options */ +-struct hashtab *fsopttab; /* table of configured file systems */ +-struct dlhash *defopttab; /* options that have been "defopt"'d */ +-struct dlhash *defflagtab; /* options that have been "defflag"'d */ +-struct dlhash *defparamtab; /* options that have been "defparam"'d */ +-struct dlhash *defoptlint; /* lint values for options */ +-struct nvhash *deffstab; /* defined file systems */ +-struct dlhash *optfiletab; /* "defopt"'d option .h files */ +-struct hashtab *attrtab; /* attributes (locators, etc.) */ +-struct hashtab *attrdeptab; /* attribute dependencies */ +-struct hashtab *bdevmtab; /* block devm lookup */ +-struct hashtab *cdevmtab; /* character devm lookup */ ++extern const char *ioconfname; /* ioconf name, mutually exclusive to machine */ ++extern const char *srcdir; /* path to source directory (rel. to build) */ ++extern const char *builddir; /* path to build directory */ ++extern const char *defbuilddir; /* default build directory */ ++extern const char *ident; /* kernel "ident"ification string */ ++extern int errors; /* counts calls to error() */ ++extern int minmaxusers; /* minimum "maxusers" parameter */ ++extern int defmaxusers; /* default "maxusers" parameter */ ++extern int maxmaxusers; /* default "maxusers" parameter */ ++extern int maxusers; /* configuration's "maxusers" parameter */ ++extern int maxpartitions; /* configuration's "maxpartitions" parameter */ ++extern int version; /* version of the configuration file */ ++extern struct nvlist *options; /* options */ ++extern struct nvlist *fsoptions; /* filesystems */ ++extern struct nvlist *mkoptions; /* makeoptions */ ++extern struct nvlist *appmkoptions; /* appending mkoptions */ ++extern struct nvlist *condmkoptions; /* conditional makeoption table */ ++extern struct hashtab *devbasetab; /* devbase lookup */ ++extern struct hashtab *devroottab; /* attach at root lookup */ ++extern struct hashtab *devatab; /* devbase attachment lookup */ ++extern struct hashtab *devitab; /* device instance lookup */ ++extern struct hashtab *deaddevitab; /* removed instances lookup */ ++extern struct hashtab *selecttab; /* selects things that are "optional foo" */ ++extern struct hashtab *needcnttab; /* retains names marked "needs-count" */ ++extern struct hashtab *opttab; /* table of configured options */ ++extern struct hashtab *fsopttab; /* table of configured file systems */ ++extern struct dlhash *defopttab; /* options that have been "defopt"'d */ ++extern struct dlhash *defflagtab; /* options that have been "defflag"'d */ ++extern struct dlhash *defparamtab; /* options that have been "defparam"'d */ ++extern struct dlhash *defoptlint; /* lint values for options */ ++extern struct nvhash *deffstab; /* defined file systems */ ++extern struct dlhash *optfiletab; /* "defopt"'d option .h files */ ++extern struct hashtab *attrtab; /* attributes (locators, etc.) */ ++extern struct hashtab *attrdeptab; /* attribute dependencies */ ++extern struct hashtab *bdevmtab; /* block devm lookup */ ++extern struct hashtab *cdevmtab; /* character devm lookup */ + +-TAILQ_HEAD(, devbase) allbases; /* list of all devbase structures */ +-TAILQ_HEAD(, deva) alldevas; /* list of all devbase attachments */ +-TAILQ_HEAD(conftq, config) allcf; /* list of configured kernels */ +-TAILQ_HEAD(, devi) alldevi, /* list of all instances */ +- allpseudo; /* list of all pseudo-devices */ +-TAILQ_HEAD(, devm) alldevms; /* list of all device-majors */ +-TAILQ_HEAD(, pspec) allpspecs; /* list of all parent specs */ +-int ndevi; /* number of devi's (before packing) */ +-int npspecs; /* number of parent specs */ +-devmajor_t maxbdevm; /* max number of block major */ +-devmajor_t maxcdevm; /* max number of character major */ +-int do_devsw; /* 0 if pre-devsw config */ +-int oktopackage; /* 0 before setmachine() */ +-int devilevel; /* used for devi->i_level */ ++TAILQ_HEAD(devbasetq, devbase); ++TAILQ_HEAD(devatq, deva); ++TAILQ_HEAD(conftq, config); ++TAILQ_HEAD(devitq, devi); ++TAILQ_HEAD(devmtq, devm); ++TAILQ_HEAD(pspectq, pspec); + +-struct filelist allfiles; /* list of all kernel source files */ +-struct filelist allcfiles; /* list of all .c files */ +-struct filelist allsfiles; /* list of all .S files */ +-struct filelist allofiles; /* list of all .o files */ ++extern struct devbasetq allbases; /* list of all devbase structures */ ++extern struct devatq alldevas; /* list of all devbase attachments */ ++extern struct conftq allcf;/* list of configured kernels */ ++extern struct devitq alldevi, /* list of all instances */ ++ allpseudo; /* list of all pseudo-devices */ ++extern struct devmtq alldevms; /* list of all device-majors */ ++extern struct pspectq allpspecs; /* list of all parent specs */ + +-struct prefixlist prefixes, /* prefix stack */ +- allprefixes; /* all prefixes used (after popped) */ +-struct prefixlist buildprefixes, /* build prefix stack */ +- allbuildprefixes;/* all build prefixes used (after popped) */ +-SLIST_HEAD(, prefix) curdirs; /* curdir stack */ ++extern int ndevi; /* number of devi's (before packing) */ ++extern int npspecs; /* number of parent specs */ ++extern devmajor_t maxbdevm; /* max number of block major */ ++extern devmajor_t maxcdevm; /* max number of character major */ ++extern int do_devsw; /* 0 if pre-devsw config */ ++extern int oktopackage; /* 0 before setmachine() */ ++extern int devilevel; /* used for devi->i_level */ + ++extern struct filelist allfiles; /* list of all kernel source files */ ++extern struct filelist allcfiles; /* list of all .c files */ ++extern struct filelist allsfiles; /* list of all .S files */ ++extern struct filelist allofiles; /* list of all .o files */ ++ ++extern struct prefixlist prefixes, /* prefix stack */ ++ allprefixes; /* all prefixes used (after popped) */ ++extern struct prefixlist buildprefixes, /* build prefix stack */ ++ allbuildprefixes;/* all build prefixes used (after popped) */ ++ + extern struct attr allattr; +-struct devi **packed; /* arrayified table for packed devi's */ +-size_t npacked; /* size of packed table, <= ndevi */ ++extern struct devi **packed; /* arrayified table for packed devi's */ ++extern size_t npacked; /* size of packed table, <= ndevi */ + +-struct { /* loc[] table for config */ ++extern struct locators { /* loc[] table for config */ + const char **vec; + int used; + } locators; Added: head/misc/rump/files/patch-src_usr.bin_config_main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_usr.bin_config_main.c Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,81 @@ +--- src/usr.bin/config/main.c.orig 2020-08-29 04:33:06 UTC ++++ src/usr.bin/config/main.c +@@ -86,6 +86,78 @@ COPYRIGHT("@(#) Copyright (c) 1992, 1993\ + #define LINE_MAX 1024 + #endif + ++struct devbasetq allbases; ++struct devatq alldevas; ++struct conftq allcf; ++struct devitq alldevi, allpseudo; ++struct devmtq alldevms; ++struct pspectq allpspecs; ++ ++struct devi **packed; ++size_t npacked; ++ ++struct locators locators; ++ ++int lkmmode; ++const char *conffile; /* source file, e.g., "GENERIC.sparc" */ ++const char *machine; /* machine type, e.g., "sparc" or "sun3" */ ++const char *machinearch; /* machine arch, e.g., "sparc" or "m68k" */ ++struct nvlist *machinesubarches; ++ /* machine subarches, e.g., "sun68k" or "hpc" */ ++const char *ioconfname; /* ioconf name, mutually exclusive to machine */ ++const char *srcdir; /* path to source directory (rel. to build) */ ++const char *builddir; /* path to build directory */ ++const char *defbuilddir; /* default build directory */ ++const char *ident; /* kernel "ident"ification string */ ++int errors; /* counts calls to error() */ ++int minmaxusers; /* minimum "maxusers" parameter */ ++int defmaxusers; /* default "maxusers" parameter */ ++int maxmaxusers; /* default "maxusers" parameter */ ++int maxusers; /* configuration's "maxusers" parameter */ ++int maxpartitions; /* configuration's "maxpartitions" parameter */ ++int version; /* version of the configuration file */ ++struct nvlist *options; /* options */ ++struct nvlist *fsoptions; /* filesystems */ ++struct nvlist *mkoptions; /* makeoptions */ ++struct nvlist *appmkoptions; /* appending mkoptions */ ++struct nvlist *condmkoptions; /* conditional makeoption table */ ++struct hashtab *devbasetab; /* devbase lookup */ ++struct hashtab *devroottab; /* attach at root lookup */ ++struct hashtab *devatab; /* devbase attachment lookup */ ++struct hashtab *deaddevitab; /* removed instances lookup */ ++struct hashtab *selecttab; /* selects things that are "optional foo" */ ++struct hashtab *needcnttab; /* retains names marked "needs-count" */ ++struct hashtab *opttab; /* table of configured options */ ++struct hashtab *fsopttab; /* table of configured file systems */ ++struct dlhash *defopttab; /* options that have been "defopt"'d */ ++struct dlhash *defflagtab; /* options that have been "defflag"'d */ ++struct dlhash *defparamtab; /* options that have been "defparam"'d */ ++struct dlhash *defoptlint; /* lint values for options */ ++struct nvhash *deffstab; /* defined file systems */ ++struct dlhash *optfiletab; /* "defopt"'d option .h files */ ++struct hashtab *attrtab; /* attributes (locators, etc.) */ ++struct hashtab *attrdeptab; /* attribute dependencies */ ++struct hashtab *bdevmtab; /* block devm lookup */ ++struct hashtab *cdevmtab; /* character devm lookup */ ++ ++int ndevi; /* number of devi's (before packing) */ ++int npspecs; /* number of parent specs */ ++devmajor_t maxbdevm; /* max number of block major */ ++devmajor_t maxcdevm; /* max number of character major */ ++int do_devsw; /* 0 if pre-devsw config */ ++int oktopackage; /* 0 before setmachine() */ ++int devilevel; /* used for devi->i_level */ ++ ++struct filelist allfiles; /* list of all kernel source files */ ++struct filelist allcfiles; /* list of all .c files */ ++struct filelist allsfiles; /* list of all .S files */ ++struct filelist allofiles; /* list of all .o files */ ++ ++struct prefixlist prefixes, /* prefix stack */ ++ allprefixes; /* all prefixes used (after popped) */ ++struct prefixlist buildprefixes, /* build prefix stack */ ++ allbuildprefixes;/* all build prefixes used (after popped) */ ++ + int vflag; /* verbose output */ + int Pflag; /* pack locators */ + int Lflag; /* lint config generation */ Added: head/misc/rump/files/patch-src_usr.bin_config_scan.l ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_usr.bin_config_scan.l Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,10 @@ +--- src/usr.bin/config/scan.l.orig 2020-08-29 04:30:42 UTC ++++ src/usr.bin/config/scan.l +@@ -108,6 +108,7 @@ static int endinclude(void); + static int getincludepath(void); + static int getcurifdef(void); + ++SLIST_HEAD(, prefix) curdirs; /* curdir stack */ + + %} + Added: head/misc/rump/files/patch-src_usr.bin_make_main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_usr.bin_make_main.c Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,11 @@ +--- src/usr.bin/make/main.c.orig 2020-08-29 04:02:38 UTC ++++ src/usr.bin/make/main.c +@@ -191,6 +191,8 @@ char *makeDependfile; + pid_t myPid; + int makelevel; + ++FILE *debug_file; ++ + Boolean forceJobs = FALSE; + + extern Lst parseIncPath; Added: head/misc/rump/files/patch-src_usr.bin_make_make.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/rump/files/patch-src_usr.bin_make_make.h Sat Aug 29 05:13:27 2020 (r546869) @@ -0,0 +1,11 @@ +--- src/usr.bin/make/make.h.orig 2020-08-29 02:06:40 UTC ++++ src/usr.bin/make/make.h +@@ -446,7 +446,7 @@ extern pid_t myPid; + * There is one bit per module. It is up to the module what debug + * information to print. + */ +-FILE *debug_file; /* Output written here - default stdout */ ++extern FILE *debug_file; /* Output written here - default stdout */ + extern int debug; + #define DEBUG_ARCH 0x00001 + #define DEBUG_COND 0x00002