[Glibc-bsd-commits] r5495 - in branches/experimental/kfreebsd-10/debian: . patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Sun Aug 24 15:03:22 UTC 2014
Author: stevenc-guest
Date: 2014-08-24 15:03:22 +0000 (Sun, 24 Aug 2014)
New Revision: 5495
Added:
branches/experimental/kfreebsd-10/debian/patches/110_ftbfs.diff
branches/experimental/kfreebsd-10/debian/patches/111_ipsec_nat-t.diff
branches/experimental/kfreebsd-10/debian/patches/924_module_objdir.diff
Modified:
branches/experimental/kfreebsd-10/debian/changelog
branches/experimental/kfreebsd-10/debian/patches/001_misc.diff
branches/experimental/kfreebsd-10/debian/patches/902_version.diff
branches/experimental/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff
branches/experimental/kfreebsd-10/debian/patches/915_ip6.v6only.diff
branches/experimental/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
branches/experimental/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff
branches/experimental/kfreebsd-10/debian/patches/999_config.diff
branches/experimental/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff
branches/experimental/kfreebsd-10/debian/patches/series
branches/experimental/kfreebsd-10/debian/patches/userland.diff
branches/experimental/kfreebsd-10/debian/rules
Log:
* New upstream snapshot of STABLE-10
* Reset abiname to 0
* 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:
- si_status_wait6.diff
- accept_O_CLOEXEC_in_shm_open.diff
- newcons.diff
- SA-14_05.nfsserver.patch
- SA-14_08.tcp.patch
- EN-14_05.ciss.patch
- EN-14_06.execve.patch
* Refresh patches:
- radeonkms_abort_nofw.diff
- userland.diff
- 001_misc.diff
- 902_version.diff
- 908_linprocfs_is_not_proc.diff
- 915_ip6.v6only.diff
- 917_disable_kgssapi.diff
- 918_unix_socket_overflow.diff
- 999_config.diff
* Fix FTBFS building the kernel in isolation
- 110_ftbfs.diff
* Enable IPSEC (Closes: #644353)
- 111_ipsec_nat-t.diff: redefine UDP_ENCAP to match GNU userland
(Closes: #718224)
* Build modules in-place instead of creating a deep nested hierarchy
- 924_module_objdir.diff (Closes: #757632)
* Compile objects with relative, not absolute paths, to avoid embedding
full build tree paths into modules (Closes: #757629)
Modified: branches/experimental/kfreebsd-10/debian/changelog
===================================================================
--- branches/experimental/kfreebsd-10/debian/changelog 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/changelog 2014-08-24 15:03:22 UTC (rev 5495)
@@ -1,3 +1,40 @@
+kfreebsd-10 (10.1~svn270484-1) UNRELEASED; urgency=low
+
+ [ Steven Chamberlain ]
+ * New upstream snapshot of STABLE-10
+ * Reset abiname to 0
+ * 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:
+ - si_status_wait6.diff
+ - accept_O_CLOEXEC_in_shm_open.diff
+ - newcons.diff
+ - SA-14_05.nfsserver.patch
+ - SA-14_08.tcp.patch
+ - EN-14_05.ciss.patch
+ - EN-14_06.execve.patch
+ * Refresh patches:
+ - radeonkms_abort_nofw.diff
+ - userland.diff
+ - 001_misc.diff
+ - 902_version.diff
+ - 908_linprocfs_is_not_proc.diff
+ - 915_ip6.v6only.diff
+ - 917_disable_kgssapi.diff
+ - 918_unix_socket_overflow.diff
+ - 999_config.diff
+ * Fix FTBFS building the kernel in isolation
+ - 110_ftbfs.diff
+ * Enable IPSEC (Closes: #644353)
+ - 111_ipsec_nat-t.diff: redefine UDP_ENCAP to match GNU userland
+ (Closes: #718224)
+ * Build modules in-place instead of creating a deep nested hierarchy
+ - 924_module_objdir.diff (Closes: #757632)
+ * Compile objects with relative, not absolute paths, to avoid embedding
+ full build tree paths into modules (Closes: #757629)
+
+ -- Steven Chamberlain <steven at pyro.eu.org> Sun, 24 Aug 2014 02:00:12 +0100
+
kfreebsd-10 (10.0-6) unstable; urgency=high
* Team upload.
Modified: branches/experimental/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/001_misc.diff 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/001_misc.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -4,7 +4,7 @@
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -1,5 +1,15 @@
- # $FreeBSD$
+ # $FreeBSD: stable/10/sys/conf/kern.mk 268882 2014-07-19 18:33:09Z dim $
+FREEBSD_CC!= ${CC} -dM -E -</dev/null | awk '/__FreeBSD_cc_version/ { print $$3 }' || true
+
@@ -19,7 +19,7 @@
#
# Warning flags for compiling the kernel and components of the kernel:
#
-@@ -61,7 +71,7 @@
+@@ -62,7 +72,7 @@
#
.if ${MACHINE_CPUARCH} == "i386"
.if ${COMPILER_TYPE} != "clang"
Added: branches/experimental/kfreebsd-10/debian/patches/110_ftbfs.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/110_ftbfs.diff (rev 0)
+++ branches/experimental/kfreebsd-10/debian/patches/110_ftbfs.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -0,0 +1,93 @@
+--- /dev/null
++++ b/sys/cddl/contrib/opensolaris/common/util/strtolctype.h
+@@ -0,0 +1,79 @@
++/*
++ * CDDL HEADER START
++ *
++ * The contents of this file are subject to the terms of the
++ * Common Development and Distribution License (the "License").
++ * You may not use this file except in compliance with the License.
++ *
++ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
++ * or http://www.opensolaris.org/os/licensing.
++ * See the License for the specific language governing permissions
++ * and limitations under the License.
++ *
++ * When distributing Covered Code, include this CDDL HEADER in each
++ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
++ * If applicable, add the following below this CDDL HEADER, with the
++ * fields enclosed by brackets "[]" replaced with your own identifying
++ * information: Portions Copyright [yyyy] [name of copyright owner]
++ *
++ * CDDL HEADER END
++ */
++
++/*
++ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
++ * Use is subject to license terms.
++ */
++
++/* Copyright (c) 1988 AT&T */
++/* All Rights Reserved */
++
++#ifndef _COMMON_UTIL_CTYPE_H
++#define _COMMON_UTIL_CTYPE_H
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++ * This header file contains a collection of macros that the strtou?ll?
++ * functions in common/util use to test characters. What we need is a kernel
++ * version of ctype.h.
++ *
++ * NOTE: These macros are used within several DTrace probe context functions.
++ * They must not be altered to make function calls or perform actions not
++ * safe in probe context.
++ */
++
++#if defined(sun) && (defined(_KERNEL) || defined(_BOOT))
++
++#define isalnum(ch) (isalpha(ch) || isdigit(ch))
++#define isalpha(ch) (isupper(ch) || islower(ch))
++#define isdigit(ch) ((ch) >= '0' && (ch) <= '9')
++#define islower(ch) ((ch) >= 'a' && (ch) <= 'z')
++#define isspace(ch) (((ch) == ' ') || ((ch) == '\r') || ((ch) == '\n') || \
++ ((ch) == '\t') || ((ch) == '\f'))
++#define isupper(ch) ((ch) >= 'A' && (ch) <= 'Z')
++#define isxdigit(ch) (isdigit(ch) || ((ch) >= 'a' && (ch) <= 'f') || \
++ ((ch) >= 'A' && (ch) <= 'F'))
++
++#endif /* _KERNEL || _BOOT */
++
++#define DIGIT(x) \
++ (isdigit(x) ? (x) - '0' : islower(x) ? (x) + 10 - 'a' : (x) + 10 - 'A')
++
++#define MBASE ('z' - 'a' + 1 + 10)
++
++/*
++ * The following macro is a version of isalnum() that limits alphabetic
++ * characters to the ranges a-z and A-Z; locale dependent characters will not
++ * return 1. The members of a-z and A-Z are assumed to be in ascending order
++ * and contiguous.
++ */
++#define lisalnum(x) \
++ (isdigit(x) || ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z'))
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif /* _COMMON_UTIL_CTYPE_H */
+--- a/sys/modules/dtrace/dtrace/Makefile
++++ b/sys/modules/dtrace/dtrace/Makefile
+@@ -40,7 +40,7 @@
+ -I${.CURDIR}/../../../cddl/dev/dtrace \
+ -I${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} \
+ -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
+- -I${.CURDIR}/../../../../cddl/contrib/opensolaris/common/util \
++ -I${.CURDIR}/../../../cddl/contrib/opensolaris/common/util \
+ -I${.CURDIR}/../../.. -DDIS_MEM
+
+ CFLAGS+= -DSMP
Added: branches/experimental/kfreebsd-10/debian/patches/111_ipsec_nat-t.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/111_ipsec_nat-t.diff (rev 0)
+++ branches/experimental/kfreebsd-10/debian/patches/111_ipsec_nat-t.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -0,0 +1,11 @@
+--- a/sys/netinet/udp.h
++++ b/sys/netinet/udp.h
+@@ -48,7 +48,7 @@
+ /*
+ * User-settable options (used with setsockopt).
+ */
+-#define UDP_ENCAP 1
++#define UDP_ENCAP 100
+
+ /* Start of reserved space for third-party user-settable options. */
+ #define UDP_VENDOR SO_VENDOR
Modified: branches/experimental/kfreebsd-10/debian/patches/902_version.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/902_version.diff 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/902_version.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -1,10 +1,10 @@
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
-@@ -189,7 +189,7 @@
+@@ -209,7 +209,7 @@
cat << EOF > vers.c
$COPYRIGHT
- #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${p4version}: ${t}"
--#define VERSTR "${VERSION} #${v}${svn}${git}${p4version}: ${t}\\n ${u}@${h}:${d}\\n"
+ #define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}"
+-#define VERSTR "${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}\\n ${u}@${h}:${d}\\n"
+#define VERSTR "#${v} ${t}\\n"
#define RELSTR "${RELEASE}"
Modified: branches/experimental/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/908_linprocfs_is_not_proc.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -1,6 +1,6 @@
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -356,10 +356,6 @@
+@@ -357,10 +357,6 @@
/* determine fs type */
fstype = mp->mnt_stat.f_fstypename;
Modified: branches/experimental/kfreebsd-10/debian/patches/915_ip6.v6only.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/915_ip6.v6only.diff 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/915_ip6.v6only.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -1,6 +1,6 @@
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
-@@ -396,7 +396,7 @@
+@@ -405,7 +405,7 @@
VNET_DEFINE(int, ip6_sendredirects) = IPV6_SENDREDIRECTS;
VNET_DEFINE(int, ip6_defhlim) = IPV6_DEFHLIM;
VNET_DEFINE(int, ip6_defmcasthlim) = IPV6_DEFAULT_MULTICAST_HOPS;
@@ -9,7 +9,7 @@
VNET_DEFINE(int, ip6_no_radr) = 0;
VNET_DEFINE(int, ip6_norbit_raif) = 0;
VNET_DEFINE(int, ip6_rfc6204w3) = 0;
-@@ -412,7 +412,7 @@
+@@ -421,7 +421,7 @@
VNET_DEFINE(int, ip6_rr_prune) = 5; /* router renumbering prefix
* walk list every 5 sec. */
VNET_DEFINE(int, ip6_mcast_pmtu) = 0; /* enable pMTU discovery for multicast? */
Modified: branches/experimental/kfreebsd-10/debian/patches/917_disable_kgssapi.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/917_disable_kgssapi.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -1,6 +1,6 @@
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
-@@ -175,8 +175,6 @@
+@@ -178,8 +178,6 @@
jme \
joy \
kbdmux \
Modified: branches/experimental/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -8,7 +8,7 @@
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
-@@ -472,7 +472,12 @@
+@@ -474,7 +474,12 @@
KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
if (soun->sun_len > sizeof(struct sockaddr_un))
Added: branches/experimental/kfreebsd-10/debian/patches/924_module_objdir.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/924_module_objdir.diff (rev 0)
+++ branches/experimental/kfreebsd-10/debian/patches/924_module_objdir.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -0,0 +1,11 @@
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -182,7 +182,7 @@
+ # MKMODULESENV is set here so that port makefiles can augment
+ # them.
+
+-MKMODULESENV+= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
++MKMODULESENV+= MAKEOBJDIRPREFIX=/ KMODDIR=${KODIR}
+ MKMODULESENV+= MACHINE_CPUARCH=${MACHINE_CPUARCH}
+ .if (${KERN_IDENT} == LINT)
+ MKMODULESENV+= ALL_MODULES=LINT
Modified: branches/experimental/kfreebsd-10/debian/patches/999_config.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/999_config.diff 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/999_config.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -2,7 +2,7 @@
+++ b/sys/amd64/conf/GENERIC
@@ -18,8 +18,8 @@
#
- # $FreeBSD$
+ # $FreeBSD: stable/10/sys/amd64/conf/GENERIC 268813 2014-07-17 22:31:46Z imp $
-cpu HAMMER
-ident GENERIC
@@ -24,7 +24,7 @@
+++ b/sys/i386/conf/GENERIC
@@ -18,10 +18,10 @@
#
- # $FreeBSD$
+ # $FreeBSD: stable/10/sys/i386/conf/GENERIC 268813 2014-07-17 22:31:46Z imp $
-cpu I486_CPU
-cpu I586_CPU
@@ -48,7 +48,7 @@
options SYSVSHM # SYSV-style shared memory
--- /dev/null
+++ b/sys/conf/DEBIAN
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,52 @@
+# Common options to all Debian GNU/kFreeBSD kernels
+
+options LINPROCFS
@@ -89,6 +89,18 @@
+
+# Disable binary blobs
+include WITHOUT_SOURCELESS
++
++# In order to enable IPSEC you MUST also add device crypto to
++# your kernel configuration
++device crypto # core crypto support
++
++options IPSEC #IP security (requires device crypto)
++#options IPSEC_DEBUG #debug for IP security
++#
++# Set IPSEC_NAT_T to enable NAT-Traversal support. This enables
++# optional UDP encapsulation of ESP packets.
++#
++options IPSEC_NAT_T #NAT-T support, UDP encap of ESP
--- /dev/null
+++ b/sys/conf/DEBIAN_DEBUG
@@ -0,0 +1,22 @@
Modified: branches/experimental/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/radeonkms_abort_nofw.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -3,8 +3,8 @@
--- a/sys/dev/drm2/radeon/r600.c
+++ b/sys/dev/drm2/radeon/r600.c
-@@ -3012,6 +3012,12 @@
- rdev->accel_working = false;
+@@ -3018,6 +3018,12 @@
+ return -EINVAL;
}
+ /* Don't start up if the ucode is missing. */
@@ -18,8 +18,8 @@
--- a/sys/dev/drm2/radeon/rv770.c
+++ b/sys/dev/drm2/radeon/rv770.c
-@@ -1186,6 +1186,12 @@
- rdev->accel_working = false;
+@@ -1192,6 +1192,12 @@
+ return -EINVAL;
}
+ /* Don't start up if the ucode is missing. */
Modified: branches/experimental/kfreebsd-10/debian/patches/series
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/series 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/series 2014-08-24 15:03:22 UTC (rev 5495)
@@ -1,12 +1,5 @@
# Patches from (or merged in) upstream
-si_status_wait6.diff
-accept_O_CLOEXEC_in_shm_open.diff
radeonkms_abort_nofw.diff
-newcons.diff
-SA-14_05.nfsserver.patch
-SA-14_08.tcp.patch
-EN-14_05.ciss.patch
-EN-14_06.execve.patch
# Patches that are in good shape for merging upstream
mount_remount.diff
@@ -21,6 +14,8 @@
#009_disable_duped_modules.diff
107_mount_update.diff
109_linprocfs_non_x86.diff
+110_ftbfs.diff
+111_ipsec_nat-t.diff
# Patches that are likely to be Debian-specific
firmware_load.diff
@@ -38,4 +33,5 @@
921_signal_watchdog.diff
922_cc_version.diff
923_newvers_timestamp.diff
+924_module_objdir.diff
999_config.diff
Modified: branches/experimental/kfreebsd-10/debian/patches/userland.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/userland.diff 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/patches/userland.diff 2014-08-24 15:03:22 UTC (rev 5495)
@@ -418,7 +418,7 @@
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -30,8 +30,12 @@
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/sys/queue.h 251887 2013-06-18 02:57:56Z lstewart $
*/
-#ifndef _SYS_QUEUE_H_
@@ -785,7 +785,7 @@
struct bintime {
time_t sec;
uint64_t frac;
-@@ -281,7 +287,7 @@
+@@ -282,7 +288,7 @@
#endif /* _KERNEL */
@@ -794,7 +794,7 @@
#define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
-@@ -309,6 +315,7 @@
+@@ -310,6 +316,7 @@
} while (0)
#endif
@@ -802,7 +802,7 @@
/*
* Names of the interval timers, and structure
* defining a timer setting.
-@@ -361,6 +368,8 @@
+@@ -362,6 +369,8 @@
#define CPUCLOCK_WHICH_TID 1
#endif
@@ -811,7 +811,7 @@
#ifdef _KERNEL
/*
-@@ -472,6 +481,7 @@
+@@ -473,6 +482,7 @@
#include <sys/cdefs.h>
#include <sys/select.h>
@@ -819,7 +819,7 @@
__BEGIN_DECLS
int setitimer(int, const struct itimerval *, struct itimerval *);
int utimes(const char *, const struct timeval *);
-@@ -491,6 +501,7 @@
+@@ -492,6 +502,7 @@
#endif
__END_DECLS
Modified: branches/experimental/kfreebsd-10/debian/rules
===================================================================
--- branches/experimental/kfreebsd-10/debian/rules 2014-08-24 14:21:23 UTC (rev 5494)
+++ branches/experimental/kfreebsd-10/debian/rules 2014-08-24 15:03:22 UTC (rev 5495)
@@ -21,7 +21,7 @@
config_files := $(wildcard debian/arch/$(cpu)/*.config)
flavours := $(config_files:debian/arch/$(cpu)/%.config=%)
configfile := DEBCUSTOM
-abiname := 1
+abiname := 0
ld_target := $(shell ld --help | sed -ne "s/[^ :]*: supported targets: \([^ ]*\) .*/\1/p")
ifeq ($(cpu), mipsel)
@@ -30,9 +30,9 @@
kfreebsd_cpu := $(cpu)
endif
-SVN := https://svn0.us-west.freebsd.org/base/release/$(version).0
+#SVN := https://svn0.us-west.freebsd.org/base/release/$(version).0
#SVN := https://svn0.us-west.freebsd.org/base/releng/$(version)
-#SVN := https://svn0.us-west.freebsd.org/base/stable/$(major)
+SVN := https://svn0.us-west.freebsd.org/base/stable/$(major)
#SVN := https://svn0.us-west.freebsd.org/base/head
SOURCE_PACKAGE := $(CURDIR)/debian/kfreebsd-source-$(version)
IMAGE_PACKAGE := $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
@@ -61,13 +61,13 @@
# Clang is the default compiler on these architectures (see src/share/mk/bsd.own.mk)
clang_cpus := i386 amd64 arm
-cc_pkg := clang-3.3 (>= 1:3.3-9) [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
- gcc-4.8 [$(foreach cpu,$(clang_cpus),!any-$(cpu))]
+cc_pkg := clang-3.4 [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
+ gcc-4.9 [$(foreach cpu,$(clang_cpus),!any-$(cpu))]
ifneq (, $(filter $(clang_cpus), $(DEB_HOST_ARCH_CPU)))
-cc_cmd := clang
+cc_cmd := clang-3.4
else
-cc_cmd := gcc-4.8
+cc_cmd := gcc-4.9
endif
ifeq ($(cc_cmd), clang)
@@ -174,6 +174,13 @@
src-flavor-%-stamp:
mkdir -p $(FLAVOR_DIR)-$*
cp -af sys $(FLAVOR_DIR)-$*/
+
+ # Compile objects with relative, not absolute paths, to avoid embedding
+ # full build tree paths into modules (Bug #757629)
+ find $(FLAVOR_DIR)-$*/sys/modules/ \
+ \( -name Makefile -o -name Makefile.inc \) \
+ -exec sed -i 's@$${.CURDIR}/@@' \{\} \;
+
touch $@
build-flavor-%-stamp: src-flavor-%-stamp
# Add the abiname and the flavor to the kernel version
More information about the Glibc-bsd-commits
mailing list