[Glibc-bsd-commits] r4813 - in trunk/kfreebsd-8/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-07-28 19:48:43 +0000 (Sun, 28 Jul 2013)
New Revision: 4813

Added:
   trunk/kfreebsd-8/debian/patches/disable_ctf.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
   trunk/kfreebsd-8/debian/rules
Log:
Disable CTF to fix FTBFS on newer buildutils. (Closes: #718162)

Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2013-07-28 19:48:07 UTC (rev 4812)
+++ trunk/kfreebsd-8/debian/changelog	2013-07-28 19:48:43 UTC (rev 4813)
@@ -1,3 +1,9 @@
+kfreebsd-8 (8.3-7) UNRELEASED; urgency=low
+
+  * Disable CTF to fix FTBFS on newer buildutils. (Closes: #718162)
+
+ -- Robert Millan <rmh at debian.org>  Sun, 28 Jul 2013 18:32:37 +0200
+
 kfreebsd-8 (8.3-6) unstable; urgency=medium
 
   * Apply patch for SA-12:08 / CVE-2012-4576:

Added: trunk/kfreebsd-8/debian/patches/disable_ctf.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/disable_ctf.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/disable_ctf.diff	2013-07-28 19:48:43 UTC (rev 4813)
@@ -0,0 +1,36 @@
+--- a/sys/conf/kern.post.mk
++++ b/sys/conf/kern.post.mk
+@@ -87,7 +87,6 @@
+ 	@echo linking ${.TARGET}
+ 	${SYSTEM_LD}
+ .if defined(CTFMERGE)
+-	${SYSTEM_CTFMERGE}
+ .endif
+ .if !defined(DEBUG)
+ 	${OBJCOPY} --strip-debug ${.TARGET}
+@@ -238,7 +237,6 @@
+ config.o env.o hints.o vers.o vnode_if.o:
+ 	${NORMAL_C}
+ .if defined(CTFCONVERT)
+-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+ .endif
+ 
+ config.ln env.ln hints.ln vers.ln vnode_if.ln:
+--- a/sys/conf/kern.pre.mk
++++ b/sys/conf/kern.pre.mk
+@@ -135,7 +135,6 @@
+ 	  ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
+ 
+ .if defined(CTFCONVERT)
+-NORMAL_CTFCONVERT= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+ .else
+ NORMAL_CTFCONVERT=
+ .endif
+@@ -149,7 +148,6 @@
+ SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o}
+ SYSTEM_OBJS+= hack.So
+ .if defined(CTFMERGE)
+-SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
+ LD+= -g
+ .endif
+ SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} \

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2013-07-28 19:48:07 UTC (rev 4812)
+++ trunk/kfreebsd-8/debian/patches/series	2013-07-28 19:48:43 UTC (rev 4813)
@@ -51,5 +51,6 @@
 918_unix_socket_overflow.diff
 919_delete_key.diff
 950_no_stack_protector.diff
+disable_ctf.diff
 999_config.diff
 999_firmware.diff

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2013-07-28 19:48:07 UTC (rev 4812)
+++ trunk/kfreebsd-8/debian/rules	2013-07-28 19:48:43 UTC (rev 4813)
@@ -48,6 +48,8 @@
 # "unstripped-binary-or-object" lintian error).
 MAKE += -DWITHOUT_KERNEL_SYMBOLS	
 
+MAKE += -DWITHOUT_CTF
+
 get-orig-source:
 	rm -rf $(ORIG_DIR)
 	for i in sys usr.sbin/config ; do \