Skip to content

Commit 3343ea9

Browse files
committed
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
1 parent 4aecd22 commit 3343ea9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

contrib/hstore_plperl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ endif
3232
ifeq ($(PORTNAME), win32)
3333
# these settings are the same as for plperl
3434
override CPPFLAGS += -DPLPERL_HAVE_UID_GID -Wno-comment
35-
SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plperl/libperl*.a)
35+
SHLIB_LINK += ../hstore/libhstore.a $(sort $(wildcard ../../src/pl/plperl/libperl*.a))
3636
endif
3737

3838
ifeq ($(PORTNAME), cygwin)

contrib/hstore_plpython/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ endif
2727
# dependency. This does preclude pgxs builds.
2828
ifeq ($(PORTNAME), aix)
2929
rpathdir = $(pkglibdir):$(python_libdir)
30-
SHLIB_LINK += ../hstore/libhstore.exp $(python_libspec) $(python_additional_libs) $(wildcard ../../src/pl/plpython/libplpython*.exp)
30+
SHLIB_LINK += ../hstore/libhstore.exp $(python_libspec) $(python_additional_libs) $(sort $(wildcard ../../src/pl/plpython/libplpython*.exp))
3131
endif
3232
ifeq ($(PORTNAME), win32)
33-
SHLIB_LINK += ../hstore/libhstore.a $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a)
33+
SHLIB_LINK += ../hstore/libhstore.a $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) $(sort $(wildcard ../../src/pl/plpython/libplpython*.a))
3434
endif
3535

3636
ifeq ($(PORTNAME), cygwin)

contrib/ltree_plpython/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ endif
2727
# dependency. This does preclude pgxs builds.
2828
ifeq ($(PORTNAME), aix)
2929
rpathdir = $(pkglibdir):$(python_libdir)
30-
SHLIB_LINK += $(python_libspec) $(python_additional_libs) $(wildcard ../../src/pl/plpython/libplpython*.exp)
30+
SHLIB_LINK += $(python_libspec) $(python_additional_libs) $(sort $(wildcard ../../src/pl/plpython/libplpython*.exp))
3131
endif
3232
ifeq ($(PORTNAME), win32)
33-
SHLIB_LINK += $(wildcard ../../src/pl/plpython/libpython*.a) $(wildcard ../../src/pl/plpython/libplpython*.a)
33+
SHLIB_LINK += $(sort $(wildcard ../../src/pl/plpython/libpython*.a)) $(sort $(wildcard ../../src/pl/plpython/libplpython*.a))
3434
endif
3535

3636
ifeq ($(PORTNAME), cygwin)

src/bin/pg_xlogdump/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OBJS = pg_xlogdump.o compat.o xlogreader.o rmgrdesc.o \
1212

1313
override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
1414

15-
RMGRDESCSOURCES = $(notdir $(wildcard $(top_srcdir)/src/backend/access/rmgrdesc/*desc.c))
15+
RMGRDESCSOURCES = $(sort $(notdir $(wildcard $(top_srcdir)/src/backend/access/rmgrdesc/*desc.c)))
1616
RMGRDESCOBJS = $(patsubst %.c,%.o,$(RMGRDESCSOURCES))
1717

1818

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy