Skip to content

[gdal] Fix linker error with static libpng #6305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 3 commits into from
May 6, 2019
Merged

[gdal] Fix linker error with static libpng #6305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
070112e
When linking gdal with static libpng, it fails because the libpng vcp…
jumpinjackie May 4, 2019
d8924bf
Merge branch 'master' into gdal-fix-static-libpng
jumpinjackie May 6, 2019
7ae8259
[gdal]: Bump portfile version as master is already at 2.4.1-2
jumpinjackie May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/gdal/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Source: gdal
Version: 2.4.1-1
Version: 2.4.1-3
Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5
Build-Depends: proj, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib

Feature: mysql-libmariadb
Build-Depends: libmariadb
Expand Down
9 changes: 9 additions & 0 deletions ports/gdal/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" PNG_INCLUDE_DIR)
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libpng16.lib" PNG_LIBRARY_REL)
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libpng16d.lib" PNG_LIBRARY_DBG)

# Setup zlib libraries + include path
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" ZLIB_INCLUDE_DIR)
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/zlib.lib" ZLIB_LIBRARY_REL)
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib" ZLIB_LIBRARY_DBG)

# Setup geos libraries + include path
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" GEOS_INCLUDE_DIR)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
Expand Down Expand Up @@ -163,6 +168,8 @@ list(APPEND NMAKE_OPTIONS
LIBXML2_INC=-I${XML2_INCLUDE_DIR}
PNG_EXTERNAL_LIB=1
PNGDIR=${PNG_INCLUDE_DIR}
ZLIB_INC=-I${ZLIB_INCLUDE_DIR}
ZLIB_EXTERNAL_LIB=1
MSVC_VER=1900
)

Expand Down Expand Up @@ -196,6 +203,7 @@ list(APPEND NMAKE_OPTIONS_REL
OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}
WEBP_LIBS=${WEBP_LIBRARY_REL}
LIBXML2_LIB=${XML2_LIBRARY_REL}
ZLIB_LIB=${ZLIB_LIBRARY_REL}
)
if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
# Static Build does not like PG_LIB
Expand All @@ -214,6 +222,7 @@ list(APPEND NMAKE_OPTIONS_DBG
OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}
WEBP_LIBS=${WEBP_LIBRARY_DBG}
LIBXML2_LIB=${XML2_LIBRARY_DBG}
ZLIB_LIB=${ZLIB_LIBRARY_DBG}
DEBUG=1
)
if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
Expand Down