[Glibc-bsd-commits] r5810 - in trunk/freebsd-buildutils/debian: . patches
christoph at alioth.debian.org
christoph at alioth.debian.org
Wed Oct 21 10:47:56 UTC 2015
Author: christoph
Date: 2015-10-21 10:47:56 +0000 (Wed, 21 Oct 2015)
New Revision: 5810
Removed:
trunk/freebsd-buildutils/debian/patches/mk_hyperv.diff
trunk/freebsd-buildutils/debian/patches/mk_ncp.diff
trunk/freebsd-buildutils/debian/patches/mk_tests.diff
Modified:
trunk/freebsd-buildutils/debian/changelog
trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff
trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
trunk/freebsd-buildutils/debian/patches/aicasm.diff
trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff
trunk/freebsd-buildutils/debian/patches/hppa.diff
trunk/freebsd-buildutils/debian/patches/mk_eisa.diff
trunk/freebsd-buildutils/debian/patches/nostrip.diff
trunk/freebsd-buildutils/debian/patches/r276494.diff
trunk/freebsd-buildutils/debian/patches/series
trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff
trunk/freebsd-buildutils/debian/rules
Log:
Update to 10.2
Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/changelog 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,3 +1,13 @@
+freebsd-buildutils (10.2-1) UNRELEASED; urgency=medium
+
+ * Update to 10.2 source
+ * refresh patches
+ * drop mk_ncp.diff -- was a workaround for kfreebsd-9
+ * drop mk_hyperv.diff and mk_tests.diff now upstream
+ * Compress orig-source with xz
+
+ -- Christoph Egger <christoph at debian.org> Wed, 21 Oct 2015 12:10:45 +0200
+
freebsd-buildutils (10.0-7) unstable; urgency=medium
* Cherry-pick r276494 from HEAD:
Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -7,9 +7,11 @@
src/share/mk/sys.mk | 3 +--
6 files changed, 24 insertions(+), 35 deletions(-)
---- a/src/share/mk/bsd.incs.mk
-+++ b/src/share/mk/bsd.incs.mk
-@@ -41,7 +41,7 @@
+Index: freebsd-buildutils/src/share/mk/bsd.incs.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.incs.mk
++++ freebsd-buildutils/src/share/mk/bsd.incs.mk
+@@ -41,7 +41,7 @@ ${group}NAME_${header:T}?= ${header:T}
.endif
installincludes: _${group}INS_${header:T}
_${group}INS_${header:T}: ${header}
@@ -18,7 +20,7 @@
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -53,10 +53,10 @@
+@@ -53,10 +53,10 @@ _${group}INCS+= ${header}
installincludes: _${group}INS
_${group}INS: ${_${group}INCS}
.if defined(${group}NAME)
@@ -31,9 +33,11 @@
${.ALLSRC} ${DESTDIR}${${group}DIR}
.endif
.endif
---- a/src/share/mk/bsd.info.mk
-+++ b/src/share/mk/bsd.info.mk
-@@ -73,7 +73,7 @@
+Index: freebsd-buildutils/src/share/mk/bsd.info.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.info.mk
++++ freebsd-buildutils/src/share/mk/bsd.info.mk
+@@ -73,7 +73,7 @@ MAKEINFO?= makeinfo
MAKEINFOFLAGS+= --no-split # simplify some things, e.g., compression
SRCDIR?= ${.CURDIR}
INFODIRFILE?= dir
@@ -42,7 +46,7 @@
INSTALLINFOFLAGS+=--quiet
INFOSECTION?= Miscellaneous
ICOMPRESS_CMD?= ${COMPRESS_CMD}
-@@ -143,18 +143,8 @@
+@@ -143,18 +143,8 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
.for x in ${INFO}
INSTALLINFODIRS+= ${x:S/$/-install/}
${x:S/$/-install/}:
@@ -63,47 +67,38 @@
.endfor
.PHONY: ${INSTALLINFODIRS}
---- a/src/share/mk/bsd.lib.mk
-+++ b/src/share/mk/bsd.lib.mk
-@@ -168,9 +168,9 @@
+Index: freebsd-buildutils/src/share/mk/bsd.lib.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.lib.mk
++++ freebsd-buildutils/src/share/mk/bsd.lib.mk
+@@ -175,7 +175,7 @@ _LIBS= lib${LIB}.a
+ lib${LIB}.a: ${OBJS} ${STATICOBJS}
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
- .if !defined(NM)
-- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-+ @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
- .else
- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+ @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
- ${RANLIB} ${.TARGET}
- .endif
-@@ -185,9 +185,9 @@
+
+@@ -188,7 +188,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=
+ lib${LIB}_p.a: ${POBJS}
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
- .if !defined(NM)
-- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
-+ @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort` ${ARADD}
- .else
- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
+ @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD}
+ ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
.endif
- ${RANLIB} ${.TARGET}
+
+@@ -217,7 +217,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
.endif
-@@ -218,11 +218,11 @@
- .if !defined(NM)
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
+ ${_LD} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-o ${.TARGET} -Wl,-soname,${SONAME} \
-- `lorder ${SOBJS} | tsort -q` ${LDADD}
-+ `lorder ${SOBJS} | tsort` ${LDADD}
- .else
- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+ `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD}
- .endif
.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
-@@ -302,11 +302,11 @@
+ .endif
+@@ -296,11 +296,11 @@ realinstall: _libinstall
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -117,7 +112,7 @@
${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
.endif
.if defined(SHLIB_NAME)
-@@ -343,7 +343,7 @@
+@@ -337,7 +337,7 @@ _libinstall:
sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \
-e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \
${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
@@ -126,9 +121,11 @@
${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \
${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
---- a/src/share/mk/bsd.man.mk
-+++ b/src/share/mk/bsd.man.mk
-@@ -216,7 +216,7 @@
+Index: freebsd-buildutils/src/share/mk/bsd.man.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.man.mk
++++ freebsd-buildutils/src/share/mk/bsd.man.mk
+@@ -216,7 +216,7 @@ _maninstall: ${MAN}
t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
@@ -137,7 +134,7 @@
done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
-@@ -231,7 +231,7 @@
+@@ -231,7 +231,7 @@ _maninstall: ${MAN}
t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
@@ -146,8 +143,10 @@
done
.endif
.endif
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
+Index: freebsd-buildutils/src/share/mk/bsd.own.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
++++ freebsd-buildutils/src/share/mk/bsd.own.mk
@@ -18,7 +18,7 @@
#
# BINOWN Binary owner. [root]
@@ -166,7 +165,7 @@
#
# SHAREMODE ASCII text file mode. [${NOBINMODE}]
#
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ SRCCONF?= /etc/src.conf
# Binaries
BINOWN?= root
@@ -175,7 +174,7 @@
BINMODE?= 555
NOBINMODE?= 444
-@@ -147,9 +147,9 @@
+@@ -151,9 +151,9 @@ DTBMODE?= 444
LIBDIR?= /usr/lib
LIBCOMPATDIR?= /usr/lib/compat
LIBPRIVATEDIR?= /usr/lib/private
@@ -188,7 +187,7 @@
SHLIBDIR?= ${LIBDIR}
LIBOWN?= ${BINOWN}
LIBGRP?= ${BINGRP}
-@@ -162,7 +162,7 @@
+@@ -166,7 +166,7 @@ DEBUGMODE?= ${NOBINMODE}
# Share files
SHAREDIR?= /usr/share
SHAREOWN?= root
@@ -197,7 +196,7 @@
SHAREMODE?= ${NOBINMODE}
CONFDIR?= /etc
-@@ -198,8 +198,8 @@
+@@ -202,8 +202,8 @@ INCLUDEDIR?= /usr/include
HRDLINK?= -l h
SYMLINK?= -l s
@@ -208,8 +207,10 @@
# Common variables
.if !defined(DEBUG_FLAGS)
---- a/src/share/mk/sys.mk
-+++ b/src/share/mk/sys.mk
+Index: freebsd-buildutils/src/share/mk/sys.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/sys.mk
++++ freebsd-buildutils/src/share/mk/sys.mk
@@ -1,8 +1,7 @@
# from: @(#)sys.mk 8.2 (Berkeley) 3/21/94
# $FreeBSD$
@@ -220,15 +221,17 @@
.if !defined(%POSIX)
#
---- a/src/share/mk/bsd.compiler.mk
-+++ b/src/share/mk/bsd.compiler.mk
-@@ -14,7 +14,8 @@
- . elif ${_COMPILER_VERSION:Mclang}
+Index: freebsd-buildutils/src/share/mk/bsd.compiler.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.compiler.mk
++++ freebsd-buildutils/src/share/mk/bsd.compiler.mk
+@@ -36,7 +36,8 @@ COMPILER_TYPE:= gcc
+ . elif ${_v:Mclang}
COMPILER_TYPE:= clang
- . else
+ . else
-.error Unable to determine compiler type for ${CC}. Consider setting COMPILER_TYPE.
+# Fallback to gcc in order to support CC="cc" case
+COMPILER_TYPE:= gcc
- . endif
- . undef _COMPILER_VERSION
. endif
+ .endif
+ .if !defined(COMPILER_VERSION)
Modified: trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -2,9 +2,11 @@
src/share/mk/bsd.own.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -206,7 +206,7 @@
+Index: freebsd-buildutils/src/share/mk/bsd.own.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
++++ freebsd-buildutils/src/share/mk/bsd.own.mk
+@@ -210,7 +210,7 @@ INSTALL_SYMLINK?= ln -s
STRIP?= -s
.endif
Modified: trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/18_fix_sysdir.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,5 +1,7 @@
---- a/src/share/mk/bsd.kmod.mk
-+++ b/src/share/mk/bsd.kmod.mk
+Index: freebsd-buildutils/src/share/mk/bsd.kmod.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.kmod.mk
++++ freebsd-buildutils/src/share/mk/bsd.kmod.mk
@@ -1,15 +1,17 @@
# $FreeBSD$
Modified: trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,5 +1,7 @@
---- a/src/usr.bin/make/Makefile
-+++ b/src/usr.bin/make/Makefile
+Index: freebsd-buildutils/src/usr.bin/make/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/make/Makefile
++++ freebsd-buildutils/src/usr.bin/make/Makefile
@@ -6,6 +6,7 @@
PROG= make
@@ -8,9 +10,11 @@
SRCS= arch.c buf.c cond.c dir.c for.c hash.c hash_tables.c job.c \
lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c \
util.c var.c
---- a/src/usr.sbin/mtree/Makefile
-+++ b/src/usr.sbin/mtree/Makefile
-@@ -9,6 +9,7 @@
+Index: freebsd-buildutils/src/usr.sbin/mtree/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.sbin/mtree/Makefile
++++ freebsd-buildutils/src/usr.sbin/mtree/Makefile
+@@ -9,6 +9,7 @@ PROG= fmtree
MAN= fmtree.8 mtree.5
SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
SRCS+= specspec.c
@@ -18,8 +22,10 @@
.if ${MK_NMTREE} == "no"
---- a/src/usr.bin/brandelf/Makefile
-+++ b/src/usr.bin/brandelf/Makefile
+Index: freebsd-buildutils/src/usr.bin/brandelf/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/brandelf/Makefile
++++ freebsd-buildutils/src/usr.bin/brandelf/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
@@ -27,8 +33,10 @@
+LDADD= -lbsd
.include <bsd.prog.mk>
---- a/src/usr.bin/cksum/Makefile
-+++ b/src/usr.bin/cksum/Makefile
+Index: freebsd-buildutils/src/usr.bin/cksum/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/cksum/Makefile
++++ freebsd-buildutils/src/usr.bin/cksum/Makefile
@@ -3,6 +3,7 @@
PROG= cksum
@@ -37,11 +45,15 @@
SIMLINKS= ${BINDIR}/cksum ${BINDIR}/sum
MLINKS= cksum.1 sum.1
---- a/src/usr.bin/file2c/Makefile
-+++ b/src/usr.bin/file2c/Makefile
-@@ -1,4 +1,5 @@
- # $FreeBSD$
+Index: freebsd-buildutils/src/usr.bin/file2c/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/file2c/Makefile
++++ freebsd-buildutils/src/usr.bin/file2c/Makefile
+@@ -3,6 +3,7 @@
+ .include <bsd.own.mk>
PROG= file2c
+LDADD+= -lbsd
- .include <bsd.prog.mk>
+
+ .if ${MK_TESTS} != "no"
+ SUBDIR+= tests
Modified: trunk/freebsd-buildutils/debian/patches/aicasm.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/aicasm.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/aicasm.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,9 +1,11 @@
Partially sent to freebsd-hackers (2011-07-02)
---- a/src/sys/dev/aic7xxx/aicasm/Makefile
-+++ b/src/sys/dev/aic7xxx/aicasm/Makefile
-@@ -24,6 +24,10 @@
+Index: freebsd-buildutils/src/sys/dev/aic7xxx/aicasm/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/sys/dev/aic7xxx/aicasm/Makefile
++++ freebsd-buildutils/src/sys/dev/aic7xxx/aicasm/Makefile
+@@ -24,6 +24,10 @@ WARNS?= 0
DEPENDFILE= .depend_aicasm
.endif
@@ -11,6 +13,6 @@
+LDADD+= -ldb -lbsd
+CFLAGS+= -D_GNU_SOURCE -isystem /usr/include/freebsd
+
- CFLAGS+= -I.
+ CFLAGS+= -I${.CURDIR}
.ifdef MAKESRCPATH
CFLAGS+= -I${MAKESRCPATH}
Modified: trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,20 +1,24 @@
This allows freebsd-buildutils to be installed alongside bmake.
---- a/src/share/mk/Makefile
-+++ b/src/share/mk/Makefile
-@@ -41,7 +41,7 @@
+Index: freebsd-buildutils/src/share/mk/Makefile
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/Makefile
++++ freebsd-buildutils/src/share/mk/Makefile
+@@ -41,7 +41,7 @@ FILES= \
version_gen.awk
NO_OBJ=
-FILESDIR= ${BINDIR}/mk
+FILESDIR= ${BINDIR}/mk-freebsd
- .if ${MK_ATF} != "no"
+ .if ${MK_TESTS} != "no"
FILES+= atf.test.mk
---- a/src/share/mk/bsd.symver.mk
-+++ b/src/share/mk/bsd.symver.mk
-@@ -23,7 +23,7 @@
+Index: freebsd-buildutils/src/share/mk/bsd.symver.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.symver.mk
++++ freebsd-buildutils/src/share/mk/bsd.symver.mk
+@@ -23,7 +23,7 @@ _mpath+= ${_arg}
.endif
_oarg= ${_arg}
.endfor
@@ -23,9 +27,11 @@
# Look up ${VERSION_GEN} in ${_mpath}.
_vgen=
---- a/src/usr.bin/make/make.1
-+++ b/src/usr.bin/make/make.1
-@@ -235,7 +235,7 @@
+Index: freebsd-buildutils/src/usr.bin/make/make.1
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/make/make.1
++++ freebsd-buildutils/src/usr.bin/make/make.1
+@@ -235,7 +235,7 @@ Multiple
.Fl m
options can be specified to form a search path.
This path will override the default system include path,
@@ -34,7 +40,7 @@
The system include path will always be appended to the search path used
for "..."-style inclusions and makefile searches (see the
.Fl I
-@@ -1721,7 +1721,7 @@
+@@ -1721,7 +1721,7 @@ list of dependencies
object directory
.It Pa sys.mk
system makefile
@@ -43,8 +49,10 @@
default system makefile directory
.It Pa /usr/share/doc/psd/12.make
PMake tutorial
---- a/src/usr.bin/make/pathnames.h
-+++ b/src/usr.bin/make/pathnames.h
+Index: freebsd-buildutils/src/usr.bin/make/pathnames.h
+===================================================================
+--- freebsd-buildutils.orig/src/usr.bin/make/pathnames.h
++++ freebsd-buildutils/src/usr.bin/make/pathnames.h
@@ -50,7 +50,7 @@
#endif /* ! PATH_DEFSYSMK */
Modified: trunk/freebsd-buildutils/debian/patches/hppa.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/hppa.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/hppa.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -3,10 +3,12 @@
Bug-Debian: https://bugs.debian.org/758377
Forwarded: not-needed
---- a/src/share/mk/bsd.sys.mk
-+++ b/src/share/mk/bsd.sys.mk
-@@ -123,11 +123,12 @@
- .endif # CLANG
+Index: freebsd-buildutils/src/share/mk/bsd.sys.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.sys.mk
++++ freebsd-buildutils/src/share/mk/bsd.sys.mk
+@@ -144,11 +144,12 @@ CXXFLAGS+= ${CXXFLAGS.gcc}
+ .endif # !EARLY_BUILD
.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
- ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
Modified: trunk/freebsd-buildutils/debian/patches/mk_eisa.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_eisa.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/mk_eisa.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,10 +1,12 @@
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -365,6 +365,7 @@
+Index: freebsd-buildutils/src/share/mk/bsd.own.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
++++ freebsd-buildutils/src/share/mk/bsd.own.mk
+@@ -390,6 +390,7 @@ __DEFAULT_YES_OPTIONS = \
__DEFAULT_NO_OPTIONS = \
BSD_GREP \
CLANG_EXTRAS \
+ EISA \
CTF \
DEBUG_FILES \
- GPL_DTC \
+ HESIOD \
Deleted: trunk/freebsd-buildutils/debian/patches/mk_hyperv.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_hyperv.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/mk_hyperv.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,15 +0,0 @@
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -444,6 +444,12 @@
- .else
- __DEFAULT_NO_OPTIONS+=FDT
- .endif
-+# HyperV is only available for x86 and amd64.
-+.if ${__T} == "amd64" || ${__T} == "i386"
-+__DEFAULT_YES_OPTIONS+=HYPERV
-+.else
-+__DEFAULT_NO_OPTIONS+=HYPERV
-+.endif
- .undef __T
-
- #
Deleted: trunk/freebsd-buildutils/debian/patches/mk_ncp.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_ncp.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/mk_ncp.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,25 +0,0 @@
-
-MK_NCP was removed from HEAD in rev 241629, but kfreebsd-9 still
-uses it (in sys/modules/Makefile).
-
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -314,6 +314,7 @@
- MAILWRAPPER \
- MAKE \
- MAN \
-+ NCP \
- NDIS \
- NETCAT \
- NETGRAPH \
-@@ -516,6 +517,10 @@
- MK_GROFF:= no
- .endif
-
-+.if ${MK_IPX} == "no"
-+MK_NCP:= no
-+.endif
-+
- .if ${MK_MAIL} == "no"
- MK_MAILWRAPPER:= no
- MK_SENDMAIL:= no
Deleted: trunk/freebsd-buildutils/debian/patches/mk_tests.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_tests.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/mk_tests.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,34 +0,0 @@
-Subject: backport MK_TESTS for freebsd-utils (>> 10.1~)
-Origin: vendor, http://svnweb.freebsd.org/base/stable/10/share/mk/bsd.own.mk?r1=260012&r2=260013&view=patch
-
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -376,6 +376,7 @@
- PKGTOOLS \
- SHARED_TOOLCHAIN \
- SVN \
-+ TESTS \
- USB_GADGET_EXAMPLES
-
- #
-@@ -555,6 +556,20 @@
- MK_LLDB:= no
- .endif
-
-+.if defined(NO_TESTS)
-+# This should be handled above along the handling of all other NO_* options.
-+# However, the above is broken when WITH_*=yes are passed to make(1) as
-+# command line arguments. See PR bin/183762.
-+#
-+# Because the TESTS option is new and it will default to yes, it's likely
-+# that people will pass WITHOUT_TESTS=yes to make(1) directly and get a broken
-+# build. So, just in case, it's better to explicitly handle this case here.
-+#
-+# TODO(jmmv): Either fix make to allow us putting this override where it
-+# belongs above or fix this file to cope with the make bug.
-+MK_TESTS:= no
-+.endif
-+
- #
- # Set defaults for the MK_*_SUPPORT variables.
- #
Modified: trunk/freebsd-buildutils/debian/patches/nostrip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/nostrip.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/nostrip.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -2,9 +2,11 @@
By default, install without -s. Let dh_strip, etc handle stripping
(and honor DEB_BUILD_OPTIONS=nostrip, etc).
---- a/src/share/mk/bsd.lib.mk
-+++ b/src/share/mk/bsd.lib.mk
-@@ -40,7 +40,7 @@
+Index: freebsd-buildutils/src/share/mk/bsd.lib.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.lib.mk
++++ freebsd-buildutils/src/share/mk/bsd.lib.mk
+@@ -47,7 +47,7 @@ CFLAGS+= ${DEBUG_FLAGS}
CTFFLAGS+= -g
.endif
.else
@@ -13,9 +15,11 @@
.endif
.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -203,7 +203,7 @@
+Index: freebsd-buildutils/src/share/mk/bsd.own.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
++++ freebsd-buildutils/src/share/mk/bsd.own.mk
+@@ -207,7 +207,7 @@ INSTALL_SYMLINK?= ln -s
# Common variables
.if !defined(DEBUG_FLAGS)
@@ -24,9 +28,11 @@
.endif
COMPRESS_CMD?= gzip -cn -9
---- a/src/share/mk/bsd.prog.mk
-+++ b/src/share/mk/bsd.prog.mk
-@@ -45,7 +45,7 @@
+Index: freebsd-buildutils/src/share/mk/bsd.prog.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.prog.mk
++++ freebsd-buildutils/src/share/mk/bsd.prog.mk
+@@ -43,7 +43,7 @@ CTFFLAGS+= -g
.endif
.if !defined(DEBUG_FLAGS)
Modified: trunk/freebsd-buildutils/debian/patches/r276494.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/r276494.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/r276494.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -4,9 +4,11 @@
twice on the command line. That would override CWARNFLAGS, and causes
some modules to fail to build under Clang.
---- a/src/share/mk/bsd.kmod.mk
-+++ b/src/share/mk/bsd.kmod.mk
-@@ -15,5 +15,3 @@
+Index: freebsd-buildutils/src/share/mk/bsd.kmod.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/bsd.kmod.mk
++++ freebsd-buildutils/src/share/mk/bsd.kmod.mk
+@@ -13,5 +13,3 @@ SYSDIR= ${_dir}
.endif
.include "${SYSDIR}/conf/kmod.mk"
Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/series 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,8 +1,5 @@
# Patches from (or merged in) upstream
-mk_ncp.diff
mk_eisa.diff
-mk_hyperv.diff
-mk_tests.diff
r276494.diff
# Patches that are in good shape for merging upstream
Modified: trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff 2015-10-21 10:47:56 UTC (rev 5810)
@@ -1,6 +1,8 @@
---- a/src/share/mk/sys.mk
-+++ b/src/share/mk/sys.mk
-@@ -150,7 +150,7 @@
+Index: freebsd-buildutils/src/share/mk/sys.mk
+===================================================================
+--- freebsd-buildutils.orig/src/share/mk/sys.mk
++++ freebsd-buildutils/src/share/mk/sys.mk
+@@ -153,7 +153,7 @@ RFLAGS ?=
SHELL ?= sh
Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules 2015-10-21 00:12:57 UTC (rev 5809)
+++ trunk/freebsd-buildutils/debian/rules 2015-10-21 10:47:56 UTC (rev 5810)
@@ -44,7 +44,7 @@
SOURCE = freebsd-buildutils
ORIGDIR = $(SOURCE)-$(tar_version)
-TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
+TARNAME = $(SOURCE)_$(tar_version).orig.tar.xz
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -92,7 +92,7 @@
; do \
svn export --ignore-keywords -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/src/$$i ; \
done
- tar --numeric-owner --owner 0 --group 0 -czf ../$(TARNAME) $(ORIGDIR)
+ tar --numeric-owner --owner 0 --group 0 -cJf ../$(TARNAME) $(ORIGDIR)
rm -rf $(ORIGDIR)
unpack: unpack-stamp
More information about the Glibc-bsd-commits
mailing list