git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

author Peter Eisentraut <peter@eisentraut.org>

2022年12月28日 13:20:53 +0000 (14:20 +0100)

committer Peter Eisentraut <peter@eisentraut.org>

2022年12月28日 14:10:27 +0000 (15:10 +0100)

This restores some once-intended alphabetical orders and makes the
lists consistent between the different build systems.

src/bin/pg_basebackup/Makefile patch | blob | blame | history

src/common/Makefile patch | blob | blame | history

src/tools/msvc/Mkvcbuild.pm patch | blob | blame | history

diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile

index 0035ebcef5409cc652d23f782e3ae10b58349156..a16106eec2d067f44069a29fb8fd54bb42091751 100644 (file)

--- a/src/bin/pg_basebackup/Makefile

+++ b/src/bin/pg_basebackup/Makefile

@@ -44,8 +44,8 @@ BBOBJS = \

bbstreamer_gzip.o \

bbstreamer_inject.o \

bbstreamer_lz4.o \

- bbstreamer_zstd.o \

- bbstreamer_tar.o

+ bbstreamer_tar.o \

+ bbstreamer_zstd.o

all: pg_basebackup pg_receivewal pg_recvlogical

diff --git a/src/common/Makefile b/src/common/Makefile

index e9af7346c9cb80020304b2b3a2042904b6a099cf..898701fae1c17c0733204dc0105824fad2ff9b35 100644 (file)

--- a/src/common/Makefile

+++ b/src/common/Makefile

@@ -83,9 +83,9 @@ OBJS_COMMON = \

ifeq ($(with_ssl),openssl)

OBJS_COMMON += \

- protocol_openssl.o \

cryptohash_openssl.o \

- hmac_openssl.o

+ hmac_openssl.o \

+ protocol_openssl.o

else

OBJS_COMMON += \

cryptohash.o \

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm

index 7e52e9ad0ae83c639bdb7ffbea6e3161910eb416..7b855d51f0df886b95725b5151f560f73ae585a0 100644 (file)

--- a/src/tools/msvc/Mkvcbuild.pm

+++ b/src/tools/msvc/Mkvcbuild.pm

@@ -404,8 +404,8 @@ sub mkvcbuild

$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_gzip.c');

$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_inject.c');

$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_lz4.c');

- $pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_zstd.c');

$pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_tar.c');

+ $pgbasebackup->AddFile('src/bin/pg_basebackup/bbstreamer_zstd.c');

$pgbasebackup->AddLibrary('ws2_32.lib');

my $pgreceivewal = AddSimpleFrontend('pg_basebackup', 1);

This is the main PostgreSQL git repository.

RSS Atom