[Glibc-bsd-commits] r4527 - in trunk/freebsd-buildutils/debian: . patches
rmh at alioth.debian.org
rmh at alioth.debian.org
Mon Jul 8 12:41:56 UTC 2013
Author: rmh
Date: 2013-06-19 10:23:05 +0000 (Wed, 19 Jun 2013)
New Revision: 4527
Removed:
trunk/freebsd-buildutils/debian/patches/make_bootstrap_fix.diff
Modified:
trunk/freebsd-buildutils/debian/changelog
trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
trunk/freebsd-buildutils/debian/patches/03_glibc.diff
trunk/freebsd-buildutils/debian/patches/04_lex_disable_unused.diff
trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
trunk/freebsd-buildutils/debian/patches/20_libbsd_overlay.diff
trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
trunk/freebsd-buildutils/debian/patches/config_ldflags.diff
trunk/freebsd-buildutils/debian/patches/disable_wsystem_headers.diff
trunk/freebsd-buildutils/debian/patches/nostrip.diff
trunk/freebsd-buildutils/debian/patches/series
trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff
trunk/freebsd-buildutils/debian/rules
Log:
New upstream snapshot
Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/changelog 2013-06-19 10:23:05 UTC (rev 4527)
@@ -1,12 +1,14 @@
-freebsd-buildutils (10~svn237137-2) UNRELEASED; urgency=low
+freebsd-buildutils (10~svn251967-1) UNRELEASED; urgency=low
+ * New upstream snapshot.
+
[ Guillem Jover ]
* Switch to canonical Vcs URLs.
[ Robert Millan ]
* Add freebsd-config back. (Closes: #712633)
- -- Guillem Jover <guillem at debian.org> Sat, 18 May 2013 22:14:56 +0200
+ -- Robert Millan <rmh at debian.org> Wed, 19 Jun 2013 01:12:32 +0200
freebsd-buildutils (10~svn237137-1) experimental; urgency=low
Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -65,37 +65,31 @@
.PHONY: ${INSTALLINFODIRS}
--- a/src/share/mk/bsd.lib.mk
+++ b/src/share/mk/bsd.lib.mk
-@@ -135,9 +135,9 @@
+@@ -156,9 +156,9 @@
@${ECHO} building static ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-+ @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
+- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
++ @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-+ @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
+- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
++ @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -152,9 +152,9 @@
+@@ -173,9 +173,9 @@
@${ECHO} building profiled ${LIB} library
@rm -f ${.TARGET}
.if !defined(NM)
-- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
-+ @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort` ${ARADD}
+- @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
++ @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort` ${ARADD}
.else
-- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
-+ @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD}
+- @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
++ @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD}
.endif
${RANLIB} ${.TARGET}
.endif
-@@ -180,16 +180,16 @@
- @${ECHO} building shared library ${SHLIB_NAME}
- @rm -f ${.TARGET} ${SHLIB_LINK}
- .if defined(SHLIB_LINK)
-- @ln -fs ${.TARGET} ${SHLIB_LINK}
-+ @ln -fs ${SHLIBDIR}/${.TARGET} ${SHLIB_LINK}
- .endif
+@@ -206,11 +206,11 @@
.if !defined(NM)
@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
-o ${.TARGET} -Wl,-soname,${SONAME} \
@@ -109,7 +103,7 @@
.endif
.if ${MK_CTF} != "no"
${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
-@@ -259,11 +259,11 @@
+@@ -290,11 +290,11 @@
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -125,33 +119,21 @@
.if defined(SHLIB_NAME)
--- a/src/share/mk/bsd.man.mk
+++ b/src/share/mk/bsd.man.mk
-@@ -211,12 +211,12 @@
- [123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
- esac; \
- name=$$1; shift; sect=$$1; shift; \
-- l=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
-+ l=${MANDIR}$${sect}${MANSUBDIR}/$$name; \
- name=$$1; shift; sect=$$1; shift; \
+@@ -216,7 +216,7 @@
t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
-- ln $${l}${ZEXT} $${t}${ZEXT}; \
-+ ln -s $${l}${ZEXT} $${t}${ZEXT}; \
+- ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
++ ${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \
done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
-@@ -226,12 +226,12 @@
- [123]) echo "warn: empty MLINK: $$1 $$2 $$3"; break;; \
- esac; \
- name=$$1; shift; sect=$$1; shift; \
-- l=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
-+ l=${CATDIR}$${sect}${MANSUBDIR}/$$name; \
- name=$$1; shift; sect=$$1; shift; \
+@@ -231,7 +231,7 @@
t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
-- ln $${l}${ZEXT} $${t}${ZEXT}; \
-+ ln -s $${l}${ZEXT} $${t}${ZEXT}; \
+- ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
++ ${INSTALL_SYMLINK} $${l}${ZEXT} $${t}${ZEXT}; \
done
.endif
.endif
@@ -166,7 +148,7 @@
#
# BINMODE Binary mode. [555]
#
-@@ -58,7 +58,7 @@
+@@ -63,7 +63,7 @@
#
# SHAREOWN ASCII text file owner. [root]
#
@@ -175,7 +157,7 @@
#
# SHAREMODE ASCII text file mode. [${NOBINMODE}]
#
-@@ -124,7 +124,7 @@
+@@ -129,7 +129,7 @@
# Binaries
BINOWN?= root
@@ -184,7 +166,7 @@
BINMODE?= 555
NOBINMODE?= 444
-@@ -151,7 +151,7 @@
+@@ -159,7 +159,7 @@
# Share files
SHAREDIR?= /usr/share
SHAREOWN?= root
@@ -193,6 +175,17 @@
SHAREMODE?= ${NOBINMODE}
CONFDIR?= /etc
+@@ -195,8 +195,8 @@
+ HRDLINK?= -l h
+ SYMLINK?= -l s
+
+-INSTALL_LINK?= ${INSTALL} ${HRDLINK}
+-INSTALL_SYMLINK?= ${INSTALL} ${SYMLINK}
++INSTALL_LINK?= ln
++INSTALL_SYMLINK?= ln -s
+
+ # Common variables
+ .if !defined(DEBUG_FLAGS)
--- a/src/share/mk/sys.mk
+++ b/src/share/mk/sys.mk
@@ -1,8 +1,7 @@
@@ -205,3 +198,15 @@
.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}
+ COMPILER_TYPE:= clang
+ . 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
Modified: trunk/freebsd-buildutils/debian/patches/03_glibc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/03_glibc.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/03_glibc.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -11,12 +11,13 @@
--- a/src/usr.sbin/mtree/Makefile
+++ b/src/usr.sbin/mtree/Makefile
-@@ -8,8 +8,4 @@
+@@ -10,9 +10,6 @@
SRCS= compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c
SRCS+= specspec.c
-CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256
-DPADD= ${LIBMD}
-LDADD= -lmd
--
- .include <bsd.prog.mk>
+
+ .if ${MK_NMTREE} == "no"
+ LINKS= ${BINDIR}/fmtree ${BINDIR}/mtree
Modified: trunk/freebsd-buildutils/debian/patches/04_lex_disable_unused.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/04_lex_disable_unused.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/04_lex_disable_unused.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -5,26 +5,16 @@
lex itself, it is used as template to generate code that will later be built
in other packages (e.g. kfreebsd-9).
---- a/src/usr.bin/lex/flex.skl
-+++ b/src/usr.bin/lex/flex.skl
-@@ -5,10 +5,8 @@
- * $FreeBSD$
- */
-
--#if defined(__FreeBSD__)
+--- a/src/contrib/flex/flex.skl
++++ b/src/contrib/flex/flex.skl
+@@ -202,8 +202,10 @@
#include <sys/cdefs.h>
--#else
--#define __unused
+ #include <stdint.h>
+ #else
+#ifndef __dead2
- #define __dead2
+ #define __dead2
#endif
++#endif
-@@ -264,7 +262,7 @@
- %*
-
- static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
--static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __unused;
-+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __attribute__((unused));
- static void yy_flex_free YY_PROTO(( void * ));
-
- #define yy_new_buffer yy_create_buffer
+ /* begin standard C headers. */
+ %if-c-only
Modified: trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/05_disable_hardlinks.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -22,5 +22,5 @@
+SIMLINKS+= ${BINDIR}/lex ${BINDIR}/flex
+SIMLINKS+= ${BINDIR}/lex ${BINDIR}/flex++
- SRCS= scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.y \
- skel.c sym.c tblcmp.c yylex.c
+ FLEXDIR= ${.CURDIR}/../../contrib/flex
+
Modified: trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -4,7 +4,7 @@
--- a/src/share/mk/bsd.own.mk
+++ b/src/share/mk/bsd.own.mk
-@@ -186,7 +186,7 @@
+@@ -203,7 +203,7 @@
STRIP?= -s
.endif
Modified: trunk/freebsd-buildutils/debian/patches/20_libbsd_overlay.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/20_libbsd_overlay.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/20_libbsd_overlay.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -1,27 +1,3 @@
-
-Workaround for #630907. This patch can be removed when libbsd overlay
-is re-enabled.
-
---- a/src/usr.bin/cksum/cksum.c
-+++ b/src/usr.bin/cksum/cksum.c
-@@ -57,6 +57,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <stdint.h> /* uintXX_t (glibc) */
-
- #include "extern.h"
-
---- a/src/usr.bin/cksum/extern.h
-+++ b/src/usr.bin/cksum/extern.h
-@@ -35,6 +35,7 @@
- */
-
- #include <sys/cdefs.h>
-+#include <stdint.h> /* uintXX_t (glibc) */
-
- __BEGIN_DECLS
- int crc(int, uint32_t *, off_t *);
--- a/src/usr.bin/file2c/Makefile
+++ b/src/usr.bin/file2c/Makefile
@@ -1,5 +1,6 @@
@@ -31,297 +7,3 @@
+LDADD= -lbsd
WARNS?= 6
.include <bsd.prog.mk>
---- a/src/usr.bin/file2c/file2c.c
-+++ b/src/usr.bin/file2c/file2c.c
-@@ -10,6 +10,7 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
-
-+#include <bsd/stdlib.h>
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
---- a/src/usr.bin/make/arch.c
-+++ b/src/usr.bin/make/arch.c
-@@ -88,7 +88,8 @@
- */
-
- #include <sys/param.h>
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
-+#include <bsd/string.h>
- #include <sys/types.h>
- #include <ar.h>
- #include <ctype.h>
---- a/src/usr.bin/make/dir.h
-+++ b/src/usr.bin/make/dir.h
-@@ -43,7 +43,7 @@
- #ifndef dir_h_6002e3b8
- #define dir_h_6002e3b8
-
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
- #include "hash.h"
-
- struct GNode;
---- a/src/usr.bin/make/job.c
-+++ b/src/usr.bin/make/job.c
-@@ -101,7 +101,8 @@
- * thems as need creatin'
- */
-
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
-+#include <bsd/stdlib.h>
- #include <sys/types.h>
- #include <sys/select.h>
- #include <sys/stat.h>
---- a/src/usr.bin/make/main.c
-+++ b/src/usr.bin/make/main.c
-@@ -67,7 +67,8 @@
- #include <sys/sysctl.h>
- #endif
- #include <sys/time.h>
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
-+#include <bsd/err.h>
- #include <sys/resource.h>
- #include <sys/utsname.h>
- #include <sys/wait.h>
-@@ -149,6 +150,8 @@
- time_t now; /* Time at start of make */
- struct GNode *DEFAULT; /* .DEFAULT node */
-
-+#include <bsd/getopt.h> /* optreset */
-+
- /**
- * Exit with usage message.
- */
-@@ -382,7 +385,7 @@
- if ((optind < argc) && strcmp(argv[optind], "--") == 0) {
- found_dd = TRUE;
- }
-- if ((c = getopt(argc, argv, OPTFLAGS)) == -1) {
-+ if ((c = bsd_getopt(argc, argv, OPTFLAGS)) == -1) {
- break;
- }
- switch(c) {
---- a/src/usr.bin/make/proc.h
-+++ b/src/usr.bin/make/proc.h
-@@ -48,6 +48,6 @@
- pid_t child_pid;
- } ProcStuff;
-
--void Proc_Exec(const ProcStuff *) __dead2;
-+void Proc_Exec(const ProcStuff *);
-
- #endif /* proc_h_458845848 */
---- a/src/usr.bin/make/shell.c
-+++ b/src/usr.bin/make/shell.c
-@@ -40,7 +40,7 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
-
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- a/src/usr.bin/make/shell.h
-+++ b/src/usr.bin/make/shell.h
-@@ -42,7 +42,7 @@
- #ifndef shell_h_6002e3b8
- #define shell_h_6002e3b8
-
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
-
- #include "str.h"
- #include "util.h"
---- a/src/usr.bin/make/suff.c
-+++ b/src/usr.bin/make/suff.c
-@@ -90,7 +90,7 @@
- * if the target had no implicit sources.
- */
-
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
- #include <assert.h>
- #include <string.h>
- #include <stdlib.h>
---- a/src/usr.bin/make/util.c
-+++ b/src/usr.bin/make/util.c
-@@ -61,7 +61,7 @@
- #include "targ.h"
- #include "util.h"
-
--static void enomem(void) __dead2;
-+static void enomem(void);
-
- /*-
- * Debug --
---- a/src/usr.bin/make/util.h
-+++ b/src/usr.bin/make/util.h
-@@ -103,10 +103,10 @@
- void Debug(const char *, ...);
- void DebugM(const char *, ...);
- void Error(const char *, ...);
--void Fatal(const char *, ...) __dead2;
--void Punt(const char *, ...) __dead2;
--void DieHorribly(void) __dead2;
--void Finish(int) __dead2;
-+void Fatal(const char *, ...);
-+void Punt(const char *, ...);
-+void DieHorribly(void);
-+void Finish(int);
- char *estrdup(const char *);
- void *emalloc(size_t);
- void *erealloc(void *, size_t);
---- a/src/usr.bin/yacc/defs.h
-+++ b/src/usr.bin/yacc/defs.h
-@@ -42,6 +42,9 @@
- #include <err.h>
- #include <stdio.h>
-
-+#ifndef __dead2
-+# define __dead2
-+#endif
-
- /* machine-dependent definitions */
- /* the following definitions are for the Tahoe */
---- a/src/usr.bin/yacc/main.c
-+++ b/src/usr.bin/yacc/main.c
-@@ -114,7 +114,7 @@
-
- volatile sig_atomic_t sigdie;
-
--__dead2 void
-+ void
- done(k)
- int k;
- {
---- a/src/usr.sbin/btxld/btx.h
-+++ b/src/usr.sbin/btxld/btx.h
-@@ -30,6 +30,7 @@
- #define _BTX_H_
-
- #include <sys/types.h>
-+#include <stdint.h>
-
- #define BTX_PGSIZE 0x1000 /* Page size */
- #define BTX_PGBASE 0x5000 /* Start of page tables */
---- a/src/usr.sbin/btxld/btxld.c
-+++ b/src/usr.sbin/btxld/btxld.c
-@@ -30,7 +30,6 @@
- #endif /* not lint */
-
- #include <sys/param.h>
--#include <sys/endian.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-
---- a/src/usr.sbin/btxld/elfh.c
-+++ b/src/usr.sbin/btxld/elfh.c
-@@ -27,9 +27,9 @@
- */
-
- #include <sys/types.h>
--#include <sys/endian.h>
-
- #include <stddef.h>
-+#include <stdint.h>
- #include "elfh.h"
-
- #define SET_ME 0xeeeeeeee /* filled in by btxld */
---- a/src/usr.sbin/kgzip/elfhdr.c
-+++ b/src/usr.sbin/kgzip/elfhdr.c
-@@ -26,7 +26,6 @@
- * $FreeBSD$
- */
-
--#include <sys/endian.h>
- #include <stddef.h>
- #include "elfhdr.h"
-
---- a/src/usr.sbin/kgzip/kgzld.c
-+++ b/src/usr.sbin/kgzip/kgzld.c
-@@ -27,7 +27,6 @@
- */
-
- #include <sys/types.h>
--#include <sys/endian.h>
- #include <sys/wait.h>
-
- #include <err.h>
---- a/src/usr.sbin/mtree/create.c
-+++ b/src/usr.sbin/mtree/create.c
-@@ -77,7 +77,11 @@
- static u_long flags = 0xffffffff;
-
- static int dsort(const FTSENT * const *, const FTSENT * const *);
--static void output(int, int *, const char *, ...) __printflike(3, 4);
-+static void output(int, int *, const char *, ...)
-+#ifdef __FreeBSD__
-+__printflike(3, 4)
-+#endif
-+;
- static int statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *);
- static void statf(int, FTSENT *);
-
---- a/src/usr.sbin/mtree/excludes.c
-+++ b/src/usr.sbin/mtree/excludes.c
-@@ -32,7 +32,8 @@
-
- #include <sys/types.h>
- #include <sys/time.h> /* XXX for mtree.h */
--#include <sys/queue.h>
-+#include <bsd/sys/queue.h>
-+#include <bsd/stdio.h>
-
- #include <err.h>
- #include <fnmatch.h>
---- a/src/usr.sbin/mtree/extern.h
-+++ b/src/usr.sbin/mtree/extern.h
-@@ -29,6 +29,9 @@
- * @(#)extern.h 8.1 (Berkeley) 6/6/93
- * $FreeBSD$
- */
-+
-+#include <stdint.h>
-+
- extern uint32_t crc_total;
-
- #ifdef _FTS_H_
---- a/src/usr.sbin/mtree/mtree.h
-+++ b/src/usr.sbin/mtree/mtree.h
-@@ -60,6 +60,9 @@
- char *slink; /* symbolic link reference */
- uid_t st_uid; /* uid */
- gid_t st_gid; /* gid */
-+#ifndef S_ISTXT
-+#define S_ISTXT S_ISVTX
-+#endif
- #define MBITS (S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
- mode_t st_mode; /* mode */
- u_long st_flags; /* flags */
---- a/src/usr.sbin/mtree/spec.c
-+++ b/src/usr.sbin/mtree/spec.c
-@@ -35,6 +35,7 @@
- #include <sys/cdefs.h>
- __FBSDID("$FreeBSD$");
-
-+#include <bsd/stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <ctype.h>
---- a/src/usr.bin/make/Makefile.dist
-+++ b/src/usr.bin/make/Makefile.dist
-@@ -2,7 +2,7 @@
- # a simple makefile to help builds on !FreeBSD systems
- pmake:
- @echo 'make started.'
-- cc $(shell pkg-config --cflags libbsd-overlay) -DDEFSHELLNAME=\"sh\" -I. -c *.c
-+ cc -D__FBSDID="static const char *id=" -DDEFSHELLNAME=\"sh\" -I. -c *.c
- cc *.o -lbsd -o pmake
- @echo 'make completed.'
-
Modified: trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/22_ld_as_needed.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -10,13 +10,14 @@
util.c var.c
--- a/src/usr.sbin/mtree/Makefile
+++ b/src/usr.sbin/mtree/Makefile
-@@ -7,5 +7,6 @@
- MAN= mtree.8 mtree.5
+@@ -9,6 +9,7 @@
+ 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
+LDADD+= -lbsd
- .include <bsd.prog.mk>
+
+ .if ${MK_NMTREE} == "no"
--- a/src/usr.bin/brandelf/Makefile
+++ b/src/usr.bin/brandelf/Makefile
@@ -1,5 +1,6 @@
Modified: trunk/freebsd-buildutils/debian/patches/config_ldflags.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/config_ldflags.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/config_ldflags.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -1,6 +1,6 @@
--- a/src/usr.sbin/config/Makefile
+++ b/src/usr.sbin/config/Makefile
-@@ -14,6 +14,8 @@
+@@ -16,6 +16,8 @@
DPADD= ${LIBL} ${LIBSBUF}
LDADD= -ll -lsbuf
Modified: trunk/freebsd-buildutils/debian/patches/disable_wsystem_headers.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/disable_wsystem_headers.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/disable_wsystem_headers.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -1,12 +1,12 @@
--- a/src/share/mk/bsd.sys.mk
+++ b/src/share/mk/bsd.sys.mk
-@@ -27,7 +27,8 @@
+@@ -29,7 +29,8 @@
#CFLAGS+= -pedantic
.if defined(WARNS)
.if ${WARNS} >= 1
-CWARNFLAGS+= -Wsystem-headers
+# Disabled (see #664242)
+#CWARNFLAGS+= -Wsystem-headers
- .if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \
- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang))
+ .if !defined(NO_WERROR) && (${COMPILER_TYPE} != "clang" \
+ || !defined(NO_WERROR.clang))
CWARNFLAGS+= -Werror
Deleted: trunk/freebsd-buildutils/debian/patches/make_bootstrap_fix.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/make_bootstrap_fix.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/make_bootstrap_fix.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -1,11 +0,0 @@
---- a/src/share/mk/bsd.own.mk
-+++ b/src/share/mk/bsd.own.mk
-@@ -639,7 +639,7 @@
-
- .if ${MK_CTF} != "no"
- CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
--.elif ${MAKE_VERSION} >= 5201111300
-+.elif defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300
- CTFCONVERT_CMD=
- .else
- CTFCONVERT_CMD= @:
Modified: trunk/freebsd-buildutils/debian/patches/nostrip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/nostrip.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/nostrip.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -4,18 +4,18 @@
--- a/src/share/mk/bsd.lib.mk
+++ b/src/share/mk/bsd.lib.mk
-@@ -42,7 +42,7 @@
+@@ -40,7 +40,7 @@
+ CTFFLAGS+= -g
.endif
-
- .if !defined(DEBUG_FLAGS)
+ .else
-STRIP?= -s
+#STRIP?= -s
.endif
- .include <bsd.libnames.mk>
+ .if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
--- a/src/share/mk/bsd.own.mk
+++ b/src/share/mk/bsd.own.mk
-@@ -183,7 +183,7 @@
+@@ -200,7 +200,7 @@
# Common variables
.if !defined(DEBUG_FLAGS)
@@ -26,7 +26,7 @@
COMPRESS_CMD?= gzip -cn -9
--- a/src/share/mk/bsd.prog.mk
+++ b/src/share/mk/bsd.prog.mk
-@@ -29,7 +29,7 @@
+@@ -45,7 +45,7 @@
.endif
.if !defined(DEBUG_FLAGS)
Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/series 2013-06-19 10:23:05 UTC (rev 4527)
@@ -1,7 +1,6 @@
# Patches from (or merged in) upstream
# Patches that are in good shape for merging upstream
-make_bootstrap_fix.diff
yacc_is_byacc.diff
# Other patches
Modified: trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff 2013-06-19 10:23:05 UTC (rev 4527)
@@ -1,6 +1,6 @@
--- a/src/share/mk/sys.mk
+++ b/src/share/mk/sys.mk
-@@ -137,7 +137,7 @@
+@@ -150,7 +150,7 @@
SHELL ?= sh
Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules 2013-06-18 22:56:05 UTC (rev 4526)
+++ trunk/freebsd-buildutils/debian/rules 2013-06-19 10:23:05 UTC (rev 4527)
@@ -56,7 +56,7 @@
PMAKE_FLAGS = -m $(CURDIR)/src/share/mk
PMAKE_BOOTSTRAP = $(CURDIR)/build-tree/src/usr.bin/make/pmake $(PMAKE_FLAGS)
-PMAKE = $(CURDIR)/build-tree/src/usr.bin/make/make $(PMAKE_FLAGS)
+PMAKE = $(CURDIR)/build-tree/src/usr.bin/make/fmake $(PMAKE_FLAGS)
YACC = byacc
package = $(SOURCE)
@@ -69,6 +69,7 @@
usr.bin/cksum \
usr.bin/file2c \
usr.bin/lex \
+ contrib/flex \
usr.bin/make \
usr.bin/mkdep \
usr.bin/brandelf \
@@ -102,7 +103,6 @@
cd build-tree/src/usr.bin/lex ; \
$(PMAKE) bootstrap ; \
- $(YACC) -d -o parse.c parse.y ; \
$(PMAKE) $(MAKE_BUILD_FLAGS) NO_PROFILE=1 NO_INSTALLLIB=1
$(PMAKE) $(MAKE_BUILD_FLAGS) -C build-tree/src/usr.bin/mkdep
@@ -132,11 +132,16 @@
$(PMAKE) -C build-tree/src/share/mk install \
DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/share
+ # Legacy make is now called "fmake". FIXME: I guess we'll need to point this
+ # symlink to "bmake" at some point?
+ ln -s fmake $(CURDIR)/debian/$(package)/usr/lib/freebsd/make
+
# remove trash
rm -rf $(CURDIR)/debian/$(package)/usr/include \
$(CURDIR)/debian/$(package)/var
- find $(CURDIR)/debian/$(package)/usr/share/man -type l | \
- xargs rm
+ for i in `find $(CURDIR)/debian/$(package)/usr/share/man -type l` ; do \
+ rm $$i ; \
+ done
# relocate files
for m in `find $(CURDIR)/debian/$(package)/usr/share/man -type f`; do \
More information about the Glibc-bsd-commits
mailing list