diff options
Diffstat (limited to 'external/postgresql')
| -rw-r--r-- | external/postgresql/ExternalProject_postgresql.mk | 8 | ||||
| -rw-r--r-- | external/postgresql/README | 6 | ||||
| -rw-r--r-- | external/postgresql/arm64.patch.1 | 2 | ||||
| -rw-r--r-- | external/postgresql/postgres-msvc-build.patch.1 | 8 | ||||
| -rw-r--r-- | external/postgresql/postgresql.exit.patch.0 | 4 | ||||
| -rw-r--r-- | external/postgresql/windows.patch.0 | 2 |
6 files changed, 16 insertions, 14 deletions
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index 37824f303306..1d0a13b6bb03 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -44,7 +44,7 @@ endif ifeq ($(ENABLE_OPENSSL),TRUE) ifeq ($(SYSTEM_OPENSSL),) postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include -postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)/ $(if $(filter $(OS),LINUX),-pthread) +postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl) $(if $(filter $(OS),LINUX),-pthread) endif endif @@ -54,8 +54,6 @@ postgresql_LDFLAGS += \ -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \ -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs \ -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs \ - $(if $(SYSTEM_NSS),,\ - -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib) \ endif @@ -69,14 +67,14 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : --without-readline \ --without-zlib \ --with-ldap \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(gb_CONFIGURE_PLATFORMS) \ $(if $(ENABLE_OPENSSL),--with-openssl \ $(if $(WITH_GSSAPI),--with-gssapi)) \ $(if $(ENABLE_LDAP),,--with-ldap=no) \ CFLAGS="-fPIC" \ CPPFLAGS="$(postgresql_CPPFLAGS)" \ LDFLAGS="$(postgresql_LDFLAGS)" \ - $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \ + $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber") \ && cd src/interfaces/libpq \ && MAKEFLAGS= && $(MAKE) MAKELEVEL=0 all-static-lib) $(call gb_Trace_EndRange,postgresql,EXTERNAL) diff --git a/external/postgresql/README b/external/postgresql/README index edc3d5df2781..a04037993690 100644 --- a/external/postgresql/README +++ b/external/postgresql/README @@ -1,3 +1,7 @@ PostgreSQL object-relational database management system -We use some pieces of this code for the postgresql database connector.
\ No newline at end of file +We use some pieces of this code for the postgresql database connector. + +From [https://www.postgresql.org/]. + +Release archives at [https://www.postgresql.org/ftp/source/]. diff --git a/external/postgresql/arm64.patch.1 b/external/postgresql/arm64.patch.1 index 7f8f2d6e4137..db8a3ad0a069 100644 --- a/external/postgresql/arm64.patch.1 +++ b/external/postgresql/arm64.patch.1 @@ -28,7 +28,7 @@ diff -ur postgresql.org/src/tools/msvc/MSBuildProject.pm postgresql/src/tools/ms my $includes = $self->{includes}; unless ($includes eq '' or $includes =~ /;$/) -@@ -347,7 +347,6 @@ +@@ -347,7 +346,6 @@ <ProgramDatabaseFile>.\\$cfgname\\$self->{name}\\$self->{name}.pdb</ProgramDatabaseFile> <GenerateMapFile>false</GenerateMapFile> <MapFileName>.\\$cfgname\\$self->{name}\\$self->{name}.map</MapFileName> diff --git a/external/postgresql/postgres-msvc-build.patch.1 b/external/postgresql/postgres-msvc-build.patch.1 index c217a755918b..dec31742238e 100644 --- a/external/postgresql/postgres-msvc-build.patch.1 +++ b/external/postgresql/postgres-msvc-build.patch.1 @@ -42,7 +42,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32, and why even check { # Examine CL help output to determine if we are in 32 or 64-bit mode. my $output = `cl /? 2>&1`; -@@ -1081,7 +1081,7 @@ +@@ -1100,7 +1100,7 @@ } if ($fld ne "") { @@ -53,7 +53,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32, and why even check EndProject --- postgresql/src/tools/msvc/VSObjectFactory.pm.orig 2021-01-19 18:06:42.633421700 +0100 +++ postgresql/src/tools/msvc/VSObjectFactory.pm 2021-01-19 18:06:28.663523200 +0100 -@@ -111,7 +111,7 @@ +@@ -131,7 +131,7 @@ sub DetermineVisualStudioVersion { @@ -85,7 +85,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32, and why even check my $sslout = `$opensslcmd`; $? >> 8 == 0 -@@ -964,8 +964,8 @@ +@@ -967,8 +967,8 @@ # On both Win32 and Win64 the same library # names are used without a debugging context. $dbgsuffix = 0; @@ -96,7 +96,7 @@ Also Cygwin perl has $Config{osname} different from MSWin32, and why even check } $proj->AddLibrary($self->{options}->{openssl} . $libsslpath, -@@ -990,9 +990,9 @@ +@@ -993,9 +993,9 @@ # to be here, so don't ask for it in last # parameter. $proj->AddLibrary( diff --git a/external/postgresql/postgresql.exit.patch.0 b/external/postgresql/postgresql.exit.patch.0 index 77912038e88e..8eaa1ea52ebb 100644 --- a/external/postgresql/postgresql.exit.patch.0 +++ b/external/postgresql/postgresql.exit.patch.0 @@ -1,7 +1,7 @@ # error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration] --- configure +++ configure -@@ -24565,6 +24565,7 @@ +@@ -16997,6 +16997,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9,7 +9,7 @@ typedef long int ac_int64; /* -@@ -24702,6 +24702,7 @@ +@@ -17081,6 +17082,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/external/postgresql/windows.patch.0 b/external/postgresql/windows.patch.0 index dbac548d4659..28fc9046c298 100644 --- a/external/postgresql/windows.patch.0 +++ b/external/postgresql/windows.patch.0 @@ -1,6 +1,6 @@ --- src/port/chklocale.c +++ src/port/chklocale.c -@@ -211,7 +211,7 @@ +@@ -220,7 +220,7 @@ { r = malloc(16); /* excess */ if (r != NULL) |