Skip to content
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

Windows: Apply OSGeo4W patches for Postgres #4996

Merged
merged 4 commits into from
Jan 28, 2025
Merged

Windows: Apply OSGeo4W patches for Postgres #4996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
347b547
Windows: Apply OSGeo4W patches for Postgres
echoix Jan 27, 2025
398dc36
Update postgres-libs path according to patch
echoix Jan 27, 2025
c7b1427
Update build_osgeo4w.sh
echoix Jan 27, 2025
609420d
Create directory osgeo4w/lib directory and copy Postgres lib in build…
echoix Jan 28, 2025
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
7 changes: 6 additions & 1 deletion mswindows/osgeo4w/build_osgeo4w.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ export C_INCLUDE_PATH=".:${OSGEO4W_ROOT_MSYS}/include:${SRC}/dist.${ARCH}/includ
export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python312
export ARCH=x86_64-w64-mingw32


mkdir -p mswindows/osgeo4w/lib
rm -f $OSGEO4W_ROOT_MSYS/lib/libpq.a
cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/libpq.lib

CFLAGS="$CFLAGS -pipe" \
CXXFLAGS="$CXXFLAGS -pipe" \
./configure \
Expand Down Expand Up @@ -55,7 +60,7 @@ CXXFLAGS="$CXXFLAGS -pipe" \
--with-openmp \
--with-postgres \
--with-postgres-includes=${OSGEO4W_ROOT_MSYS}/include \
--with-postgres-libs=${OSGEO4W_ROOT_MSYS}/lib \
--with-postgres-libs=${SRC}/mswindows/osgeo4w/lib \
--with-proj-includes=${OSGEO4W_ROOT_MSYS}/include \
--with-proj-libs=${OSGEO4W_ROOT_MSYS}/lib \
--with-proj-share=${OSGEO4W_ROOT_MSYS}/share/proj \
Expand Down
4 changes: 3 additions & 1 deletion mswindows/osgeo4w/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
rm -f mswindows/osgeo4w/package.log.*

mkdir -p mswindows/osgeo4w/lib
rm -f $OSGEO4W_ROOT_MSYS/lib/libpq.a
cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/libpq.lib
cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/sqlite3.lib


Expand Down Expand Up @@ -155,7 +157,7 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
--with-openmp \
--with-postgres \
--with-postgres-includes=${OSGEO4W_ROOT_MSYS}/include \
--with-postgres-libs=${OSGEO4W_ROOT_MSYS}/lib \
--with-postgres-libs=${SRC}/mswindows/osgeo4w/lib \
--with-proj-includes=${OSGEO4W_ROOT_MSYS}/include \
--with-proj-libs=${OSGEO4W_ROOT_MSYS}/lib \
--with-proj-share=${OSGEO4W_ROOT_MSYS}/share/proj \
Expand Down
Loading