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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-08 20:18:30 +0000 (Wed, 08 Oct 2014)
New Revision: 5616

Added:
   trunk/freebsd-buildutils/debian/patches/mk_tests.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/series
Log:
backport MK_TESTS for freebsd-utils (>> 10.1~)


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2014-10-08 20:07:50 UTC (rev 5615)
+++ trunk/freebsd-buildutils/debian/changelog	2014-10-08 20:18:30 UTC (rev 5616)
@@ -4,6 +4,7 @@
   * Backport mk_hyperv, needed by 10.1 RC
 
   [ Steven Chamberlain ]
+  * backports MK_TESTS for freebsd-utils (>> 10.1~)
   * Do not use -fstack-protector on hppa/parisc arch (thanks, Helge
     Deller) (Closes: #758377)
   * In get-orig-source, svn export with --ignore-keywords so that

Added: trunk/freebsd-buildutils/debian/patches/mk_tests.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_tests.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/mk_tests.diff	2014-10-08 20:18:30 UTC (rev 5616)
@@ -0,0 +1,34 @@
+Subject: backport MK_TESTS for freebsd-utils (>> 10.1~)
+Origin: vendor, http://svnweb.freebsd.org/base/stable/10/share/mk/bsd.own.mk?r1=260012&r2=260013&view=patch
+
+--- a/src/share/mk/bsd.own.mk
++++ b/src/share/mk/bsd.own.mk
+@@ -376,6 +376,7 @@
+     PKGTOOLS \
+     SHARED_TOOLCHAIN \
+     SVN \
++    TESTS \
+     USB_GADGET_EXAMPLES
+ 
+ #
+@@ -555,6 +556,20 @@
+ MK_LLDB:= no
+ .endif
+ 
++.if defined(NO_TESTS)
++# This should be handled above along the handling of all other NO_*  options.
++# However, the above is broken when WITH_*=yes are passed to make(1) as
++# command line arguments.  See PR bin/183762.
++#
++# Because the TESTS option is new and it will default to yes, it's likely
++# that people will pass WITHOUT_TESTS=yes to make(1) directly and get a broken
++# build.  So, just in case, it's better to explicitly handle this case here.
++#
++# TODO(jmmv): Either fix make to allow us putting this override where it
++# belongs above or fix this file to cope with the make bug.
++MK_TESTS:= no
++.endif
++
+ #
+ # Set defaults for the MK_*_SUPPORT variables.
+ #

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2014-10-08 20:07:50 UTC (rev 5615)
+++ trunk/freebsd-buildutils/debian/patches/series	2014-10-08 20:18:30 UTC (rev 5616)
@@ -30,3 +30,4 @@
 makefiles.diff
 #test
 hppa.diff
+mk_tests.diff