Commit 14eec410 authored by Christoph Berg's avatar Christoph Berg

Grab patch from libusual upstream to make linking order reproducible.

parent 04efd7e6
pgbouncer (1.7.1-2) UNRELEASED; urgency=medium
pgbouncer (1.7.1-2) unstable; urgency=medium
* Set V=1 to get verbose build output.
* Grab patch from libusual upstream to make linking order reproducible.
-- Christoph Berg <myon@debian.org> Sat, 20 Feb 2016 14:20:54 +0100
-- Christoph Berg <christoph.berg@credativ.de> Wed, 24 Feb 2016 15:29:38 +0100
pgbouncer (1.7.1-1) unstable; urgency=medium
......
......@@ -3,7 +3,7 @@ Maintainer: Debian PostgreSQL Maintainers <pkg-postgresql-public@lists.alioth.de
Uploaders: Bernd Zeimetz <bzed@debian.org>, Christoph Berg <myon@debian.org>, Peter Eisentraut <petere@debian.org>
Section: database
Priority: optional
Standards-Version: 3.9.6
Standards-Version: 3.9.7
Build-Depends: debhelper (>= 9), libevent-dev (>= 1.3b), libssl-dev, autotools-dev
Homepage: http://pgfoundry.org/projects/pgbouncer/
Vcs-Git: git://anonscm.debian.org/pkg-postgresql/pgbouncer.git
......
commit 2f0d8767f2b0ca3f4aacd46cde1fc93019a2ae70
Author: Marko Kreen <markokr@gmail.com>
Date: Sun Feb 21 18:57:45 2016 +0200
mk: wrap $(wildcard) in $(sort) where file list is used
Helps to make reproducible builds.
Fixes: pgbouncer/pgbouncer#111
diff --git a/mk/amext-libusual.mk b/mk/amext-libusual.mk
index c00c063..09b959e 100644
--- a/lib/mk/amext-libusual.mk
+++ b/lib/mk/amext-libusual.mk
@@ -18,10 +18,10 @@ _USUAL_DIR = $(call JoinPath,$(srcdir),$(USUAL_DIR))
_USUAL_DIR2 = $(call JoinPath,$(_USUAL_DIR),usual)
# module names from sources (plus headers)
-UsualMods = $(trace1)$(shell $(_USUAL_DIR)/find_modules.sh $(_USUAL_DIR) $(wildcard $(addprefix $(srcdir)/,$(1))))
+UsualMods = $(trace1)$(shell $(_USUAL_DIR)/find_modules.sh $(_USUAL_DIR) $(sort $(wildcard $(addprefix $(srcdir)/,$(1)))))
# full-path sources based on module list
-UsualSrcsFull = $(trace1)$(wildcard $(addprefix $(_USUAL_DIR2)/,$(addsuffix *.[ch],$(1))))
+UsualSrcsFull = $(trace1)$(sort $(wildcard $(addprefix $(_USUAL_DIR2)/,$(addsuffix *.[ch],$(1)))))
# remove USUAL_DIR
UsualStrip = $(trace1)$(subst $(_USUAL_DIR)/,,$(1))
diff --git a/mk/antimake.mk b/mk/antimake.mk
index c5af4da..91b99cd 100755
--- a/lib/mk/antimake.mk
+++ b/lib/mk/antimake.mk
@@ -552,7 +552,7 @@ SourceObjs = $(trace1)$(call SourceObjsExt,$(1),$(OBJEXT),$(2))
SourceObjsExt = $(addprefix $(call JoinPath,$(OBJDIR),$(1))/, $(call ReplaceExts,$(AM_SRCEXTS),$(2),$(3)))
# dependency files from object files, must match OBJDEPS
-DepFiles = $(wildcard $(addsuffix .d,$(1)))
+DepFiles = $(sort $(wildcard $(addsuffix .d,$(1))))
# per-target var override, 1=target, 2=varname
# if foo_VAR exists, expand to:
debian-config
reproducible-build
libusual-2f0d8767f2b0ca3f4aacd46cde1fc93019a2ae70
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment