diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-01-05 15:47:05 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-01-05 15:47:05 -0500 |
| commit | 8805af0886c671adcaf0200d70549d5d933f5cf2 (patch) | |
| tree | f88b4a1ad9306749b41daaa2080a653fda08beb5 /contrib | |
| parent | 7ef311eb426b2ab01831cc5f1502a5b838c8cdd3 (diff) | |
| download | postgresql-8805af0886c671adcaf0200d70549d5d933f5cf2.tar.gz postgresql-8805af0886c671adcaf0200d70549d5d933f5cf2.zip | |
Sort $(wildcard) output where needed for reproducible build output.
The order of inclusion of .o files makes a difference in linker output;
not a functional difference, but still a bitwise difference, which annoys
some packagers who would like reproducible builds.
Report and patch by Christoph Berg
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/hstore_plperl/Makefile | 2 | ||||
| -rw-r--r-- | contrib/hstore_plpython/Makefile | 4 | ||||
| -rw-r--r-- | contrib/ltree_plpython/Makefile | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/hstore_plperl/Makefile b/contrib/hstore_plperl/Makefile index 8f7b171bcd6..b3b8654bc80 100644 --- a/contrib/hstore_plperl/Makefile +++ b/contrib/hstore_plperl/Makefile @@ -32,7 +32,7 @@ endif ifeq ($(PORTNAME), win32) # these settings are the same as for plperl override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment -SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plperl/libperl*.a) +SHLIB_LINK += ../hstore/libhstore.a $(sort $(wildcard ../../src/pl/plperl/libperl*.a)) endif ifeq ($(PORTNAME), cygwin) diff --git a/contrib/hstore_plpython/Makefile b/contrib/hstore_plpython/Makefile index 2de00a2c43c..c4dad6f1119 100644 --- a/contrib/hstore_plpython/Makefile +++ b/contrib/hstore_plpython/Makefile @@ -27,10 +27,10 @@ endif # dependency. This does preclude pgxs builds. ifeq ($(PORTNAME), aix) rpathdir = $(pkglibdir):$(python_libdir) -SHLIB_LINK += ../hstore/libhstore.exp $(python_libspec) $(python_additional_libs) $(wildcard ../../src/pl/plpython/libplpython*.exp) +SHLIB_LINK += ../hstore/libhstore.exp $(python_libspec) $(python_additional_libs) $(sort $(wildcard ../../src/pl/plpython/libplpython*.exp)) endif ifeq ($(PORTNAME), win32) -SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a) +SHLIB_LINK += ../hstore/libhstore.a $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) $(sort $(wildcard ../../src/pl/plpython/libplpython*.a)) endif ifeq ($(PORTNAME), cygwin) diff --git a/contrib/ltree_plpython/Makefile b/contrib/ltree_plpython/Makefile index 7eacb401159..08186f19a13 100644 --- a/contrib/ltree_plpython/Makefile +++ b/contrib/ltree_plpython/Makefile @@ -27,10 +27,10 @@ endif # dependency. This does preclude pgxs builds. ifeq ($(PORTNAME), aix) rpathdir = $(pkglibdir):$(python_libdir) -SHLIB_LINK += $(python_libspec) $(python_additional_libs) $(wildcard ../../src/pl/plpython/libplpython*.exp) +SHLIB_LINK += $(python_libspec) $(python_additional_libs) $(sort $(wildcard ../../src/pl/plpython/libplpython*.exp)) endif ifeq ($(PORTNAME), win32) -SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a) +SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) $(sort $(wildcard ../../src/pl/plpython/libplpython*.a)) endif ifeq ($(PORTNAME), cygwin) |