[Glibc-bsd-commits] r5499 - in branches/experimental/kfreebsd-10/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-08-24 23:02:55 +0000 (Sun, 24 Aug 2014)
New Revision: 5499

Added:
   branches/experimental/kfreebsd-10/debian/patches/001_misc.diff
Modified:
   branches/experimental/kfreebsd-10/debian/changelog
   branches/experimental/kfreebsd-10/debian/patches/series
Log:
Bring back 001_misc.diff, but in simpler form;  we may still need it


Modified: branches/experimental/kfreebsd-10/debian/changelog
===================================================================
--- branches/experimental/kfreebsd-10/debian/changelog	2014-08-24 22:42:54 UTC (rev 5498)
+++ branches/experimental/kfreebsd-10/debian/changelog	2014-08-24 23:02:55 UTC (rev 5499)
@@ -6,7 +6,6 @@
   * Switch to clang-3.4 on i386, amd64, arm (Closes: #754799)
   * Switch to gcc-4.9 on other architectures (Closes: #751316)
   * Delete patches merged upstream:
-    - 001_misc.diff
     - si_status_wait6.diff
     - accept_O_CLOEXEC_in_shm_open.diff
     - newcons.diff

Added: branches/experimental/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/001_misc.diff	                        (rev 0)
+++ branches/experimental/kfreebsd-10/debian/patches/001_misc.diff	2014-08-24 23:02:55 UTC (rev 5499)
@@ -0,0 +1,23 @@
+
+Co-authored by Nali Toja
+
+--- a/sys/conf/kern.mk
++++ b/sys/conf/kern.mk
+@@ -1,5 +1,8 @@
+ # $FreeBSD: stable/10/sys/conf/kern.mk 268882 2014-07-19 18:33:09Z dim $
+ 
++# Debian compilers do not have this FreeBSD-specific compiler extension
++MK_FORMAT_EXTENSIONS=no
++
+ #
+ # Warning flags for compiling the kernel and components of the kernel:
+ #
+@@ -62,7 +65,7 @@
+ #
+ .if ${MACHINE_CPUARCH} == "i386"
+ .if ${COMPILER_TYPE} != "clang"
+-CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
++CFLAGS+=	${no-align-long-strings} -mpreferred-stack-boundary=2
+ .else
+ CFLAGS+=	-mno-aes -mno-avx
+ .endif

Modified: branches/experimental/kfreebsd-10/debian/patches/series
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/series	2014-08-24 22:42:54 UTC (rev 5498)
+++ branches/experimental/kfreebsd-10/debian/patches/series	2014-08-24 23:02:55 UTC (rev 5499)
@@ -6,6 +6,7 @@
 
 # Other patches that might or might not be mergeable
 userland.diff
+001_misc.diff
 002_maxpathlen.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff