tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean dirty hacks

Browse Source
This commit is contained in:
fyhz 2024-03-13 23:05:34 +08:00
parent 4db99f4012
commit ccecd4c9e9
11 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/pax/extern.h
View File

@ -204,7 +204,6 @@ void options(int, char **);
OPLIST * opt_next(void); OPLIST * opt_next(void);
int bad_opt(void); int bad_opt(void);
int mkpath(char *); int mkpath(char *);
char *chdname;
#if !HAVE_NBTOOL_CONFIG_H #if !HAVE_NBTOOL_CONFIG_H
int do_chroot; int do_chroot;
#endif #endif

2
bin/pax/options.c
View File

@ -214,6 +214,8 @@ int havechd = 0;
* parser * parser
*/ */
char *chdname;
void void
options(int argc, char **argv) options(int argc, char **argv)
{ {

2
external/bsd/llvm/dist/llvm/include/llvm/IR/ValueMap.h vendored
View File

@ -101,7 +101,7 @@ public:
~ValueMap() {} ~ValueMap() {}
bool hasMD() const { return MDMap; } bool hasMD() const { return (bool)MDMap; }
MDMapT &MD() { MDMapT &MD() {
if (!MDMap) if (!MDMap)
MDMap.reset(new MDMapT); MDMap.reset(new MDMapT);

7
external/gpl3/binutils/fetch.sh vendored
View File

@ -5,8 +5,11 @@ echo $0
cd `dirname $0` cd `dirname $0`
# Configure fetch method # Configure fetch method
URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/binutils-2.23.2.tar.bz2"
BACKUP_URL="http://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2" # URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/binutils-2.23.2.tar.bz2"
# BACKUP_URL="http://ftp.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2"
URL="https://ftpmirror.gnu.org/gnu/binutils/binutils-2.23.2.tar.bz2"
BACKUP_URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/binutils-2.23.2.tar.bz2"
FETCH=ftp FETCH=ftp
which curl >/dev/null which curl >/dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then

14
external/gpl3/gcc/fetch.sh vendored
View File

@ -9,13 +9,15 @@ cd `dirname $0`
: ${SED=sed} : ${SED=sed}
# Configure fetch method # Configure fetch method
URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/gcc-4.8.5.tar.bz2" # URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/gcc-4.8.5.tar.bz2"
BACKUP_URL="ftp://ftp.gwdg.de/pub/misc/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2" # BACKUP_URL="ftp://ftp.gwdg.de/pub/misc/gcc/releases/gcc-4.8.5/gcc-4.8.5.tar.bz2"
URL="https://ftpmirror.gnu.org/gnu/gcc/gcc-4.8.5/gcc-4.8.5.tar.bz2"
BACKUP_URL="http://www.minix3.org/pkgsrc/distfiles/minix/3.4.0/gcc-4.8.5.tar.bz2"
FETCH=ftp FETCH=ftp
if which curl >/dev/null # if which curl >/dev/null
then # then
FETCH="curl -O -f" # FETCH="curl -O -f"
fi # fi
# Remove a few directories from the start, so we do not end up with a 165MB patch... # Remove a few directories from the start, so we do not end up with a 165MB patch...
DELETEDIRS=" DELETEDIRS="

2
releasetools/arm_sdimage.sh
View File

@ -23,6 +23,8 @@ fi
: ${OBJ=../obj.${ARCH}} : ${OBJ=../obj.${ARCH}}
: ${TOOLCHAIN_TRIPLET=arm-elf32-minix-} : ${TOOLCHAIN_TRIPLET=arm-elf32-minix-}
: ${BUILDSH=build.sh} : ${BUILDSH=build.sh}
# Set the number of parallel build jobs the same number of CPU cores.
: ${JOBS=$(nproc)}
: ${SETS="minix-base minix-comp minix-games minix-man minix-tests tests"} : ${SETS="minix-base minix-comp minix-games minix-man minix-tests tests"}
: ${IMG=minix_arm_sd.img} : ${IMG=minix_arm_sd.img}

4
sbin/newfs_udf/newfs_udf.h
View File

@ -53,8 +53,8 @@ extern float meta_fract;
/* shared structure between udf_create.c users */ /* shared structure between udf_create.c users */
struct udf_create_context context; extern struct udf_create_context context;
struct udf_disclayout layout; extern struct udf_disclayout layout;
/* prototypes */ /* prototypes */
int udf_write_sector(void *sector, uint64_t location); int udf_write_sector(void *sector, uint64_t location);

4
sbin/newfs_udf/udf_create.c
View File

@ -52,6 +52,10 @@ __RCSID("$NetBSD: udf_create.c,v 1.25 2015/06/16 23:18:55 christos Exp $");
# endif # endif
#endif #endif
/* shared structure between udf_create.c users */
struct udf_create_context context;
struct udf_disclayout layout;
/* /*
* NOTE that there is some overlap between this code and the udf kernel fs. * NOTE that there is some overlap between this code and the udf kernel fs.
* This is intentially though it might better be factored out one day. * This is intentially though it might better be factored out one day.

2
usr.bin/make/main.c
View File

@ -192,6 +192,8 @@ char *makeDependfile;
pid_t myPid; pid_t myPid;
int makelevel; int makelevel;
FILE *debug_file;
Boolean forceJobs = FALSE; Boolean forceJobs = FALSE;
extern Lst parseIncPath; extern Lst parseIncPath;

2
usr.bin/make/make.h
View File

@ -440,7 +440,7 @@ extern pid_t myPid;
* There is one bit per module. It is up to the module what debug * There is one bit per module. It is up to the module what debug
* information to print. * information to print.
*/ */
FILE *debug_file; /* Output written here - default stdout */ extern FILE *debug_file; /* Output written here - default stdout */
extern int debug; extern int debug;
#define DEBUG_ARCH 0x00001 #define DEBUG_ARCH 0x00001
#define DEBUG_COND 0x00002 #define DEBUG_COND 0x00002

2
usr.sbin/installboot/machines.c
View File

@ -48,13 +48,11 @@ __RCSID("$NetBSD: machines.c,v 1.39 2014/02/24 07:23:44 skrll Exp $");
*/ */
struct ib_mach struct ib_mach
ib_mach_alpha, ib_mach_alpha,
ib_mach_amd64,
ib_mach_amiga, ib_mach_amiga,
ib_mach_emips, ib_mach_emips,
ib_mach_ews4800mips, ib_mach_ews4800mips,
ib_mach_hp300, ib_mach_hp300,
ib_mach_hppa, ib_mach_hppa,
ib_mach_i386,
ib_mach_landisk, ib_mach_landisk,
ib_mach_macppc, ib_mach_macppc,
ib_mach_news68k, ib_mach_news68k,