[packages/gdal] - teach configure / m4 about libx32 - rel 15

[baggins]

commit f9aa527bdf6f3a8959ce7f88ed51b083bbf2bc8f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Sep 5 00:23:38 2017 +0200

    - teach configure / m4 about libx32
    - rel 15

 gdal.spec    |  4 +++-
 libx32.patch | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/gdal.spec b/gdal.spec
index 9639ab4..ed8537b 100644
--- 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
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdal.git/commitdiff/f9aa527bdf6f3a8959ce7f88ed51b083bbf2bc8f