diff options
author | Amy Liffey <amynka@gentoo.org> | 2017-12-20 19:22:13 +0100 |
---|---|---|
committer | Amy Liffey <amynka@gentoo.org> | 2017-12-20 19:23:11 +0100 |
commit | d16d04fc7bd9558d67e7b97fbab6f026e70a7ec2 (patch) | |
tree | 9a1ea148b84c2b55294fc3fa6f21a9a5e9ab3429 /sci-libs/gdal/files | |
parent | dev-python/m2crypto: depend on dev-libs/openssl[-bindist] (diff) | |
download | gentoo-d16d04fc7bd9558d67e7b97fbab6f026e70a7ec2.tar.gz gentoo-d16d04fc7bd9558d67e7b97fbab6f026e70a7ec2.tar.bz2 gentoo-d16d04fc7bd9558d67e7b97fbab6f026e70a7ec2.zip |
sci-libs/gdal: version bump 2.2.3
Closes: https://bugs.gentoo.org/615986
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'sci-libs/gdal/files')
-rw-r--r-- | sci-libs/gdal/files/gdal-2.2.3-soname.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/sci-libs/gdal/files/gdal-2.2.3-soname.patch b/sci-libs/gdal/files/gdal-2.2.3-soname.patch new file mode 100644 index 000000000000..f2746bdf5e30 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.2.3-soname.patch @@ -0,0 +1,54 @@ +Set SONAME and unbreak compilation on Darwin + +Author: Fabian Groffen <grobian@gentoo.org> +Author: Dennis Schridde <devurandom@gmx.net> + +--- old/GDALmake.opt.in.orig 2008-02-02 18:25:48.000000000 -0800 ++++ new/GDALmake.opt.in 2008-02-02 18:54:53.000000000 -0800 +@@ -97,6 +97,14 @@ + GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) + GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal + ++# for building without libtool ++GDAL_SLIB_SO_VER = $(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION) ++ifeq ("$(shell uname -s)", "Darwin") ++GDAL_SLIB_SONAME = -install_name $(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT) ++else ++GDAL_SLIB_SONAME = -Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR) ++endif ++ + # Mac OS X Framework definition + MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@ + +--- gdal-2.0.3.old/GNUmakefile ++++ gdal-2.0.3/GNUmakefile +@@ -208,7 +208,7 @@ else + + ifeq ($(HAVE_LD_SHARED),yes) + +-GDAL_SLIB_B = $(notdir $(GDAL_SLIB)) ++GDAL_SLIB_B = libgdal + + install-lib: + +@@ -216,14 +216,14 @@ install-lib: + ifeq ($(MACOSX_FRAMEWORK),yes) + $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL + else +- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B) +- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) +- rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER) +- $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER) ++ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(SO_EXT) ++ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).$(SO_EXT) ++ rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).$(SO_EXT) ++ $(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).$(SO_EXT) + (cd $(DESTDIR)$(INST_LIB) ; \ +- ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)) ++ ln -s $(GDAL_SLIB_B).$(GDAL_VER).$(SO_EXT) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).$(SO_EXT)) + (cd $(DESTDIR)$(INST_LIB) ; \ +- ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B)) ++ ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).$(SO_EXT) $(GDAL_SLIB_B).$(SO_EXT)) + $(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/gdalplugins + endif + |