diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-12-30 10:40:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 10:40:30 -0800 |
| commit | 78d4f88c0578b26425506fd93d978835c9d9b07b (patch) | |
| tree | 0040bc2251d0275f05126ca1b591eee6bd1918e5 | |
| parent | 38c6fbd0c7b02f7d73a397fc5490bcbec605e791 (diff) | |
| download | vcpkg-78d4f88c0578b26425506fd93d978835c9d9b07b.tar.gz vcpkg-78d4f88c0578b26425506fd93d978835c9d9b07b.zip | |
[libpq] Change compile flag /Zi to /Z7 when building Windows (#15361)
* [libpq] Change compile flag /Zi to /Z7 when building Windows
* [libpq] Fix installation about pdbs
| -rw-r--r-- | ports/libpq/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libpq/patches/windows/fix-compile-flag-Zi.patch | 33 | ||||
| -rw-r--r-- | ports/libpq/portfile.cmake | 1 |
3 files changed, 35 insertions, 1 deletions
diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index 9087debee..fa6ea6d91 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,6 +1,6 @@ Source: libpq Version: 12.2 -Port-Version: 9 +Port-Version: 10 Build-Depends: libpq[core,bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/libpq/patches/windows/fix-compile-flag-Zi.patch b/ports/libpq/patches/windows/fix-compile-flag-Zi.patch new file mode 100644 index 000000000..04d86811e --- /dev/null +++ b/ports/libpq/patches/windows/fix-compile-flag-Zi.patch @@ -0,0 +1,33 @@ +diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm +index b93992f..2397511 100644 +--- a/src/tools/msvc/MSBuildProject.pm ++++ b/src/tools/msvc/MSBuildProject.pm +@@ -333,7 +333,7 @@ sub WriteItemDefinitionGroup + <BrowseInformation>false</BrowseInformation> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> +- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> ++ <DebugInformationFormat>OldStyle</DebugInformationFormat> + <CompileAs>Default</CompileAs> + </ClCompile> + <Link> +diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm +index e0c9a88..98f9e67 100644 +--- a/src/tools/msvc/Install.pm ++++ b/src/tools/msvc/Install.pm +@@ -341,9 +341,12 @@ sub CopySolutionOutput + || croak "Could not copy $pf.$ext\n"; + } + } +- lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") +- || croak "Could not copy $pf.pdb\n"; +- print "."; ++ if ($1 eq 'DynamicLibrary') ++ { ++ lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb") ++ || croak "Could not copy $pf.pdb\n"; ++ print "."; ++ } + } + print "\n"; + return; diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 442fa199b..91f6e3643 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -42,6 +42,7 @@ set(PATCHES patches/windows/MSBuildProject_fix_gendef_perl.patch patches/windows/msgfmt.patch patches/windows/python_lib.patch + patches/windows/fix-compile-flag-Zi.patch patches/linux/configure.patch) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) |