[debrepatch] 01/01: patches: bash: fix build-path in example makefile
Ximin Luo
infinity0 at debian.org
Tue May 9 20:59:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository debrepatch.
commit 021f5aadb07c792a033ab8a3786f8c996b7e425c
Author: Ximin Luo <infinity0 at debian.org>
Date: Tue May 9 22:48:04 2017 +0200
patches: bash: fix build-path in example makefile
---
patches/bash_806945_incomplete.patch | 145 +++++++++++++++++++++++++++++++----
1 file changed, 130 insertions(+), 15 deletions(-)
diff --git a/patches/bash_806945_incomplete.patch b/patches/bash_806945_incomplete.patch
index b00432e..60b02ac 100644
--- a/patches/bash_806945_incomplete.patch
+++ b/patches/bash_806945_incomplete.patch
@@ -1,12 +1,14 @@
-diff -Nru bash-4.4/debian/changelog bash-4.3/debian/changelog
---- bash-4.4/debian/changelog 2015-09-01 01:04:48.000000000 +0200
-+++ bash-4.4/debian/changelog 2016-06-07 11:56:09.000000000 +0200
-@@ -1,3 +1,15 @@
-+bash (4.4-1.0~reproducible1) UNRELEASED; urgency=medium
+diff -Nru bash-4.4/debian/changelog bash-4.4/debian/changelog
+--- bash-4.4/debian/changelog 2017-01-24 16:13:37.000000000 +0100
++++ bash-4.4/debian/changelog 2016-09-26 14:40:45.000000000 +0200
+@@ -1,3 +1,17 @@
++bash (4.4-4.0~reproducible1) UNRELEASED; urgency=medium
+
+ [ Ximin Luo ]
+ * Non-maintainer upload.
+ * Set PGRP_PIPE unconditionally on Linux, reproducibly.
++ * Don't embed @BUILD_DIR@ in loadables example Makefile, so we can build
++ reproducibly. Instead, pass in the real value from the parent Makefile.
+
+ [ Reiner Herrmann ]
+ * Use the system man2html instead of the embedded one, for better build
@@ -14,12 +16,12 @@ diff -Nru bash-4.4/debian/changelog bash-4.3/debian/changelog
+
+ -- Ximin Luo <infinity0 at debian.org> Mon, 26 Sep 2016 14:40:45 +0200
+
- bash (4.4-1) unstable; urgency=medium
+ bash (4.4-4) unstable; urgency=medium
- * Bash 4.4 release.
-diff -Nru bash-4.4/debian/control bash-4.3/debian/control
---- bash-4.4/debian/control 2015-01-28 17:13:32.000000000 +0100
-+++ bash-4.4/debian/control 2016-06-06 03:00:38.000000000 +0200
+ * Apply upstream patches 008 - 011.
+diff -Nru bash-4.4/debian/control bash-4.4/debian/control
+--- bash-4.4/debian/control 2017-01-20 11:52:59.000000000 +0100
++++ bash-4.4/debian/control 2016-09-26 14:40:45.000000000 +0200
@@ -6,7 +6,7 @@
Build-Depends: autoconf, autotools-dev, bison, libncurses5-dev,
texinfo, texi2html, debhelper (>= 9), gettext, sharutils,
@@ -29,9 +31,114 @@ diff -Nru bash-4.4/debian/control bash-4.3/debian/control
Build-Depends-Indep: texlive-latex-base, ghostscript, texlive-fonts-recommended
Homepage: http://tiswww.case.edu/php/chet/bash/bashtop.html
Vcs-Browser: https://code.launchpad.net/~doko/+junk/pkg-bash-debian
-diff -Nru bash-4.4/debian/patches/pgrp-pipe.diff bash-4.3/debian/patches/pgrp-pipe.diff
---- bash-4.4/debian/patches/pgrp-pipe.diff 2013-10-23 14:41:22.000000000 +0200
-+++ bash-4.4/debian/patches/pgrp-pipe.diff 2016-06-07 12:17:05.000000000 +0200
+diff -Nru bash-4.4/debian/patches/no-buildpath-in-runtime-example-makefile.diff bash-4.4/debian/patches/no-buildpath-in-runtime-example-makefile.diff
+--- bash-4.4/debian/patches/no-buildpath-in-runtime-example-makefile.diff 1970-01-01 01:00:00.000000000 +0100
++++ bash-4.4/debian/patches/no-buildpath-in-runtime-example-makefile.diff 2016-09-26 14:40:45.000000000 +0200
+@@ -0,0 +1,101 @@
++Index: bash-4.4/examples/loadables/Makefile.in
++===================================================================
++--- bash-4.4.orig/examples/loadables/Makefile.in
+++++ bash-4.4/examples/loadables/Makefile.in
++@@ -35,7 +35,7 @@ loadablesdir = @loadablesdir@
++ headersdir = @headersdir@
++
++ topdir = @top_srcdir@
++-BUILD_DIR = @BUILD_DIR@
+++BUILD_DIR = $(CURDIR)
++ srcdir = @srcdir@
++ VPATH = @srcdir@
++
++Index: bash-4.4/examples/loadables/Makefile.inc.in
++===================================================================
++--- bash-4.4.orig/examples/loadables/Makefile.inc.in
+++++ bash-4.4/examples/loadables/Makefile.inc.in
++@@ -38,7 +38,7 @@ loadablesdir = @loadablesdir@
++ headersdir = @headersdir@
++
++ topdir = @top_srcdir@
++-BUILD_DIR = @BUILD_DIR@
+++BUILD_DIR = $(CURDIR)
++ srcdir = @srcdir@
++ VPATH = @srcdir@
++
++Index: bash-4.4/Makefile.in
++===================================================================
++--- bash-4.4.orig/Makefile.in
+++++ bash-4.4/Makefile.in
++@@ -561,6 +561,7 @@ OTHER_DOCS = $(srcdir)/CHANGES $(srcdir)
++ OTHER_INSTALLED_DOCS = CHANGES COMPAT NEWS POSIX RBASH README
++
++ LOADABLES_DIR = ${top_builddir}/examples/loadables
+++LOADABLES_MAKE = cd $(LOADABLES_DIR) && $(MAKE) BUILD_DIR=$(BUILD_DIR)
++
++ # Keep GNU Make from exporting the entire environment for small machines.
++ .NOEXPORT:
++@@ -757,7 +758,7 @@ reconfig: force
++ sh $(srcdir)/configure -C
++
++ loadables:
++- cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) all
+++ $(LOADABLES_MAKE) $(MFLAGS) all
++
++ #newversion: mkversion
++ # $(RM) .build
++@@ -799,7 +800,7 @@ install: .made installdirs
++ infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
++ -( cd $(DEFDIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++ -( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++- -( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+++ -( $(LOADABLES_MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++
++ install-strip:
++ $(MAKE) $(MFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
++@@ -842,7 +843,7 @@ uninstall: .made
++ man3dir=$(man3dir) man3ext=$(man3ext) \
++ infodir=$(infodir) htmldir=$(htmldir) DESTDIR=$(DESTDIR) $@ )
++ -( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++- -( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+++ -( $(LOADABLES_MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++
++ .PHONY: basic-clean clean realclean maintainer-clean distclean mostlyclean maybe-clean
++
++@@ -861,7 +862,7 @@ clean: basic-clean
++ (cd $$libdir && test -f Makefile && $(MAKE) $(MFLAGS) $@) ;\
++ done
++ -( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++- -( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+++ -( $(LOADABLES_MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++ $(RM) $(CREATED_SUPPORT)
++
++ mostlyclean: basic-clean
++@@ -872,7 +873,7 @@ mostlyclean: basic-clean
++ (cd $$libdir && test -f Makefile && $(MAKE) $(MFLAGS) $@) ;\
++ done
++ -( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++- -( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+++ -( $(LOADABLES_MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++
++ distclean: basic-clean maybe-clean
++ ( cd $(DOCDIR) && $(MAKE) $(MFLAGS) $@ )
++@@ -882,7 +883,7 @@ distclean: basic-clean maybe-clean
++ (cd $$libdir && test -f Makefile && $(MAKE) $(MFLAGS) $@) ;\
++ done
++ -( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++- -( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+++ -( $(LOADABLES_MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++ $(RM) $(CREATED_CONFIGURE) tags TAGS
++ $(RM) $(CREATED_SUPPORT) Makefile $(CREATED_MAKEFILES) pathnames.h
++
++@@ -897,7 +898,7 @@ maintainer-clean: basic-clean
++ (cd $$libdir && test -f Makefile && $(MAKE) $(MFLAGS) $@) ;\
++ done
++ -( cd $(PO_DIR) ; $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++- -( cd $(LOADABLES_DIR) && $(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
+++ -( $(LOADABLES_MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) $@ )
++ $(RM) $(CREATED_CONFIGURE) $(CREATED_MAKEFILES)
++ $(RM) $(CREATED_SUPPORT) Makefile pathnames.h
++
+diff -Nru bash-4.4/debian/patches/pgrp-pipe.diff bash-4.4/debian/patches/pgrp-pipe.diff
+--- bash-4.4/debian/patches/pgrp-pipe.diff 2016-07-25 20:40:55.000000000 +0200
++++ bash-4.4/debian/patches/pgrp-pipe.diff 2016-09-26 14:40:45.000000000 +0200
@@ -1,13 +1,43 @@
-# DP: Define PGRP_PIPE to avoid race condition.
-
@@ -89,9 +196,17 @@ diff -Nru bash-4.4/debian/patches/pgrp-pipe.diff bash-4.3/debian/patches/pgrp-pi
+ *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;;
+ *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
+ powerux*) LOCAL_LIBS="-lgen" ;;
+diff -Nru bash-4.4/debian/patches/series bash-4.4/debian/patches/series
+--- bash-4.4/debian/patches/series 2017-01-24 16:10:53.000000000 +0100
++++ bash-4.4/debian/patches/series 2016-09-26 14:40:45.000000000 +0200
+@@ -30,3 +30,4 @@
+ use-system-texi2html.diff
+ bzero.diff
+ man-macro-warnings.diff
++no-buildpath-in-runtime-example-makefile.diff
diff -Nru bash-4.4/debian/rules bash-4.4/debian/rules
---- bash-4.4/debian/rules 2015-01-28 17:55:12.000000000 +0100
-+++ bash-4.4/debian/rules 2016-06-06 03:00:38.000000000 +0200
+--- bash-4.4/debian/rules 2017-01-20 11:52:59.000000000 +0100
++++ bash-4.4/debian/rules 2016-09-26 14:40:45.000000000 +0200
@@ -135,7 +135,7 @@
bash-doc-build: stamps/stamp-build-bash-doc
stamps/stamp-build-bash-doc:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debrepatch.git
More information about the Reproducible-commits
mailing list