| Message ID | 1462824635-15327-1-git-send-email-fli4l@franke-prem.de |
|---|---|
| State | Superseded |
| Headers | show |
Hello, On Mon, 9 May 2016 22:10:35 +0200, Roland Franke wrote: > delete patch 0001-Add-configure-option-to-disable-documentation.patch > as this is now include in the new version. > > Signed-off-by: Roland Franke <fli4l@franke-prem.de> Thanks for your patch. One question below, though. > -# For 0001-Add-configure-option-to-disable-documentation.patch > RRDTOOL_AUTORECONF = YES > RRDTOOL_GETTEXTIZE = YES Enabling autoreconf and gettextize was added when 0001-Add-configure-option-to-disable-documentation.patch was added by Gustavo. So I would assume that they could now be removed. However, it turns out that rrdtool 1.6.0 doesn't build without autoreconf+gettextize, I'm not sure why. In any case, the comment should be updated and not removed. I'm Cc'ing Gustavo who originally added the patch. Thanks, Thomas
On 09/05/16 18:21, Thomas Petazzoni wrote: > Enabling autoreconf and gettextize was added when > 0001-Add-configure-option-to-disable-documentation.patch was added by > Gustavo. So I would assume that they could now be removed. > > However, it turns out that rrdtool 1.6.0 doesn't build without > autoreconf+gettextize, I'm not sure why. In any case, the comment > should be updated and not removed. > > I'm Cc'ing Gustavo who originally added the patch. > > Thanks, > > Thomas Hi all. What's the failure you're seeing by dropping autoreconf/gettextize? On my end it seems to build just fine. Regards.
Hello, On 09/05/16 18:21, Thomas Petazzoni wrote: >> Enabling autoreconf and gettextize was added when >> 0001-Add-configure-option-to-disable-documentation.patch was added by >> Gustavo. So I would assume that they could now be removed. >> >> However, it turns out that rrdtool 1.6.0 doesn't build without >> autoreconf+gettextize, I'm not sure why. In any case, the comment >> should be updated and not removed. > Hi all. > What's the failure you're seeing by dropping autoreconf/gettextize? > On my end it seems to build just fine. my fault. was not testing without autoreconf+gettextize first. Now made localy on my system and build was working fine. Best regards, Roland
>>>>> "Roland" == Roland Franke <fli4l@franke-prem.de> writes: > Hello, > On 09/05/16 18:21, Thomas Petazzoni wrote: >>> Enabling autoreconf and gettextize was added when >>> 0001-Add-configure-option-to-disable-documentation.patch was added by >>> Gustavo. So I would assume that they could now be removed. >>> >>> However, it turns out that rrdtool 1.6.0 doesn't build without >>> autoreconf+gettextize, I'm not sure why. In any case, the comment >>> should be updated and not removed. >> Hi all. >> What's the failure you're seeing by dropping autoreconf/gettextize? >> On my end it seems to build just fine. > my fault. was not testing without autoreconf+gettextize first. > Now made localy on my system and build was working fine. Ok, great. Will you send an updated patch removing autoreconf/gettextize?
Hello, On Tue, 10 May 2016 07:33:32 -0300, Gustavo Zacarias wrote: > What's the failure you're seeing by dropping autoreconf/gettextize? > On my end it seems to build just fine. I get: CCLD rrdcached /home/test/outputs/rrdtool/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.7.4/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: rrd_tool.o: undefined reference to symbol 'libintl_gettext' /home/test/outputs/rrdtool/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libintl.so.8: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status When building rrdtool 1.6.0 with autoreconf/gettextize disabled, using the following defconfig: BR2_arm=y BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2016.02-3-g762b7c9.tar.bz2" BR2_TOOLCHAIN_EXTERNAL_GCC_4_7=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y BR2_TOOLCHAIN_EXTERNAL_LOCALE=y # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y BR2_INIT_NONE=y BR2_SYSTEM_BIN_SH_NONE=y # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_RRDTOOL=y # BR2_TARGET_ROOTFS_TAR is not set built in the chroot that I use to run the autobuilder testing. Re-adding autoreconf/gettextize fixes the problem. Thomas
Hello, Am 2016-05-09 22:10, schrieb Roland Franke: > delete patch 0001-Add-configure-option-to-disable-documentation.patch > as this is now include in the new version. > > Signed-off-by: Roland Franke <fli4l@franke-prem.de> Reviewed-by: Alexander Dahl <post@lespocky.de> I checked the removed patch has gone upstream (it has, see [1]) and successfully built it with beaglebone_defconfig. If the removed autoreconf and gettextize options break the build, we can just use the v1 of the patch, can't we? Greets Alex [1] https://github.com/oetiker/rrdtool-1.x/pull/690
diff --git a/package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch b/package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch deleted file mode 100644 index afb6292..0000000 --- a/package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch +++ /dev/null @@ -1,71 +0,0 @@ -From deaef0790f3cbbce826275d3564551fc9568b628 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <gustavo@zacarias.com.ar> -Date: Wed, 2 Dec 2015 14:31:52 -0300 -Subject: [PATCH] Add configure option to disable documentation - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> ---- - Makefile.am | 6 +++++- - configure.ac | 8 ++++++++ - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index f45975c..1f46a9b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,7 +5,11 @@ RSYNC = rsync --rsh=ssh - - # build the following subdirectories - --SUBDIRS = po src doc bindings tests -+SUBDIRS = po src bindings tests -+ -+if BUILD_DOCS -+SUBDIRS += doc -+endif - - if BUILD_EXAMPLES - SUBDIRS += examples -diff --git a/configure.ac b/configure.ac -index dc70e7d..7460c67 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,6 +100,9 @@ AC_ARG_VAR(RRDGRAPH_YLEGEND_ANGLE, - AC_DEFINE_UNQUOTED(RRDGRAPH_YLEGEND_ANGLE,${RRDGRAPH_YLEGEND_ANGLE:-90.0}, - [Vertical label angle: -90.0 (default) or 90.0]) - -+AC_ARG_ENABLE(docs,AS_HELP_STRING([--disable-docs],[disable building documentation]), -+[],[enable_docs=yes]) -+ - AC_ARG_ENABLE(examples,AS_HELP_STRING([--disable-examples],[disable building of examples]), - [],[enable_examples=yes]) - -@@ -115,6 +118,7 @@ AC_ARG_ENABLE(rrd_graph,AS_HELP_STRING([--disable-rrd_graph],[disable all rrd_gr - AC_ARG_ENABLE(rrd_restore,AS_HELP_STRING([--disable-rrd_restore],[disable rrd_restore XML import functions]), - [],[enable_rrd_restore=yes]) - -+AM_CONDITIONAL(BUILD_DOCS,[test $enable_docs != no]) - AM_CONDITIONAL(BUILD_EXAMPLES,[test $enable_examples != no]) - AM_CONDITIONAL(BUILD_RRDCGI,[test $enable_rrdcgi != no]) - AM_CONDITIONAL(BUILD_RRDCACHED,[test $enable_rrdcached != no]) -@@ -945,6 +949,8 @@ fi - - AC_SUBST(COMP_PYTHON) - -+if test $enable_docs != no; then -+ - dnl Check for nroff - AC_ARG_VAR(NROFF, [path to the local nroff version]) - AC_PATH_PROGS(NROFF, [gnroff nroff]) -@@ -961,6 +967,8 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory]) - if test -z "$RRDDOCDIR"; then - RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi - -+fi -+ - # systemd check - PKG_PROG_PKG_CONFIG - AC_ARG_WITH([systemdsystemunitdir], --- -2.4.10 - diff --git a/package/rrdtool/rrdtool.hash b/package/rrdtool/rrdtool.hash index 97741c9..3422ad7 100644 --- a/package/rrdtool/rrdtool.hash +++ b/package/rrdtool/rrdtool.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 9832775479684b8f94767201ee0440a1cacdbbbb7dd6736eb96b9a0750644ce8 rrdtool-1.5.6.tar.gz +sha256 cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 rrdtool-1.6.0.tar.gz diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk index 6d6ab0c..f3c7451 100644 --- a/package/rrdtool/rrdtool.mk +++ b/package/rrdtool/rrdtool.mk @@ -4,12 +4,11 @@ # ################################################################################ -RRDTOOL_VERSION = 1.5.6 +RRDTOOL_VERSION = 1.6.0 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 -# For 0001-Add-configure-option-to-disable-documentation.patch RRDTOOL_AUTORECONF = YES RRDTOOL_GETTEXTIZE = YES RRDTOOL_INSTALL_STAGING = YES
delete patch 0001-Add-configure-option-to-disable-documentation.patch as this is now include in the new version. Signed-off-by: Roland Franke <fli4l@franke-prem.de> --- ...configure-option-to-disable-documentation.patch | 71 ---------------------- package/rrdtool/rrdtool.hash | 2 +- package/rrdtool/rrdtool.mk | 3 +- 3 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 package/rrdtool/0001-Add-configure-option-to-disable-documentation.patch