deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/libgeotiff: fix static linking with proj

Browse source 
Use pkg-config to retrieve proj static dependency such as -lstdc++

Fixes:
 - http://autobuild.buildroot.org/results/77721989e5b057995e6c5f1f184fe368d8a8fa78

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-10-09 19:03:25 +02:00 committed by Thomas Petazzoni
parent fc50d3b46a
commit c131ab1b7b
2 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
package/libgeotiff/0002-configure.ac-use-pkg-config-to-find-proj-dependency.patch Normal file
View file

@ -0,0 +1,37 @@
From 33937e2861fda87dc314378bf87db2c766c37a6b Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Wed, 9 Oct 2019 15:11:34 +0200
Subject: [PATCH] configure.ac: use pkg-config to find proj dependency
Use pkg-config to retrieve proj and its static dependencies such as
-lstdc++
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/OSGeo/libgeotiff/pull/24]
---
libgeotiff/configure.ac | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/libgeotiff/configure.ac
index c3395d5..f7a8f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,9 +246,12 @@ if test "x$with_proj" = "xno" ; then
else
if test "x$with_proj" = "xyes" -o "x$with_proj" = "x"; then
- ORIG_LIBS="$LIBS"
- LIBS="-lproj $ORIG_LIBS"
- AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+ PKG_CHECK_MODULES(PROJ, proj, [LIBS="$LIBS $PROJ_LIBS" PROJ_FOUND=yes], [PROJ_FOUND=no])
+ if test "$PROJ_FOUND" = "no"; then
+ ORIG_LIBS="$LIBS"
+ LIBS="-lproj $ORIG_LIBS"
+ AC_CHECK_LIB(proj,proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
+ fi
if test "$PROJ_FOUND" = "no"; then
AC_CHECK_LIB(proj,internal_proj_create_from_wkt,PROJ_FOUND=yes,PROJ_FOUND=no,)
if test "$PROJ_FOUND" = "yes"; then
--
2.23.0

1
package/libgeotiff/libgeotiff.mk
View file

@ -10,7 +10,6 @@ LIBGEOTIFF_LICENSE = X11-style, public domain
LIBGEOTIFF_LICENSE_FILES = LICENSE
LIBGEOTIFF_DEPENDENCIES = proj tiff host-pkgconf
LIBGEOTIFF_INSTALL_STAGING = YES
LIBGEOTIFF_CONF_OPTS = --with-proj=$(STAGING_DIR)/usr
# We're patching configure.ac
LIBGEOTIFF_AUTORECONF = YES