- teach configure / m4 about libx32

- rel 15

diff --git a/gdal.spec b/gdal.spec
index 9639ab4745c541b00c337df6814e653c45dcc2ab..ed8537b050038e5e1e0807c780e0874923a05625 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -50,7 +50,7 @@ Summary:      Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:          gdal
 Version:       2.0.2
-Release:       14
+Release:       15
 License:       BSD-like
 Group:         Libraries
 Source0:       http://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz
@@ -67,6 +67,7 @@ Patch11:      %{name}-armadillo.patch
 Patch12:       %{name}-rasdaman.patch
 Patch13:       %{name}-pluginsdir.patch
 Patch14:       %{name}-uchar.patch
+Patch15:       libx32.patch
 URL:           http://www.gdal.org/
 %{?with_php:BuildRequires:     %{php_name}-devel}
 %{?with_opencl:BuildRequires:  OpenCL-devel >= 1.0}
@@ -295,6 +296,7 @@ osr.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # need to regenerate (old ones don't support perl 5.10 or php 5.5)
 %{__rm} swig/{perl,php}/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}

diff --git a/libx32.patch b/libx32.patch
new file mode 100644 (file)
index 0000000..5fad1ec
--- /dev/null
+++ b/libx32.patch
@@ -0,0 +1,14 @@
+--- gdal-2.0.2/m4/lib-prefix.m4~       2016-01-26 16:21:45.000000000 +0100
++++ gdal-2.0.2/m4/lib-prefix.m4        2017-09-04 23:14:12.632192795 +0200
+@@ -172,9 +172,11 @@
+     for searchdir in $searchpath; do
+       if test -d "$searchdir"; then
+         case "$searchdir" in
++          */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
+           */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+           *) searchdir=`cd "$searchdir" && pwd`
+              case "$searchdir" in
++               */libx324 ) acl_libdirstem=libx32 ;;
+                */lib64 ) acl_libdirstem=lib64 ;;
+              esac ;;
+         esac