From 18771deb3d21d44a766347d1485244dbeb8c7f22 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 11 May 2012 03:33:57 +0000 Subject: rrdtool: fix breakage with newer autotools Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- ...2.30-configure-dont-hardcode-include-dirs.patch | 26 ---------------------- package/rrdtool/rrdtool-automake-compat.patch | 18 +++++++++++++++ ...tool-configure-dont-hardcode-include-dirs.patch | 26 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 26 deletions(-) delete mode 100644 package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch create mode 100644 package/rrdtool/rrdtool-automake-compat.patch create mode 100644 package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch (limited to 'package/rrdtool') diff --git a/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch b/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch deleted file mode 100644 index 43b57a1b2..000000000 --- a/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] configure.ac: don't hardcode include files search paths - -Breaks cross compilation if host has libart/freetype. - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: rrdtool-1.2.30/configure.ac -=================================================================== ---- rrdtool-1.2.30.orig/configure.ac -+++ rrdtool-1.2.30/configure.ac -@@ -524,10 +524,10 @@ - - CORE_LIBS="$LIBS" - --EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0) -+EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, "") - EX_CHECK_ALL(z, zlibVersion, zlib.h, zlib, 1.2.3, http://www.gzip.org/zlib/, "") - EX_CHECK_ALL(png, png_access_version_number, png.h, libpng, 1.2.10, http://prdownloads.sourceforge.net/libpng/, "") --EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.10, http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2) -+EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.10, http://prdownloads.sourceforge.net/freetype/, "") - - if test "$EX_CHECK_ALL_ERR" = "YES"; then - AC_MSG_ERROR([Please fix the library issues listed above and try again.]) diff --git a/package/rrdtool/rrdtool-automake-compat.patch b/package/rrdtool/rrdtool-automake-compat.patch new file mode 100644 index 000000000..92b753db2 --- /dev/null +++ b/package/rrdtool/rrdtool-automake-compat.patch @@ -0,0 +1,18 @@ +Make it compatible with newer autoconf/automake. +Patch from OpenWRT. + +Signed-off-by: Gustavo Zacarias + +--- a/bindings/tcl/Makefile.am ++++ b/bindings/tcl/Makefile.am +@@ -26,8 +26,8 @@ tclpkgdir = @TCL_PACKAGE_DIR@ + tclpkg_DATA = pkgIndex.tcl + tclpkg_SCRIPTS = ifOctets.tcl + else +-pkglib_DATA = pkgIndex.tcl +-pkglib_SCRIPTS = ifOctets.tcl ++pkgdata_DATA = pkgIndex.tcl ++pkgdata_SCRIPTS = ifOctets.tcl + endif + + # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as diff --git a/package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch b/package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch new file mode 100644 index 000000000..43b57a1b2 --- /dev/null +++ b/package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch @@ -0,0 +1,26 @@ +[PATCH] configure.ac: don't hardcode include files search paths + +Breaks cross compilation if host has libart/freetype. + +Signed-off-by: Peter Korsgaard +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: rrdtool-1.2.30/configure.ac +=================================================================== +--- rrdtool-1.2.30.orig/configure.ac ++++ rrdtool-1.2.30/configure.ac +@@ -524,10 +524,10 @@ + + CORE_LIBS="$LIBS" + +-EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, /usr/include/libart-2.0) ++EX_CHECK_ALL(art_lgpl_2, art_vpath_add_point, libart_lgpl/libart.h, libart-2.0, 2.3.17, ftp://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/, "") + EX_CHECK_ALL(z, zlibVersion, zlib.h, zlib, 1.2.3, http://www.gzip.org/zlib/, "") + EX_CHECK_ALL(png, png_access_version_number, png.h, libpng, 1.2.10, http://prdownloads.sourceforge.net/libpng/, "") +-EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.10, http://prdownloads.sourceforge.net/freetype/, /usr/include/freetype2) ++EX_CHECK_ALL(freetype, FT_Init_FreeType, ft2build.h, freetype2, 2.1.10, http://prdownloads.sourceforge.net/freetype/, "") + + if test "$EX_CHECK_ALL_ERR" = "YES"; then + AC_MSG_ERROR([Please fix the library issues listed above and try again.]) -- cgit v1.2.3