Bump buildroot to 2019.02
This commit is contained in:
@@ -0,0 +1,20 @@
|
||||
Fix GEO_NORMALIZE_DISABLE_TOWGS84 definition
|
||||
|
||||
Fix "missing template: GEO_NORMALIZE_DISABLE_TOWGS84" error by adding
|
||||
a non-empty description of GEO_NORMALIZE_DISABLE_TOWGS84 in AC_DEFINE
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
Index: libgeotiff/configure.ac
|
||||
===================================================================
|
||||
--- libgeotiff/configure.ac (révision 2818)
|
||||
+++ libgeotiff/configure.ac (copie de travail)
|
||||
@@ -317,7 +317,7 @@
|
||||
AM_CONDITIONAL([CSV_IS_CONFIG], [test ! x$CSV_CONFIG = xno])
|
||||
|
||||
|
||||
-AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE(GEO_NORMALIZE_DISABLE_TOWGS84))
|
||||
+AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE(GEO_NORMALIZE_DISABLE_TOWGS84, [], [Disable WGS84 parameters]))
|
||||
|
||||
dnl #########################################################################
|
||||
dnl Doxygen settings
|
||||
@@ -0,0 +1,65 @@
|
||||
From edc9ec69b43c27955ee4f24db2e6808bb1a8974d Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 3 Feb 2019 23:20:43 +0100
|
||||
Subject: [PATCH] libgeotiff/configure.ac: do not check for C++
|
||||
|
||||
Do not check for C++ compiler as libgeotiff is written in C otherwise
|
||||
build will fail on toolchains without a working C++ compiler:
|
||||
|
||||
checking how to run the C++ preprocessor... /lib/cpp
|
||||
configure: error: in `/data/buildroot/buildroot-test/instance-1/output/build/libgeotiff-1.4.2':
|
||||
configure: error: C++ preprocessor "/lib/cpp" fails sanity check
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/72f1c5c1b8fc337a1cff4b280abe99afd65f945b
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/OSGeo/libgeotiff/pull/9]
|
||||
---
|
||||
libgeotiff/configure.ac | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a334416..4ebbd6f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -25,8 +25,6 @@ dnl #########################################################################
|
||||
AM_INIT_AUTOMAKE
|
||||
AM_MAINTAINER_MODE
|
||||
AC_PROG_CC
|
||||
-AC_PROG_CXX
|
||||
-AC_PROG_CXXCPP
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
@@ -46,7 +44,6 @@ dnl #########################################################################
|
||||
m4_define([debug_default],[no])
|
||||
|
||||
CFLAGS="$CFLAGS"
|
||||
-CXXFLAGS="$CXXFLAGS"
|
||||
|
||||
dnl We want to honor the users wishes with regard to linking.
|
||||
LIBS="$LDFLAGS $LIBS"
|
||||
@@ -82,11 +79,9 @@ AC_MSG_CHECKING([for debug enabled])
|
||||
|
||||
if test "x$enable_debug" = "xyes"; then
|
||||
CFLAGS="$CFLAGS -g -DDEBUG -Wall"
|
||||
- CXXFLAGS="$CXXFLAGS -g -DDEBUG -Wall"
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
CFLAGS="$CFLAGS -O3 -DNDEBUG"
|
||||
- CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG"
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
@@ -367,7 +362,6 @@ LOC_MSG()
|
||||
LOC_MSG([ Version..................: ${RELEASE_VERSION}])
|
||||
LOC_MSG([ Installation directory...: ${prefix}])
|
||||
LOC_MSG([ C compiler...............: ${CC} ${CFLAGS}])
|
||||
-LOC_MSG([ C++ compiler.............: ${CXX} ${CXXFLAGS}])
|
||||
|
||||
LOC_MSG([ Debugging support........: ${enable_debug}])
|
||||
LOC_MSG()
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally computed
|
||||
sha1 4c6f405869826bb7d9f35f1d69167e3b44a57ef0 libgeotiff-1.4.0.tar.gz
|
||||
sha256 b8510d9b968b5ee899282cdd5bef13fd02d5a4c19f664553f81e31127bc47265 libgeotiff-1.4.3.tar.gz
|
||||
sha256 16b83cf7c3bbfd20bffa768b9bfdb16506ca50f5c140a9f3431e740b155359c1 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGEOTIFF_VERSION = 1.4.0
|
||||
LIBGEOTIFF_VERSION = 1.4.3
|
||||
LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff
|
||||
LIBGEOTIFF_LICENSE = X11-style, public domain
|
||||
LIBGEOTIFF_LICENSE_FILES = LICENSE
|
||||
@@ -26,4 +26,11 @@ else
|
||||
LIBGEOTIFF_CONF_OPTS += --without-jpeg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PROJ),y)
|
||||
LIBGEOTIFF_DEPENDENCIES += proj
|
||||
LIBGEOTIFF_CONF_OPTS += --with-proj=$(STAGING_DIR)/usr
|
||||
else
|
||||
LIBGEOTIFF_CONF_OPTS += --without-proj
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user