└── debian ├── compat ├── source └── format ├── freebsd-mk.dirs ├── dirs ├── patches ├── 20_libbsd_overlay.diff ├── yacc_is_byacc.diff ├── mk_eisa.diff ├── config_ldflags.diff ├── makefiles.diff ├── 03_glibc.diff ├── armhf.diff ├── 15_manpages_gzip.diff ├── disable_wsystem_headers.diff ├── prototype-setmode.diff ├── aicasm.diff ├── r276494.diff ├── 04_lex_disable_unused.diff ├── 05_disable_hardlinks.diff ├── 16_bootstrap_pmake.diff ├── series ├── man_symlinks.diff ├── hppa.diff ├── kldxref_abort_on_error.diff ├── 18_fix_sysdir.diff ├── ar_command_lines.diff ├── 22_ld_as_needed.diff ├── 21_endian.diff ├── nostrip.diff ├── avoid_defsyspath_collision.diff ├── 08_maxpathlen.diff ├── 00_upstream.diff ├── 01_make_fixes.diff └── 17_multiarch.diff ├── control ├── copyright ├── rules └── changelog /debian/compat: -------------------------------------------------------------------------------- 1 | 9 2 | -------------------------------------------------------------------------------- /debian/source/format: -------------------------------------------------------------------------------- 1 | 3.0 (quilt) 2 | -------------------------------------------------------------------------------- /debian/freebsd-mk.dirs: -------------------------------------------------------------------------------- 1 | usr/share/mk-freebsd 2 | -------------------------------------------------------------------------------- /debian/dirs: -------------------------------------------------------------------------------- 1 | usr/share 2 | usr/sbin 3 | usr/bin 4 | usr/share/man/man1 5 | usr/share/man/man5 6 | usr/share/man/man8 7 | usr/lib 8 | var/db 9 | usr/lib/freebsd 10 | -------------------------------------------------------------------------------- /debian/patches/20_libbsd_overlay.diff: -------------------------------------------------------------------------------- 1 | --- a/src/usr.bin/file2c/Makefile 2 | +++ b/src/usr.bin/file2c/Makefile 3 | @@ -1,5 +1,6 @@ 4 | # $FreeBSD$ 5 | 6 | PROG= file2c 7 | +LDADD= -lbsd 8 | WARNS?= 6 9 | .include 10 | -------------------------------------------------------------------------------- /debian/patches/yacc_is_byacc.diff: -------------------------------------------------------------------------------- 1 | --- a/src/share/mk/sys.mk 2 | +++ b/src/share/mk/sys.mk 3 | @@ -155,7 +155,7 @@ 4 | 5 | SHELL ?= sh 6 | 7 | -YACC ?= yacc 8 | +YACC ?= byacc 9 | .if defined(%POSIX) 10 | YFLAGS ?= 11 | .else 12 | -------------------------------------------------------------------------------- /debian/patches/mk_eisa.diff: -------------------------------------------------------------------------------- 1 | --- a/src/share/mk/bsd.own.mk 2 | +++ b/src/share/mk/bsd.own.mk 3 | @@ -398,6 +398,7 @@ 4 | __DEFAULT_NO_OPTIONS = \ 5 | BSD_GREP \ 6 | CLANG_EXTRAS \ 7 | + EISA \ 8 | CTF \ 9 | DEBUG_FILES \ 10 | HESIOD \ 11 | -------------------------------------------------------------------------------- /debian/patches/config_ldflags.diff: -------------------------------------------------------------------------------- 1 | --- a/src/usr.sbin/config/Makefile 2 | +++ b/src/usr.sbin/config/Makefile 3 | @@ -16,6 +16,8 @@ 4 | DPADD= ${LIBL} ${LIBSBUF} 5 | LDADD= -ll -lsbuf 6 | 7 | +LDADD+= -lbsd 8 | + 9 | CLEANFILES+= kernconf.c 10 | 11 | mkmakefile.o: configvers.h 12 | -------------------------------------------------------------------------------- /debian/patches/makefiles.diff: -------------------------------------------------------------------------------- 1 | --- a/src/usr.sbin/kldxref/Makefile 2 | +++ b/src/usr.sbin/kldxref/Makefile 3 | @@ -7,6 +7,8 @@ 4 | WARNS?= 2 5 | CFLAGS+=-fno-strict-aliasing 6 | 7 | +LDADD+= -lbsd 8 | + 9 | .if exists(ef_${MACHINE_CPUARCH}.c) && ${MACHINE_ARCH} != "powerpc64" 10 | SRCS+= ef_${MACHINE_CPUARCH}.c 11 | .else 12 | -------------------------------------------------------------------------------- /debian/patches/03_glibc.diff: -------------------------------------------------------------------------------- 1 | --- a/src/usr.sbin/mtree/specspec.c 2 | +++ b/src/usr.sbin/mtree/specspec.c 3 | @@ -84,8 +84,6 @@ 4 | printf(" rmd160digest=%s", n->rmd160digest); 5 | if (f & F_SHA256) 6 | printf(" sha256digest=%s", n->sha256digest); 7 | - if (f & F_FLAGS) 8 | - printf(" flags=%s", flags_to_string(n->st_flags)); 9 | printf("\n"); 10 | } 11 | 12 | -------------------------------------------------------------------------------- /debian/patches/armhf.diff: -------------------------------------------------------------------------------- 1 | --- a/src/share/mk/bsd.cpu.mk 2 | +++ b/src/share/mk/bsd.cpu.mk 3 | @@ -261,6 +261,10 @@ 4 | _CPUCFLAGS += -mfloat-abi=softfp 5 | .endif 6 | 7 | +.if ${MACHINE_ARCH} == "armv6hf" 8 | +_CPUCFLAGS += -mfloat-abi=hard -mfpu=vfp 9 | +.endif 10 | + 11 | # NB: COPTFLAGS is handled in /usr/src/sys/conf/kern.pre.mk 12 | 13 | .if !defined(NO_CPU_CFLAGS) 14 | -------------------------------------------------------------------------------- /debian/patches/15_manpages_gzip.diff: -------------------------------------------------------------------------------- 1 | --- 2 | src/share/mk/bsd.own.mk | 2 +- 3 | 1 file changed, 1 insertion(+), 1 deletion(-) 4 | 5 | --- a/src/share/mk/bsd.own.mk 6 | +++ b/src/share/mk/bsd.own.mk 7 | @@ -210,7 +210,7 @@ 8 | STRIP?= -s 9 | .endif 10 | 11 | -COMPRESS_CMD?= gzip -cn 12 | +COMPRESS_CMD?= gzip -cn -9 13 | COMPRESS_EXT?= .gz 14 | 15 | # Set XZ_THREADS to 1 to disable multi-threading. 16 | -------------------------------------------------------------------------------- /debian/patches/disable_wsystem_headers.diff: -------------------------------------------------------------------------------- 1 | --- a/src/share/mk/bsd.sys.mk 2 | +++ b/src/share/mk/bsd.sys.mk 3 | @@ -29,7 +29,8 @@ 4 | #CFLAGS+= -pedantic 5 | .if defined(WARNS) 6 | .if ${WARNS} >= 1 7 | -CWARNFLAGS+= -Wsystem-headers 8 | +# Disabled (see #664242) 9 | +#CWARNFLAGS+= -Wsystem-headers 10 | .if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \ 11 | || !defined(NO_WERROR.clang)) 12 | CWARNFLAGS+= -Werror 13 | -------------------------------------------------------------------------------- /debian/patches/prototype-setmode.diff: -------------------------------------------------------------------------------- 1 | Author: Logan Rosen 2 | Description: Prototype setmode 3 | Bug-Debian: https://bugs.debian.org/819145 4 | 5 | Index: b/src/usr.sbin/mtree/spec.c 6 | =================================================================== 7 | --- a/src/usr.sbin/mtree/spec.c 8 | +++ b/src/usr.sbin/mtree/spec.c 9 | @@ -49,6 +49,8 @@ 10 | #include "mtree.h" 11 | #include "extern.h" 12 | 13 | +extern void *setmode(const char *mode_str); 14 | + 15 | int lineno; /* Current spec line number. */ 16 | 17 | static void set(char *, NODE *); 18 | -------------------------------------------------------------------------------- /debian/patches/aicasm.diff: -------------------------------------------------------------------------------- 1 | 2 | Partially sent to freebsd-hackers (2011-07-02) 3 | 4 | Index: freebsd-buildutils/src/sys/dev/aic7xxx/aicasm/Makefile 5 | =================================================================== 6 | --- freebsd-buildutils.orig/src/sys/dev/aic7xxx/aicasm/Makefile 7 | +++ freebsd-buildutils/src/sys/dev/aic7xxx/aicasm/Makefile 8 | @@ -24,6 +24,10 @@ WARNS?= 0 9 | DEPENDFILE= .depend_aicasm 10 | .endif 11 | 12 | +NO_WERROR?= 1 13 | +LDADD+= -ldb -lbsd 14 | +CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd 15 | + 16 | CFLAGS+= -I${.CURDIR} 17 | .ifdef MAKESRCPATH 18 | CFLAGS+= -I${MAKESRCPATH} 19 | -------------------------------------------------------------------------------- /debian/patches/r276494.diff: -------------------------------------------------------------------------------- 1 | r276494 from upstream HEAD 2 | 3 | Don't include bsd.sys.mk within bsd.kmod.mk, else CFLAGS will be given 4 | twice on the command line. That would override CWARNFLAGS, and causes 5 | some modules to fail to build under Clang. 6 | 7 | Index: freebsd-buildutils/src/share/mk/bsd.kmod.mk 8 | =================================================================== 9 | --- freebsd-buildutils.orig/src/share/mk/bsd.kmod.mk 10 | +++ freebsd-buildutils/src/share/mk/bsd.kmod.mk 11 | @@ -13,5 +13,3 @@ SYSDIR= ${_dir} 12 | .endif 13 | 14 | .include "${SYSDIR}/conf/kmod.mk" 15 | - 16 | -.include 17 | -------------------------------------------------------------------------------- /debian/patches/04_lex_disable_unused.diff: -------------------------------------------------------------------------------- 1 | 2 | Defining __unused causes breakage in system headers (see #522773 and #522774). 3 | 4 | Note: special care should be taken with flex.skl; this code isn't compiled in 5 | lex itself, it is used as template to generate code that will later be built 6 | in other packages (e.g. kfreebsd-9). 7 | 8 | --- a/src/contrib/flex/flex.skl 9 | +++ b/src/contrib/flex/flex.skl 10 | @@ -202,8 +202,10 @@ 11 | #include 12 | #include 13 | #else 14 | +#ifndef __dead2 15 | #define __dead2 16 | #endif 17 | +#endif 18 | 19 | /* begin standard C headers. */ 20 | %if-c-only 21 | -------------------------------------------------------------------------------- /debian/patches/05_disable_hardlinks.diff: -------------------------------------------------------------------------------- 1 | --- a/src/usr.bin/cksum/Makefile 2 | +++ b/src/usr.bin/cksum/Makefile 3 | @@ -3,7 +3,7 @@ 4 | 5 | PROG= cksum 6 | SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c 7 | -LINKS= ${BINDIR}/cksum ${BINDIR}/sum 8 | +SIMLINKS= ${BINDIR}/cksum ${BINDIR}/sum 9 | MLINKS= cksum.1 sum.1 10 | 11 | .include 12 | --- a/src/usr.bin/lex/Makefile 13 | +++ b/src/usr.bin/lex/Makefile 14 | @@ -10,9 +10,9 @@ 15 | # 16 | 17 | PROG= lex 18 | -LINKS+= ${BINDIR}/lex ${BINDIR}/lex++ 19 | -LINKS+= ${BINDIR}/lex ${BINDIR}/flex 20 | -LINKS+= ${BINDIR}/lex ${BINDIR}/flex++ 21 | +SIMLINKS+= ${BINDIR}/lex ${BINDIR}/lex++ 22 | +SIMLINKS+= ${BINDIR}/lex ${BINDIR}/flex 23 | +SIMLINKS+= ${BINDIR}/lex ${BINDIR}/flex++ 24 | 25 | FLEXDIR= ${.CURDIR}/../../contrib/flex 26 | 27 | -------------------------------------------------------------------------------- /debian/patches/16_bootstrap_pmake.diff: -------------------------------------------------------------------------------- 1 | Author: Guillem Jover 2 | 3 | --- 4 | src/usr.bin/make/Makefile.dist | 11 +++++++---- 5 | 1 file changed, 7 insertions(+), 4 deletions(-) 6 | 7 | --- a/src/usr.bin/make/Makefile.dist 8 | +++ b/src/usr.bin/make/Makefile.dist 9 | @@ -2,9 +2,12 @@ 10 | # a simple makefile to help builds on !FreeBSD systems 11 | pmake: 12 | @echo 'make started.' 13 | - cc -D__dead2="" -D__unused="" -Darc4random=random -D__FBSDID="static const char *id=" -DDEFSHELLNAME=\"sh\" -I. -c *.c 14 | - cc *.o -o pmake 15 | + cc -D_GNU_SOURCE=1 -isystem /usr/include/freebsd -DDEFSHELLNAME=\"sh\" -I. -c *.c -g 16 | + cc *.o -lbsd -o pmake 17 | @echo 'make completed.' 18 | 19 | -clean: 20 | - @rm -f *.o pmake 21 | +mostlyclean: 22 | + @rm -f *.o 23 | + 24 | +clean: mostlyclean 25 | + @rm -f pmake 26 | -------------------------------------------------------------------------------- /debian/patches/series: -------------------------------------------------------------------------------- 1 | # Patches from (or merged in) upstream 2 | mk_eisa.diff 3 | r276494.diff 4 | 5 | # Patches that are in good shape for merging upstream 6 | yacc_is_byacc.diff 7 | kldxref_abort_on_error.diff 8 | 9 | # Other patches that might or might not be mergeable 10 | 00_upstream.diff 11 | 01_make_fixes.diff 12 | 03_glibc.diff 13 | 04_lex_disable_unused.diff 14 | 05_disable_hardlinks.diff 15 | 08_maxpathlen.diff 16 | 15_manpages_gzip.diff 17 | 16_bootstrap_pmake.diff 18 | #17_multiarch.diff 19 | 18_fix_sysdir.diff 20 | 21_endian.diff 21 | 22_ld_as_needed.diff 22 | disable_wsystem_headers.diff 23 | nostrip.diff 24 | config_ldflags.diff 25 | prototype-setmode.diff 26 | 27 | # Patches that are likely to be Debian-specific 28 | avoid_defsyspath_collision.diff 29 | aicasm.diff 30 | makefiles.diff 31 | #test 32 | hppa.diff 33 | man_symlinks.diff 34 | ar_command_lines.diff 35 | armhf.diff 36 | -------------------------------------------------------------------------------- /debian/patches/man_symlinks.diff: -------------------------------------------------------------------------------- 1 | Subject: use relative path in manpage symlinks 2 | From: Steven Chamberlain 3 | Date: Sat, 05 Mar 2016 15:31:00 +0000 4 | 5 | See https://bugs.debian.org/749327 6 | 7 | --- a/src/share/mk/bsd.man.mk 8 | +++ b/src/share/mk/bsd.man.mk 9 | @@ -211,12 +211,12 @@ 10 | [123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \ 11 | esac; \ 12 | name=$$1; shift; sect=$$1; shift; \ 13 | - l=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \ 14 | + l=$$name; \ 15 | name=$$1; shift; sect=$$1; shift; \ 16 | t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \ 17 | ${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \ 18 | rm -f $${t} $${t}${MCOMPRESS_EXT}; \ 19 | - ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \ 20 | + ${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \ 21 | done 22 | .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) 23 | @set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \ 24 | -------------------------------------------------------------------------------- /debian/patches/hppa.diff: -------------------------------------------------------------------------------- 1 | From: Helge Deller 2 | Subject: Do not use -fstack-protector on hppa/parisc arch. 3 | Bug-Debian: https://bugs.debian.org/758377 4 | Forwarded: not-needed 5 | 6 | --- a/src/share/mk/bsd.sys.mk 7 | +++ b/src/share/mk/bsd.sys.mk 8 | @@ -144,11 +144,12 @@ 9 | .endif # !EARLY_BUILD 10 | 11 | .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ 12 | - ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" 13 | + ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" && \ 14 | + ${MACHINE_CPUARCH} != "hppa" && ${MACHINE_CPUARCH} != "alpha" 15 | # Don't use -Wstack-protector as it breaks world with -Werror. 16 | SSP_CFLAGS?= -fstack-protector 17 | CFLAGS+= ${SSP_CFLAGS} 18 | -.endif # SSP && !IA64 && !ARM && !MIPS 19 | +.endif # SSP && !IA64 && !ARM && !MIPS && !HPPA && !ALPHA 20 | 21 | # Allow user-specified additional warning flags and file specific flag 22 | # overrides. 23 | -------------------------------------------------------------------------------- /debian/patches/kldxref_abort_on_error.diff: -------------------------------------------------------------------------------- 1 | 2 | With kldxref from 10.0-2, this warnc() reports EFAULT, rendering the 3 | output useless. However this is no longer reproducible after rebuilding 4 | 10.0-2 with recent unstable. Let's treat this warnc() as fatal so that 5 | at least we know if/when trouble comes back. 6 | 7 | It's probably related to offset types (Elf_Off / off_t). Unfortunately 8 | I haven't been able to diagnose it: 9 | 10 | $ kldxref -dv /tmp/t/ 11 | /tmp/t/drm2.ko 12 | kldxref: ef_seg_read_rel(/tmp/t/drm2.ko): bad offset/len (4800000130808b48:33) 13 | kldxref: error while reading /tmp/t/drm2.ko: Bad address 14 | 15 | --- a/src/usr.sbin/kldxref/kldxref.c 16 | +++ b/src/usr.sbin/kldxref/kldxref.c 17 | @@ -230,7 +230,7 @@ 18 | parse_entry(&md, cval, &ef, kldname); 19 | } 20 | if (error) 21 | - warnc(error, "error while reading %s", filename); 22 | + errc(error, "error while reading %s", filename); 23 | free(orgp); 24 | } while(0); 25 | EF_CLOSE(&ef); 26 | -------------------------------------------------------------------------------- /debian/patches/18_fix_sysdir.diff: -------------------------------------------------------------------------------- 1 | Index: freebsd-buildutils/src/share/mk/bsd.kmod.mk 2 | =================================================================== 3 | --- freebsd-buildutils.orig/src/share/mk/bsd.kmod.mk 4 | +++ freebsd-buildutils/src/share/mk/bsd.kmod.mk 5 | @@ -1,15 +1,17 @@ 6 | # $FreeBSD$ 7 | 8 | +KVER!= uname -r 9 | + 10 | # Search for kernel source tree in standard places. 11 | .for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \ 12 | - ${.CURDIR}/../../../../.. /sys /usr/src/sys 13 | + ${.CURDIR}/../../../../.. /usr/src/kfreebsd-headers-${KVER}/sys 14 | .if !defined(SYSDIR) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk) 15 | SYSDIR= ${_dir} 16 | .endif 17 | .endfor 18 | .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \ 19 | !exists(${SYSDIR}/conf/kmod.mk) 20 | -.error Unable to locate the kernel source tree. Set SYSDIR to override. 21 | +.error "can't find kernel headers, install kfreebsd-headers-${KVER} package" 22 | .endif 23 | 24 | .include "${SYSDIR}/conf/kmod.mk" 25 | -------------------------------------------------------------------------------- /debian/patches/ar_command_lines.diff: -------------------------------------------------------------------------------- 1 | Date: Tue, 19 Jul 2016 09:06:50 +0100 2 | From: Steven Chamberlain 3 | Subject: make ar command lines visible in build log 4 | 5 | --- a/src/share/mk/bsd.lib.mk 6 | +++ b/src/share/mk/bsd.lib.mk 7 | @@ -175,7 +175,7 @@ 8 | lib${LIB}.a: ${OBJS} ${STATICOBJS} 9 | @${ECHO} building static ${LIB} library 10 | @rm -f ${.TARGET} 11 | - @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD} 12 | + ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD} 13 | ${RANLIB} ${RANLIBFLAGS} ${.TARGET} 14 | .endif 15 | 16 | @@ -188,7 +188,7 @@ 17 | lib${LIB}_p.a: ${POBJS} 18 | @${ECHO} building profiled ${LIB} library 19 | @rm -f ${.TARGET} 20 | - @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD} 21 | + ${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD} 22 | ${RANLIB} ${RANLIBFLAGS} ${.TARGET} 23 | .endif 24 | 25 | @@ -239,7 +239,7 @@ 26 | lib${LIB}_pic.a: ${SOBJS} 27 | @${ECHO} building special pic ${LIB} library 28 | @rm -f ${.TARGET} 29 | - @${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD} 30 | + ${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD} 31 | ${RANLIB} ${RANLIBFLAGS} ${.TARGET} 32 | .endif 33 | 34 | -------------------------------------------------------------------------------- /debian/patches/22_ld_as_needed.diff: -------------------------------------------------------------------------------- 1 | --- a/src/usr.bin/make/Makefile 2 | +++ b/src/usr.bin/make/Makefile 3 | @@ -6,6 +6,7 @@ 4 | 5 | PROG= make 6 | CFLAGS+=-I${.CURDIR} 7 | +LDADD+=-lbsd 8 | SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \ 9 | lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \ 10 | util.c var.c 11 | --- a/src/usr.sbin/mtree/Makefile 12 | +++ b/src/usr.sbin/mtree/Makefile 13 | @@ -12,7 +12,7 @@ 14 | 15 | CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256 16 | DPADD= ${LIBMD} 17 | -LDADD= -lmd 18 | +LDADD= -lmd -lbsd 19 | 20 | .if ${MK_NMTREE} == "no" 21 | LINKS= ${BINDIR}/fmtree ${BINDIR}/mtree 22 | --- a/src/usr.bin/brandelf/Makefile 23 | +++ b/src/usr.bin/brandelf/Makefile 24 | @@ -1,5 +1,6 @@ 25 | # $FreeBSD$ 26 | 27 | PROG= brandelf 28 | +LDADD= -lbsd 29 | 30 | .include 31 | --- a/src/usr.bin/cksum/Makefile 32 | +++ b/src/usr.bin/cksum/Makefile 33 | @@ -3,6 +3,7 @@ 34 | 35 | PROG= cksum 36 | SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c 37 | +LDADD+= -lbsd 38 | SIMLINKS= ${BINDIR}/cksum ${BINDIR}/sum 39 | MLINKS= cksum.1 sum.1 40 | 41 | --- a/src/usr.bin/file2c/Makefile 42 | +++ b/src/usr.bin/file2c/Makefile 43 | @@ -3,6 +3,7 @@ 44 | .include 45 | 46 | PROG= file2c 47 | +LDADD+= -lbsd 48 | 49 | .if ${MK_TESTS} != "no" 50 | SUBDIR+= tests 51 | -------------------------------------------------------------------------------- /debian/patches/21_endian.diff: -------------------------------------------------------------------------------- 1 | 2 | If neither TARGET_BIG_ENDIAN or TARGET_LITTLE_ENDIAN are defined, 3 | default to native compilation. 4 | 5 | FIXME: This only checks for variable definition (i.e. via environment), not 6 | for command-line assignment parameters. 7 | 8 | --- a/src/usr.bin/make/main.c 9 | +++ b/src/usr.bin/make/main.c 10 | @@ -61,6 +61,7 @@ 11 | * the .MFLAGS target. 12 | */ 13 | 14 | +#include 15 | #include 16 | #include 17 | #include 18 | @@ -881,6 +882,7 @@ 19 | const char *machine; 20 | const char *machine_arch; 21 | const char *machine_cpu; 22 | + int machine_endian_little; 23 | Boolean outOfDate = TRUE; /* FALSE if all targets up to date */ 24 | const char *p; 25 | const char *pathp; 26 | @@ -1014,6 +1016,16 @@ 27 | Var_SetGlobal("MACHINE", machine); 28 | Var_SetGlobal("MACHINE_ARCH", machine_arch); 29 | Var_SetGlobal("MACHINE_CPU", machine_cpu); 30 | + if (!Var_Exists("TARGET_BIG_ENDIAN", VAR_GLOBAL) && !Var_Exists("TARGET_LITTLE_ENDIAN", VAR_GLOBAL)) { 31 | + /* 32 | + * If neither TARGET_BIG_ENDIAN or TARGET_LITTLE_ENDIAN are defined, 33 | + * default to native compilation. 34 | + */ 35 | + if (_BYTE_ORDER == _LITTLE_ENDIAN) 36 | + Var_SetGlobal("TARGET_LITTLE_ENDIAN", "true"); 37 | + else 38 | + Var_SetGlobal("TARGET_BIG_ENDIAN", "true"); 39 | + } 40 | #ifdef MAKE_VERSION 41 | Var_SetGlobal("MAKE_VERSION", MAKE_VERSION); 42 | #endif 43 | -------------------------------------------------------------------------------- /debian/patches/nostrip.diff: -------------------------------------------------------------------------------- 1 | 2 | By default, install without -s. Let dh_strip, etc handle stripping 3 | (and honor DEB_BUILD_OPTIONS=nostrip, etc). 4 | 5 | Index: freebsd-buildutils/src/share/mk/bsd.lib.mk 6 | =================================================================== 7 | --- freebsd-buildutils.orig/src/share/mk/bsd.lib.mk 8 | +++ freebsd-buildutils/src/share/mk/bsd.lib.mk 9 | @@ -47,7 +47,7 @@ CFLAGS+= ${DEBUG_FLAGS} 10 | CTFFLAGS+= -g 11 | .endif 12 | .else 13 | -STRIP?= -s 14 | +#STRIP?= -s 15 | .endif 16 | 17 | .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ 18 | Index: freebsd-buildutils/src/share/mk/bsd.own.mk 19 | =================================================================== 20 | --- freebsd-buildutils.orig/src/share/mk/bsd.own.mk 21 | +++ freebsd-buildutils/src/share/mk/bsd.own.mk 22 | @@ -207,7 +207,7 @@ INSTALL_SYMLINK?= ln -s 23 | 24 | # Common variables 25 | .if !defined(DEBUG_FLAGS) 26 | -STRIP?= -s 27 | +#STRIP?= -s 28 | .endif 29 | 30 | COMPRESS_CMD?= gzip -cn -9 31 | Index: freebsd-buildutils/src/share/mk/bsd.prog.mk 32 | =================================================================== 33 | --- freebsd-buildutils.orig/src/share/mk/bsd.prog.mk 34 | +++ freebsd-buildutils/src/share/mk/bsd.prog.mk 35 | @@ -43,7 +43,7 @@ CTFFLAGS+= -g 36 | .endif 37 | 38 | .if !defined(DEBUG_FLAGS) 39 | -STRIP?= -s 40 | +#STRIP?= -s 41 | .endif 42 | 43 | .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") 44 | -------------------------------------------------------------------------------- /debian/patches/avoid_defsyspath_collision.diff: -------------------------------------------------------------------------------- 1 | 2 | This allows freebsd-buildutils to be installed alongside bmake. 3 | 4 | --- a/src/share/mk/Makefile 5 | +++ b/src/share/mk/Makefile 6 | @@ -47,7 +47,7 @@ 7 | version_gen.awk 8 | 9 | NO_OBJ= 10 | -FILESDIR= ${BINDIR}/mk 11 | +FILESDIR= ${BINDIR}/mk-freebsd 12 | 13 | .if ${MK_TESTS} != "no" 14 | FILES+= atf.test.mk 15 | --- a/src/share/mk/bsd.symver.mk 16 | +++ b/src/share/mk/bsd.symver.mk 17 | @@ -23,7 +23,7 @@ 18 | .endif 19 | _oarg= ${_arg} 20 | .endfor 21 | -_mpath+= /usr/share/mk 22 | +_mpath+= /usr/share/mk-freebsd 23 | 24 | # Look up ${VERSION_GEN} in ${_mpath}. 25 | _vgen= 26 | --- a/src/usr.bin/make/make.1 27 | +++ b/src/usr.bin/make/make.1 28 | @@ -235,7 +235,7 @@ 29 | .Fl m 30 | options can be specified to form a search path. 31 | This path will override the default system include path, 32 | -.Pa /usr/share/mk . 33 | +.Pa /usr/share/mk-freebsd . 34 | The system include path will always be appended to the search path used 35 | for "..."-style inclusions and makefile searches (see the 36 | .Fl I 37 | @@ -1721,7 +1721,7 @@ 38 | object directory 39 | .It Pa sys.mk 40 | system makefile 41 | -.It Pa /usr/share/mk 42 | +.It Pa /usr/share/mk-freebsd 43 | default system makefile directory 44 | .It Pa /usr/share/doc/psd/12.make 45 | PMake tutorial 46 | --- a/src/usr.bin/make/pathnames.h 47 | +++ b/src/usr.bin/make/pathnames.h 48 | @@ -50,7 +50,7 @@ 49 | #endif /* ! PATH_DEFSYSMK */ 50 | 51 | #ifndef PATH_DEFSYSPATH 52 | -#define PATH_DEFSYSPATH "/usr/share/mk" 53 | +#define PATH_DEFSYSPATH "/usr/share/mk-freebsd" 54 | #endif /* ! PATH_DEFSYSPATH */ 55 | 56 | #endif /* pathnames_h_235b888a */ 57 | -------------------------------------------------------------------------------- /debian/patches/08_maxpathlen.diff: -------------------------------------------------------------------------------- 1 | --- 2 | src/usr.bin/make/arch.c | 4 ++++ 3 | src/usr.bin/make/main.c | 3 +++ 4 | src/usr.sbin/config/main.c | 4 ++++ 5 | src/usr.sbin/config/mkmakefile.c | 4 ++++ 6 | src/usr.sbin/config/mkoptions.c | 4 ++++ 7 | src/usr.sbin/mtree/create.c | 4 ++++ 8 | src/usr.sbin/mtree/extern.h | 5 +++-- 9 | 7 files changed, 26 insertions(+), 2 deletions(-) 10 | 11 | --- a/src/usr.bin/make/arch.c 12 | +++ b/src/usr.bin/make/arch.c 13 | @@ -191,6 +191,10 @@ 14 | Error ARGS; \ 15 | } while (0) 16 | 17 | +#ifndef MAXPATHLEN 18 | +# define MAXPATHLEN 4096 19 | +#endif 20 | + 21 | /*- 22 | *----------------------------------------------------------------------- 23 | * Arch_ParseArchive -- 24 | --- a/src/usr.bin/make/main.c 25 | +++ b/src/usr.bin/make/main.c 26 | @@ -255,6 +255,9 @@ 27 | { 28 | char *fname, *fnamesave; /* makefile to read */ 29 | FILE *stream; 30 | +#ifndef MAXPATHLEN 31 | +# define MAXPATHLEN 4096 32 | +#endif 33 | char *name, path[MAXPATHLEN]; 34 | char *MAKEFILE; 35 | int setMAKEFILE; 36 | --- a/src/usr.sbin/mtree/create.c 37 | +++ b/src/usr.sbin/mtree/create.c 38 | @@ -67,6 +67,10 @@ 39 | #define INDENTNAMELEN 15 40 | #define MAXLINELEN 80 41 | 42 | +#ifndef MAXHOSTNAMELEN 43 | +# define MAXHOSTNAMELEN 255 44 | +#endif 45 | + 46 | static gid_t gid; 47 | static uid_t uid; 48 | static mode_t mode; 49 | --- a/src/usr.sbin/mtree/extern.h 50 | +++ b/src/usr.sbin/mtree/extern.h 51 | @@ -54,6 +54,7 @@ 52 | extern u_int keys; 53 | extern int lineno; 54 | extern int dflag, eflag, iflag, nflag, qflag, rflag, sflag, uflag, wflag; 55 | -#ifdef MAXPATHLEN 56 | -extern char fullpath[MAXPATHLEN]; 57 | +#ifndef MAXPATHLEN 58 | +# define MAXPATHLEN 4096 59 | #endif 60 | +extern char fullpath[MAXPATHLEN]; 61 | -------------------------------------------------------------------------------- /debian/control: -------------------------------------------------------------------------------- 1 | Source: freebsd-buildutils 2 | Section: devel 3 | Priority: extra 4 | Maintainer: GNU/kFreeBSD Maintainers 5 | Uploaders: 6 | Aurelien Jarno , 7 | Robert Millan , 8 | Steven Chamberlain , 9 | Build-Depends: debhelper (>= 9), 10 | flex | flex-old, 11 | libfl-dev | flex-old, 12 | bison, 13 | dpkg-dev (>= 1.16.1.1), 14 | libbsd-dev (>= 0.3.0), 15 | libmd-dev, 16 | freebsd-glue (>= 0.2.20), 17 | bmake, 18 | byacc (>= 20120115~), 19 | # for freebsd-config 20 | libsbuf-dev, 21 | Standards-Version: 3.9.8 22 | Vcs-Browser: https://salsa.debian.org/kfreebsd-team/freebsd-buildutils 23 | Vcs-Git: https://salsa.debian.org/kfreebsd-team/freebsd-buildutils.git 24 | 25 | Package: freebsd-buildutils 26 | Architecture: any 27 | Depends: ${shlibs:Depends}, ${misc:Depends}, bsdmainutils, unzip, patchutils, 28 | freebsd-glue (>= 0.2.8~), 29 | # Required by lex 30 | m4, 31 | # Not strictly required anymore. But let's drag it in for now, to avoid breaking 32 | # expectations. 33 | freebsd-mk, 34 | Conflicts: freebsd5-buildutils, freebsd6-buildutils, flex-old 35 | Provides: freebsd6-buildutils, freebsd7-buildutils 36 | Description: Utilities for building FreeBSD sources 37 | This package contains the FreeBSD counterparts of some standard build 38 | utilities (make, mkdep, lex ..) 39 | . 40 | They have some specific modifications needed to be able to build FreeBSD 41 | sources. 42 | 43 | Package: freebsd-mk 44 | Architecture: all 45 | Depends: ${misc:Depends} 46 | Multi-Arch: foreign 47 | Replaces: freebsd-buildutils (<< 10.0~svn259404-5~) 48 | Enhances: bmake 49 | Description: FreeBSD makefile templates for bmake 50 | This package contains the makefile templates from the FreeBSD project. They 51 | provide simple rules to build programs, libraries, etc. 52 | . 53 | These templates provide an alternative to the default makefile templates 54 | shipped with bmake. If you want to enable them in your programs, simply 55 | invoke bmake as follows: 56 | . 57 | bmake -m /usr/share/mk-freebsd 58 | -------------------------------------------------------------------------------- /debian/copyright: -------------------------------------------------------------------------------- 1 | This package was debianized by Nathan Hawkins on 2 | Fri, 11 Oct 2002 20:43:20 -0400. 3 | 4 | It was downloaded from FreeBSD CVS (http://www.freebsd.org/) 5 | 6 | Upstream Author: The FreeBSD Project 7 | 8 | Copyright: 9 | 10 | Copyright (c) 1980, 1983, 1985, 1987, 1988, 1989, 1990, 1991, 1993 11 | The Regents of the University of California 12 | Copyright (c) 1988, 1989 Adam de Boor 13 | Copyright (c) 1989 by Berkeley Softworks 14 | Copyright (c) 1995 Peter Wemm 15 | Copyright (c) 1996 Søren Schmidt 16 | Copyright (c) 1998 John D. Polstra. 17 | Copyright (c) 1997 John-Mark Gurney 18 | Copyright (c) 1998, 2000 Robert Nordier 19 | Copyright (c) 1999 Global Technology Associates, Inc. 20 | Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav 21 | Copyright (c) 2000 Massachusetts Institute of Technology 22 | Copyright (c) 2000, 2001 David O'Brien 23 | Copyright (c) 2002 Juli Mallett 24 | Copyright (c) 2003 Joseph Koshy 25 | Copyright (c) 2003 Poul-Henning Kamp 26 | Copyright (c) 2003 Dan Nelson 27 | Copyright (c) 2005 Max Okumoto 28 | Copyright (c) 2006 Daniel M. Eischen 29 | 30 | 31 | License: 32 | 33 | Redistribution and use in source and binary forms, with or without 34 | modification, are permitted provided that the following conditions 35 | are met: 36 | 1. Redistributions of source code must retain the above copyright 37 | notice, this list of conditions and the following disclaimer. 38 | 2. Redistributions in binary form must reproduce the above copyright 39 | notice, this list of conditions and the following disclaimer in the 40 | documentation and/or other materials provided with the distribution. 41 | 3. Neither the name of the University nor the names of its contributors 42 | may be used to endorse or promote products derived from this software 43 | without specific prior written permission. 44 | 45 | THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 46 | ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 47 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 48 | ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 49 | FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 50 | DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 51 | OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 52 | HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 53 | LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 54 | OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 55 | SUCH DAMAGE. 56 | -------------------------------------------------------------------------------- /debian/patches/00_upstream.diff: -------------------------------------------------------------------------------- 1 | --- a/src/usr.sbin/mtree/compare.c 2 | +++ b/src/usr.sbin/mtree/compare.c 3 | @@ -176,21 +176,22 @@ 4 | (intmax_t)s->st_size, (intmax_t)p->fts_statp->st_size); 5 | tab = "\t"; 6 | } 7 | +#ifdef ST_MTIM 8 | /* 9 | * XXX 10 | * Catches nano-second differences, but doesn't display them. 11 | */ 12 | if ((s->flags & F_TIME) && 13 | - ((s->st_mtimespec.tv_sec != p->fts_statp->st_mtim.tv_sec) || 14 | - (s->st_mtimespec.tv_nsec != p->fts_statp->st_mtim.tv_nsec))) { 15 | + ((s->ST_MTIM.tv_sec != p->fts_statp->st_mtim.tv_sec) || 16 | + (s->ST_MTIM.tv_nsec != p->fts_statp->st_mtim.tv_nsec))) { 17 | LABEL; 18 | (void)printf("%smodification time expected %.24s ", 19 | - tab, ctime(&s->st_mtimespec.tv_sec)); 20 | + tab, ctime(&s->ST_MTIM.tv_sec)); 21 | (void)printf("found %.24s", 22 | ctime(&p->fts_statp->st_mtim.tv_sec)); 23 | if (uflag) { 24 | - tv[0].tv_sec = s->st_mtimespec.tv_sec; 25 | - tv[0].tv_usec = s->st_mtimespec.tv_nsec / 1000; 26 | + tv[0].tv_sec = s->ST_MTIM.tv_sec; 27 | + tv[0].tv_usec = s->ST_MTIM.tv_nsec / 1000; 28 | tv[1] = tv[0]; 29 | if (utimes(p->fts_accpath, tv)) 30 | (void)printf(" not modified: %s\n", 31 | @@ -201,6 +202,7 @@ 32 | (void)printf("\n"); 33 | tab = "\t"; 34 | } 35 | +#endif /* ST_MTIM */ 36 | if (s->flags & F_CKSUM) { 37 | if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0) { 38 | LABEL; 39 | @@ -223,6 +225,7 @@ 40 | } 41 | } 42 | } 43 | +#if defined(__FreeBSD__) 44 | if ((s->flags & F_FLAGS) && s->st_flags != p->fts_statp->st_flags) { 45 | LABEL; 46 | fflags = flags_to_string(s->st_flags); 47 | @@ -243,6 +246,7 @@ 48 | (void)printf("\n"); 49 | tab = "\t"; 50 | } 51 | +#endif 52 | #ifdef MD5 53 | if (s->flags & F_MD5) { 54 | char *new_digest, buf[33]; 55 | --- a/src/usr.sbin/mtree/create.c 56 | +++ b/src/usr.sbin/mtree/create.c 57 | @@ -265,11 +265,13 @@ 58 | if (keys & F_SLINK && 59 | (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) 60 | output(indent, &offset, "link=%s", rlink(p->fts_accpath)); 61 | +#if defined(__FreeBSD__) 62 | if (keys & F_FLAGS && p->fts_statp->st_flags != flags) { 63 | fflags = flags_to_string(p->fts_statp->st_flags); 64 | output(indent, &offset, "flags=%s", fflags); 65 | free(fflags); 66 | } 67 | +#endif 68 | (void)putchar('\n'); 69 | } 70 | 71 | @@ -328,6 +330,7 @@ 72 | maxuid = u[suid]; 73 | } 74 | 75 | +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) 76 | /* 77 | * XXX 78 | * note that the below will break when file flags 79 | @@ -341,6 +344,7 @@ 80 | saveflags = sflags; 81 | maxflags = f[FLAGS2IDX(sflags)]; 82 | } 83 | +#endif /* __FreeBSD__ */ 84 | } 85 | } 86 | /* 87 | @@ -384,11 +388,13 @@ 88 | (void)printf(" mode=%#o", savemode); 89 | if (keys & F_NLINK) 90 | (void)printf(" nlink=1"); 91 | +#if defined(__FreeBSD__) 92 | if (keys & F_FLAGS) { 93 | fflags = flags_to_string(saveflags); 94 | (void)printf(" flags=%s", fflags); 95 | free(fflags); 96 | } 97 | +#endif 98 | (void)printf("\n"); 99 | *puid = saveuid; 100 | *pgid = savegid; 101 | --- a/src/usr.sbin/mtree/misc.c 102 | +++ b/src/usr.sbin/mtree/misc.c 103 | @@ -107,6 +107,7 @@ 104 | return (strcmp(((const KEY *)a)->name, ((const KEY *)b)->name)); 105 | } 106 | 107 | +#if defined(__FreeBSD__) 108 | char * 109 | flags_to_string(u_long fflags) 110 | { 111 | @@ -122,3 +123,4 @@ 112 | 113 | return string; 114 | } 115 | +#endif /* __FreeBSD__ */ 116 | --- a/src/usr.sbin/mtree/mtree.h 117 | +++ b/src/usr.sbin/mtree/mtree.h 118 | @@ -42,7 +42,16 @@ 119 | struct _node *parent, *child; /* up, down */ 120 | struct _node *prev, *next; /* left, right */ 121 | off_t st_size; /* size */ 122 | - struct timespec st_mtimespec; /* last modification time */ 123 | +#ifdef __GLIBC__ 124 | +# ifdef _STATBUF_ST_NSEC 125 | +# define ST_MTIM st_mtim 126 | +# endif 127 | +#else 128 | +# define ST_MTIM st_mtimespec 129 | +#endif 130 | +#ifdef ST_MTIM 131 | + struct timespec ST_MTIM; /* last modification time */ 132 | +#endif 133 | u_long cksum; /* check sum */ 134 | char *md5digest; /* MD5 digest */ 135 | char *sha1digest; /* SHA-1 digest */ 136 | --- a/src/usr.sbin/mtree/spec.c 137 | +++ b/src/usr.sbin/mtree/spec.c 138 | @@ -204,12 +204,14 @@ 139 | if(!ip->rmd160digest) 140 | errx(1, "strdup"); 141 | break; 142 | +#if defined(__FreeBSD__) 143 | case F_FLAGS: 144 | if (strcmp("none", val) == 0) 145 | ip->st_flags = 0; 146 | else if (strtofflags(&val, &ip->st_flags, NULL) != 0) 147 | errx(1, "line %d: invalid flag %s",lineno, val); 148 | break; 149 | +#endif 150 | case F_GID: 151 | ip->st_gid = strtoul(val, &ep, 10); 152 | if (*ep) 153 | @@ -252,20 +254,22 @@ 154 | if (strunvis(ip->slink, val) == -1) 155 | errx(1, "symlink %s is ill-encoded", val); 156 | break; 157 | +#ifdef ST_MTIM 158 | case F_TIME: 159 | - ip->st_mtimespec.tv_sec = strtoul(val, &ep, 10); 160 | + ip->ST_MTIM.tv_sec = strtoul(val, &ep, 10); 161 | if (*ep == '.') { 162 | /* Note: we require exactly nine 163 | * digits after the decimal point. */ 164 | val = ep + 1; 165 | - ip->st_mtimespec.tv_nsec 166 | + ip->ST_MTIM.tv_nsec 167 | = strtoul(val, &ep, 10); 168 | } else 169 | - ip->st_mtimespec.tv_nsec = 0; 170 | + ip->ST_MTIM.tv_nsec = 0; 171 | if (*ep) 172 | errx(1, "line %d: invalid time %s", 173 | lineno, val); 174 | break; 175 | +#endif 176 | case F_TYPE: 177 | switch(*val) { 178 | case 'b': 179 | --- a/src/usr.sbin/mtree/specspec.c 180 | +++ b/src/usr.sbin/mtree/specspec.c 181 | @@ -150,8 +150,10 @@ 182 | differs |= F_SIZE; 183 | if (FS(n1, n2, F_SLINK, slink)) 184 | differs |= F_SLINK; 185 | - if (FM(n1, n2, F_TIME, st_mtimespec)) 186 | +#ifdef ST_MTIM 187 | + if (FM(n1, n2, F_TIME, ST_MTIM)) 188 | differs |= F_TIME; 189 | +#endif 190 | if (FF(n1, n2, F_UID, st_uid)) 191 | differs |= F_UID; 192 | if (FF(n1, n2, F_UNAME, st_uid)) 193 | --- a/src/usr.sbin/mtree/verify.c 194 | +++ b/src/usr.sbin/mtree/verify.c 195 | @@ -251,9 +251,11 @@ 196 | if (chmod(path, p->st_mode)) 197 | (void)printf("%s: permissions not set: %s\n", 198 | path, strerror(errno)); 199 | +#if defined(__FreeBSD__) 200 | if ((p->flags & F_FLAGS) && p->st_flags && 201 | chflags(path, p->st_flags)) 202 | (void)printf("%s: file flags not set: %s\n", 203 | path, strerror(errno)); 204 | +#endif 205 | } 206 | } 207 | -------------------------------------------------------------------------------- /debian/rules: -------------------------------------------------------------------------------- 1 | #!/usr/bin/make -f 2 | # Sample debian/rules that uses debhelper. 3 | # GNU copyright 1997 to 1999 by Joey Hess. 4 | 5 | # Uncomment this to turn on verbose mode. 6 | #export DH_VERBOSE=1 7 | 8 | full_version := $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g') 9 | tar_version := $(shell echo $(full_version) | sed -e 's/-.*//g') 10 | svn_revision := $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g') 11 | version := $(shell echo $(full_version) | sed -e 's/[~+-].*//g') 12 | pversion := $(shell echo $(version) | sed -e 's/\./_/g') 13 | major := $(shell echo $(version) | sed -e 's/\..*//g') 14 | revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g') 15 | 16 | include /usr/share/dpkg/architecture.mk 17 | 18 | # Determine host architecture compiler 19 | ifeq ($(origin CC),default) 20 | CC := $(DEB_HOST_GNU_TYPE)-gcc 21 | endif 22 | 23 | # Use hardening flags 24 | export DEB_BUILD_MAINT_OPTIONS = hardening=+all 25 | 26 | # Pre-define CFLAGS, for hardening, debug and optimisation level 27 | DPKG_EXPORT_BUILDFLAGS = 1 28 | include /usr/share/dpkg/buildflags.mk 29 | 30 | MACHINE_ARCH := $(DEB_HOST_ARCH_CPU) 31 | MACHINE_MULTIARCH := $(DEB_HOST_MULTIARCH) 32 | 33 | ifeq ($(DEB_HOST_ARCH_CPU), arm) 34 | ifneq (,$(findstring armhf,$(DEB_HOST_ARCH))) 35 | MACHINE_ARCH := armv6hf 36 | else 37 | MACHINE_ARCH := armv6 38 | endif 39 | endif 40 | 41 | ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) 42 | export STRIPFLAG= 43 | endif 44 | 45 | EXTRA_CFLAGS = \ 46 | -D_GNU_SOURCE -pipe -Wall \ 47 | -DMACHINE_ARCH='\"$(MACHINE_ARCH)\"' \ 48 | -DMACHINE_MULTIARCH='\"$(MACHINE_MULTIARCH)\"' \ 49 | -I$(CURDIR)/build-tree/src/sys \ 50 | -isystem /usr/include/freebsd \ 51 | -fPIC \ 52 | $(CPPFLAGS) \ 53 | $(NULL) 54 | # disabled due to #630907 (see also 20_libbsd_overlay.diff) 55 | # $(shell pkg-config --cflags libbsd-overlay) 56 | CFLAGS += $(EXTRA_CFLAGS) 57 | 58 | ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) 59 | NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) 60 | 61 | # Do not mess with MAKEFLAGS until we transfer control to BSD make (see below) 62 | BSD_MAKEFLAGS += -j$(NUMJOBS) 63 | endif 64 | 65 | SVN_BASE := https://svn.freebsd.org/base 66 | #SVN := $(SVN_BASE)/release/$(version).0 67 | SVN := $(SVN_BASE)/releng/$(version) 68 | #SVN := $(SVN_BASE)/stable/$(major) 69 | #SVN := $(SVN_BASE)/head 70 | 71 | SOURCE = freebsd-buildutils 72 | ORIGDIR = $(SOURCE)-$(tar_version) 73 | TARNAME = $(SOURCE)_$(tar_version).orig.tar.xz 74 | SOURCE_DATE_EPOCH ?= $(shell date -d "$$(dpkg-parsechangelog -SDate)" +%s) 75 | 76 | PMAKE_COMMON = \ 77 | MAKEFLAGS=$(BSD_MAKEFLAGS) \ 78 | NO_WERROR=1 NOGCCERROR=1 \ 79 | NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 \ 80 | bmake \ 81 | CC=$(CC) \ 82 | -m $(CURDIR)/src/share/mk \ 83 | $(NULL) 84 | PMAKE = \ 85 | CFLAGS="$(CFLAGS)" \ 86 | $(PMAKE_COMMON) 87 | 88 | YACC = byacc 89 | 90 | package = $(SOURCE) 91 | 92 | get-orig-source: 93 | rm -rf $(ORIGDIR) 94 | mkdir -p $(ORIGDIR)/src/sys/sys $(ORIGDIR)/src/sys/kern/ 95 | for i in \ 96 | share/mk \ 97 | usr.bin/cksum \ 98 | usr.bin/elfdump \ 99 | usr.bin/file2c \ 100 | usr.bin/lex \ 101 | contrib/flex \ 102 | usr.bin/make \ 103 | usr.bin/mkdep \ 104 | usr.bin/brandelf \ 105 | usr.sbin/btxld \ 106 | usr.sbin/config \ 107 | usr.sbin/kgzip \ 108 | usr.sbin/kldxref \ 109 | usr.sbin/mtree \ 110 | sys/dev/aic7xxx/aicasm \ 111 | ; do \ 112 | svn export --ignore-keywords -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/src/$$i || exit ; \ 113 | done 114 | # Clamp timestamps to be no newer than last changelog entry, see 115 | # https://wiki.debian.org/ReproducibleBuilds/TimestampsInTarball 116 | find $(ORIGDIR) -newermt "@$(SOURCE_DATE_EPOCH)" -print0 \ 117 | | xargs -0r touch --no-dereference --date="@$(SOURCE_DATE_EPOCH)" 118 | # Create tarball with files sorted in a stable order, see 119 | # https://wiki.debian.org/ReproducibleBuilds/FileOrderInTarballs 120 | find $(ORIGDIR) -print0 | LC_ALL=C sort -z \ 121 | | tar --null --no-recursion --files-from - \ 122 | --numeric-owner --owner 0 --group 0 \ 123 | -cJf ../$(TARNAME) 124 | rm -rf $(ORIGDIR) 125 | 126 | unpack: unpack-stamp 127 | unpack-stamp: 128 | mkdir build-tree 129 | cp -a src build-tree/ 130 | 131 | touch unpack-stamp 132 | 133 | build: build-arch build-indep 134 | build-arch: build-stamp 135 | build-indep: build-stamp 136 | 137 | build-stamp: unpack-stamp 138 | dh_testdir 139 | 140 | $(PMAKE) -C build-tree/src/usr.bin/make 141 | 142 | $(PMAKE) -C build-tree/src/usr.bin/cksum 143 | 144 | cd build-tree/src/usr.bin/lex ; \ 145 | $(PMAKE) bootstrap ; \ 146 | $(PMAKE) NO_INSTALLLIB=1 147 | 148 | $(PMAKE) -C build-tree/src/usr.bin/mkdep 149 | $(PMAKE) -C build-tree/src/usr.sbin/mtree 150 | $(PMAKE) -C build-tree/src/usr.bin/file2c 151 | $(PMAKE) -C build-tree/src/usr.bin/brandelf 152 | $(PMAKE) -C build-tree/src/sys/dev/aic7xxx/aicasm 153 | ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) 154 | # Not portable yet. Maybe someday... 155 | $(PMAKE) -C build-tree/src/usr.sbin/kldxref 156 | endif 157 | 158 | PATH=$(CURDIR)/build-tree/src/usr.bin/file2c:$(PATH) \ 159 | $(PMAKE) -C build-tree/src/usr.sbin/config 160 | 161 | touch build-stamp 162 | 163 | install: build 164 | dh_testdir 165 | dh_testroot 166 | dh_prep 167 | dh_installdirs 168 | 169 | $(PMAKE) -C build-tree/src/usr.bin/file2c install DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin 170 | $(PMAKE) -C build-tree/src/usr.bin/brandelf install DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin 171 | 172 | for i in cksum lex mkdep ; do \ 173 | $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/$$i install \ 174 | DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \ 175 | done 176 | for i in config ; do \ 177 | $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/$$i install \ 178 | DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \ 179 | done 180 | $(PMAKE) -C build-tree/src/share/mk install \ 181 | DESTDIR=$(CURDIR)/debian/freebsd-mk BINDIR=/usr/share \ 182 | WITH_TESTS=yes 183 | 184 | $(PMAKE) -C build-tree/src/sys/dev/aic7xxx/aicasm install \ 185 | DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin 186 | 187 | ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) 188 | $(PMAKE) -C build-tree/src/usr.sbin/kldxref install \ 189 | DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin 190 | endif 191 | 192 | # Legacy make (aka fmake / fmtree) 193 | $(PMAKE) -C $(CURDIR)/build-tree/src/usr.bin/make install \ 194 | DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin 195 | $(PMAKE) -C $(CURDIR)/build-tree/src/usr.sbin/mtree install \ 196 | DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin 197 | 198 | # remove trash 199 | rm -rf $(CURDIR)/debian/$(package)/usr/include \ 200 | $(CURDIR)/debian/$(package)/var 201 | for i in `find $(CURDIR)/debian/$(package)/usr/share/man -type l` ; do \ 202 | rm $$i ; \ 203 | done 204 | rm -f $(CURDIR)/debian/$(package)/usr/share/man/man5/mtree.5.gz 205 | 206 | # relocate files 207 | for i in `cd $(CURDIR)/debian/$(package)/usr/lib/freebsd && ls` ; do \ 208 | ln -s ../lib/freebsd/$$i \ 209 | $(CURDIR)/debian/$(package)/usr/bin/freebsd-$$i ; \ 210 | for m in $(CURDIR)/debian/$(package)/usr/share/man/man[0-9]/$$i.* ; do \ 211 | mv $$m `echo $$m | sed -e 's:\(man[0-9]/\):\1freebsd-:'` ; \ 212 | done ; \ 213 | done 214 | rmdir $(CURDIR)/debian/$(package)/usr/sbin 215 | 216 | dh_install 217 | 218 | clean: 219 | dh_testdir 220 | dh_testroot 221 | rm -rf build-tree 222 | rm -f *-stamp 223 | 224 | dh_clean 225 | 226 | 227 | # Build architecture-independent files here. 228 | binary-indep: build binary-arch install 229 | # We have nothing to do by default. 230 | 231 | # Build architecture-dependent files here. 232 | binary-arch: build install 233 | dh_testdir 234 | dh_testroot 235 | # dh_installdebconf 236 | dh_installdocs 237 | # dh_installexamples 238 | # dh_installmenu 239 | # dh_installlogrotate 240 | # dh_installemacsen 241 | # dh_installpam 242 | # dh_installmime 243 | # dh_installinit 244 | # dh_installcron 245 | dh_installman 246 | # dh_installinfo 247 | dh_installchangelogs 248 | dh_link 249 | dh_strip 250 | dh_compress 251 | dh_fixperms 252 | # dh_makeshlibs 253 | dh_installdeb 254 | # dh_perl 255 | dh_shlibdeps 256 | dh_gencontrol 257 | dh_md5sums 258 | dh_builddeb 259 | 260 | binary: binary-indep binary-arch 261 | .PHONY: build clean binary-indep binary-arch binary install configure 262 | -------------------------------------------------------------------------------- /debian/patches/01_make_fixes.diff: -------------------------------------------------------------------------------- 1 | --- 2 | src/share/mk/bsd.incs.mk | 6 +++--- 3 | src/share/mk/bsd.info.mk | 16 +++------------- 4 | src/share/mk/bsd.lib.mk | 18 +++++++++--------- 5 | src/share/mk/bsd.man.mk | 8 ++++---- 6 | src/share/mk/bsd.own.mk | 8 ++++---- 7 | src/share/mk/sys.mk | 3 +-- 8 | 6 files changed, 24 insertions(+), 35 deletions(-) 9 | 10 | Index: freebsd-buildutils/src/share/mk/bsd.incs.mk 11 | =================================================================== 12 | --- freebsd-buildutils.orig/src/share/mk/bsd.incs.mk 13 | +++ freebsd-buildutils/src/share/mk/bsd.incs.mk 14 | @@ -41,7 +41,7 @@ ${group}NAME_${header:T}?= ${header:T} 15 | .endif 16 | installincludes: _${group}INS_${header:T} 17 | _${group}INS_${header:T}: ${header} 18 | - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ 19 | + ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ 20 | -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ 21 | ${.ALLSRC} \ 22 | ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} 23 | @@ -53,10 +53,10 @@ _${group}INCS+= ${header} 24 | installincludes: _${group}INS 25 | _${group}INS: ${_${group}INCS} 26 | .if defined(${group}NAME) 27 | - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ 28 | + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ 29 | ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} 30 | .else 31 | - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ 32 | + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ 33 | ${.ALLSRC} ${DESTDIR}${${group}DIR} 34 | .endif 35 | .endif 36 | Index: freebsd-buildutils/src/share/mk/bsd.info.mk 37 | =================================================================== 38 | --- freebsd-buildutils.orig/src/share/mk/bsd.info.mk 39 | +++ freebsd-buildutils/src/share/mk/bsd.info.mk 40 | @@ -73,7 +73,7 @@ MAKEINFO?= makeinfo 41 | MAKEINFOFLAGS+= --no-split # simplify some things, e.g., compression 42 | SRCDIR?= ${.CURDIR} 43 | INFODIRFILE?= dir 44 | -INSTALLINFO?= install-info 45 | +INSTALLINFO?= `which ginstall-info || which install-info` 46 | INSTALLINFOFLAGS+=--quiet 47 | INFOSECTION?= Miscellaneous 48 | ICOMPRESS_CMD?= ${COMPRESS_CMD} 49 | @@ -143,18 +143,8 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} 50 | .for x in ${INFO} 51 | INSTALLINFODIRS+= ${x:S/$/-install/} 52 | ${x:S/$/-install/}: 53 | -.if !empty(.MAKEFLAGS:M-j) 54 | - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ 55 | - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ 56 | - --defsection=${INFOSECTION} \ 57 | - --defentry=${INFOENTRY_${x}} \ 58 | - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} 59 | -.else 60 | - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ 61 | - --defsection=${INFOSECTION} \ 62 | - --defentry=${INFOENTRY_${x}} \ 63 | - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} 64 | -.endif 65 | + mkdir -p ${DESTDIR}${INFODIR} 66 | + install -m 644 ${x}.info ${DESTDIR}${INFODIR}/ 67 | .endfor 68 | 69 | .PHONY: ${INSTALLINFODIRS} 70 | Index: freebsd-buildutils/src/share/mk/bsd.lib.mk 71 | =================================================================== 72 | --- freebsd-buildutils.orig/src/share/mk/bsd.lib.mk 73 | +++ freebsd-buildutils/src/share/mk/bsd.lib.mk 74 | @@ -175,7 +175,7 @@ _LIBS= lib${LIB}.a 75 | lib${LIB}.a: ${OBJS} ${STATICOBJS} 76 | @${ECHO} building static ${LIB} library 77 | @rm -f ${.TARGET} 78 | - @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} 79 | + @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD} 80 | ${RANLIB} ${RANLIBFLAGS} ${.TARGET} 81 | .endif 82 | 83 | @@ -188,7 +188,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= 84 | lib${LIB}_p.a: ${POBJS} 85 | @${ECHO} building profiled ${LIB} library 86 | @rm -f ${.TARGET} 87 | - @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} 88 | + @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD} 89 | ${RANLIB} ${RANLIBFLAGS} ${.TARGET} 90 | .endif 91 | 92 | @@ -217,7 +217,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS} 93 | .endif 94 | ${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ 95 | -o ${.TARGET} -Wl,-soname,${SONAME} \ 96 | - `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} 97 | + `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD} 98 | .if ${MK_CTF} != "no" 99 | ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} 100 | .endif 101 | @@ -296,11 +296,11 @@ realinstall: _libinstall 102 | .ORDER: beforeinstall _libinstall 103 | _libinstall: 104 | .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" 105 | - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ 106 | + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ 107 | ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR} 108 | .endif 109 | .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) 110 | - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ 111 | + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ 112 | ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR} 113 | .endif 114 | .if defined(SHLIB_NAME) 115 | @@ -337,7 +337,7 @@ _libinstall: 116 | sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \ 117 | -e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \ 118 | ${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld 119 | - ${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ 120 | + ${INSTALL} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ 121 | ${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \ 122 | ${DESTDIR}${_LIBDIR}/${SHLIB_LINK} 123 | rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld 124 | Index: freebsd-buildutils/src/share/mk/bsd.own.mk 125 | =================================================================== 126 | --- freebsd-buildutils.orig/src/share/mk/bsd.own.mk 127 | +++ freebsd-buildutils/src/share/mk/bsd.own.mk 128 | @@ -18,7 +18,7 @@ 129 | # 130 | # BINOWN Binary owner. [root] 131 | # 132 | -# BINGRP Binary group. [wheel] 133 | +# BINGRP Binary group. [root] 134 | # 135 | # BINMODE Binary mode. [555] 136 | # 137 | @@ -65,7 +65,7 @@ 138 | # 139 | # SHAREOWN ASCII text file owner. [root] 140 | # 141 | -# SHAREGRP ASCII text file group. [wheel] 142 | +# SHAREGRP ASCII text file group. [root] 143 | # 144 | # SHAREMODE ASCII text file mode. [${NOBINMODE}] 145 | # 146 | @@ -131,7 +131,7 @@ SRCCONF?= /etc/src.conf 147 | 148 | # Binaries 149 | BINOWN?= root 150 | -BINGRP?= wheel 151 | +BINGRP?= root 152 | BINMODE?= 555 153 | NOBINMODE?= 444 154 | 155 | @@ -151,9 +151,9 @@ DTBMODE?= 444 156 | LIBDIR?= /usr/lib 157 | LIBCOMPATDIR?= /usr/lib/compat 158 | LIBPRIVATEDIR?= /usr/lib/private 159 | -LIBDATADIR?= /usr/libdata 160 | -LIBEXECDIR?= /usr/libexec 161 | -LINTLIBDIR?= /usr/libdata/lint 162 | +LIBDATADIR?= /usr/share 163 | +LIBEXECDIR?= ${LIBDIR} 164 | +LINTLIBDIR?= ${LIBDATADIR}/lint 165 | SHLIBDIR?= ${LIBDIR} 166 | LIBOWN?= ${BINOWN} 167 | LIBGRP?= ${BINGRP} 168 | @@ -166,7 +166,7 @@ DEBUGMODE?= ${NOBINMODE} 169 | # Share files 170 | SHAREDIR?= /usr/share 171 | SHAREOWN?= root 172 | -SHAREGRP?= wheel 173 | +SHAREGRP?= root 174 | SHAREMODE?= ${NOBINMODE} 175 | 176 | CONFDIR?= /etc 177 | @@ -202,8 +202,8 @@ INCLUDEDIR?= /usr/include 178 | HRDLINK?= -l h 179 | SYMLINK?= -l s 180 | 181 | -INSTALL_LINK?= ${INSTALL} ${HRDLINK} 182 | -INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK} 183 | +INSTALL_LINK?= ln 184 | +INSTALL_SYMLINK?= ln -s 185 | 186 | # Common variables 187 | .if !defined(DEBUG_FLAGS) 188 | Index: freebsd-buildutils/src/share/mk/sys.mk 189 | =================================================================== 190 | --- freebsd-buildutils.orig/src/share/mk/sys.mk 191 | +++ freebsd-buildutils/src/share/mk/sys.mk 192 | @@ -1,8 +1,7 @@ 193 | # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 194 | # $FreeBSD$ 195 | 196 | -unix ?= We run FreeBSD, not UNIX. 197 | -.FreeBSD ?= true 198 | +unix ?= We run Debian, not UNIX. 199 | 200 | .if !defined(%POSIX) 201 | # 202 | Index: freebsd-buildutils/src/share/mk/bsd.compiler.mk 203 | =================================================================== 204 | --- freebsd-buildutils.orig/src/share/mk/bsd.compiler.mk 205 | +++ freebsd-buildutils/src/share/mk/bsd.compiler.mk 206 | @@ -36,7 +36,8 @@ COMPILER_TYPE:= gcc 207 | . elif ${_v:Mclang} 208 | COMPILER_TYPE:= clang 209 | . else 210 | -.error Unable to determine compiler type for ${CC}. Consider setting COMPILER_TYPE. 211 | +# Fallback to gcc in order to support CC="cc" case 212 | +COMPILER_TYPE:= gcc 213 | . endif 214 | .endif 215 | .if !defined(COMPILER_VERSION) 216 | -------------------------------------------------------------------------------- /debian/patches/17_multiarch.diff: -------------------------------------------------------------------------------- 1 | --- 2 | src/share/mk/bsd.libnames.mk | 680 +++++++++++++++++++++++++++++++++++-------- 3 | src/share/mk/bsd.own.mk | 4 4 | src/usr.bin/make/main.c | 14 5 | src/usr.bin/make/make.1 | 6 6 | 4 files changed, 588 insertions(+), 116 deletions(-) 7 | 8 | --- a/src/usr.bin/make/main.c 9 | +++ b/src/usr.bin/make/main.c 10 | @@ -860,6 +860,7 @@ 11 | { 12 | const char *machine; 13 | const char *machine_arch; 14 | + const char *machine_multiarch; 15 | const char *machine_cpu; 16 | Boolean outOfDate = TRUE; /* FALSE if all targets up to date */ 17 | const char *p; 18 | @@ -946,8 +947,8 @@ 19 | * so we can share an executable for similar machines. 20 | * (i.e. m68k: amiga hp300, mac68k, sun3, ...) 21 | * 22 | - * Note that both MACHINE and MACHINE_ARCH are decided at 23 | - * run-time. 24 | + * Note that all of MACHINE, MACHINE_ARCH and MACHINE_MULTIARCH 25 | + * are decided at run-time. 26 | */ 27 | if (machine == NULL) { 28 | #ifdef MACHINE_ARCH 29 | @@ -965,6 +966,14 @@ 30 | #endif 31 | } 32 | 33 | + if ((machine_multiarch = getenv("MACHINE_MULTIARCH")) == NULL) { 34 | +#ifdef MACHINE_MULTIARCH 35 | + machine_multiarch = MACHINE_MULTIARCH; 36 | +#else 37 | + machine_multiarch = "unknown-unknown-unknown"; 38 | +#endif 39 | + } 40 | + 41 | /* 42 | * Set machine_cpu to the minumum supported CPU revision based 43 | * on the target architecture, if not already set. 44 | @@ -1007,6 +1016,7 @@ 45 | Var_SetGlobal("MFLAGS", ""); 46 | Var_SetGlobal("MACHINE", machine); 47 | Var_SetGlobal("MACHINE_ARCH", machine_arch); 48 | + Var_SetGlobal("MACHINE_MULTIARCH", machine_multiarch); 49 | Var_SetGlobal("MACHINE_CPU", machine_cpu); 50 | #ifdef MAKE_VERSION 51 | Var_SetGlobal("MAKE_VERSION", MAKE_VERSION); 52 | --- a/src/usr.bin/make/make.1 53 | +++ b/src/usr.bin/make/make.1 54 | @@ -815,6 +815,12 @@ 55 | Name of the machine architecture 56 | .Nm 57 | was compiled for, defined at compilation time. 58 | +.It Va MACHINE_MULTIARCH 59 | +Name of the machine multiarch triplet 60 | +.Nm 61 | +was compiler for, defined at compilation time. It's common use is for path 62 | +components, to allow co-installation in multiarch environment. 63 | +. 64 | .It Va VPATH 65 | Makefiles may assign a colon-delimited list of directories to 66 | .Va VPATH . 67 | --- a/src/share/mk/bsd.own.mk 68 | +++ b/src/share/mk/bsd.own.mk 69 | @@ -26,6 +26,9 @@ 70 | # 71 | # LIBDIR Base path for libraries. [/usr/lib] 72 | # 73 | +# LIBARCHDIR Base path for multi-arch libraries. 74 | +# [/usr/lib/${MACHINE_MULTIARCH}] 75 | +# 76 | # LIBCOMPATDIR Base path for compat libraries. [/usr/lib/compat] 77 | # 78 | # LIBDATADIR Base path for misc. utility data files. [/usr/libdata] 79 | @@ -127,6 +130,7 @@ 80 | KMODMODE?= ${BINMODE} 81 | 82 | LIBDIR?= /usr/lib 83 | +LIBARCHDIR?= /usr/lib/${MACHINE_MULTIARCH} 84 | LIBCOMPATDIR?= /usr/lib/compat 85 | LIBDATADIR?= /usr/libdata 86 | LINTLIBDIR?= /usr/libdata/lint 87 | --- a/src/share/mk/bsd.libnames.mk 88 | +++ b/src/share/mk/bsd.libnames.mk 89 | @@ -8,104 +8,424 @@ 90 | .error bsd.libnames.mk cannot be included directly. 91 | .endif 92 | 93 | -LIBCRT0?= ${DESTDIR}${LIBDIR}/crt0.o 94 | +.if exists(${DESTDIR}${LIBARCHDIR}/crt0.o) 95 | +LIBCRT0?= ${DESTDIR}${LIBARCHDIR}/crt0.o 96 | +.else 97 | +LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o 98 | +.endif 99 | 100 | -LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a 101 | -LIBARCHIVE?= ${DESTDIR}${LIBDIR}/libarchive.a 102 | -LIBASN1?= ${DESTDIR}${LIBDIR}/libasn1.a 103 | -LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a 104 | -LIBAUDITD?= ${DESTDIR}${LIBDIR}/libauditd.a 105 | -LIBAVL?= ${DESTDIR}${LIBDIR}/libavl.a 106 | -LIBBEGEMOT?= ${DESTDIR}${LIBDIR}/libbegemot.a 107 | +.if exists(${DESTDIR}${LIBARCHDIR}/libalias.a) 108 | +LIBALIAS?= ${DESTDIR}${LIBARCHDIR}/libalias.a 109 | +.else 110 | +LIBALIAS?= ${DESTDIR}/usr/lib/libalias.a 111 | +.endif 112 | +.if exists(${DESTDIR}${LIBARCHDIR}/libarchive.a) 113 | +LIBARCHIVE?= ${DESTDIR}${LIBARCHDIR}/libarchive.a 114 | +.else 115 | +LIBARCHIVE?= ${DESTDIR}/usr/lib/libarchive.a 116 | +.endif 117 | +.if exists(${DESTDIR}${LIBARCHDIR}/libasn1.a) 118 | +LIBASN1?= ${DESTDIR}${LIBARCHDIR}/libasn1.a 119 | +.else 120 | +LIBASN1?= ${DESTDIR}/usr/lib/libasn1.a 121 | +.endif 122 | +.if exists(${DESTDIR}${LIBARCHDIR}/libatm.a) 123 | +LIBATM?= ${DESTDIR}${LIBARCHDIR}/libatm.a 124 | +.else 125 | +LIBATM?= ${DESTDIR}/usr/lib/libatm.a 126 | +.endif 127 | +.if exists(${DESTDIR}${LIBARCHDIR}/libauditd.a) 128 | +LIBAUDITD?= ${DESTDIR}${LIBARCHDIR}/libauditd.a 129 | +.else 130 | +LIBAUDITD?= ${DESTDIR}/usr/lib/libauditd.a 131 | +.endif 132 | +.if exists(${DESTDIR}${LIBARCHDIR}/libavl.a) 133 | +LIBAVL?= ${DESTDIR}${LIBARCHDIR}/libavl.a 134 | +.else 135 | +LIBAVL?= ${DESTDIR}/usr/lib/libavl.a 136 | +.endif 137 | +.if exists(${DESTDIR}${LIBARCHDIR}/libbegemot.a) 138 | +LIBBEGEMOT?= ${DESTDIR}${LIBARCHDIR}/libbegemot.a 139 | +.else 140 | +LIBBEGEMOT?= ${DESTDIR}/usr/lib/libbegemot.a 141 | +.endif 142 | .if ${MK_BIND_LIBS} != "no" 143 | -LIBBIND?= ${DESTDIR}${LIBDIR}/libbind.a 144 | -LIBBIND9?= ${DESTDIR}${LIBDIR}/libbind9.a 145 | +.if exists(${DESTDIR}${LIBARCHDIR}/libbind.a) 146 | +LIBBIND?= ${DESTDIR}${LIBARCHDIR}/libbind.a 147 | +.else 148 | +LIBBIND?= ${DESTDIR}/usr/lib/libbind.a 149 | +.endif 150 | +.if exists(${DESTDIR}${LIBARCHDIR}/libbind9.a) 151 | +LIBBIND9?= ${DESTDIR}${LIBARCHDIR}/libbind9.a 152 | +.else 153 | +LIBBIND9?= ${DESTDIR}/usr/lib/libbind9.a 154 | +.endif 155 | +.endif 156 | +.if exists(${DESTDIR}${LIBARCHDIR}/libbluetooth.a) 157 | +LIBBLUETOOTH?= ${DESTDIR}${LIBARCHDIR}/libbluetooth.a 158 | +.else 159 | +LIBBLUETOOTH?= ${DESTDIR}/usr/lib/libbluetooth.a 160 | +.endif 161 | +.if exists(${DESTDIR}${LIBARCHDIR}/libbsdxml.a) 162 | +LIBBSDXML?= ${DESTDIR}${LIBARCHDIR}/libbsdxml.a 163 | +.else 164 | +LIBBSDXML?= ${DESTDIR}/usr/lib/libbsdxml.a 165 | +.endif 166 | +.if exists(${DESTDIR}${LIBARCHDIR}/libbsm.a) 167 | +LIBBSM?= ${DESTDIR}${LIBARCHDIR}/libbsm.a 168 | +.else 169 | +LIBBSM?= ${DESTDIR}/usr/lib/libbsm.a 170 | +.endif 171 | +.if exists(${DESTDIR}${LIBARCHDIR}/libbsnmp.a) 172 | +LIBBSNMP?= ${DESTDIR}${LIBARCHDIR}/libbsnmp.a 173 | +.else 174 | +LIBBSNMP?= ${DESTDIR}/usr/lib/libbsnmp.a 175 | +.endif 176 | +.if exists(${DESTDIR}${LIBARCHDIR}/libbz2.a) 177 | +LIBBZ2?= ${DESTDIR}${LIBARCHDIR}/libbz2.a 178 | +.else 179 | +LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a 180 | +.endif 181 | +.if exists(${DESTDIR}${LIBARCHDIR}/libc.a) 182 | +LIBC?= ${DESTDIR}${LIBARCHDIR}/libc.a 183 | +.else 184 | +LIBC?= ${DESTDIR}/usr/lib/libc.a 185 | +.endif 186 | +.if exists(${DESTDIR}${LIBARCHDIR}/libc_pic.a) 187 | +LIBC_PIC?= ${DESTDIR}${LIBARCHDIR}/libc_pic.a 188 | +.else 189 | +LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a 190 | +.endif 191 | +.if exists(${DESTDIR}${LIBARCHDIR}/libcalendar.a) 192 | +LIBCALENDAR?= ${DESTDIR}${LIBARCHDIR}/libcalendar.a 193 | +.else 194 | +LIBCALENDAR?= ${DESTDIR}/usr/lib/libcalendar.a 195 | +.endif 196 | +.if exists(${DESTDIR}${LIBARCHDIR}/libcam.a) 197 | +LIBCAM?= ${DESTDIR}${LIBARCHDIR}/libcam.a 198 | +.else 199 | +LIBCAM?= ${DESTDIR}/usr/lib/libcam.a 200 | +.endif 201 | +.if exists(${DESTDIR}${LIBARCHDIR}/libcom_err.a) 202 | +LIBCOM_ERR?= ${DESTDIR}${LIBARCHDIR}/libcom_err.a 203 | +.else 204 | +LIBCOM_ERR?= ${DESTDIR}/usr/lib/libcom_err.a 205 | +.endif 206 | +.if exists(${DESTDIR}${LIBARCHDIR}/libcompat.a) 207 | +LIBCOMPAT?= ${DESTDIR}${LIBARCHDIR}/libcompat.a 208 | +.else 209 | +LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a 210 | +.endif 211 | +.if exists(${DESTDIR}${LIBARCHDIR}/libcrypt.a) 212 | +LIBCRYPT?= ${DESTDIR}${LIBARCHDIR}/libcrypt.a 213 | +.else 214 | +LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a 215 | +.endif 216 | +.if exists(${DESTDIR}${LIBARCHDIR}/libcrypto.a) 217 | +LIBCRYPTO?= ${DESTDIR}${LIBARCHDIR}/libcrypto.a 218 | +.else 219 | +LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a 220 | +.endif 221 | +.if exists(${DESTDIR}${LIBARCHDIR}/libctf.a) 222 | +LIBCTF?= ${DESTDIR}${LIBARCHDIR}/libctf.a 223 | +.else 224 | +LIBCTF?= ${DESTDIR}/usr/lib/libctf.a 225 | +.endif 226 | +.if exists(${DESTDIR}${LIBARCHDIR}/libcurses.a) 227 | +LIBCURSES?= ${DESTDIR}${LIBARCHDIR}/libcurses.a 228 | +.else 229 | +LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a 230 | +.endif 231 | +.if exists(${DESTDIR}${LIBARCHDIR}/libdevinfo.a) 232 | +LIBDEVINFO?= ${DESTDIR}${LIBARCHDIR}/libdevinfo.a 233 | +.else 234 | +LIBDEVINFO?= ${DESTDIR}/usr/lib/libdevinfo.a 235 | +.endif 236 | +.if exists(${DESTDIR}${LIBARCHDIR}/libdevstat.a) 237 | +LIBDEVSTAT?= ${DESTDIR}${LIBARCHDIR}/libdevstat.a 238 | +.else 239 | +LIBDEVSTAT?= ${DESTDIR}/usr/lib/libdevstat.a 240 | +.endif 241 | +.if exists(${DESTDIR}${LIBARCHDIR}/libdialog.a) 242 | +LIBDIALOG?= ${DESTDIR}${LIBARCHDIR}/libdialog.a 243 | +.else 244 | +LIBDIALOG?= ${DESTDIR}/usr/lib/libdialog.a 245 | +.endif 246 | +.if exists(${DESTDIR}${LIBARCHDIR}/libdisk.a) 247 | +LIBDISK?= ${DESTDIR}${LIBARCHDIR}/libdisk.a 248 | +.else 249 | +LIBDISK?= ${DESTDIR}/usr/lib/libdisk.a 250 | +.endif 251 | +.if exists(${DESTDIR}${LIBARCHDIR}/libdns.a) 252 | +LIBDNS?= ${DESTDIR}${LIBARCHDIR}/libdns.a 253 | +.else 254 | +LIBDNS?= ${DESTDIR}/usr/lib/libdns.a 255 | +.endif 256 | +.if exists(${DESTDIR}${LIBARCHDIR}/libdtrace.a) 257 | +LIBDTRACE?= ${DESTDIR}${LIBARCHDIR}/libdtrace.a 258 | +.else 259 | +LIBDTRACE?= ${DESTDIR}/usr/lib/libdtrace.a 260 | +.endif 261 | +.if exists(${DESTDIR}${LIBARCHDIR}/libdwarf.a) 262 | +LIBDWARF?= ${DESTDIR}${LIBARCHDIR}/libdwarf.a 263 | +.else 264 | +LIBDWARF?= ${DESTDIR}/usr/lib/libdwarf.a 265 | +.endif 266 | +.if exists(${DESTDIR}${LIBARCHDIR}/libedit.a) 267 | +LIBEDIT?= ${DESTDIR}${LIBARCHDIR}/libedit.a 268 | +.else 269 | +LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a 270 | +.endif 271 | +.if exists(${DESTDIR}${LIBARCHDIR}/libelf.a) 272 | +LIBELF?= ${DESTDIR}${LIBARCHDIR}/libelf.a 273 | +.else 274 | +LIBELF?= ${DESTDIR}/usr/lib/libelf.a 275 | +.endif 276 | +.if exists(${DESTDIR}${LIBARCHDIR}/libfetch.a) 277 | +LIBFETCH?= ${DESTDIR}${LIBARCHDIR}/libfetch.a 278 | +.else 279 | +LIBFETCH?= ${DESTDIR}/usr/lib/libfetch.a 280 | .endif 281 | -LIBBLUETOOTH?= ${DESTDIR}${LIBDIR}/libbluetooth.a 282 | -LIBBSDXML?= ${DESTDIR}${LIBDIR}/libbsdxml.a 283 | -LIBBSM?= ${DESTDIR}${LIBDIR}/libbsm.a 284 | -LIBBSNMP?= ${DESTDIR}${LIBDIR}/libbsnmp.a 285 | -LIBBZ2?= ${DESTDIR}${LIBDIR}/libbz2.a 286 | -LIBC?= ${DESTDIR}${LIBDIR}/libc.a 287 | -LIBC_PIC?= ${DESTDIR}${LIBDIR}/libc_pic.a 288 | -LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a 289 | -LIBCAM?= ${DESTDIR}${LIBDIR}/libcam.a 290 | -LIBCOM_ERR?= ${DESTDIR}${LIBDIR}/libcom_err.a 291 | -LIBCOMPAT?= ${DESTDIR}${LIBDIR}/libcompat.a 292 | -LIBCRYPT?= ${DESTDIR}${LIBDIR}/libcrypt.a 293 | -LIBCRYPTO?= ${DESTDIR}${LIBDIR}/libcrypto.a 294 | -LIBCTF?= ${DESTDIR}${LIBDIR}/libctf.a 295 | -LIBCURSES?= ${DESTDIR}${LIBDIR}/libcurses.a 296 | -LIBDEVINFO?= ${DESTDIR}${LIBDIR}/libdevinfo.a 297 | -LIBDEVSTAT?= ${DESTDIR}${LIBDIR}/libdevstat.a 298 | -LIBDIALOG?= ${DESTDIR}${LIBDIR}/libdialog.a 299 | -LIBDISK?= ${DESTDIR}${LIBDIR}/libdisk.a 300 | -LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a 301 | -LIBDTRACE?= ${DESTDIR}${LIBDIR}/libdtrace.a 302 | -LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a 303 | -LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a 304 | -LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a 305 | -LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a 306 | LIBFL?= "don't use LIBFL, use LIBL" 307 | -LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a 308 | -LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a 309 | -LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a 310 | -LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a 311 | -LIBGCC_PIC?= ${DESTDIR}${LIBDIR}/libgcc_pic.a 312 | -LIBGEOM?= ${DESTDIR}${LIBDIR}/libgeom.a 313 | -LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnuregex.a 314 | -LIBGSSAPI?= ${DESTDIR}${LIBDIR}/libgssapi.a 315 | -LIBGSSAPI_KRB5?= ${DESTDIR}${LIBDIR}/libgssapi_krb5.a 316 | -LIBHDB?= ${DESTDIR}${LIBDIR}/libhdb.a 317 | -LIBHISTORY?= ${DESTDIR}${LIBDIR}/libhistory.a 318 | -LIBHEIMNTLM?= ${DESTDIR}${LIBDIR}/libheimntlm.a 319 | -LIBHX509?= ${DESTDIR}${LIBDIR}/libhx509.a 320 | -LIBIPSEC?= ${DESTDIR}${LIBDIR}/libipsec.a 321 | +.if exists(${DESTDIR}${LIBARCHDIR}/libform.a) 322 | +LIBFORM?= ${DESTDIR}${LIBARCHDIR}/libform.a 323 | +.else 324 | +LIBFORM?= ${DESTDIR}/usr/lib/libform.a 325 | +.endif 326 | +.if exists(${DESTDIR}${LIBARCHDIR}/libftpio.a) 327 | +LIBFTPIO?= ${DESTDIR}${LIBARCHDIR}/libftpio.a 328 | +.else 329 | +LIBFTPIO?= ${DESTDIR}/usr/lib/libftpio.a 330 | +.endif 331 | +.if exists(${DESTDIR}${LIBARCHDIR}/libg2c.a) 332 | +LIBG2C?= ${DESTDIR}${LIBARCHDIR}/libg2c.a 333 | +.else 334 | +LIBG2C?= ${DESTDIR}/usr/lib/libg2c.a 335 | +.endif 336 | +.if exists(${DESTDIR}${LIBARCHDIR}/libgcc.a) 337 | +LIBGCC?= ${DESTDIR}${LIBARCHDIR}/libgcc.a 338 | +.else 339 | +LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a 340 | +.endif 341 | +.if exists(${DESTDIR}${LIBARCHDIR}/libgcc_pic.a) 342 | +LIBGCC_PIC?= ${DESTDIR}${LIBARCHDIR}/libgcc_pic.a 343 | +.else 344 | +LIBGCC_PIC?= ${DESTDIR}/usr/lib/libgcc_pic.a 345 | +.endif 346 | +.if exists(${DESTDIR}${LIBARCHDIR}/libgeom.a) 347 | +LIBGEOM?= ${DESTDIR}${LIBARCHDIR}/libgeom.a 348 | +.else 349 | +LIBGEOM?= ${DESTDIR}/usr/lib/libgeom.a 350 | +.endif 351 | +.if exists(${DESTDIR}${LIBARCHDIR}/libgnuregex.a) 352 | +LIBGNUREGEX?= ${DESTDIR}${LIBARCHDIR}/libgnuregex.a 353 | +.else 354 | +LIBGNUREGEX?= ${DESTDIR}/usr/lib/libgnuregex.a 355 | +.endif 356 | +.if exists(${DESTDIR}${LIBARCHDIR}/libgssapi.a) 357 | +LIBGSSAPI?= ${DESTDIR}${LIBARCHDIR}/libgssapi.a 358 | +.else 359 | +LIBGSSAPI?= ${DESTDIR}/usr/lib/libgssapi.a 360 | +.endif 361 | +.if exists(${DESTDIR}${LIBARCHDIR}/libgssapi_krb5.a) 362 | +LIBGSSAPI_KRB5?= ${DESTDIR}${LIBARCHDIR}/libgssapi_krb5.a 363 | +.else 364 | +LIBGSSAPI_KRB5?= ${DESTDIR}/usr/lib/libgssapi_krb5.a 365 | +.endif 366 | +.if exists(${DESTDIR}${LIBARCHDIR}/libhdb.a) 367 | +LIBHDB?= ${DESTDIR}${LIBARCHDIR}/libhdb.a 368 | +.else 369 | +LIBHDB?= ${DESTDIR}/usr/lib/libhdb.a 370 | +.endif 371 | +.if exists(${DESTDIR}${LIBARCHDIR}/libhistory.a) 372 | +LIBHISTORY?= ${DESTDIR}${LIBARCHDIR}/libhistory.a 373 | +.else 374 | +LIBHISTORY?= ${DESTDIR}/usr/lib/libhistory.a 375 | +.endif 376 | +.if exists(${DESTDIR}${LIBARCHDIR}/libheimntlm.a) 377 | +LIBHEIMNTLM?= ${DESTDIR}${LIBARCHDIR}/libheimntlm.a 378 | +.else 379 | +LIBHEIMNTLM?= ${DESTDIR}/usr/lib/libheimntlm.a 380 | +.endif 381 | +.if exists(${DESTDIR}${LIBARCHDIR}/libhx509.a) 382 | +LIBHX509?= ${DESTDIR}${LIBARCHDIR}/libhx509.a 383 | +.else 384 | +LIBHX509?= ${DESTDIR}/usr/lib/libhx509.a 385 | +.endif 386 | +.if exists(${DESTDIR}${LIBARCHDIR}/libipsec.a) 387 | +LIBIPSEC?= ${DESTDIR}${LIBARCHDIR}/libipsec.a 388 | +.else 389 | +LIBIPSEC?= ${DESTDIR}/usr/lib/libipsec.a 390 | +.endif 391 | .if ${MK_IPX} != "no" 392 | -LIBIPX?= ${DESTDIR}${LIBDIR}/libipx.a 393 | +.if exists(${DESTDIR}${LIBARCHDIR}/libipx.a) 394 | +LIBIPX?= ${DESTDIR}${LIBARCHDIR}/libipx.a 395 | +.else 396 | +LIBIPX?= ${DESTDIR}/usr/lib/libipx.a 397 | +.endif 398 | .endif 399 | .if ${MK_BIND_LIBS} != "no" 400 | -LIBISC?= ${DESTDIR}${LIBDIR}/libisc.a 401 | -LIBISCCC?= ${DESTDIR}${LIBDIR}/libisccc.a 402 | -LIBISCCFG?= ${DESTDIR}${LIBDIR}/libisccfg.a 403 | -.endif 404 | -LIBJAIL?= ${DESTDIR}${LIBDIR}/libjail.a 405 | -LIBKADM5CLNT?= ${DESTDIR}${LIBDIR}/libkadm5clnt.a 406 | -LIBKADM5SRV?= ${DESTDIR}${LIBDIR}/libkadm5srv.a 407 | -LIBKAFS5?= ${DESTDIR}${LIBDIR}/libkafs5.a 408 | -LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeycap.a 409 | -LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a 410 | -LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a 411 | -LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a 412 | -LIBL?= ${DESTDIR}${LIBDIR}/libl.a 413 | +.if exists(${DESTDIR}${LIBARCHDIR}/libisc.a) 414 | +LIBISC?= ${DESTDIR}${LIBARCHDIR}/libisc.a 415 | +.else 416 | +LIBISC?= ${DESTDIR}/usr/lib/libisc.a 417 | +.endif 418 | +.if exists(${DESTDIR}${LIBARCHDIR}/libisccc.a) 419 | +LIBISCCC?= ${DESTDIR}${LIBARCHDIR}/libisccc.a 420 | +.else 421 | +LIBISCCC?= ${DESTDIR}/usr/lib/libisccc.a 422 | +.endif 423 | +.if exists(${DESTDIR}${LIBARCHDIR}/libisccfg.a) 424 | +LIBISCCFG?= ${DESTDIR}${LIBARCHDIR}/libisccfg.a 425 | +.else 426 | +LIBISCCFG?= ${DESTDIR}/usr/lib/libisccfg.a 427 | +.endif 428 | +.endif 429 | +.if exists(${DESTDIR}${LIBARCHDIR}/libjail.a) 430 | +LIBJAIL?= ${DESTDIR}${LIBARCHDIR}/libjail.a 431 | +.else 432 | +LIBJAIL?= ${DESTDIR}/usr/lib/libjail.a 433 | +.endif 434 | +.if exists(${DESTDIR}${LIBARCHDIR}/libkadm5clnt.a) 435 | +LIBKADM5CLNT?= ${DESTDIR}${LIBARCHDIR}/libkadm5clnt.a 436 | +.else 437 | +LIBKADM5CLNT?= ${DESTDIR}/usr/lib/libkadm5clnt.a 438 | +.endif 439 | +.if exists(${DESTDIR}${LIBARCHDIR}/libkadm5srv.a) 440 | +LIBKADM5SRV?= ${DESTDIR}${LIBARCHDIR}/libkadm5srv.a 441 | +.else 442 | +LIBKADM5SRV?= ${DESTDIR}/usr/lib/libkadm5srv.a 443 | +.endif 444 | +.if exists(${DESTDIR}${LIBARCHDIR}/libkafs5.a) 445 | +LIBKAFS5?= ${DESTDIR}${LIBARCHDIR}/libkafs5.a 446 | +.else 447 | +LIBKAFS5?= ${DESTDIR}/usr/lib/libkafs5.a 448 | +.endif 449 | +.if exists(${DESTDIR}${LIBARCHDIR}/libkeycap.a) 450 | +LIBKEYCAP?= ${DESTDIR}${LIBARCHDIR}/libkeycap.a 451 | +.else 452 | +LIBKEYCAP?= ${DESTDIR}/usr/lib/libkeycap.a 453 | +.endif 454 | +.if exists(${DESTDIR}${LIBARCHDIR}/libkiconv.a) 455 | +LIBKICONV?= ${DESTDIR}${LIBARCHDIR}/libkiconv.a 456 | +.else 457 | +LIBKICONV?= ${DESTDIR}/usr/lib/libkiconv.a 458 | +.endif 459 | +.if exists(${DESTDIR}${LIBARCHDIR}/libkrb5.a) 460 | +LIBKRB5?= ${DESTDIR}${LIBARCHDIR}/libkrb5.a 461 | +.else 462 | +LIBKRB5?= ${DESTDIR}/usr/lib/libkrb5.a 463 | +.endif 464 | +.if exists(${DESTDIR}${LIBARCHDIR}/libkvm.a) 465 | +LIBKVM?= ${DESTDIR}${LIBARCHDIR}/libkvm.a 466 | +.else 467 | +LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a 468 | +.endif 469 | +.if exists(${DESTDIR}${LIBARCHDIR}/libl.a) 470 | +LIBL?= ${DESTDIR}${LIBARCHDIR}/libl.a 471 | +.else 472 | +LIBL?= ${DESTDIR}/usr/lib/libl.a 473 | +.endif 474 | LIBLN?= "don't use LIBLN, use LIBL" 475 | .if ${MK_BIND} != "no" 476 | -LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a 477 | +.if exists(${DESTDIR}${LIBARCHDIR}/liblwres.a) 478 | +LIBLWRES?= ${DESTDIR}${LIBARCHDIR}/liblwres.a 479 | +.else 480 | +LIBLWRES?= ${DESTDIR}/usr/lib/liblwres.a 481 | +.endif 482 | +.endif 483 | +.if exists(${DESTDIR}${LIBARCHDIR}/liblzma.a) 484 | +LIBLZMA?= ${DESTDIR}${LIBARCHDIR}/liblzma.a 485 | +.else 486 | +LIBLZMA?= ${DESTDIR}/usr/lib/liblzma.a 487 | +.endif 488 | +.if exists(${DESTDIR}${LIBARCHDIR}/libm.a) 489 | +LIBM?= ${DESTDIR}${LIBARCHDIR}/libm.a 490 | +.else 491 | +LIBM?= ${DESTDIR}/usr/lib/libm.a 492 | +.endif 493 | +.if exists(${DESTDIR}${LIBARCHDIR}/libmagic.a) 494 | +LIBMAGIC?= ${DESTDIR}${LIBARCHDIR}/libmagic.a 495 | +.else 496 | +LIBMAGIC?= ${DESTDIR}/usr/lib/libmagic.a 497 | +.endif 498 | +.if exists(${DESTDIR}${LIBARCHDIR}/libmd.a) 499 | +LIBMD?= ${DESTDIR}${LIBARCHDIR}/libmd.a 500 | +.else 501 | +LIBMD?= ${DESTDIR}/usr/lib/libmd.a 502 | +.endif 503 | +.if exists(${DESTDIR}${LIBARCHDIR}/libmemstat.a) 504 | +LIBMEMSTAT?= ${DESTDIR}${LIBARCHDIR}/libmemstat.a 505 | +.else 506 | +LIBMEMSTAT?= ${DESTDIR}/usr/lib/libmemstat.a 507 | +.endif 508 | +.if exists(${DESTDIR}${LIBARCHDIR}/libmenu.a) 509 | +LIBMENU?= ${DESTDIR}${LIBARCHDIR}/libmenu.a 510 | +.else 511 | +LIBMENU?= ${DESTDIR}/usr/lib/libmenu.a 512 | .endif 513 | -LIBLZMA?= ${DESTDIR}${LIBDIR}/liblzma.a 514 | -LIBM?= ${DESTDIR}${LIBDIR}/libm.a 515 | -LIBMAGIC?= ${DESTDIR}${LIBDIR}/libmagic.a 516 | -LIBMD?= ${DESTDIR}${LIBDIR}/libmd.a 517 | -LIBMEMSTAT?= ${DESTDIR}${LIBDIR}/libmemstat.a 518 | -LIBMENU?= ${DESTDIR}${LIBDIR}/libmenu.a 519 | .if ${MK_SENDMAIL} != "no" 520 | -LIBMILTER?= ${DESTDIR}${LIBDIR}/libmilter.a 521 | +.if exists(${DESTDIR}${LIBARCHDIR}/libmilter.a) 522 | +LIBMILTER?= ${DESTDIR}${LIBARCHDIR}/libmilter.a 523 | +.else 524 | +LIBMILTER?= ${DESTDIR}/usr/lib/libmilter.a 525 | +.endif 526 | +.endif 527 | +.if exists(${DESTDIR}${LIBARCHDIR}/libmp.a) 528 | +LIBMP?= ${DESTDIR}${LIBARCHDIR}/libmp.a 529 | +.else 530 | +LIBMP?= ${DESTDIR}/usr/lib/libmp.a 531 | .endif 532 | -LIBMP?= ${DESTDIR}${LIBDIR}/libmp.a 533 | .if ${MK_NCP} != "no" 534 | -LIBNCP?= ${DESTDIR}${LIBDIR}/libncp.a 535 | +.if exists(${DESTDIR}${LIBARCHDIR}/libncp.a) 536 | +LIBNCP?= ${DESTDIR}${LIBARCHDIR}/libncp.a 537 | +.else 538 | +LIBNCP?= ${DESTDIR}/usr/lib/libncp.a 539 | +.endif 540 | +.endif 541 | +.if exists(${DESTDIR}${LIBARCHDIR}/libncurses.a) 542 | +LIBNCURSES?= ${DESTDIR}${LIBARCHDIR}/libncurses.a 543 | +.else 544 | +LIBNCURSES?= ${DESTDIR}/usr/lib/libncurses.a 545 | +.endif 546 | +.if exists(${DESTDIR}${LIBARCHDIR}/libncursesw.a) 547 | +LIBNCURSESW?= ${DESTDIR}${LIBARCHDIR}/libncursesw.a 548 | +.else 549 | +LIBNCURSESW?= ${DESTDIR}/usr/lib/libncursesw.a 550 | +.endif 551 | +.if exists(${DESTDIR}${LIBARCHDIR}/libnetgraph.a) 552 | +LIBNETGRAPH?= ${DESTDIR}${LIBARCHDIR}/libnetgraph.a 553 | +.else 554 | +LIBNETGRAPH?= ${DESTDIR}/usr/lib/libnetgraph.a 555 | +.endif 556 | +.if exists(${DESTDIR}${LIBARCHDIR}/libngatm.a) 557 | +LIBNGATM?= ${DESTDIR}${LIBARCHDIR}/libngatm.a 558 | +.else 559 | +LIBNGATM?= ${DESTDIR}/usr/lib/libngatm.a 560 | +.endif 561 | +.if exists(${DESTDIR}${LIBARCHDIR}/libnvpair.a) 562 | +LIBNVPAIR?= ${DESTDIR}${LIBARCHDIR}/libnvpair.a 563 | +.else 564 | +LIBNVPAIR?= ${DESTDIR}/usr/lib/libnvpair.a 565 | +.endif 566 | +.if exists(${DESTDIR}${LIBARCHDIR}/libobjc.a) 567 | +LIBOBJC?= ${DESTDIR}${LIBARCHDIR}/libobjc.a 568 | +.else 569 | +LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a 570 | +.endif 571 | +.if exists(${DESTDIR}${LIBARCHDIR}/libopie.a) 572 | +LIBOPIE?= ${DESTDIR}${LIBARCHDIR}/libopie.a 573 | +.else 574 | +LIBOPIE?= ${DESTDIR}/usr/lib/libopie.a 575 | .endif 576 | -LIBNCURSES?= ${DESTDIR}${LIBDIR}/libncurses.a 577 | -LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncursesw.a 578 | -LIBNETGRAPH?= ${DESTDIR}${LIBDIR}/libnetgraph.a 579 | -LIBNGATM?= ${DESTDIR}${LIBDIR}/libngatm.a 580 | -LIBNVPAIR?= ${DESTDIR}${LIBDIR}/libnvpair.a 581 | -LIBOBJC?= ${DESTDIR}${LIBDIR}/libobjc.a 582 | -LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a 583 | 584 | # The static PAM library doesn't know its secondary dependencies, 585 | # so we have to specify them explicitly. 586 | -LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a 587 | +.if exists(${DESTDIR}${LIBARCHDIR}/libpam.a) 588 | +LIBPAM?= ${DESTDIR}${LIBARCHDIR}/libpam.a 589 | +.else 590 | +LIBPAM?= ${DESTDIR}/usr/lib/libpam.a 591 | +.endif 592 | MINUSLPAM= -lpam 593 | .if defined(LDFLAGS) && !empty(LDFLAGS:M-static) 594 | .if ${MK_KERBEROS} != "no" 595 | @@ -127,38 +447,170 @@ 596 | .endif 597 | .endif 598 | 599 | -LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a 600 | -LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a 601 | -LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a 602 | -LIBPROC?= ${DESTDIR}${LIBDIR}/libproc.a 603 | -LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a 604 | -LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a 605 | -LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a 606 | -LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a 607 | -LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a 608 | -LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a 609 | -LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a 610 | -LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a 611 | -LIBSSH?= ${DESTDIR}${LIBDIR}/libssh.a 612 | -LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a 613 | -LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a 614 | -LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a 615 | -LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a 616 | -LIBTERMCAP?= ${DESTDIR}${LIBDIR}/libtermcap.a 617 | +.if exists(${DESTDIR}${LIBARCHDIR}/libpanel.a) 618 | +LIBPANEL?= ${DESTDIR}${LIBARCHDIR}/libpanel.a 619 | +.else 620 | +LIBPANEL?= ${DESTDIR}/usr/lib/libpanel.a 621 | +.endif 622 | +.if exists(${DESTDIR}${LIBARCHDIR}/libpcap.a) 623 | +LIBPCAP?= ${DESTDIR}${LIBARCHDIR}/libpcap.a 624 | +.else 625 | +LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a 626 | +.endif 627 | +.if exists(${DESTDIR}${LIBARCHDIR}/libpmc.a) 628 | +LIBPMC?= ${DESTDIR}${LIBARCHDIR}/libpmc.a 629 | +.else 630 | +LIBPMC?= ${DESTDIR}/usr/lib/libpmc.a 631 | +.endif 632 | +.if exists(${DESTDIR}${LIBARCHDIR}/libproc.a) 633 | +LIBPROC?= ${DESTDIR}${LIBARCHDIR}/libproc.a 634 | +.else 635 | +LIBPROC?= ${DESTDIR}/usr/lib/libproc.a 636 | +.endif 637 | +.if exists(${DESTDIR}${LIBARCHDIR}/libpthread.a) 638 | +LIBPTHREAD?= ${DESTDIR}${LIBARCHDIR}/libpthread.a 639 | +.else 640 | +LIBPTHREAD?= ${DESTDIR}/usr/lib/libpthread.a 641 | +.endif 642 | +.if exists(${DESTDIR}${LIBARCHDIR}/libradius.a) 643 | +LIBRADIUS?= ${DESTDIR}${LIBARCHDIR}/libradius.a 644 | +.else 645 | +LIBRADIUS?= ${DESTDIR}/usr/lib/libradius.a 646 | +.endif 647 | +.if exists(${DESTDIR}${LIBARCHDIR}/libreadline.a) 648 | +LIBREADLINE?= ${DESTDIR}${LIBARCHDIR}/libreadline.a 649 | +.else 650 | +LIBREADLINE?= ${DESTDIR}/usr/lib/libreadline.a 651 | +.endif 652 | +.if exists(${DESTDIR}${LIBARCHDIR}/libroken.a) 653 | +LIBROKEN?= ${DESTDIR}${LIBARCHDIR}/libroken.a 654 | +.else 655 | +LIBROKEN?= ${DESTDIR}/usr/lib/libroken.a 656 | +.endif 657 | +.if exists(${DESTDIR}${LIBARCHDIR}/librpcsvc.a) 658 | +LIBRPCSVC?= ${DESTDIR}${LIBARCHDIR}/librpcsvc.a 659 | +.else 660 | +LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a 661 | +.endif 662 | +.if exists(${DESTDIR}${LIBARCHDIR}/libsbuf.a) 663 | +LIBSBUF?= ${DESTDIR}${LIBARCHDIR}/libsbuf.a 664 | +.else 665 | +LIBSBUF?= ${DESTDIR}/usr/lib/libsbuf.a 666 | +.endif 667 | +.if exists(${DESTDIR}${LIBARCHDIR}/libsdp.a) 668 | +LIBSDP?= ${DESTDIR}${LIBARCHDIR}/libsdp.a 669 | +.else 670 | +LIBSDP?= ${DESTDIR}/usr/lib/libsdp.a 671 | +.endif 672 | +.if exists(${DESTDIR}${LIBARCHDIR}/libsmb.a) 673 | +LIBSMB?= ${DESTDIR}${LIBARCHDIR}/libsmb.a 674 | +.else 675 | +LIBSMB?= ${DESTDIR}/usr/lib/libsmb.a 676 | +.endif 677 | +.if exists(${DESTDIR}${LIBARCHDIR}/libssh.a) 678 | +LIBSSH?= ${DESTDIR}${LIBARCHDIR}/libssh.a 679 | +.else 680 | +LIBSSH?= ${DESTDIR}/usr/lib/libssh.a 681 | +.endif 682 | +.if exists(${DESTDIR}${LIBARCHDIR}/libssl.a) 683 | +LIBSSL?= ${DESTDIR}${LIBARCHDIR}/libssl.a 684 | +.else 685 | +LIBSSL?= ${DESTDIR}/usr/lib/libssl.a 686 | +.endif 687 | +.if exists(${DESTDIR}${LIBARCHDIR}/libstand.a) 688 | +LIBSTAND?= ${DESTDIR}${LIBARCHDIR}/libstand.a 689 | +.else 690 | +LIBSTAND?= ${DESTDIR}/usr/lib/libstand.a 691 | +.endif 692 | +.if exists(${DESTDIR}${LIBARCHDIR}/libstdc++.a) 693 | +LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBARCHDIR}/libstdc++.a 694 | +.else 695 | +LIBSTDCPLUSPLUS?= ${DESTDIR}/usr/lib/libstdc++.a 696 | +.endif 697 | +.if exists(${DESTDIR}${LIBARCHDIR}/libtacplus.a) 698 | +LIBTACPLUS?= ${DESTDIR}${LIBARCHDIR}/libtacplus.a 699 | +.else 700 | +LIBTACPLUS?= ${DESTDIR}/usr/lib/libtacplus.a 701 | +.endif 702 | +.if exists(${DESTDIR}${LIBARCHDIR}/libtermcap.a) 703 | +LIBTERMCAP?= ${DESTDIR}${LIBARCHDIR}/libtermcap.a 704 | +.else 705 | +LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a 706 | +.endif 707 | LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP" 708 | LIBTINFO?= "don't use LIBTINFO, use LIBNCURSES" 709 | -LIBUFS?= ${DESTDIR}${LIBDIR}/libufs.a 710 | -LIBUGIDFW?= ${DESTDIR}${LIBDIR}/libugidfw.a 711 | -LIBUMEM?= ${DESTDIR}${LIBDIR}/libumem.a 712 | -LIBUSBHID?= ${DESTDIR}${LIBDIR}/libusbhid.a 713 | -LIBUSB?= ${DESTDIR}${LIBDIR}/libusb.a 714 | -LIBUTIL?= ${DESTDIR}${LIBDIR}/libutil.a 715 | -LIBUUTIL?= ${DESTDIR}${LIBDIR}/libuutil.a 716 | -LIBVGL?= ${DESTDIR}${LIBDIR}/libvgl.a 717 | -LIBWRAP?= ${DESTDIR}${LIBDIR}/libwrap.a 718 | -LIBXPG4?= ${DESTDIR}${LIBDIR}/libxpg4.a 719 | -LIBY?= ${DESTDIR}${LIBDIR}/liby.a 720 | -LIBYPCLNT?= ${DESTDIR}${LIBDIR}/libypclnt.a 721 | -LIBZ?= ${DESTDIR}${LIBDIR}/libz.a 722 | -LIBZFS?= ${DESTDIR}${LIBDIR}/libzfs.a 723 | -LIBZPOOL?= ${DESTDIR}${LIBDIR}/libzpool.a 724 | +.if exists(${DESTDIR}${LIBARCHDIR}/libufs.a) 725 | +LIBUFS?= ${DESTDIR}${LIBARCHDIR}/libufs.a 726 | +.else 727 | +LIBUFS?= ${DESTDIR}/usr/lib/libufs.a 728 | +.endif 729 | +.if exists(${DESTDIR}${LIBARCHDIR}/libugidfw.a) 730 | +LIBUGIDFW?= ${DESTDIR}${LIBARCHDIR}/libugidfw.a 731 | +.else 732 | +LIBUGIDFW?= ${DESTDIR}/usr/lib/libugidfw.a 733 | +.endif 734 | +.if exists(${DESTDIR}${LIBARCHDIR}/libumem.a) 735 | +LIBUMEM?= ${DESTDIR}${LIBARCHDIR}/libumem.a 736 | +.else 737 | +LIBUMEM?= ${DESTDIR}/usr/lib/libumem.a 738 | +.endif 739 | +.if exists(${DESTDIR}${LIBARCHDIR}/libusbhid.a) 740 | +LIBUSBHID?= ${DESTDIR}${LIBARCHDIR}/libusbhid.a 741 | +.else 742 | +LIBUSBHID?= ${DESTDIR}/usr/lib/libusbhid.a 743 | +.endif 744 | +.if exists(${DESTDIR}${LIBARCHDIR}/libusb.a) 745 | +LIBUSB?= ${DESTDIR}${LIBARCHDIR}/libusb.a 746 | +.else 747 | +LIBUSB?= ${DESTDIR}/usr/lib/libusb.a 748 | +.endif 749 | +.if exists(${DESTDIR}${LIBARCHDIR}/libutil.a) 750 | +LIBUTIL?= ${DESTDIR}${LIBARCHDIR}/libutil.a 751 | +.else 752 | +LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a 753 | +.endif 754 | +.if exists(${DESTDIR}${LIBARCHDIR}/libuutil.a) 755 | +LIBUUTIL?= ${DESTDIR}${LIBARCHDIR}/libuutil.a 756 | +.else 757 | +LIBUUTIL?= ${DESTDIR}/usr/lib/libuutil.a 758 | +.endif 759 | +.if exists(${DESTDIR}${LIBARCHDIR}/libvgl.a) 760 | +LIBVGL?= ${DESTDIR}${LIBARCHDIR}/libvgl.a 761 | +.else 762 | +LIBVGL?= ${DESTDIR}/usr/lib/libvgl.a 763 | +.endif 764 | +.if exists(${DESTDIR}${LIBARCHDIR}/libwrap.a) 765 | +LIBWRAP?= ${DESTDIR}${LIBARCHDIR}/libwrap.a 766 | +.else 767 | +LIBWRAP?= ${DESTDIR}/usr/lib/libwrap.a 768 | +.endif 769 | +.if exists(${DESTDIR}${LIBARCHDIR}/libxpg4.a) 770 | +LIBXPG4?= ${DESTDIR}${LIBARCHDIR}/libxpg4.a 771 | +.else 772 | +LIBXPG4?= ${DESTDIR}/usr/lib/libxpg4.a 773 | +.endif 774 | +.if exists(${DESTDIR}${LIBARCHDIR}/liby.a) 775 | +LIBY?= ${DESTDIR}${LIBARCHDIR}/liby.a 776 | +.else 777 | +LIBY?= ${DESTDIR}/usr/lib/liby.a 778 | +.endif 779 | +.if exists(${DESTDIR}${LIBARCHDIR}/libypclnt.a) 780 | +LIBYPCLNT?= ${DESTDIR}${LIBARCHDIR}/libypclnt.a 781 | +.else 782 | +LIBYPCLNT?= ${DESTDIR}/usr/lib/libypclnt.a 783 | +.endif 784 | +.if exists(${DESTDIR}${LIBARCHDIR}/libz.a) 785 | +LIBZ?= ${DESTDIR}${LIBARCHDIR}/libz.a 786 | +.else 787 | +LIBZ?= ${DESTDIR}/usr/lib/libz.a 788 | +.endif 789 | +.if exists(${DESTDIR}${LIBARCHDIR}/libzfs.a) 790 | +LIBZFS?= ${DESTDIR}${LIBARCHDIR}/libzfs.a 791 | +.else 792 | +LIBZFS?= ${DESTDIR}/usr/lib/libzfs.a 793 | +.endif 794 | +.if exists(${DESTDIR}${LIBARCHDIR}/libzpool.a) 795 | +LIBZPOOL?= ${DESTDIR}${LIBARCHDIR}/libzpool.a 796 | +.else 797 | +LIBZPOOL?= ${DESTDIR}/usr/lib/libzpool.a 798 | +.endif 799 | -------------------------------------------------------------------------------- /debian/changelog: -------------------------------------------------------------------------------- 1 | freebsd-buildutils (10.3~svn296373-7) unstable; urgency=medium 2 | 3 | * Build fmtree with support for MD5, SHA1, RMD160, SHA256 checksums 4 | (Closes: #854184, #855072) 5 | - add Build-Depends: libmd-dev 6 | - refresh 22_ld_as_needed.diff 7 | * Merge patch from Ubuntu: prototype-setmode.diff (Logan Rosen) 8 | 9 | -- Steven Chamberlain Mon, 13 Feb 2017 21:45:25 +0000 10 | 11 | freebsd-buildutils (10.3~svn296373-6) unstable; urgency=medium 12 | 13 | * Declare Conflicts: flex-old due to freebsd-buildutils shipping a 14 | libfl.a for freebsd-lex (Closes: #846578) 15 | * Make explicit Build-Depends on libfl-dev when using newer flex 16 | (Thanks, Helmut Grohne!) (Closes: #846427, #848736) 17 | 18 | -- Steven Chamberlain Sun, 08 Jan 2017 22:00:58 +0000 19 | 20 | freebsd-buildutils (10.3~svn296373-5) unstable; urgency=medium 21 | 22 | * Fix typo in debian/rules causing FTBFS on arm* architectures 23 | 24 | -- Steven Chamberlain Tue, 29 Nov 2016 17:00:33 +0000 25 | 26 | freebsd-buildutils (10.3~svn296373-4) unstable; urgency=medium 27 | 28 | * Add Build-Depends: dpkg-dev (>= 1.16.1.1) and use buildflags.mk 29 | to set CFLAGS, respecting DEB_BUILD_OPTIONS flags such as noopt 30 | * Enable hardening=+all, which includes PIE, relro and stack protector 31 | * Use architecture.mk instead of individual calls to dpkg-architecture 32 | * Create a new MACHINE_ARCH armv6hf for linux armhf and kfreebsd-armhf 33 | (Closes: #845105) 34 | 35 | -- Steven Chamberlain Tue, 29 Nov 2016 15:30:28 +0000 36 | 37 | freebsd-buildutils (10.3~svn296373-3) unstable; urgency=medium 38 | 39 | * Update my email address in Uploaders 40 | * Make `ar` command lines visible in the build log 41 | * Adding missing required build-arch, build-indep targets 42 | * Now using Standards-Version 3.9.8 43 | * Now using debhelper compat v9 44 | * Add missing ${misc:Depends} to freebsd-mk (to satisfy lintian; 45 | although it evaluates to an empty list currently) 46 | 47 | -- Steven Chamberlain Tue, 19 Jul 2016 09:08:38 +0100 48 | 49 | freebsd-buildutils (10.3~svn296373-2) unstable; urgency=medium 50 | 51 | * Upload to unstable 52 | * Use new preferred hostname for upstream SVN with HTTPS 53 | (svn.freebsd.org). 54 | 55 | -- Steven Chamberlain Mon, 04 Apr 2016 12:34:17 +0100 56 | 57 | freebsd-buildutils (10.3~svn296373-1) experimental; urgency=medium 58 | 59 | * New upstream snapshot of 10.3-RC1 60 | * Mark freebsd-mk as Multi-Arch: foreign (thanks, Helmut Grohne!) 61 | * Actually use the proper build architecture compiler 62 | * Map Debian's kfreebsd-armhf to FreeBSD's armv6 MACHINE_ARCH 63 | * Add *.test.mk files to freebsd-mk, allowing reverse-dependencies to 64 | use WITH_TESTS=yes 65 | * Use relative path in manpage symlinks 66 | - man_symlinks.diff 67 | 68 | -- Steven Chamberlain Sat, 05 Mar 2016 00:27:01 +0000 69 | 70 | freebsd-buildutils (10.3~svn295289-1) experimental; urgency=medium 71 | 72 | * New upstream snapshot of 10.3-BETA1 73 | * Make get-orig-source tarball reproducible 74 | * Refresh patches: 75 | - mk_eisa.diff 76 | - yacc_is_byacc.diff 77 | - 15_manpages_gzip.diff 78 | - avoid_defsyspath_collision.diff 79 | - hppa.diff 80 | 81 | -- Steven Chamberlain Sat, 06 Feb 2016 22:50:09 +0000 82 | 83 | freebsd-buildutils (10.2-2) experimental; urgency=medium 84 | 85 | * arch=all autobuilding doesn't seem to work for this yet 86 | 87 | -- Christoph Egger Wed, 21 Oct 2015 14:28:20 +0200 88 | 89 | freebsd-buildutils (10.2-1) experimental; urgency=medium 90 | 91 | * Update to 10.2 source 92 | * refresh patches 93 | * drop mk_ncp.diff -- was a workaround for kfreebsd-9 94 | * drop mk_hyperv.diff and mk_tests.diff now upstream 95 | * Compress orig-source with xz 96 | 97 | -- Christoph Egger Wed, 21 Oct 2015 12:10:45 +0200 98 | 99 | freebsd-buildutils (10.0-7) unstable; urgency=medium 100 | 101 | * Cherry-pick r276494 from HEAD: 102 | Don't include bsd.sys.mk within bsd.kmod.mk 103 | * binary-indep target requires binary-arch to run first. 104 | 105 | -- Steven Chamberlain Wed, 08 Jul 2015 16:44:07 +0100 106 | 107 | freebsd-buildutils (10.0-6) experimental; urgency=medium 108 | 109 | * Raise Build-Depends on freebsd-glue to >= 0.2.20~, to not be 110 | affected by #759249 if the installed libbsd-dev is newer 111 | * Do not use -fstack-protector on alpha 112 | 113 | -- Steven Chamberlain Tue, 21 Oct 2014 22:50:38 +0100 114 | 115 | freebsd-buildutils (10.0-5) unstable; urgency=medium 116 | 117 | [ Petr Salinger ] 118 | * Backport mk_hyperv, needed by 10.1 RC 119 | 120 | [ Steven Chamberlain ] 121 | * backports MK_TESTS for freebsd-utils (>> 10.1~) 122 | * Do not use -fstack-protector on hppa/parisc arch (thanks, Helge 123 | Deller) (Closes: #758377) 124 | * In get-orig-source, svn export with --ignore-keywords so that 125 | revision tags do not fuzzy the patches 126 | * Add myself to Uploaders 127 | 128 | -- Petr Salinger Sat, 04 Oct 2014 18:16:23 +0200 129 | 130 | freebsd-buildutils (10.0-4) unstable; urgency=low 131 | 132 | * Add MK_EISA. 133 | 134 | -- Robert Millan Sun, 04 May 2014 14:15:29 +0200 135 | 136 | freebsd-buildutils (10.0-3) unstable; urgency=low 137 | 138 | * kldxref_abort_on_error.diff: Treat EFAULT condition as fatal (see 139 | comment in patch header). 140 | 141 | -- Robert Millan Fri, 21 Feb 2014 20:31:13 +0100 142 | 143 | freebsd-buildutils (10.0-2) unstable; urgency=low 144 | 145 | * Adjust LIBDATADIR, LIBEXECDIR and LINTLIBDIR for FHS conformance. 146 | 147 | -- Robert Millan Wed, 15 Jan 2014 17:26:00 +0100 148 | 149 | freebsd-buildutils (10.0-1) unstable; urgency=low 150 | 151 | * New upstream release. 152 | 153 | -- Robert Millan Wed, 15 Jan 2014 13:37:23 +0100 154 | 155 | freebsd-buildutils (10.0~svn259404-6) unstable; urgency=low 156 | 157 | * Upload to unstable. 158 | 159 | -- Robert Millan Fri, 03 Jan 2014 17:12:31 +0100 160 | 161 | freebsd-buildutils (10.0~svn259404-5) experimental; urgency=low 162 | 163 | * Break circular build-dependency with freebsd-glue by splitting 164 | freebsd-mk into a package of its own. 165 | 166 | -- Robert Millan Thu, 02 Jan 2014 23:17:49 +0100 167 | 168 | freebsd-buildutils (10.0~svn259404-4) unstable; urgency=low 169 | 170 | * Correctly setup BSD version of MAKEFLAGS to support parallel builds. 171 | * Install make and mtree by their upstream names (fmake and fmtree). 172 | Remove the legacy symlinks (leave them to freebsd-glue). 173 | * Install file2c and brandelf directly to /usr/bin. 174 | * Move /usr/share/mk to /usr/share/mk-freebsd. This allows 175 | freebsd-buildutils to be installed alongside bmake. 176 | * Remove bootstrap magic. bmake is the default in upstream now: just 177 | use it to build fmake. 178 | 179 | -- Robert Millan Thu, 02 Jan 2014 17:43:51 +0100 180 | 181 | freebsd-buildutils (10.0~svn259404-3) unstable; urgency=low 182 | 183 | * Fix aicasm install path. 184 | 185 | -- Robert Millan Wed, 18 Dec 2013 12:15:59 +0100 186 | 187 | freebsd-buildutils (10.0~svn259404-2) unstable; urgency=low 188 | 189 | * kldxref is kFreeBSD-only. 190 | 191 | -- Robert Millan Tue, 17 Dec 2013 23:34:15 +0100 192 | 193 | freebsd-buildutils (10.0~svn259404-1) unstable; urgency=low 194 | 195 | * New upstream snapshot (10.0-RC2). 196 | - Switch to releng/10.0 branch. 197 | - Add kldxref. 198 | 199 | [ Robert Millan ] 200 | * Fetch source code securely (https) in get-orig-source. 201 | 202 | -- Robert Millan Tue, 17 Dec 2013 22:28:15 +0100 203 | 204 | freebsd-buildutils (10~svn258496-1) unstable; urgency=low 205 | 206 | * New upstream snapshot. 207 | - Refresh all patches. 208 | - Add aicasm. It is now required by kernel builds. 209 | 210 | [ Guillem Jover ] 211 | * Remove myself from Uploaders. 212 | 213 | -- Robert Millan Sat, 23 Nov 2013 15:48:42 +0100 214 | 215 | freebsd-buildutils (10~svn253832-1) unstable; urgency=low 216 | 217 | * New upstream snapshot (provides MK_USB_GADGET_EXAMPLES). 218 | 219 | -- Robert Millan Fri, 02 Aug 2013 21:04:11 +0200 220 | 221 | freebsd-buildutils (10~svn251967-6) unstable; urgency=low 222 | 223 | * Bump freebsd-glue B-D to fix FTBFS. 224 | 225 | -- Robert Millan Mon, 22 Jul 2013 21:57:31 +0200 226 | 227 | freebsd-buildutils (10~svn251967-5) unstable; urgency=low 228 | 229 | * Reupload. 230 | 231 | -- Robert Millan Mon, 22 Jul 2013 20:10:42 +0200 232 | 233 | freebsd-buildutils (10~svn251967-4) experimental; urgency=low 234 | 235 | * Bring back MK_NCP (needed by kfreebsd-9). 236 | 237 | -- Robert Millan Sat, 06 Jul 2013 22:49:13 +0200 238 | 239 | freebsd-buildutils (10~svn251967-3) experimental; urgency=low 240 | 241 | * Depend on m4 as it's now required by lex (no pun intended). 242 | 243 | -- Robert Millan Fri, 05 Jul 2013 23:25:44 +0200 244 | 245 | freebsd-buildutils (10~svn251967-2) experimental; urgency=low 246 | 247 | * Depend on suitable version of freebsd-glue (for _SAFE macros). 248 | 249 | -- Robert Millan Fri, 05 Jul 2013 23:06:31 +0200 250 | 251 | freebsd-buildutils (10~svn251967-1) experimental; urgency=low 252 | 253 | * New upstream snapshot. 254 | 255 | [ Guillem Jover ] 256 | * Switch to canonical Vcs URLs. 257 | 258 | [ Robert Millan ] 259 | * Add freebsd-config back. (Closes: #712633) 260 | * Ease flex build-dependency. 261 | 262 | -- Robert Millan Wed, 19 Jun 2013 12:23:55 +0200 263 | 264 | freebsd-buildutils (10~svn237137-1) experimental; urgency=low 265 | 266 | * New upstream snapshot. 267 | - Removes yacc (it's been replaced by byacc in upstream). 268 | 269 | -- Robert Millan Sat, 16 Jun 2012 12:17:10 +0200 270 | 271 | freebsd-buildutils (9.0-10) unstable; urgency=low 272 | 273 | * disable_wsystem_headers.diff: Disable -Wsystem-headers to avoid 274 | triggering #664242. 275 | * Fix getopt declaration. 276 | * Add MK_CTF build option. 277 | * nostrip.diff: By default, install without -s. Let dh_strip, etc 278 | handle stripping (and honor DEB_BUILD_OPTIONS=nostrip, etc). 279 | * Remove compatibility hacks (now provided by freebsd-glue). 280 | 281 | -- Robert Millan Fri, 25 May 2012 19:16:53 +0200 282 | 283 | freebsd-buildutils (9.0-9) unstable; urgency=low 284 | 285 | * Add MK_CLANG_IS_CC build option (needed by recent kfreebsd-10). 286 | 287 | -- Robert Millan Fri, 09 Mar 2012 22:57:12 +0100 288 | 289 | freebsd-buildutils (9.0-8) unstable; urgency=low 290 | 291 | * Add getosreldate() to local headers. 292 | * Make feature_present() backward-compatible with pre-900038 kernels. 293 | 294 | -- Robert Millan Thu, 23 Feb 2012 20:58:39 +0100 295 | 296 | freebsd-buildutils (9.0-7) unstable; urgency=low 297 | 298 | * sys/endian.h: Don't include_next , just include. 299 | * Add execvP(). 300 | 301 | -- Robert Millan Wed, 15 Feb 2012 22:57:13 +0100 302 | 303 | freebsd-buildutils (9.0-6) unstable; urgency=low 304 | 305 | * Make imply , even on non-kFreeBSD 306 | platforms (we always have in local directory). 307 | 308 | -- Robert Millan Wed, 15 Feb 2012 20:45:29 +0100 309 | 310 | freebsd-buildutils (9.0-5) unstable; urgency=low 311 | 312 | * Add implicit includes to sys/stdint.h. 313 | * Steal a few more definitions for sys/cdefs.h. 314 | 315 | -- Robert Millan Sat, 04 Feb 2012 17:14:34 +0100 316 | 317 | freebsd-buildutils (9.0-4) unstable; urgency=low 318 | 319 | * FreeBSD code expects that implicitly defines SIG* 320 | macros. 321 | * Cherry-pick MK_SOURCELESS build option from 10-CURRENT. 322 | 323 | -- Robert Millan Sat, 04 Feb 2012 12:27:38 +0100 324 | 325 | freebsd-buildutils (9.0-3) unstable; urgency=low 326 | 327 | * Replace 10_non_kfreebsd.diff with equivalent patch from upstream 328 | HEAD. 329 | * Add __BEGIN_DECLS / __END_DECLS in local unistd.h. 330 | * Fix local endian.h to use native on GNU/kFreeBSD. 331 | * Add local sys/errno.h and sys/stdint.h. 332 | * Add a few more definitions to local sys/cdefs.h. 333 | * Remove getline kludge. The second part was unneeded, the first one 334 | caused version_gen.awk to hang. 335 | * Add __offsetof(). 336 | * Add nfssvc, closefrom and feature_present to unistd.h. 337 | * Add sys/time.h. 338 | 339 | -- Robert Millan Sun, 29 Jan 2012 02:59:54 +0100 340 | 341 | freebsd-buildutils (9.0-2) unstable; urgency=low 342 | 343 | * Add elf_common.h to local includes to fix FTBFS on GNU/Linux. 344 | * Install headers in freebsd hierrachy. 345 | 346 | -- Robert Millan Sun, 08 Jan 2012 00:45:11 +0100 347 | 348 | freebsd-buildutils (9.0-1) unstable; urgency=low 349 | 350 | * New upstream release. 351 | 352 | -- Robert Millan Sat, 07 Jan 2012 20:34:01 +0100 353 | 354 | freebsd-buildutils (8.2-8) unstable; urgency=low 355 | 356 | [ Matthias Klose ] 357 | * Fix FTBFS with ld --as-needed. (Closes: #642091, LP: #749170) 358 | 359 | [ Robert Millan ] 360 | * Export CFLAGS in debian/rules so that it is actually propagated. 361 | (Closes: #642700) 362 | * Fix bsd.dep.mk so that -U flags are propagated in kernel builds. 363 | 364 | -- Robert Millan Thu, 03 Nov 2011 15:02:07 +0100 365 | 366 | freebsd-buildutils (8.2-7) unstable; urgency=low 367 | 368 | * 04_lex_disable_unused.diff: Fix generation of code in lex, which 369 | defined __unused and broke system headers (see #522773 and #522774). 370 | 371 | -- Robert Millan Tue, 12 Jul 2011 17:53:12 +0200 372 | 373 | freebsd-buildutils (8.2-6) unstable; urgency=low 374 | 375 | * 21_endian.diff: If neither TARGET_BIG_ENDIAN or TARGET_LITTLE_ENDIAN are 376 | defined, default to native compilation (fixes FTBFS on mips and armeb). 377 | 378 | -- Robert Millan Wed, 06 Jul 2011 19:48:48 +0200 379 | 380 | freebsd-buildutils (8.2-5) unstable; urgency=low 381 | 382 | * Disable libbsd overlay untill #630907 is fixed. (Closes: #632600) 383 | 384 | -- Robert Millan Mon, 04 Jul 2011 15:43:02 +0200 385 | 386 | freebsd-buildutils (8.2-4) unstable; urgency=low 387 | 388 | * MACHINE_ARCH is now set to "mips" on mipsel. (Closes: #631890) 389 | 390 | -- Robert Millan Sat, 02 Jul 2011 13:13:57 +0200 391 | 392 | freebsd-buildutils (8.2-3) unstable; urgency=low 393 | 394 | * 18_fix_sysdir.diff: Bring back search in relative paths (removing it 395 | breaks kfreebsd builds). (Closes: #631889, #631892) 396 | 397 | -- Robert Millan Tue, 28 Jun 2011 15:23:42 +0200 398 | 399 | freebsd-buildutils (8.2-2) unstable; urgency=low 400 | 401 | * 18_fix_sysdir.diff: Fix SYSDIR path to make kernel modules buildable. 402 | (Closes: #594183). 403 | * Switch to use the libbsd-overlay: 404 | - Bump libbsd-dev Build-Depends to (>= 0.3.0). 405 | - Add pkg-config to Build-Depends. 406 | - Remove some now obsolete porting code. 407 | * Disable FreeBSD/pc98 pre-7.0 compatibility on non-FreeBSD (fixes FTBFS on 408 | hurd-i386). 409 | * 19_fix_cmd_pathnames.diff: Fix pathnames for a number of commands. 410 | (Closes: #625261) 411 | * Add myself to Uploaders. 412 | 413 | -- Robert Millan Sun, 26 Jun 2011 17:47:37 +0200 414 | 415 | freebsd-buildutils (8.2-1) unstable; urgency=low 416 | 417 | [ Robert Millan ] 418 | * 10_non_kfreebsd.diff: Make freebsd-make usable on non-kFreeBSD 419 | systems. (Closes: #602768) 420 | 421 | [ Guillem Jover ] 422 | * Now using Standards-Version 3.9.2 (no changes needed). 423 | * Switch to source format “3.0 (quilt)”. 424 | - Remove quilt from Build-Depends. 425 | - Remove patch target in debian/rules. 426 | - Remove now unneeded README.source. 427 | - Refresh all patches. 428 | * Use -C option for pmake instead of manually changing dir. 429 | * Stop Build-Depending on pmake, bootstrap freebsd-make using GNU make 430 | and use it as pmake instead of using it from the pmake package. 431 | * Switch to debhelper compatibility level 7. 432 | - Use dh_prep instead of “dh_clean -k”. 433 | * Only use MACHINE_ARCH in freebsd-make if it's defined. 434 | * Add support for Multi-Arch directories to freebsd-make: 435 | - Do not switch LIBDIR yet, the dynamic linker does not have the 436 | correct paths for i386 based architectures. 437 | - Add builtin MACHINE_MULTIARCH make variable. 438 | * Refactor source and tar name into SOURCE and TARNAME in debian/rules. 439 | * Line-wrap CFLAGS variable in debian/rules. 440 | * Install binaries directly to /usr/lib/freebsd instead of relocating them 441 | from /usr/bin and /usr/sbin. 442 | * Install the man pages. (Closes: #493898) 443 | * Change ‘unix’ freebsd-make variable to “We run Debian, not UNIX.” and 444 | remove ‘.FreeBSD’ freebsd-make variable. (Closes: #493841) 445 | * Intersperse Depends description comments between the actual dependencies. 446 | * Do not install profile and libfl.a hardlinks for freebsd-lex libln.a. 447 | 448 | -- Guillem Jover Tue, 31 May 2011 04:20:37 +0200 449 | 450 | freebsd-buildutils (8.1-1) unstable; urgency=low 451 | 452 | [ Petr Salinger ] 453 | * New upstream version (RELENG_8_1_0_RELEASE) 454 | 455 | [ Aurelien Jarno ] 456 | * Update debian/copyright. 457 | * Bumped Standard-Versions to 3.9.1 (no changes). 458 | 459 | -- Aurelien Jarno Thu, 29 Jul 2010 21:33:33 +0200 460 | 461 | freebsd-buildutils (8.0-1) unstable; urgency=low 462 | 463 | [ Petr Salinger ] 464 | * New upstream version (RELENG_8_0_0_RELEASE) 465 | * Add a get-orig-source target to debian/rules and 466 | stop using a tar in tar system. 467 | * Use quilt for patches management 468 | 469 | [ Aurelien Jarno ] 470 | * Add a README.source. 471 | 472 | -- Aurelien Jarno Mon, 12 Apr 2010 23:53:50 +0200 473 | 474 | freebsd-buildutils (7.2-2) unstable; urgency=low 475 | 476 | * Remove part of the automatic patches in favor of patches. 477 | * Use libbsd instead of hacked funtions (Closes: #379259). 478 | * Use includes instead of . 479 | * Remove depends on dash, it is now essential. 480 | * Add depends on ${misc:Depends}. 481 | * Bumped Standard-Versions to 3.8.4 (no changes). 482 | * Handle nostrip build options (Closes: #436857). 483 | 484 | -- Aurelien Jarno Sat, 10 Apr 2010 16:49:49 +0200 485 | 486 | freebsd-buildutils (7.2-1) unstable; urgency=low 487 | 488 | [ Petr Salinger ] 489 | * New upstream version (RELENG_7_2_0_RELEASE) 490 | 491 | -- Aurelien Jarno Wed, 06 May 2009 09:03:20 +0200 492 | 493 | freebsd-buildutils (7.1-2) unstable; urgency=low 494 | 495 | * patches/15_manpages_gzip.diff: new patch to gzip manpages with -9 by 496 | default, as required on Debian systems. 497 | * Switch to debhelper 5. 498 | * Bumped Standard-Versions to 3.8.1 (no changes). 499 | 500 | -- Aurelien Jarno Tue, 07 Apr 2009 17:49:03 +0200 501 | 502 | freebsd-buildutils (7.1-1) unstable; urgency=low 503 | 504 | [ Petr Salinger ] 505 | * New upstream version (RELENG_7_1_0_RELEASE) 506 | 507 | -- Aurelien Jarno Sun, 11 Jan 2009 11:59:32 +0100 508 | 509 | freebsd-buildutils (7.0-2) unstable; urgency=low 510 | 511 | [ Petr Salinger ] 512 | * fix implicit-pointer-conversion by including appropriate headers. 513 | Closes: #493770. 514 | * add Vcs-* fields into debian/control. 515 | 516 | -- Aurelien Jarno Tue, 05 Aug 2008 14:30:25 +0200 517 | 518 | freebsd-buildutils (7.0-1) unstable; urgency=low 519 | 520 | [ Petr Salinger ] 521 | * New upstream version (RELENG_7_0_0_RELEASE) 522 | - drop upstream patches 000_fix_make_double_free.diff, 523 | 000_7-current_support_in_bsd.own.mk.diff 524 | - replace 02_silly_macros.diff via sed and 12_unused.diff 525 | - add 13_bsd_sys.diff, 14_config.diff 526 | - update remaining patches 527 | * Package rename, cleanup 528 | * Upload to Debian. Closes: #344417. 529 | See also #474761, #474762. 530 | 531 | [ Aurelien Jarno ] 532 | * Drop symlink pointing to gcc-3.4. 533 | * Bumped Standard-Versions to 3.8.0 (no changes). 534 | * Update debian/copyright. 535 | 536 | -- Aurelien Jarno Tue, 15 Jul 2008 19:37:00 +0200 537 | 538 | freebsd6-buildutils (6.3-2) unreleased; urgency=low 539 | 540 | * Don't build-depends nor depends on gcc-3.4. 541 | 542 | -- Aurelien Jarno Sat, 12 Jan 2008 18:02:07 +0100 543 | 544 | freebsd6-buildutils (6.3-1) unreleased; urgency=low 545 | 546 | [ Petr Salinger ] 547 | * New upstream version (RELENG_6_3_0_RELEASE) 548 | 549 | [ Aurelien Jarno ] 550 | * Bumped Standard-Versions to 3.7.3 (no changes). 551 | * Gzip manpages with -9. 552 | 553 | -- Aurelien Jarno Thu, 10 Jan 2008 14:03:04 +0100 554 | 555 | freebsd6-buildutils (6.2-1) unreleased; urgency=low 556 | 557 | [ Petr Salinger ] 558 | * New upstream version (RELENG_6_2_0_RELEASE) 559 | 560 | -- Aurelien Jarno Mon, 15 Jan 2007 13:38:31 +0100 561 | 562 | freebsd6-buildutils (6.0-0.2) unreleased; urgency=low 563 | 564 | * Add cruft to bsd.own.mk necessary to build latest kernel. 565 | 566 | -- Robert Millan Sat, 6 May 2006 13:10:05 +0200 567 | 568 | freebsd6-buildutils (6.0-0.1) unreleased; urgency=low 569 | 570 | * Fork 6.x branch. 571 | * Switch to libbsd. 572 | - control (Build-Depends): Add libbsd-dev. 573 | - rules: export LDADD=-lbsd 574 | - patches/03_glibc.diff: 575 | - usr.sbin/config/main.c: Nuke strl{cpy,cat} hack. 576 | - usr.sbin/mtree/excludes.c: Nuke fgetln hack. 577 | - usr.bin/make/Makefile: Stop adding LDADD=-lbsd (now passed from rules). 578 | - patches/11_config_allow_override.diff: 579 | - usr.sbin/config/Makefile: s/LDADD=/LDADD+=/g. 580 | * Make dash and gcc-3.4 the default "sh" and "cc". 581 | - control (Depends): Add gcc-3.4. 582 | - links: New. Setup sh and cc symlinks. 583 | * Pass NO_SHARED=NO from debian/rules 584 | - rules 585 | - patches/01_make_fixes.diff: Nuke part that disables NO_SHARED. 586 | * patches/03_glibc.diff: 587 | - Remove s,sys/time.h/time.h,g (was it ever needed?) 588 | - Nuke LIST_* defines (should be in sys/queue.h, or find another 589 | solution, like s,sys/queue.h,bsd/queue.h,g) 590 | * rules: 591 | - Only apply patches with *.diff suffix. 592 | * Move /usr/share/freebsd6-buildutils to /usr/share. 593 | - control (Conflicts): Add pmake. 594 | - patches/01_make_fixes.diff (usr.bin/make/pathnames.h): Remove 595 | PATH_DEFSYSPATH redefinition. 596 | - rules: Install mk and Mk in /usr/share. 597 | * patches/000_fix_make_double_free.diff: New. Patch from upstream 598 | (1.155:1.158). Thanks to Petr for spotting this. 599 | * Build using gcc 3.4, like upstream. 600 | - control (Build-Depends): Add gcc-3.4. 601 | - rules: Pass CC=gcc-3.4 to make. 602 | - patches/06_ftbfs_gcc-4.0.diff: Remove. 603 | * Fixes runtime getopt parsing infin loop. 604 | - rules (COPTS): Build with -D_GNU_SOURCE. 605 | - rules: Rename internal getline function to avoid collision with the one 606 | from Glibc (s/getline/bsd_&/g). 607 | - patches/06_ftbfs_gcc-4.0.diff: Remove (it had dirty getopt hacks as well). 608 | * patches/11_optreset.diff: New. Replace unportable optreset mangling 609 | with reset_getopt () from libbsd. 610 | * Our awk wasn't actualy from FreeBSD, but imported from original-awk. 611 | Let's use that directly instead. 612 | - control (Depends): Add original-awk. 613 | - links: Add link to original-awk. 614 | - patches/00_upstream.diff: Remove hunks that apply to awk. 615 | - patches/05_disable_hardlinks.diff: Ditto. 616 | - rules: Remove commands that work with awk. 617 | - fetch: Remove awk dirs from checkout/update. 618 | * Add gmake (as alias for gnu make). 619 | - control (Depends): Add make. 620 | - links: Add gmake link. 621 | * Massive cleanup in ports/Mk patches. 622 | - rules: Add sed rules that superceed most of the changes. 623 | - patches/09_ports_path.diff: Remove most of the patch, and re-diff. 624 | - patches/10_linux_utils.diff: Merge into 09_ports_path.diff 625 | * patches/09_ports_path.diff: Set PORTSDIR to /usr/share (instead of 626 | /usr/ports). 627 | * patches/09_ports_path.diff: Fix sed regexp. 628 | 629 | -- Robert Millan Fri, 17 Feb 2006 17:20:38 +0100 630 | 631 | freebsd5-buildutils (5.4-3) unstable; urgency=low 632 | 633 | * Fixed the MACHINE_ARCH variable on i386 (closes: bug#328604). 634 | 635 | -- Aurelien Jarno Sat, 17 Sep 2005 04:36:26 +0200 636 | 637 | freebsd5-buildutils (5.4-2) unstable; urgency=low 638 | 639 | * Added a dependency on bsdmainutils (closes: bug#323758). 640 | * Bumped Standard-Versions to 3.6.2 (no changes). 641 | 642 | -- Aurelien Jarno Fri, 19 Aug 2005 17:47:15 +0200 643 | 644 | freebsd5-buildutils (5.4-1) unstable; urgency=low 645 | 646 | * New upstream version. 647 | * Added a fix for GNU/Hurd: define MAXPATHLEN if it is not already fixed. 648 | 649 | -- Aurelien Jarno Fri, 17 Jun 2005 18:53:06 +0200 650 | 651 | freebsd5-buildutils (5.3+2-4) unstable; urgency=low 652 | 653 | * Use md5sum.textutils instead of md5sum to compute md5. Thanks to Robert 654 | Millan for the patch (closes: bug#313618). 655 | 656 | -- Aurelien Jarno Tue, 14 Jun 2005 20:42:27 +0200 657 | 658 | freebsd5-buildutils (5.3+2-3) unstable; urgency=low 659 | 660 | * Package adopted by the GNU/kFreeBSD Maintainers. Thanks to Robert 661 | Millan for all the work done on this package. 662 | * Added patch from Victor Hsieh to fix incompatibilities with linux 663 | utilities (closes: bug#306146). 664 | 665 | -- Aurelien Jarno Thu, 9 Jun 2005 01:02:28 +0200 666 | 667 | freebsd5-buildutils (5.3+2-2) unstable; urgency=low 668 | 669 | * Replace Architecture with Cpu/System in control.in. 670 | * Add /usr/ports, installed as /usr/share/freebsd5-buildutils/ports. 671 | * Move /usr/share/fbmk to /usr/share/freebsd5-buildutils/mk for consistency. 672 | * Misc package cleanup (Nuked debian/mk, etc). 673 | 674 | -- Robert Millan Fri, 4 Feb 2005 01:30:26 +0100 675 | 676 | freebsd5-buildutils (5.3+1-1) unstable; urgency=low 677 | 678 | * Add brandelf. 679 | - patches/07_brandelf.diff 680 | 681 | -- Robert Millan Mon, 27 Dec 2004 21:39:45 +0100 682 | 683 | freebsd5-buildutils (5.3-2) unstable; urgency=low 684 | 685 | * patches/01_make_fixes.diff: 686 | - Set INSTALLINFO to `which ginstall-info || which install-info`. 687 | - Do, however, not run install-info at all, and use manual install instead. 688 | * patches/06_ftbfs_gcc-4.0.diff: New. Don't declare maxJobs as static. 689 | This fixes build on gcc-4.0. Thanks Andreas Jochens. (Closes: #285953) 690 | 691 | -- Robert Millan Sat, 18 Dec 2004 01:50:04 +0100 692 | 693 | freebsd5-buildutils (5.3-1) unstable; urgency=low 694 | 695 | * Fork for 5.x branch (package been renamed). 696 | - patches/02_silly_macros.diff: Sync. 697 | 698 | -- Robert Millan Thu, 25 Nov 2004 20:14:35 +0100 699 | 700 | freebsd-buildutils (5.2.1+20041028.1-1) unstable; urgency=low 701 | 702 | * Add file2c command. 703 | 704 | -- Robert Millan Fri, 12 Nov 2004 20:13:06 +0100 705 | 706 | freebsd-buildutils (5.2.1+20041028-1) unstable; urgency=low 707 | 708 | * New upstream snapshot (6.x branch). Drop support for btxld. 709 | - patches/*.diff: Sync. 710 | * Use new CDBS debian/control auto-generation method. 711 | - control.in: New. Set Build-Depends on @cdbs@ tag. 712 | - rules: Set DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes. 713 | 714 | -- Robert Millan Thu, 28 Oct 2004 22:53:34 +0200 715 | 716 | freebsd-buildutils (5.2.1+20040403-11) unstable; urgency=low 717 | 718 | * patches/002_upstream.diff: Unfuck __unused definition in 719 | usr.bin/lex/flex.skl. 720 | 721 | -- Robert Millan Sun, 20 Jun 2004 13:05:13 +0200 722 | 723 | freebsd-buildutils (5.2.1+20040403-10) unstable; urgency=low 724 | 725 | * patches/002_upstream.diff: Nuke __unused completely instead of defining 726 | it as empty macro. (Closes: #249892) 727 | 728 | -- Robert Millan Wed, 9 Jun 2004 18:18:47 +0200 729 | 730 | freebsd-buildutils (5.2.1+20040403-9) unstable; urgency=low 731 | 732 | * control (Build-Depends): Add flex. (Closes: #248265) 733 | 734 | -- Robert Millan Mon, 10 May 2004 14:11:02 +0200 735 | 736 | freebsd-buildutils (5.2.1+20040403-8) unstable; urgency=low 737 | 738 | * Fix strl{cpy,cat} porting properly in config/main.c. 739 | 740 | -- Robert Millan Mon, 10 May 2004 02:48:47 +0200 741 | 742 | freebsd-buildutils (5.2.1+20040403-7) unstable; urgency=low 743 | 744 | * Fix stupid FTBFS. 745 | mk/build.mk: Don't attempt to use our make after building it! 746 | * mk/build.mk: Misc cleanup. 747 | 748 | -- Robert Millan Sat, 8 May 2004 21:21:45 +0200 749 | 750 | freebsd-buildutils (5.2.1+20040403-6) unstable; urgency=low 751 | 752 | * 003_glibc.diff: Fix stupid segfault in config. 753 | * mk/build.mk: Set MACHINE_ARCH for make. 754 | 755 | -- Robert Millan Tue, 4 May 2004 16:20:17 +0200 756 | 757 | freebsd-buildutils (5.2.1+20040403-5) unstable; urgency=low 758 | 759 | * Fix FTBFS. 760 | mk/build.mk: Set PATH so that our own yacc is used for building config. 761 | 762 | -- Robert Millan Sun, 2 May 2004 18:06:29 +0200 763 | 764 | freebsd-buildutils (5.2.1+20040403-4) unstable; urgency=low 765 | 766 | * Add awk and config. 767 | 768 | -- Robert Millan Sun, 2 May 2004 14:40:25 +0200 769 | 770 | freebsd-buildutils (5.2.1+20040403-3) unstable; urgency=low 771 | 772 | * patches/004_lex_bootstrap.diff: Nuked. 773 | * mk/build.mk: Use yacc to generate parse.h for src/usr.bin/lex. 774 | 775 | -- Robert Millan Wed, 14 Apr 2004 14:59:23 +0200 776 | 777 | freebsd-buildutils (5.2.1+20040403-2) unstable; urgency=low 778 | 779 | * control (Depends): Add dash. 780 | * patches/*.diff: Cleanup in order to submit upstream. 781 | 782 | -- Robert Millan Thu, 8 Apr 2004 00:17:41 +0200 783 | 784 | freebsd-buildutils (5.2.1+20040403-1) unstable; urgency=low 785 | 786 | * New upstream snapshot. 787 | - patches/*.diff: Resync. 788 | * Really apply the change (Really Closes: #240023) 789 | 790 | -- Robert Millan Sat, 3 Apr 2004 16:02:23 +0200 791 | 792 | freebsd-buildutils (5.1-4) unstable; urgency=low 793 | 794 | * Fix FTBFS on alpha. (Closes: #240023) 795 | - patches/003_glibc.diff (mtree): Check for _STATBUF_ST_NSEC before 796 | attempting nanosecond tests. 797 | * control: Fix typo in description. (Closes: #239923) 798 | 799 | -- Robert Millan Sat, 3 Apr 2004 13:39:03 +0200 800 | 801 | freebsd-buildutils (5.1-3) unstable; urgency=low 802 | 803 | * control (Build-Depends): Add bison. 804 | 805 | -- Robert Millan Wed, 24 Mar 2004 22:45:55 +0100 806 | 807 | freebsd-buildutils (5.1-2) unstable; urgency=low 808 | 809 | * New package: freebsd-buildutils (based on freebsd-utils). 810 | (Closes: #233074) 811 | 812 | -- Robert Millan Tue, 17 Feb 2004 13:36:30 +0100 813 | 814 | freebsd-utils (5.1-1) unstable; urgency=low 815 | 816 | * Upgraded to 5.1 817 | * Converted to cdbs, and added Build-Depends for freebsd-source-5.1, 818 | which contains the actual source code. 819 | 820 | -- Nathan Hawkins Tue, 7 Oct 2003 15:18:34 -0500 821 | 822 | freebsd-utils (5.0-2) unstable; urgency=low 823 | 824 | * Set maintainer to glibc-bsd-devel@lists.alioth.debian.org 825 | * Added me to Uploaders. 826 | * Turn into non-native package. 827 | * Added missing packages to Build-Depends (-libc5-dev, -gcc, byacc) 828 | * Minor fixes in debian/copyright. 829 | * Added dummy freebsd-utils package for upgrading. 830 | 831 | -- Robert Millan Fri, 11 Jul 2003 04:28:37 +0200 832 | 833 | freebsd-utils-5.0 (5.0-1) unstable; urgency=low 834 | 835 | * Initial Release. 836 | 837 | -- Nathan Hawkins Fri, 11 Oct 2002 20:43:20 -0400 838 | --------------------------------------------------------------------------------