[Glibc-bsd-commits] r4672 - in trunk/kfreebsd-10/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-07-02 15:05:38 +0000 (Tue, 02 Jul 2013)
New Revision: 4672

Removed:
   trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/patches/series
   trunk/kfreebsd-10/debian/rules
Log:
Remove 951_disable_mk_magic.diff, use -DWITHOUT_CTF instead.

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-07-02 13:11:58 UTC (rev 4671)
+++ trunk/kfreebsd-10/debian/changelog	2013-07-02 15:05:38 UTC (rev 4672)
@@ -1,3 +1,9 @@
+kfreebsd-10 (10.0~svn252032-2) UNRELEASED; urgency=low
+
+  * Remove 951_disable_mk_magic.diff, use -DWITHOUT_CTF instead.
+
+ -- Robert Millan <rmh at debian.org>  Tue, 02 Jul 2013 17:05:10 +0200
+
 kfreebsd-10 (10.0~svn252032-1) experimental; urgency=low
 
   [Petr Salinger]   

Deleted: trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2013-07-02 13:11:58 UTC (rev 4671)
+++ trunk/kfreebsd-10/debian/patches/951_disable_mk_magic.diff	2013-07-02 15:05:38 UTC (rev 4672)
@@ -1,25 +0,0 @@
-
-freebsd-buildutils 9.0 doesn't define MK_CTF.
-
---- a/sys/conf/kern.post.mk
-+++ b/sys/conf/kern.post.mk
-@@ -125,7 +125,7 @@
- 	@rm -f ${.TARGET}
- 	@echo linking ${.TARGET}
- 	${SYSTEM_LD}
--.if ${MK_CTF} != "no"
-+.if 0
- 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
- .endif
- .if !defined(DEBUG)
---- a/sys/conf/kern.pre.mk
-+++ b/sys/conf/kern.pre.mk
-@@ -145,7 +145,7 @@
- ZFS_C=		${CC} -c ${ZFS_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC}
- ZFS_S=		${CC} -c ${ZFS_ASM_CFLAGS} ${WERROR} ${.IMPSRC}
- 
--.if ${MK_CTF} != "no"
-+.if 0
- NORMAL_CTFCONVERT=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
- .elif ${MAKE_VERSION} >= 5201111300
- NORMAL_CTFCONVERT=

Modified: trunk/kfreebsd-10/debian/patches/series
===================================================================
--- trunk/kfreebsd-10/debian/patches/series	2013-07-02 13:11:58 UTC (rev 4671)
+++ trunk/kfreebsd-10/debian/patches/series	2013-07-02 15:05:38 UTC (rev 4672)
@@ -27,5 +27,4 @@
 920_linux_cflags.diff
 921_signal_watchdog.diff
 922_cc_version.diff
-951_disable_mk_magic.diff
 999_config.diff

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-07-02 13:11:58 UTC (rev 4671)
+++ trunk/kfreebsd-10/debian/rules	2013-07-02 15:05:38 UTC (rev 4672)
@@ -48,6 +48,8 @@
 
 MAKE += -DWITHOUT_CLANG_IS_CC
 
+MAKE += -DWITHOUT_CTF
+
 # Disable install of *.ko.symbols files (their presence would trigger an
 # "unstripped-binary-or-object" lintian error).
 MAKE += -DWITHOUT_KERNEL_SYMBOLS