[Glibc-bsd-commits] r2218 - in trunk/freebsd6-buildutils: . debian debian/patches

ps-guest at alioth.debian.org ps-guest at alioth.debian.org
Fri Jul 11 14:08:14 UTC 2008


Author: ps-guest
Date: 2008-07-11 14:08:13 +0000 (Fri, 11 Jul 2008)
New Revision: 2218

Added:
   trunk/freebsd6-buildutils/debian/patches/12_unused.diff
   trunk/freebsd6-buildutils/debian/patches/13_bsd_sys.diff
   trunk/freebsd6-buildutils/debian/patches/14_config.diff
Removed:
   trunk/freebsd6-buildutils/debian/install
   trunk/freebsd6-buildutils/debian/patches/000_7-current_support_in_bsd.own.mk.diff
   trunk/freebsd6-buildutils/debian/patches/000_fix_make_double_free.diff
   trunk/freebsd6-buildutils/debian/patches/02_silly_macros.diff
Modified:
   trunk/freebsd6-buildutils/debian/changelog
   trunk/freebsd6-buildutils/debian/control
   trunk/freebsd6-buildutils/debian/dirs
   trunk/freebsd6-buildutils/debian/patches/00_upstream.diff
   trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff
   trunk/freebsd6-buildutils/debian/rules
   trunk/freebsd6-buildutils/fetch
Log:
freebsd-buildutils:
  * New upstream version (RELENG_7_0_0_RELEASE)
    - drop upstream patches 000_fix_make_double_free.diff,
      000_7-current_support_in_bsd.own.mk.diff
    - replace 02_silly_macros.diff via sed and 12_unused.diff
    - add 13_bsd_sys.diff, 14_config.diff
    - update remaining patches
  * Package rename, cleanup



Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/changelog	2008-07-11 14:08:13 UTC (rev 2218)
@@ -1,9 +1,19 @@
-freebsd6-buildutils (6.3-3) UNRELEASED; urgency=low
+freebsd-buildutils (7.0-1) UNRELEASED; urgency=low
 
-  * Drop also symlink pointing to gcc-3.4. 
+  [ Petr Salinger ]
+  * New upstream version (RELENG_7_0_0_RELEASE)
+    - drop upstream patches 000_fix_make_double_free.diff,
+      000_7-current_support_in_bsd.own.mk.diff
+    - replace 02_silly_macros.diff via sed and 12_unused.diff
+    - add 13_bsd_sys.diff, 14_config.diff
+    - update remaining patches
+  * Package rename, cleanup
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 12 Jan 2008 18:02:07 +0100
+  [ Aurelien Jarno ]
+  * Drop symlink pointing to gcc-3.4.
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 11 Jul 2008 15:55:55 +0200
+
 freebsd6-buildutils (6.3-2) unreleased; urgency=low
 
   * Don't build-depends nor depends on gcc-3.4. 

Modified: trunk/freebsd6-buildutils/debian/control
===================================================================
--- trunk/freebsd6-buildutils/debian/control	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/control	2008-07-11 14:08:13 UTC (rev 2218)
@@ -1,12 +1,12 @@
-Source: freebsd6-buildutils
+Source: freebsd-buildutils
 Section: devel
 Priority: extra
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: patchutils (>= 0.2.25), debhelper (>= 4.1.0), pmake, flex, bison, libbsd-dev
+Build-Depends: debhelper (>= 4.1.0), pmake, flex, bison, libbsd-dev
 Standards-Version: 3.7.3
 
-Package: freebsd6-buildutils
+Package: freebsd-buildutils
 Architecture: any
 Depends: ${shlibs:Depends}, bsdmainutils, unzip, patchutils, dash, original-awk, make
 #
@@ -15,11 +15,11 @@
 #   awk -> original-awk
 #   gmake -> make
 #
-Conflicts: freebsd5-buildutils, freebsd-buildutils, pmake
-Provides: freebsd-buildutils
-Description: Utilities for building FreeBSD 6.x sources
- This package contains the FreeBSD 6.x counterparts of some standard build
+Conflicts: freebsd5-buildutils, freebsd6-buildutils, pmake
+Provides: freebsd6-buildutils, freebsd7-buildutils
+Description: Utilities for building FreeBSD sources
+ This package contains the FreeBSD counterparts of some standard build
  utilities (make, yacc, lex ..)
  .
- They have some specific modifications needed to be able to build FreeBSD 6.x
- sources (such as ufsutils).
+ They have some specific modifications needed to be able to build FreeBSD
+ sources (such as kfreebsd-7).

Modified: trunk/freebsd6-buildutils/debian/dirs
===================================================================
--- trunk/freebsd6-buildutils/debian/dirs	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/dirs	2008-07-11 14:08:13 UTC (rev 2218)
@@ -4,8 +4,6 @@
 usr/share/man/man1
 usr/share/man/man5
 usr/share/man/man8
-usr/include/g++
-usr/include/c++/3.3
 usr/lib
 var/db
 usr/share/mk

Deleted: trunk/freebsd6-buildutils/debian/install
===================================================================
--- trunk/freebsd6-buildutils/debian/install	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/install	2008-07-11 14:08:13 UTC (rev 2218)
@@ -1 +0,0 @@
-build-tree/ports	usr/share/freebsd5-buildutils

Deleted: trunk/freebsd6-buildutils/debian/patches/000_7-current_support_in_bsd.own.mk.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/000_7-current_support_in_bsd.own.mk.diff	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/patches/000_7-current_support_in_bsd.own.mk.diff	2008-07-11 14:08:13 UTC (rev 2218)
@@ -1,295 +0,0 @@
-
-Stolen from HEAD on 2006-05-06.  This is needed to build 7.x kernel.
-
---- src/share/mk/bsd.own.mk.old	2006-05-06 13:05:37.000000000 +0200
-+++ src/share/mk/bsd.own.mk	2006-05-06 13:07:25.000000000 +0200
-@@ -162,7 +162,288 @@
- STRIP?=		-s
- .endif
- 
--COMPRESS_CMD?=	gzip -cn
-+COMPRESS_CMD?=	gzip -9 -cn
- COMPRESS_EXT?=	.gz
- 
-+#
-+# Define MK_* variables (which are either "yes" or "no") for users
-+# to set via WITH_*/WITHOUT_* in /etc/src.conf and override in the
-+# make(1) environment.
-+# These should be tested with `== "no"' or `!= "no"' in makefiles.
-+# The NO_* variables should only be set by makefiles.
-+#
-+
-+#
-+# Supported NO_* options (if defined, MK_* will be forced to "no",
-+# regardless of user's setting).
-+#
-+.for var in \
-+    MAN \
-+    PROFILE
-+.if defined(NO_${var})
-+WITHOUT_${var}=
-+.endif
-+.endfor
-+
-+#
-+# Compat NO_* options (same as above, except their use is deprecated).
-+#
-+.if !defined(BURN_BRIDGES)
-+.for var in \
-+    ACPI \
-+    ATM \
-+    AUDIT \
-+    AUTHPF \
-+    BIND \
-+    BIND_DNSSEC \
-+    BIND_ETC \
-+    BIND_LIBS_LWRES \
-+    BIND_MTREE \
-+    BIND_NAMED \
-+    BIND_UTILS \
-+    BLUETOOTH \
-+    BOOT \
-+    CALENDAR \
-+    CPP \
-+    CRYPT \
-+    CVS \
-+    CXX \
-+    DICT \
-+    DYNAMICROOT \
-+    EXAMPLES \
-+    FORTH \
-+    FORTRAN \
-+    FP_LIBC \
-+    GAMES \
-+    GCOV \
-+    GDB \
-+    GNU \
-+    GPIB \
-+    GROFF \
-+    HTML \
-+    I4B \
-+    INET6 \
-+    INFO \
-+    IPFILTER \
-+    IPX \
-+    KERBEROS \
-+    LIB32 \
-+    LIBC_R \
-+    LIBPTHREAD \
-+    LIBTHR \
-+    LOCALES \
-+    LPR \
-+    MAILWRAPPER \
-+    NETCAT \
-+    NIS \
-+    NLS \
-+    NLS_CATALOGS \
-+    NS_CACHING \
-+    OBJC \
-+    OPENSSH \
-+    OPENSSL \
-+    PAM \
-+    PCVT \
-+    PF \
-+    RCMDS \
-+    RCS \
-+    RESCUE \
-+    SENDMAIL \
-+    SETUID_LOGIN \
-+    SHAREDOCS \
-+    SYSCONS \
-+    TCSH \
-+    TOOLCHAIN \
-+    USB \
-+    WPA_SUPPLICANT_EAPOL
-+.if defined(NO_${var})
-+#.warning NO_${var} is deprecated in favour of WITHOUT_${var}=
-+WITHOUT_${var}=
-+.endif
-+.endfor
-+.endif # !defined(BURN_BRIDGES)
-+
-+#
-+# Older-style variables that enabled behaviour when set.
-+#
-+.if defined(YES_HESIOD)
-+WITH_HESIOD=
-+.endif
-+.if defined(MAKE_IDEA)
-+WITH_IDEA=
-+.endif
-+
-+#
-+# MK_* options which default to "yes".
-+#
-+.for var in \
-+    ACPI \
-+    ATM \
-+    AUDIT \
-+    AUTHPF \
-+    BIND \
-+    BIND_DNSSEC \
-+    BIND_ETC \
-+    BIND_LIBS_LWRES \
-+    BIND_MTREE \
-+    BIND_NAMED \
-+    BIND_UTILS \
-+    BLUETOOTH \
-+    BOOT \
-+    CALENDAR \
-+    CPP \
-+    CRYPT \
-+    CVS \
-+    CXX \
-+    DICT \
-+    DYNAMICROOT \
-+    EXAMPLES \
-+    FORTH \
-+    FORTRAN \
-+    FP_LIBC \
-+    GAMES \
-+    GCOV \
-+    GDB \
-+    GNU \
-+    GPIB \
-+    GROFF \
-+    HTML \
-+    I4B \
-+    INET6 \
-+    INFO \
-+    IPFILTER \
-+    IPX \
-+    KERBEROS \
-+    LIB32 \
-+    LIBC_R \
-+    LIBPTHREAD \
-+    LIBTHR \
-+    LOCALES \
-+    LPR \
-+    MAILWRAPPER \
-+    MAN \
-+    NCP \
-+    NETCAT \
-+    NIS \
-+    NLS \
-+    NLS_CATALOGS \
-+    NS_CACHING \
-+    OBJC \
-+    OPENSSH \
-+    OPENSSL \
-+    PAM \
-+    PCVT \
-+    PF \
-+    PROFILE \
-+    RCMDS \
-+    RCS \
-+    RESCUE \
-+    SENDMAIL \
-+    SETUID_LOGIN \
-+    SHAREDOCS \
-+    SYSCONS \
-+    TCSH \
-+    TOOLCHAIN \
-+    USB \
-+    WPA_SUPPLICANT_EAPOL
-+.if defined(WITH_${var}) && defined(WITHOUT_${var})
-+.error WITH_${var} and WITHOUT_${var} can't both be set.
-+.endif
-+.if defined(MK_${var})
-+.error MK_${var} can't be set by a user.
-+.endif
-+.if defined(WITHOUT_${var})
-+MK_${var}:=	no
-+.else
-+MK_${var}:=	yes
-+.endif
-+.endfor
-+
-+#
-+# MK_* options which default to "no".
-+#
-+.for var in \
-+    BIND_LIBS \
-+    HESIOD \
-+    IDEA
-+.if defined(WITH_${var}) && defined(WITHOUT_${var})
-+.error WITH_${var} and WITHOUT_${var} can't both be set.
-+.endif
-+.if defined(MK_${var})
-+.error MK_${var} can't be set by a user.
-+.endif
-+.if defined(WITH_${var})
-+MK_${var}:=	yes
-+.else
-+MK_${var}:=	no
-+.endif
-+.endfor
-+
-+#
-+# Force some options off if their dependencies are off.
-+#
-+.if ${MK_BIND} == "no"
-+MK_BIND_DNSSEC:= no
-+MK_BIND_ETC:=	no
-+MK_BIND_LIBS:=	no
-+MK_BIND_LIBS_LWRES:= no
-+MK_BIND_MTREE:=	no
-+MK_BIND_NAMED:=	no
-+MK_BIND_UTILS:=	no
-+.endif
-+
-+.if ${MK_BIND_MTREE} == "no"
-+MK_BIND_ETC:=	no
-+.endif
-+
-+.if ${MK_CRYPT} == "no"
-+MK_OPENSSL:=	no
-+MK_OPENSSH:=	no
-+MK_KERBEROS:=	no
-+.endif
-+
-+.if ${MK_IPX} == "no"
-+MK_NCP:=	no
-+.endif
-+
-+.if ${MK_OPENSSL} == "no"
-+MK_OPENSSH:=	no
-+MK_KERBEROS:=	no
-+.endif
-+
-+.if ${MK_PF} == "no"
-+MK_AUTHPF:=	no
-+.endif
-+
-+.if ${MK_TOOLCHAIN} == "no"
-+MK_GDB:=	no
-+.endif
-+
-+#
-+# Set defaults for the MK_*_SUPPORT variables.
-+#
-+
-+#
-+# MK_*_SUPPORT options which default to "yes" unless their corresponding
-+# MK_* variable is set to "no".
-+#
-+.for var in \
-+    GNU \
-+    INET6 \
-+    IPX \
-+    KERBEROS \
-+    PAM
-+.if defined(WITH_${var}_SUPPORT) && defined(WITHOUT_${var}_SUPPORT)
-+.error WITH_${var}_SUPPORT and WITHOUT_${var}_SUPPORT can't both be set.
-+.endif
-+.if defined(MK_${var}_SUPPORT)
-+.error MK_${var}_SUPPORT can't be set by a user.
-+.endif
-+.if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no"
-+MK_${var}_SUPPORT:= no
-+.else
-+MK_${var}_SUPPORT:= yes
-+.endif
-+.endfor
-+
- .endif	# !target(__<bsd.own.mk>__)

Deleted: trunk/freebsd6-buildutils/debian/patches/000_fix_make_double_free.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/000_fix_make_double_free.diff	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/patches/000_fix_make_double_free.diff	2008-07-11 14:08:13 UTC (rev 2218)
@@ -1,44 +0,0 @@
-
-Patch from upstream (1.155:1.158).  Thanks to Petr for spotting this.
-
---- src.old/usr.bin/make/main.c	2006-02-12 17:43:38.000000000 +0100
-+++ src/usr.bin/make/main.c	2006-02-12 17:44:22.000000000 +0100
-@@ -235,14 +235,14 @@
- static Boolean
- ReadMakefile(const char p[])
- {
--	char *fname;			/* makefile to read */
-+	char *fname, *fnamesave;	/* makefile to read */
- 	FILE *stream;
- 	char *name, path[MAXPATHLEN];
- 	char *MAKEFILE;
- 	int setMAKEFILE;
- 
- 	/* XXX - remove this once constification is done */
--	fname = estrdup(p);
-+	fnamesave = fname = estrdup(p);
- 
- 	if (!strcmp(fname, "-")) {
- 		Parse_File("(stdin)", stdin);
-@@ -297,8 +297,10 @@
- 		name = Path_FindFile(fname, &parseIncPath);
- 		if (!name)
- 			name = Path_FindFile(fname, &sysIncPath);
--		if (!name || !(stream = fopen(name, "r")))
-+		if (!name || !(stream = fopen(name, "r"))) {
-+			free(fnamesave);
- 			return (FALSE);
-+		}
- 		MAKEFILE = fname = name;
- 		/*
- 		 * set the MAKEFILE variable desired by System V fans -- the
-@@ -309,8 +311,8 @@
- 		if (setMAKEFILE)
- 			Var_SetGlobal("MAKEFILE", MAKEFILE);
- 		Parse_File(fname, stream);
--		fclose(stream);
- 	}
-+	free(fnamesave);
- 	return (TRUE);
- }
- 

Modified: trunk/freebsd6-buildutils/debian/patches/00_upstream.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/00_upstream.diff	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/patches/00_upstream.diff	2008-07-11 14:08:13 UTC (rev 2218)
@@ -48,21 +48,6 @@
  
  	/*
  	 * Get the name of this type of MACHINE from utsname
-diff -ur src.old/usr.bin/yacc/main.c src/usr.bin/yacc/main.c
---- src.old/usr.bin/yacc/main.c	2004-03-05 03:05:56.000000000 +0100
-+++ src/usr.bin/yacc/main.c	2006-02-09 19:27:56.000000000 +0100
-@@ -114,7 +114,10 @@
- 
- volatile sig_atomic_t sigdie;
- 
--__dead2 void
-+
-+
-+
-+void
- done(k)
- int k;
- {
 diff -ur src.old/usr.sbin/config/main.c src/usr.sbin/config/main.c
 --- src.old/usr.sbin/config/main.c	2005-12-17 12:47:02.000000000 +0100
 +++ src/usr.sbin/config/main.c	2006-02-09 19:27:56.000000000 +0100

Modified: trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/patches/01_make_fixes.diff	2008-07-11 14:08:13 UTC (rev 2218)
@@ -59,47 +59,59 @@
 diff -ur ../foo.old/src/share/mk/bsd.lib.mk ./src/share/mk/bsd.lib.mk
 --- ../foo.old/src/share/mk/bsd.lib.mk	2005-12-17 12:45:38.000000000 +0100
 +++ ./src/share/mk/bsd.lib.mk	2005-12-17 12:49:11.000000000 +0100
-@@ -109,7 +109,7 @@
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
+@@ -124,9 +124,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}
+ .else
+-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
++	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort` ${ARADD}
+ .endif
  	${RANLIB} ${.TARGET}
  .endif
- 
-@@ -122,7 +122,7 @@
- lib${LIB}_p.a: ${POBJS}
+@@ -141,9 +141,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}
+ .else
+-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
++	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort` ${ARADD}
+ .endif
  	${RANLIB} ${.TARGET}
  .endif
- 
-@@ -138,11 +138,11 @@
+@@ -160,16 +160,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
+ .if !defined(NM)
  	@${CC} ${LDFLAGS} -shared -Wl,-x \
  	    -o ${.TARGET} -Wl,-soname,${SONAME} \
 -	    `lorder ${SOBJS} | tsort -q` ${LDADD}
 +	    `lorder ${SOBJS} | tsort` ${LDADD}
+ .else
+ 	@${CC} ${LDFLAGS} -shared -Wl,-x \
+ 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
+-	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
++	    `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD}
  .endif
+ .endif
  
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
-@@ -208,11 +208,11 @@
+@@ -236,11 +236,11 @@
  .ORDER: beforeinstall _libinstall
  _libinstall:
- .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB)
+ .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
 -	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 +	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
  	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
  .endif
- .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB)
+ .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB)
 -	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 +	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
  	    ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}

Deleted: trunk/freebsd6-buildutils/debian/patches/02_silly_macros.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/02_silly_macros.diff	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/patches/02_silly_macros.diff	2008-07-11 14:08:13 UTC (rev 2218)
@@ -1,218 +0,0 @@
-diff -ur ../foo.old/src/usr.bin/lex/flex.skl ./src/usr.bin/lex/flex.skl
---- ../foo.old/src/usr.bin/lex/flex.skl	2004-01-06 20:03:44.000000000 +0100
-+++ ./src/usr.bin/lex/flex.skl	2005-12-17 12:53:40.000000000 +0100
-@@ -263,7 +263,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 )) ;
- static void yy_flex_free YY_PROTO(( void * ));
- 
- #define yy_new_buffer yy_create_buffer
-diff -ur ../foo.old/src/usr.bin/make/cond.c ./src/usr.bin/make/cond.c
---- ../foo.old/src/usr.bin/make/cond.c	2005-05-25 18:06:14.000000000 +0200
-+++ ./src/usr.bin/make/cond.c	2005-12-17 12:53:40.000000000 +0100
-@@ -1115,7 +1115,7 @@
-  *	Handle .else statement.
-  */
- void
--Cond_Else(char *line __unused, int code __unused, int lineno __unused)
-+Cond_Else(char *line , int code , int lineno )
- {
- 
- 	while (isspace((u_char)*line))
-@@ -1156,7 +1156,7 @@
-  *	Handle .endif statement.
-  */
- void
--Cond_Endif(char *line __unused, int code __unused, int lineno __unused)
-+Cond_Endif(char *line , int code , int lineno )
- {
- 
- 	while (isspace((u_char)*line))
-diff -ur ../foo.old/src/usr.bin/make/job.c ./src/usr.bin/make/job.c
---- ../foo.old/src/usr.bin/make/job.c	2005-12-17 12:46:35.000000000 +0100
-+++ ./src/usr.bin/make/job.c	2005-12-17 12:53:40.000000000 +0100
-@@ -477,7 +477,7 @@
- }
- 
- static void
--catch_child(int sig __unused)
-+catch_child(int sig )
- {
- }
- 
-@@ -2193,7 +2193,7 @@
-  */
- void
- #ifdef USE_KQUEUE
--Job_CatchOutput(int flag __unused)
-+Job_CatchOutput(int flag )
- #else
- Job_CatchOutput(int flag)
- #endif
-diff -ur ../foo.old/src/usr.bin/make/parse.c ./src/usr.bin/make/parse.c
---- ../foo.old/src/usr.bin/make/parse.c	2005-12-17 12:46:36.000000000 +0100
-+++ ./src/usr.bin/make/parse.c	2005-12-17 12:55:14.000000000 +0100
-@@ -2065,7 +2065,7 @@
-  *	options
-  */
- static void
--parse_include(char *file, int code __unused, int lineno __unused)
-+parse_include(char *file, int code, int lineno)
- {
- 	char	*fullname;	/* full pathname of file */
- 	char	endc;		/* the character which ends the file spec */
-@@ -2204,7 +2204,7 @@
-  *	a warning if the directive is malformed.
-  */
- static void
--parse_message(char *line, int iserror, int lineno __unused)
-+parse_message(char *line, int iserror, int lineno )
- {
- 
- 	if (!isspace((u_char)*line)) {
-@@ -2231,7 +2231,7 @@
-  *	Parse an .undef directive.
-  */
- static void
--parse_undef(char *line, int code __unused, int lineno __unused)
-+parse_undef(char *line, int code , int lineno )
- {
- 	char *cp;
- 
-@@ -2253,7 +2253,7 @@
-  *	Parse a .for directive.
-  */
- static void
--parse_for(char *line, int code __unused, int lineno)
-+parse_for(char *line, int code , int lineno)
- {
- 
- 	if (!For_For(line)) {
-@@ -2285,7 +2285,7 @@
-  *	Parse endfor. This may only happen if there was no matching .for.
-  */
- static void
--parse_endfor(char *line __unused, int code __unused, int lineno __unused)
-+parse_endfor(char *line , int code , int lineno )
- {
- 
- 	Parse_Error(PARSE_FATAL, "for-less endfor");
-diff -ur ../foo.old/src/usr.bin/make/shell.c ./src/usr.bin/make/shell.c
---- ../foo.old/src/usr.bin/make/shell.c	2005-05-24 17:30:03.000000000 +0200
-+++ ./src/usr.bin/make/shell.c	2005-12-17 12:53:40.000000000 +0100
-@@ -120,7 +120,7 @@
-  */
- static struct Shells shells = TAILQ_HEAD_INITIALIZER(shells);
- 
--void ShellDump(const struct Shell *) __unused;
-+void ShellDump(const struct Shell *) ;
- 
- /**
-  * Helper function for sorting the builtin list alphabetically.
-diff -ur ../foo.old/src/usr.bin/make/var.c ./src/usr.bin/make/var.c
---- ../foo.old/src/usr.bin/make/var.c	2005-12-17 12:46:36.000000000 +0100
-+++ ./src/usr.bin/make/var.c	2005-12-17 12:53:40.000000000 +0100
-@@ -248,7 +248,7 @@
-  *	The trimmed word is added to the buffer.
-  */
- static Boolean
--VarHead(const char *word, Boolean addSpace, Buffer *buf, void *dummy __unused)
-+VarHead(const char *word, Boolean addSpace, Buffer *buf, void *dummy )
- {
- 	char *slash;
- 
-@@ -283,7 +283,7 @@
-  *	The trimmed word is added to the buffer.
-  */
- static Boolean
--VarTail(const char *word, Boolean addSpace, Buffer *buf, void *dummy __unused)
-+VarTail(const char *word, Boolean addSpace, Buffer *buf, void *dummy )
- {
- 	const char *slash;
- 
-@@ -312,7 +312,7 @@
-  *	The suffix from the word is placed in the buffer.
-  */
- static Boolean
--VarSuffix(const char *word, Boolean addSpace, Buffer *buf, void *dummy __unused)
-+VarSuffix(const char *word, Boolean addSpace, Buffer *buf, void *dummy )
- {
- 	const char *dot;
- 
-@@ -340,7 +340,7 @@
-  *	The trimmed word is added to the buffer.
-  */
- static Boolean
--VarRoot(const char *word, Boolean addSpace, Buffer *buf, void *dummy __unused)
-+VarRoot(const char *word, Boolean addSpace, Buffer *buf, void *dummy )
- {
- 	char *dot;
- 
-diff -ur ../foo.old/src/usr.bin/yacc/main.c ./src/usr.bin/yacc/main.c
---- ../foo.old/src/usr.bin/yacc/main.c	2005-12-17 12:48:54.000000000 +0100
-+++ ./src/usr.bin/yacc/main.c	2005-12-17 12:53:40.000000000 +0100
-@@ -131,7 +131,7 @@
- 
- static void
- onintr(signo)
--	int signo __unused;
-+	int signo ;
- {
-     sigdie = 1;
-     done(1);
-diff -ur ../foo.old/src/usr.sbin/mtree/compare.c ./src/usr.sbin/mtree/compare.c
---- ../foo.old/src/usr.sbin/mtree/compare.c	2005-12-17 12:48:54.000000000 +0100
-+++ ./src/usr.sbin/mtree/compare.c	2005-12-17 12:53:40.000000000 +0100
-@@ -72,7 +72,7 @@
- 	}
- 
- int
--compare(char *name __unused, NODE *s, FTSENT *p)
-+compare(char *name , NODE *s, FTSENT *p)
- {
- 	struct timeval tv[2];
- 	uint32_t val;
-diff -ur ../build-tree.old/src/usr.bin/make/proc.h ./src/usr.bin/make/proc.h
---- ../build-tree.old/src/usr.bin/make/proc.h	2005-12-17 00:17:45.000000000 +0100
-+++ ./src/usr.bin/make/proc.h	2005-12-17 00:20:28.000000000 +0100
-@@ -48,6 +48,6 @@
- 	pid_t	child_pid;
- } ProcStuff;
- 
--void Proc_Exec(const ProcStuff *) __dead2;
-+void Proc_Exec(const ProcStuff *) ;
- 
- #endif /* proc_h_458845848 */
-diff -ur ../build-tree.old/src/usr.bin/make/util.c ./src/usr.bin/make/util.c
---- ../build-tree.old/src/usr.bin/make/util.c	2005-12-17 00:17:45.000000000 +0100
-+++ ./src/usr.bin/make/util.c	2005-12-17 00:20:28.000000000 +0100
-@@ -60,7 +60,7 @@
- #include "targ.h"
- #include "util.h"
- 
--static void enomem(void) __dead2;
-+static void enomem(void) ;
- 
- /*-
-  * Debug --
-diff -ur ../build-tree.old/src/usr.bin/make/util.h ./src/usr.bin/make/util.h
---- ../build-tree.old/src/usr.bin/make/util.h	2005-12-17 00:17:45.000000000 +0100
-+++ ./src/usr.bin/make/util.h	2005-12-17 00:20:28.000000000 +0100
-@@ -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);

Added: trunk/freebsd6-buildutils/debian/patches/12_unused.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/12_unused.diff	                        (rev 0)
+++ trunk/freebsd6-buildutils/debian/patches/12_unused.diff	2008-07-11 14:08:13 UTC (rev 2218)
@@ -0,0 +1,28 @@
+
+  sed in debian/rules deletes "__unused" everywhere,
+  fix consequences now
+
+diff -ur src/usr.bin/yacc/skeleton.c src/usr.bin/yacc/skeleton.c
+--- src/usr.bin/yacc/skeleton.c
++++ src/usr.bin/yacc/skeleton.c
+@@ -60,9 +60,6 @@
+ {
+     "#include <stdlib.h>",
+     "#ifndef lint",
+-    "#ifdef ",
+-    " ",
+-    "#endif",
+     "static char const ",
+     "yyrcsid[] = \"$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $\";",
+     "#endif",
+diff -ur src/usr.bin/lex/flex.skl src/usr.bin/lex/flex.skl
+--- src/usr.bin/lex/flex.skl
++++ src/usr.bin/lex/flex.skl
+@@ -8,7 +8,6 @@
+ #if defined(__FreeBSD__)
+ #include <sys/cdefs.h>
+ #else
+-#define 
+ #endif
+ 
+ #define FLEX_SCANNER

Added: trunk/freebsd6-buildutils/debian/patches/13_bsd_sys.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/13_bsd_sys.diff	                        (rev 0)
+++ trunk/freebsd6-buildutils/debian/patches/13_bsd_sys.diff	2008-07-11 14:08:13 UTC (rev 2218)
@@ -0,0 +1,14 @@
+  do not add -Wno-pointer-sign,
+  kfreebsd-6 still uses gcc-3.4
+
+--- src/share/mk/bsd.sys.mk
++++ src/share/mk/bsd.sys.mk
+@@ -55,7 +55,7 @@
+ CWARNFLAGS	+=	-Wno-uninitialized
+ .  endif
+ .  if !defined(WITH_GCC3)
+-CWARNFLAGS	+=	-Wno-pointer-sign
++#CWARNFLAGS	+=	-Wno-pointer-sign
+ .  endif
+ . endif
+ 

Added: trunk/freebsd6-buildutils/debian/patches/14_config.diff
===================================================================
--- trunk/freebsd6-buildutils/debian/patches/14_config.diff	                        (rev 0)
+++ trunk/freebsd6-buildutils/debian/patches/14_config.diff	2008-07-11 14:08:13 UTC (rev 2218)
@@ -0,0 +1,33 @@
+diff -u src/usr.sbin/config/Makefile src/usr.sbin/config/Makefile
+--- src/usr.sbin/config/Makefile
++++ src/usr.sbin/config/Makefile
+@@ -4,7 +4,7 @@
+ PROG=	config
+ MAN=	config.5 config.8
+ SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
+-	mkoptions.c y.tab.h kernconf.c
++	mkoptions.c y.tab.h kernconf.c subr_sbuf.c
+ 
+ kernconf.c: kernconf.tmpl
+ 	file2c 'char kernconfstr[] = {' ',0};' < ${.CURDIR}/kernconf.tmpl > kernconf.c
+@@ -13,7 +13,7 @@
+ CFLAGS+= -I. -I${.CURDIR}
+ 
+ DPADD=	${LIBL} ${LIBSBUF}
+-LDADD+=	-ll -lsbuf
++LDADD+=	-ll
+ 
+ CLEANFILES+=	kernconf.c
+ 
+diff -u src/usr.sbin/config/main.c src/usr.sbin/config/main.c
+--- src/usr.sbin/config/main.c
++++ src/usr.sbin/config/main.c
+@@ -43,6 +43,8 @@
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <bsd/string.h>
++#include <stdarg.h>
+ #include <sys/sbuf.h>
+ #include <sys/file.h>
+ #include <sys/mman.h>

Modified: trunk/freebsd6-buildutils/debian/rules
===================================================================
--- trunk/freebsd6-buildutils/debian/rules	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/debian/rules	2008-07-11 14:08:13 UTC (rev 2218)
@@ -12,12 +12,12 @@
 DEB_HOST_ARCH_CPU	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 PMAKE=pmake
-CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='\"$(DEB_HOST_ARCH_CPU)\"' -D_GNU_SOURCE
-MAKE_BUILD_FLAGS= CC=gcc COPTS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
+CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -D_GNU_SOURCE
+MAKE_BUILD_FLAGS= CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
 YACC=$(CURDIR)/build-tree/src/usr.bin/yacc/yacc
 export LDADD=-lbsd
 
-package=freebsd6-buildutils
+package=freebsd-buildutils
 
 unpack: unpack-stamp
 unpack-stamp:
@@ -26,6 +26,7 @@
 	find build-tree -type d -name CVS | xargs rm -rf
 	find build-tree -type f | (set -e ; while read i ; do sed -i $$i \
 		-e "/^__FBSDID/d" -e "s,<sys/queue.h>,<bsd/queue.h>,g" -e "s/^LDADD=/LDADD+=/g" \
+		-e "s/[ \t]*__\(dead2\|unused\|result\)[ \t]*/ /g" \
 		-e "s/getline/bsd_&/g" \
 	; done)
 	set -e ; for i in \
@@ -43,6 +44,10 @@
 		  echo "--- Patch $$i ---" ; \
 		  patch -p0 < $$i ; \
 		done
+
+	cp $(CURDIR)/build-tree/src/sys/kern/subr_sbuf.c \
+	   $(CURDIR)/build-tree/src/usr.sbin/config/
+
 	touch unpack-stamp
 
 build: unpack-stamp build-stamp
@@ -63,15 +68,15 @@
 		$(PMAKE) $(MAKE_BUILD_FLAGS)
 
 	cd build-tree/src/usr.bin/mkdep ; $(PMAKE) $(MAKE_BUILD_FLAGS)
+	cd build-tree/src/usr.sbin/mtree ; $(PMAKE) $(MAKE_BUILD_FLAGS)
+	cd build-tree/src/usr.bin/file2c ; $(PMAKE) $(MAKE_BUILD_FLAGS)
+	cd build-tree/src/usr.bin/brandelf ; $(PMAKE) $(MAKE_BUILD_FLAGS)
 
 	cd build-tree/src/usr.sbin/config ; \
 		$(YACC) -d config.y ; \
 		cp y.tab.c config.c ; \
+		PATH=$(PATH):$(CURDIR)/build-tree/src/usr.bin/file2c \
 		$(PMAKE) $(MAKE_BUILD_FLAGS)
-
-	cd build-tree/src/usr.sbin/mtree ; $(PMAKE) $(MAKE_BUILD_FLAGS)
-	cd build-tree/src/usr.bin/file2c ; $(PMAKE) $(MAKE_BUILD_FLAGS)
-	cd build-tree/src/usr.bin/brandelf ; $(PMAKE) $(MAKE_BUILD_FLAGS)
 	
 	touch build-stamp
 

Modified: trunk/freebsd6-buildutils/fetch
===================================================================
--- trunk/freebsd6-buildutils/fetch	2008-07-10 07:37:00 UTC (rev 2217)
+++ trunk/freebsd6-buildutils/fetch	2008-07-11 14:08:13 UTC (rev 2218)
@@ -3,8 +3,8 @@
 
 ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
 
-RELENG=RELENG_6_3_0_RELEASE
-RPORTS=RELEASE_6_3_0
+RELENG=RELENG_7_0_0_RELEASE
+RPORTS=RELEASE_7_0_0
 
 rm -rf src ports
 
@@ -29,6 +29,7 @@
     src/usr.sbin/config \
     src/usr.sbin/kgzip \
     src/usr.sbin/mtree \
+    src/sys/kern/subr_sbuf.c \
   ; do
   cvs -d $ANONCVS ${action} -r $RELENG $i
   test -e $i




More information about the Glibc-bsd-commits mailing list