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

Robert Millan rmh at costa.debian.org
Sat May 6 12:13:59 UTC 2006


Author: rmh
Date: 2006-05-06 12:13:59 +0000 (Sat, 06 May 2006)
New Revision: 1563

Added:
   trunk/freebsd6-buildutils/debian/patches/000_7-current_support_in_bsd.own.mk.diff
Modified:
   trunk/freebsd6-buildutils/debian/changelog
Log:
Add cruft to bsd.own.mk necessary to build latest kernel.

Modified: trunk/freebsd6-buildutils/debian/changelog
===================================================================
--- trunk/freebsd6-buildutils/debian/changelog	2006-05-06 08:44:52 UTC (rev 1562)
+++ trunk/freebsd6-buildutils/debian/changelog	2006-05-06 12:13:59 UTC (rev 1563)
@@ -1,5 +1,11 @@
-freebsd6-buildutils (6.0-0.1) unstable; urgency=low
+freebsd6-buildutils (6.0-0.2) unreleased; urgency=low
 
+  * Add cruft to bsd.own.mk necessary to build latest kernel.
+
+ -- Robert Millan <rmh at aybabtu.com>  Sat,  6 May 2006 13:10:05 +0200
+
+freebsd6-buildutils (6.0-0.1) unreleased; urgency=low
+
   * Fork 6.x branch.
   * Switch to libbsd.
     - control (Build-Depends): Add libbsd-dev.

Added: 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	2006-05-06 08:44:52 UTC (rev 1562)
+++ trunk/freebsd6-buildutils/debian/patches/000_7-current_support_in_bsd.own.mk.diff	2006-05-06 12:13:59 UTC (rev 1563)
@@ -0,0 +1,291 @@
+
+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
+@@ -165,4 +165,285 @@
+ COMPRESS_CMD?=	gzip -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>__)




More information about the Glibc-bsd-commits mailing list