[Glibc-bsd-commits] r5873 - in trunk/freebsd-buildutils/debian: . patches
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Sun Feb 7 00:34:10 UTC 2016
Author: stevenc-guest
Date: 2016-02-07 00:34:10 +0000 (Sun, 07 Feb 2016)
New Revision: 5873
Modified:
trunk/freebsd-buildutils/debian/changelog
trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff
trunk/freebsd-buildutils/debian/patches/hppa.diff
trunk/freebsd-buildutils/debian/patches/mk_eisa.diff
trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff
Log:
Refresh patches:
- mk_eisa.diff
- yacc_is_byacc.diff
- 15_manpages_gzip.diff
- avoid_defsyspath_collision.diff
- hppa.diff
Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog 2016-02-07 00:33:23 UTC (rev 5872)
+++ trunk/freebsd-buildutils/debian/changelog 2016-02-07 00:34:10 UTC (rev 5873)
@@ -2,6 +2,12 @@
* New upstream snapshot of 10.3-BETA1
* Make get-orig-source tarball reproducible
+ * Refresh patches:
+ - mk_eisa.diff
+ - yacc_is_byacc.diff
+ - 15_manpages_gzip.diff
+ - avoid_defsyspath_collision.diff
+ - hppa.diff
-- Steven Chamberlain <steven at pyro.eu.org> Sat, 06 Feb 2016 22:50:09 +0000
Modified: trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2016-02-07 00:33:23 UTC (rev 5872)
+++ trunk/freebsd-buildutils/debian/patches/15_manpages_gzip.diff 2016-02-07 00:34:10 UTC (rev 5873)
@@ -2,11 +2,9 @@
src/share/mk/bsd.own.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: freebsd-buildutils/src/share/mk/bsd.own.mk
-===================================================================
---- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
-+++ freebsd-buildutils/src/share/mk/bsd.own.mk
-@@ -210,7 +210,7 @@ INSTALL_SYMLINK?= ln -s
+--- a/src/share/mk/bsd.own.mk
++++ b/src/share/mk/bsd.own.mk
+@@ -210,7 +210,7 @@
STRIP?= -s
.endif
@@ -14,4 +12,4 @@
+COMPRESS_CMD?= gzip -cn -9
COMPRESS_EXT?= .gz
- .if !defined(_WITHOUT_SRCCONF)
+ # Set XZ_THREADS to 1 to disable multi-threading.
Modified: trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff 2016-02-07 00:33:23 UTC (rev 5872)
+++ trunk/freebsd-buildutils/debian/patches/avoid_defsyspath_collision.diff 2016-02-07 00:34:10 UTC (rev 5873)
@@ -1,11 +1,9 @@
This allows freebsd-buildutils to be installed alongside bmake.
-Index: freebsd-buildutils/src/share/mk/Makefile
-===================================================================
---- freebsd-buildutils.orig/src/share/mk/Makefile
-+++ freebsd-buildutils/src/share/mk/Makefile
-@@ -41,7 +41,7 @@ FILES= \
+--- a/src/share/mk/Makefile
++++ b/src/share/mk/Makefile
+@@ -47,7 +47,7 @@
version_gen.awk
NO_OBJ=
@@ -14,11 +12,9 @@
.if ${MK_TESTS} != "no"
FILES+= atf.test.mk
-Index: freebsd-buildutils/src/share/mk/bsd.symver.mk
-===================================================================
---- freebsd-buildutils.orig/src/share/mk/bsd.symver.mk
-+++ freebsd-buildutils/src/share/mk/bsd.symver.mk
-@@ -23,7 +23,7 @@ _mpath+= ${_arg}
+--- a/src/share/mk/bsd.symver.mk
++++ b/src/share/mk/bsd.symver.mk
+@@ -23,7 +23,7 @@
.endif
_oarg= ${_arg}
.endfor
@@ -27,11 +23,9 @@
# Look up ${VERSION_GEN} in ${_mpath}.
_vgen=
-Index: freebsd-buildutils/src/usr.bin/make/make.1
-===================================================================
---- freebsd-buildutils.orig/src/usr.bin/make/make.1
-+++ freebsd-buildutils/src/usr.bin/make/make.1
-@@ -235,7 +235,7 @@ Multiple
+--- a/src/usr.bin/make/make.1
++++ b/src/usr.bin/make/make.1
+@@ -235,7 +235,7 @@
.Fl m
options can be specified to form a search path.
This path will override the default system include path,
@@ -40,7 +34,7 @@
The system include path will always be appended to the search path used
for "..."-style inclusions and makefile searches (see the
.Fl I
-@@ -1721,7 +1721,7 @@ list of dependencies
+@@ -1721,7 +1721,7 @@
object directory
.It Pa sys.mk
system makefile
@@ -49,10 +43,8 @@
default system makefile directory
.It Pa /usr/share/doc/psd/12.make
PMake tutorial
-Index: freebsd-buildutils/src/usr.bin/make/pathnames.h
-===================================================================
---- freebsd-buildutils.orig/src/usr.bin/make/pathnames.h
-+++ freebsd-buildutils/src/usr.bin/make/pathnames.h
+--- a/src/usr.bin/make/pathnames.h
++++ b/src/usr.bin/make/pathnames.h
@@ -50,7 +50,7 @@
#endif /* ! PATH_DEFSYSMK */
Modified: trunk/freebsd-buildutils/debian/patches/hppa.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/hppa.diff 2016-02-07 00:33:23 UTC (rev 5872)
+++ trunk/freebsd-buildutils/debian/patches/hppa.diff 2016-02-07 00:34:10 UTC (rev 5873)
@@ -3,11 +3,9 @@
Bug-Debian: https://bugs.debian.org/758377
Forwarded: not-needed
-Index: freebsd-buildutils/src/share/mk/bsd.sys.mk
-===================================================================
---- freebsd-buildutils.orig/src/share/mk/bsd.sys.mk
-+++ freebsd-buildutils/src/share/mk/bsd.sys.mk
-@@ -144,11 +144,12 @@ CXXFLAGS+= ${CXXFLAGS.gcc}
+--- a/src/share/mk/bsd.sys.mk
++++ b/src/share/mk/bsd.sys.mk
+@@ -144,11 +144,12 @@
.endif # !EARLY_BUILD
.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \
@@ -20,5 +18,5 @@
-.endif # SSP && !IA64 && !ARM && !MIPS
+.endif # SSP && !IA64 && !ARM && !MIPS && !HPPA && !ALPHA
- # Allow user-specified additional warning flags
- CFLAGS+= ${CWARNFLAGS}
+ # Allow user-specified additional warning flags and file specific flag
+ # overrides.
Modified: trunk/freebsd-buildutils/debian/patches/mk_eisa.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/mk_eisa.diff 2016-02-07 00:33:23 UTC (rev 5872)
+++ trunk/freebsd-buildutils/debian/patches/mk_eisa.diff 2016-02-07 00:34:10 UTC (rev 5873)
@@ -1,8 +1,6 @@
-Index: freebsd-buildutils/src/share/mk/bsd.own.mk
-===================================================================
---- freebsd-buildutils.orig/src/share/mk/bsd.own.mk
-+++ freebsd-buildutils/src/share/mk/bsd.own.mk
-@@ -390,6 +390,7 @@ __DEFAULT_YES_OPTIONS = \
+--- a/src/share/mk/bsd.own.mk
++++ b/src/share/mk/bsd.own.mk
+@@ -398,6 +398,7 @@
__DEFAULT_NO_OPTIONS = \
BSD_GREP \
CLANG_EXTRAS \
Modified: trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff 2016-02-07 00:33:23 UTC (rev 5872)
+++ trunk/freebsd-buildutils/debian/patches/yacc_is_byacc.diff 2016-02-07 00:34:10 UTC (rev 5873)
@@ -1,8 +1,6 @@
-Index: freebsd-buildutils/src/share/mk/sys.mk
-===================================================================
---- freebsd-buildutils.orig/src/share/mk/sys.mk
-+++ freebsd-buildutils/src/share/mk/sys.mk
-@@ -153,7 +153,7 @@ RFLAGS ?=
+--- a/src/share/mk/sys.mk
++++ b/src/share/mk/sys.mk
+@@ -155,7 +155,7 @@
SHELL ?= sh
More information about the Glibc-bsd-commits
mailing list