haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdal302, fix build, revbump for proj, disable static library (#8577)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-05-04 09:16:39 +02:00
committed by GitHub
parent 3ade2b322c
commit b3daeeec82
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sci-libs/gdal/gdal302-3.0.2.recipe
View File

@@ -122,6 +122,7 @@ REVISION="6"
SOURCE_URI="https://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz"
CHECKSUM_SHA256="c3765371ce391715c8f28bd6defbc70b57aa43341f6e94605f04fe3c92468983"
SOURCE_DIR="gdal-$portVersion"
PATCHES="gdal302-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -137,7 +138,7 @@ libVersion=26.0.2
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
gdal$secondaryArchSuffix = $portVersion
gdal302$secondaryArchSuffix = $portVersion
lib:libgdal$secondaryArchSuffix = $libVersionCompat
cmd:gdal_contour
cmd:gdal_grid
@@ -167,6 +168,7 @@ PROVIDES="
REQUIRES="
haiku$secondaryArchSuffix
lib:libarmadillo$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
lib:libexpat$secondaryArchSuffix
lib:libgeotiff$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
@@ -185,29 +187,32 @@ REQUIRES="
"
PROVIDES_devel="
gdal${secondaryArchSuffix}_devel = $portVersion
gdal302${secondaryArchSuffix}_devel = $portVersion
cmd:gdal_config
devel:libgdal$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
gdal$secondaryArchSuffix == $portVersion base
gdal302$secondaryArchSuffix == $portVersion base
"
CONFLICTS_devel="
gdal${secondaryArchSuffix}_devel
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libarmadillo$secondaryArchSuffix
devel:libexpat$secondaryArchSuffix
devel:libgeotiff$secondaryArchSuffix >= 5
devel:libgif$secondaryArchSuffix >= 7.0.0
devel:libgeotiff$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
devel:libhdf5$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libnetcdf$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libproj$secondaryArchSuffix >= 15
devel:libproj$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix >= 5
devel:libwebp$secondaryArchSuffix >= 7
devel:libtiff$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libzstd$secondaryArchSuffix
@@ -223,16 +228,19 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix
"
defineDebugInfoPackage gdal$secondaryArchSuffix \
defineDebugInfoPackage gdal302$secondaryArchSuffix \
$libDir/libgdal.so.$libVersion
BUILD()
{
export LDFLAGS="-lnetwork"
touch config.rpath
export CXXFLAGS="-fpermissive"
expatDir=$portPackageLinksDir/lib~libexpat
autoreconf -fi
runConfigure --omit-dirs binDir ./configure \
--bindir=$commandBinDir \
--disable-static \
--with-expat=$expatDir
make $jobArgs
}

21
sci-libs/gdal/patches/gdal302-3.0.2.patchset Normal file
View File

@@ -0,0 +1,21 @@
From 983af9e5699e904dde29941818cb3a0b70fe15d7 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Thu, 4 May 2023 08:59:27 +0200
Subject: build fix
diff --git a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
index 5517c3b..9d9eeb7 100644
--- a/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
+++ b/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
@@ -36,6 +36,7 @@
#include <cassert>
#include <cstring>
#include <iostream>
+#include <limits>
#include <memory>
#include <string>
--
2.37.3