Skip to content

Commit cca3fec

Browse files
funny-falconfunny-falcon
committed
PBCKP-544 remove crc32c source patch for windows
- For Pg <= 14 it is better to link ptrack with pgport.lib by patching Mkvcbuild.pm - Pg >= 15 reacts on presence of PG_LIBS_INTERNAL += $(libpq_pgport)
1 parent 7c4dcfd commit cca3fec

7 files changed

+58
-112
lines changed

Diff for: ‎Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ DATA = ptrack--2.1.sql ptrack--2.0--2.1.sql ptrack--2.1--2.2.sql ptrack--2.2--2.
1111

1212
TAP_TESTS = 1
1313

14+
# This line to link with pgport.lib on Windows compilation
15+
# with Mkvcbuild.pm on PGv15+
16+
PG_LIBS_INTERNAL += $(libpq_pgport)
17+
1418
ifdef USE_PGXS
1519
PG_CONFIG ?= pg_config
1620
PGXS := $(shell $(PG_CONFIG) --pgxs)

Diff for: ‎patches/REL_11_STABLE-ptrack-core.diff

+13-18
Original file line numberDiff line numberDiff line change
@@ -207,24 +207,6 @@ index 80241455357..50dca7bf6f4 100644
207207

208208
#define IsBootstrapProcessingMode() (Mode == BootstrapProcessing)
209209
#define IsInitProcessingMode() (Mode == InitProcessing)
210-
diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
211-
index 9a26295c8e8..dc72b27a10d 100644
212-
--- a/src/include/port/pg_crc32c.h
213-
+++ b/src/include/port/pg_crc32c.h
214-
@@ -69,8 +69,11 @@ extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t le
215-
#define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
216-
217-
extern pg_crc32c pg_comp_crc32c_sb8(pg_crc32c crc, const void *data, size_t len);
218-
-extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
219-
-
220-
+extern
221-
+#ifndef FRONTEND
222-
+PGDLLIMPORT
223-
+#endif
224-
+pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
225-
#ifdef USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
226-
extern pg_crc32c pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len);
227-
#endif
228210
diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
229211
index 4fef3e21072..e55430879c3 100644
230212
--- a/src/include/storage/copydir.h
@@ -261,3 +243,16 @@ index 0298ed1a2bc..24c684771d0 100644
261243
extern void mdinit(void);
262244
extern void mdclose(SMgrRelation reln, ForkNumber forknum);
263245
extern void mdcreate(SMgrRelation reln, ForkNumber forknum, bool isRedo);
246+
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
247+
index b52baa90988..74870c048db 100644
248+
--- a/src/tools/msvc/Mkvcbuild.pm
249+
+++ b/src/tools/msvc/Mkvcbuild.pm
250+
@@ -33,7 +33,7 @@ my @unlink_on_exit;
251+
# Set of variables for modules in contrib/ and src/test/modules/
252+
my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' };
253+
my @contrib_uselibpq = ('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo');
254+
-my @contrib_uselibpgport = ('oid2name', 'pg_standby', 'vacuumlo');
255+
+my @contrib_uselibpgport = ('oid2name', 'pg_standby', 'vacuumlo', 'ptrack');
256+
my @contrib_uselibpgcommon = ('oid2name', 'pg_standby', 'vacuumlo');
257+
my $contrib_extralibs = undef;
258+
my $contrib_extraincludes = { 'dblink' => ['src/backend'] };

Diff for: ‎patches/REL_12_STABLE-ptrack-core.diff

+13-18
Original file line numberDiff line numberDiff line change
@@ -225,24 +225,6 @@ index 61a24c2e3c6..cbd46d0cb02 100644
225225

226226
#define IsBootstrapProcessingMode() (Mode == BootstrapProcessing)
227227
#define IsInitProcessingMode() (Mode == InitProcessing)
228-
diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
229-
index fbd079d2439..01682035e0b 100644
230-
--- a/src/include/port/pg_crc32c.h
231-
+++ b/src/include/port/pg_crc32c.h
232-
@@ -69,8 +69,11 @@ extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t le
233-
#define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
234-
235-
extern pg_crc32c pg_comp_crc32c_sb8(pg_crc32c crc, const void *data, size_t len);
236-
-extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
237-
-
238-
+extern
239-
+#ifndef FRONTEND
240-
+PGDLLIMPORT
241-
+#endif
242-
+pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
243-
#ifdef USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
244-
extern pg_crc32c pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len);
245-
#endif
246228
diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
247229
index 525cc6203e1..9481e1c5a88 100644
248230
--- a/src/include/storage/copydir.h
@@ -289,3 +271,16 @@ index 16428c5f5fb..6b0cd8f8eea 100644
289271
extern void InitSync(void);
290272
extern void SyncPreCheckpoint(void);
291273
extern void SyncPostCheckpoint(void);
274+
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
275+
index 1bdc33d7168..83b1190775f 100644
276+
--- a/src/tools/msvc/Mkvcbuild.pm
277+
+++ b/src/tools/msvc/Mkvcbuild.pm
278+
@@ -33,7 +33,7 @@ my @unlink_on_exit;
279+
# Set of variables for modules in contrib/ and src/test/modules/
280+
my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' };
281+
my @contrib_uselibpq = ('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo');
282+
-my @contrib_uselibpgport = ('oid2name', 'pg_standby', 'vacuumlo');
283+
+my @contrib_uselibpgport = ('oid2name', 'pg_standby', 'vacuumlo', 'ptrack');
284+
my @contrib_uselibpgcommon = ('oid2name', 'pg_standby', 'vacuumlo');
285+
my $contrib_extralibs = undef;
286+
my $contrib_extraincludes = { 'dblink' => ['src/backend'] };

Diff for: ‎patches/REL_13_STABLE-ptrack-core.diff

+13-24
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
commit a14ac459d71528c64df00c693e9c71ac70d3ba29
2-
Author: anastasia <[email protected]>
3-
Date: Mon Oct 19 14:53:06 2020 +0300
4-
5-
add ptrack 2.0
6-
71
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
82
index 50ae1f16d0..721b926ad2 100644
93
--- a/src/backend/replication/basebackup.c
@@ -231,24 +225,6 @@ index 72e3352398..5c2e016501 100644
231225

232226
#define IsBootstrapProcessingMode() (Mode == BootstrapProcessing)
233227
#define IsInitProcessingMode() (Mode == InitProcessing)
234-
diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
235-
index 3c6f906683..a7355f7ad1 100644
236-
--- a/src/include/port/pg_crc32c.h
237-
+++ b/src/include/port/pg_crc32c.h
238-
@@ -69,8 +69,11 @@ extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t le
239-
#define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
240-
241-
extern pg_crc32c pg_comp_crc32c_sb8(pg_crc32c crc, const void *data, size_t len);
242-
-extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
243-
-
244-
+extern
245-
+#ifndef FRONTEND
246-
+PGDLLIMPORT
247-
+#endif
248-
+pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
249-
#ifdef USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
250-
extern pg_crc32c pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len);
251-
#endif
252228
diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
253229
index 5d28f59c1d..0d3f04d8af 100644
254230
--- a/src/include/storage/copydir.h
@@ -295,3 +271,16 @@ index e16ab8e711..88da9686eb 100644
295271
extern void InitSync(void);
296272
extern void SyncPreCheckpoint(void);
297273
extern void SyncPostCheckpoint(void);
274+
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
275+
index 67b2ea9ee9b..e9a282d5647 100644
276+
--- a/src/tools/msvc/Mkvcbuild.pm
277+
+++ b/src/tools/msvc/Mkvcbuild.pm
278+
@@ -34,7 +34,7 @@ my @unlink_on_exit;
279+
# Set of variables for modules in contrib/ and src/test/modules/
280+
my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' };
281+
my @contrib_uselibpq = ('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo');
282+
-my @contrib_uselibpgport = ('oid2name', 'pg_standby', 'vacuumlo');
283+
+my @contrib_uselibpgport = ('oid2name', 'pg_standby', 'vacuumlo', 'ptrack');
284+
my @contrib_uselibpgcommon = ('oid2name', 'pg_standby', 'vacuumlo');
285+
my $contrib_extralibs = undef;
286+
my $contrib_extraincludes = { 'dblink' => ['src/backend'] };

Diff for: ‎patches/REL_14_STABLE-ptrack-core.diff

+13-24
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
commit a14ac459d71528c64df00c693e9c71ac70d3ba29
2-
Author: anastasia <[email protected]>
3-
Date: Mon Oct 19 14:53:06 2020 +0300
4-
5-
add ptrack 2.0
6-
71
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
82
index 50ae1f16d0..721b926ad2 100644
93
--- a/src/backend/replication/basebackup.c
@@ -231,24 +225,6 @@ index 72e3352398..5c2e016501 100644
231225

232226
#define IsBootstrapProcessingMode() (Mode == BootstrapProcessing)
233227
#define IsInitProcessingMode() (Mode == InitProcessing)
234-
diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
235-
index 3c6f906683..a7355f7ad1 100644
236-
--- a/src/include/port/pg_crc32c.h
237-
+++ b/src/include/port/pg_crc32c.h
238-
@@ -69,8 +69,11 @@ extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t le
239-
#define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
240-
241-
extern pg_crc32c pg_comp_crc32c_sb8(pg_crc32c crc, const void *data, size_t len);
242-
-extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
243-
-
244-
+extern
245-
+#ifndef FRONTEND
246-
+PGDLLIMPORT
247-
+#endif
248-
+pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
249-
#ifdef USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
250-
extern pg_crc32c pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len);
251-
#endif
252228
diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
253229
index 5d28f59c1d..0d3f04d8af 100644
254230
--- a/src/include/storage/copydir.h
@@ -295,3 +271,16 @@ index e16ab8e711..88da9686eb 100644
295271
extern void InitSync(void);
296272
extern void SyncPreCheckpoint(void);
297273
extern void SyncPostCheckpoint(void);
274+
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
275+
index 9b6539fb15d..4b2bcdb6b88 100644
276+
--- a/src/tools/msvc/Mkvcbuild.pm
277+
+++ b/src/tools/msvc/Mkvcbuild.pm
278+
@@ -38,7 +38,7 @@ my @unlink_on_exit;
279+
my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' };
280+
my @contrib_uselibpq =
281+
('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo', 'libpq_pipeline');
282+
-my @contrib_uselibpgport = ('libpq_pipeline', 'oid2name', 'vacuumlo');
283+
+my @contrib_uselibpgport = ('libpq_pipeline', 'oid2name', 'vacuumlo', 'ptrack');
284+
my @contrib_uselibpgcommon = ('libpq_pipeline', 'oid2name', 'vacuumlo');
285+
my $contrib_extralibs = { 'libpq_pipeline' => ['ws2_32.lib'] };
286+
my $contrib_extraincludes = { 'dblink' => ['src/backend'] };

Diff for: ‎patches/REL_15_STABLE-ptrack-core.diff

-13
Original file line numberDiff line numberDiff line change
@@ -200,19 +200,6 @@ index 62529310415..b496f54fb06 100644
200200
/* end of list */
201201
{NULL, false}
202202
};
203-
diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
204-
index d7668651ba8..33994a27f5f 100644
205-
--- a/src/include/port/pg_crc32c.h
206-
+++ b/src/include/port/pg_crc32c.h
207-
@@ -69,7 +69,7 @@ extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t le
208-
#define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
209-
210-
extern pg_crc32c pg_comp_crc32c_sb8(pg_crc32c crc, const void *data, size_t len);
211-
-extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
212-
+extern PGDLLIMPORT pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
213-
214-
#ifdef USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
215-
extern pg_crc32c pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len);
216203
diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
217204
index 50a26edeb06..af1602f5154 100644
218205
--- a/src/include/storage/copydir.h

Diff for: ‎patches/master-ptrack-core.diff

+2-15
Original file line numberDiff line numberDiff line change
@@ -200,19 +200,6 @@ index 269ed6446e6..6318a8c1f55 100644
200200
/* end of list */
201201
{NULL, false}
202202
};
203-
diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
204-
index d7668651ba8..33994a27f5f 100644
205-
--- a/src/include/port/pg_crc32c.h
206-
+++ b/src/include/port/pg_crc32c.h
207-
@@ -69,7 +69,7 @@ extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t le
208-
#define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
209-
210-
extern pg_crc32c pg_comp_crc32c_sb8(pg_crc32c crc, const void *data, size_t len);
211-
-extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
212-
+extern PGDLLIMPORT pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
213-
214-
#ifdef USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
215-
extern pg_crc32c pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len);
216203
diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
217204
index 50a26edeb06..af1602f5154 100644
218205
--- a/src/include/storage/copydir.h
@@ -224,8 +211,8 @@ index 50a26edeb06..af1602f5154 100644
224211
+typedef void (*copydir_hook_type) (const char *path);
225212
+extern PGDLLIMPORT copydir_hook_type copydir_hook;
226213
+
227-
extern void copydir(char *fromdir, char *todir, bool recurse);
228-
extern void copy_file(char *fromfile, char *tofile);
214+
extern void copydir(const char *fromdir, const char *todir, bool recurse);
215+
extern void copy_file(const char *fromfile, const char *tofile);
229216

230217
diff --git a/src/include/storage/md.h b/src/include/storage/md.h
231218
index 10aa1b0109b..1415675824e 100644

0 commit comments

Comments
 (0)