[Glibc-bsd-commits] r4311 - in trunk/freebsd-buildutils/debian: . patches

Robert Millan rmh at alioth.debian.org
Fri Jun 15 21:14:41 UTC 2012 

Author: rmh
Date: 2012-06-15 21:14:41 +0000 (Fri, 15 Jun 2012)
New Revision: 4311

Added:
   trunk/freebsd-buildutils/debian/patches/mk_ctf.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
   trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff
   trunk/freebsd-buildutils/debian/patches/mk_sourceless.diff
   trunk/freebsd-buildutils/debian/patches/series
Log:
Re-enable MK_CTF

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2012-06-15 21:12:14 UTC (rev 4310)
+++ trunk/freebsd-buildutils/debian/changelog	2012-06-15 21:14:41 UTC (rev 4311)
@@ -1,10 +1,3 @@
-freebsd-buildutils (9.0-11) unstable; urgency=high
-
-  * Remove MK_CTF option. It requires changes in kfreebsd and won't be
-    useful until post-wheezy. (Closes: #676074)
-
- -- Robert Millan <rmh at debian.org>  Sat, 09 Jun 2012 17:05:17 +0200
-
 freebsd-buildutils (9.0-10) unstable; urgency=low
 
   * disable_wsystem_headers.diff: Disable -Wsystem-headers to avoid

Modified: trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2012-06-15 21:12:14 UTC (rev 4310)
+++ trunk/freebsd-buildutils/debian/patches/01_make_fixes.diff	2012-06-15 21:14:41 UTC (rev 4311)
@@ -65,7 +65,7 @@
  .PHONY: ${INSTALLINFODIRS}
 --- a/src/share/mk/bsd.lib.mk
 +++ b/src/share/mk/bsd.lib.mk
-@@ -151,9 +151,9 @@
+@@ -146,9 +146,9 @@
  	@${ECHO} building static ${LIB} library
  	@rm -f ${.TARGET}
  .if !defined(NM)
@@ -77,7 +77,7 @@
  .endif
  	${RANLIB} ${.TARGET}
  .endif
-@@ -168,9 +168,9 @@
+@@ -163,9 +163,9 @@
  	@${ECHO} building profiled ${LIB} library
  	@rm -f ${.TARGET}
  .if !defined(NM)
@@ -89,7 +89,7 @@
  .endif
  	${RANLIB} ${.TARGET}
  .endif
-@@ -191,16 +191,16 @@
+@@ -186,16 +186,16 @@
  	@${ECHO} building shared library ${SHLIB_NAME}
  	@rm -f ${.TARGET} ${SHLIB_LINK}
  .if defined(SHLIB_LINK)
@@ -107,9 +107,9 @@
 -	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
 +	    `NM='${NM}' lorder ${SOBJS} | tsort` ${LDADD}
  .endif
- 	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
- 		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
-@@ -270,11 +270,11 @@
+ .if ${MK_CTF} != "no"
+ 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
+@@ -265,11 +265,11 @@
  .ORDER: beforeinstall _libinstall
  _libinstall:
  .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no"
@@ -205,13 +205,3 @@
  
  .if !defined(%POSIX)
  #
-@@ -68,9 +67,6 @@
- # C Type Format data is required for DTrace
- CTFFLAGS	?=	-L VERSION
- 
--CTFCONVERT	?=	ctfconvert
--CTFMERGE	?=	ctfmerge
--DTRACE		?=	dtrace
- .if defined(CFLAGS) && (${CFLAGS:M-g} != "")
- CTFFLAGS	+=	-g
- .else

Modified: trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff	2012-06-15 21:12:14 UTC (rev 4310)
+++ trunk/freebsd-buildutils/debian/patches/mk_clang_is_cc.diff	2012-06-15 21:14:41 UTC (rev 4311)
@@ -3,15 +3,15 @@
 
 --- a/src/share/mk/bsd.own.mk
 +++ b/src/share/mk/bsd.own.mk
-@@ -413,6 +413,7 @@
+@@ -414,6 +414,7 @@
      BIND_LIBS \
      BIND_SIGCHASE \
      BIND_XML \
 +    CLANG_IS_CC \
+     CTF \
      HESIOD \
      ICONV \
-     IDEA \
-@@ -561,6 +562,10 @@
+@@ -564,6 +565,10 @@
  MK_GDB:=	no
  .endif
  

Copied: trunk/freebsd-buildutils/debian/patches/mk_ctf.diff (from rev 4285, trunk/freebsd-buildutils/debian/patches/mk_ctf.diff)
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_ctf.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/mk_ctf.diff	2012-06-15 21:14:41 UTC (rev 4311)
@@ -0,0 +1,120 @@
+
+Backport from upstream rev 228158.
+
+--- a/src/share/mk/bsd.own.mk
++++ b/src/share/mk/bsd.own.mk
+@@ -203,6 +203,7 @@
+ # regardless of user's setting).
+ #
+ .for var in \
++    CTF \
+     INSTALLLIB \
+     MAN \
+     PROFILE
+@@ -410,6 +411,7 @@
+     BIND_LIBS \
+     BIND_SIGCHASE \
+     BIND_XML \
++    CTF \
+     HESIOD \
+     ICONV \
+     IDEA \
+@@ -506,6 +508,7 @@
+ 
+ .if ${MK_CDDL} == "no"
+ MK_ZFS:=	no
++MK_CTF:=	no
+ .endif
+ 
+ .if ${MK_CRYPT} == "no"
+@@ -606,6 +609,12 @@
+ .endif
+ .endfor
+ 
++.if ${MK_CTF} != "no"
++CTFCONVERT_CMD=		${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
++.else
++CTFCONVERT_CMD=		@:
++.endif
++
+ .endif # !_WITHOUT_SRCCONF
+ 
+ .endif	# !target(__<bsd.own.mk>__)
+--- a/src/share/mk/bsd.lib.mk
++++ b/src/share/mk/bsd.lib.mk
+@@ -33,15 +33,10 @@
+ NO_WERROR=
+ .endif
+ 
+-# Enable CTF conversion on request.
+-.if defined(WITH_CTF)
+-.undef NO_CTF
+-.endif
+-
+ .if defined(DEBUG_FLAGS)
+ CFLAGS+= ${DEBUG_FLAGS}
+ 
+-.if !defined(NO_CTF) && (${DEBUG_FLAGS:M-g} != "")
++.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
+ CTFFLAGS+= -g
+ .endif
+ .endif
+@@ -202,9 +197,9 @@
+ 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
+ 	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
+ .endif
+-	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
+-		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
+-		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
++.if ${MK_CTF} != "no"
++	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
++.endif
+ .endif
+ 
+ .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
+--- a/src/share/mk/bsd.prog.mk
++++ b/src/share/mk/bsd.prog.mk
+@@ -15,16 +15,11 @@
+ NO_WERROR=
+ .endif
+ 
+-# Enable CTF conversion on request.
+-.if defined(WITH_CTF)
+-.undef NO_CTF
+-.endif
+-
+ .if defined(DEBUG_FLAGS)
+ CFLAGS+=${DEBUG_FLAGS}
+ CXXFLAGS+=${DEBUG_FLAGS}
+ 
+-.if !defined(NO_CTF) && (${DEBUG_FLAGS:M-g} != "")
++.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
+ CTFFLAGS+= -g
+ .endif
+ .endif
+@@ -60,9 +55,9 @@
+ .else
+ 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
+ .endif
+-	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
+-		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} && \
+-		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS})
++.if ${MK_CTF} != "no"
++	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
++.endif
+ 
+ .else	# !defined(SRCS)
+ 
+@@ -90,9 +85,9 @@
+ .else
+ 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
+ .endif
+-	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
+-		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} && \
+-		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS})
++.if ${MK_CTF} != "no"
++	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
++.endif
+ .endif
+ 
+ .endif

Modified: trunk/freebsd-buildutils/debian/patches/mk_sourceless.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_sourceless.diff	2012-06-15 21:12:14 UTC (rev 4310)
+++ trunk/freebsd-buildutils/debian/patches/mk_sourceless.diff	2012-06-15 21:14:41 UTC (rev 4311)
@@ -3,7 +3,7 @@
 
 --- a/src/share/mk/bsd.own.mk
 +++ b/src/share/mk/bsd.own.mk
-@@ -316,6 +316,9 @@
+@@ -317,6 +317,9 @@
      BOOT \
      BSD_CPIO \
      BSNMP \
@@ -13,7 +13,7 @@
      BZIP2 \
      CALENDAR \
      CDDL \
-@@ -504,6 +507,11 @@
+@@ -506,6 +509,11 @@
  MK_BIND_ETC:=	no
  .endif
  
@@ -24,4 +24,4 @@
 +
  .if ${MK_CDDL} == "no"
  MK_ZFS:=	no
- .endif
+ MK_CTF:=	no

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2012-06-15 21:12:14 UTC (rev 4310)
+++ trunk/freebsd-buildutils/debian/patches/series	2012-06-15 21:14:41 UTC (rev 4311)
@@ -1,5 +1,6 @@
 # Patches from (or merged in) upstream
 make_foreign.diff
+mk_ctf.diff
 mk_sourceless.diff
 mk_clang_is_cc.diff

More information about the Glibc-bsd-commits mailing list