I still have two problems with my patch:
1) when running an rrdtool create command using as filename something like:
/etc/rrds/sampple.rrd
I get:
ERROR: creating '/etc/rrds/sampple.rrd': Invalid argument
Everything works fine if I use /tmp/sample.rrd as filename.
2) whe I try to compile the python bindings I get:
i486-openwrt-linux-uclibc-gcc -shared
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/lib
-L/home/rriggio/src/kamikaze/staging_dir/toolchain-i386_gcc-4.6-linaro_uClibc-0.9.33/usr/lib
-L/home/rriggio/src/kamikaze/staging_dir/toolchain-i386_gcc-4.6-linaro_uClibc-0.9.33/lib
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib/libiconv-stub/lib
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib/libintl-stub/lib
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib
-L/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib
-march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions
-fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer
-fhonour-copts -Wno-error=unused-but-set-variable
-I/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib/libiconv-stub/include
-I/home/rriggio/src/kamikaze/staging_dir/target-i386_uClibc-0.9.33/usr/lib/libintl-stub/include
-D_GNU_SOURCE -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef
-Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes
-Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition
-W -fPIC -DPIC build/temp.linux-i686-2.6/rrdtoolmodule.o
-L../../src/.libs -R/usr/lib -lrrd -o
build/lib.linux-i686-2.6/rrdtoolmodule.so
i486-openwrt-linux-uclibc-gcc: error: unrecognized option '-R'
error: command 'i486-openwrt-linux-uclibc-gcc' failed with exit status 1
On 03/20/2012 07:53 PM, Michael Heimpold wrote:
Hi,
several weeks ago I also tried to upgrade this package. Here's my patch which
is only
compile tested and not yet cleaned up.
diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index c73b4e1..62feeed 100644
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=rrdtool
-PKG_VERSION:=1.2.30
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.7
+PKG_RELEASE:=1
PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb
+PKG_MD5SUM:=ffe369d8921b4dfdeaaf43812100c38f
PKG_BUILD_DEPENDS:=python
@@ -21,7 +21,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_python-rrd \
CONFIG_PACKAGE_rrdcgi \
-PKG_FIXUP:=libtool
+#PKG_FIXUP:=libtool
+#PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
@@ -39,19 +40,19 @@ define Package/librrd
$(call Package/rrdtool/Default)
SECTION:=libs
CATEGORY:=Libraries
- TITLE+= management library (v1.2.x)
- DEPENDS+= +libart +libfreetype +libpng +zlib
+ TITLE+= management library (v1.4.x)
+ DEPENDS+= +cairo +pango +libart +libfreetype +libpng +libxml2 +zlib
endef
define Package/rrdcgi
$(call Package/rrdtool/Default)
- TITLE+= CGI graphing tool (v1.2.x)
+ TITLE+= CGI graphing tool (v1.4.x)
DEPENDS+= +librrd +cgilib
endef
define Package/rrdtool
$(call Package/rrdtool/Default)
- TITLE+= management tools (v1.2.x)
+ TITLE+= management tools (v1.4.x)
DEPENDS+= +librrd
endef
@@ -60,7 +61,7 @@ $(call Package/rrdtool/Default)
SUBMENU:=Python
SECTION:=lang
CATEGORY:=Languages
- TITLE+= python bindings (v1.2.x)
+ TITLE+= python bindings (v1.4.x)
DEPENDS+= +python-mini +librrd
endef
@@ -73,7 +74,7 @@ CONFIGURE_ARGS += \
--disable-perl \
--disable-tcl \
--disable-ruby \
- --without-x \
+ --disable-lua \
--with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \
CONFIGURE_VARS += \
@@ -96,25 +97,25 @@ else
CONFIGURE_ARGS += --disable-python
endif
+TARGET_CPPFLAGS+= -I$(STAGING_DIR)/usr/include/pango-1.0
-I$(STAGING_DIR)/usr/include/libxml2
+TARGET_LDFLAGS+= -Wl,-rpath-link="$(STAGING_DIR)/usr/lib"
+
define Build/Compile
$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
$(call Build/Compile/Default)
endef
define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/
- $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*}
$(1)/usr/lib/rrdtool-1.2/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.4/include/
+ $(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.4/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*}
$(1)/usr/lib/rrdtool-1.4/lib/
endef
define Package/librrd/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts
- $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
- $(1)/usr/share/rrdtool/fonts/
endef
define Package/rrdcgi/install
diff --git a/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
b/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
deleted file mode 100644
index 507a0e9..0000000
--- a/utils/rrdtool/patches/010-dont-add-host-include-paths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -26319,9 +26319,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_LIBS=${LIBS}
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
-- if test "x/usr/include/libart-2.0" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I/usr/include/libart-2.0"
-- fi
- { echo "$as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_2">&5
- echo $ECHO_N "checking for art_vpath_add_point in -lart_lgpl_2...
$ECHO_C">&6; }
- if test "${ac_cv_lib_art_lgpl_2_art_vpath_add_point+set}" = set; then
-@@ -27915,9 +27912,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_LIBS=${LIBS}
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
-- if test "x/usr/include/freetype2" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-- fi
- { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype">&5
- echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C">&6; }
- if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -20,9 +20,6 @@ AC_DEFUN([EX_CHECK_ALL],
- ex_check_save_LIBS=${LIBS}
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
-- if test "x$7" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I$7"
-- fi
- dnl try compiling naked first
- AC_CHECK_LIB($1,$2, [
- AC_CHECK_HEADER($3,[LIBS="-l$1 ${LIBS}";EX_CHECK_STATE=YES],[])],[])
diff --git a/utils/rrdtool/patches/020-x86-float-cast.patch
b/utils/rrdtool/patches/020-x86-float-cast.patch
deleted file mode 100644
index f382404..0000000
--- a/utils/rrdtool/patches/020-x86-float-cast.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rrdtool-1.2.30/src/rrd_format.h
-===================================================================
---- rrdtool-1.2.30.orig/src/rrd_format.h
-+++ rrdtool-1.2.30/src/rrd_format.h
-@@ -22,7 +22,7 @@
- /* #define RRD_VERSION "0002" */
- /* changed because microsecond precision requires another field */
- #define RRD_VERSION "0003"
--#define FLOAT_COOKIE 8.642135E130
-+#define FLOAT_COOKIE ((double)8.642135E130)
-
- #include "rrd_nan_inf.h"
-
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
--
--------------------------------------------------------
Roberto Riggio, Ph.D.
CREATE-NET
Network & Security Solutions for Pervasive Computing Systems (iNSPIRE)
Senior Researcher
Via alla Cascata 56/D - 38123 Povo Trento (Italy)
e-mail: roberto.rig...@create-net.org
Tel: (+39) 0461 408400 - interno/extension 708
Fax: (+39) 0461 421157
www.create-net.org/~rriggio
--------------------------------------------------------
The information transmitted is intended only for the person or entity to
which it is addressed and may contain confidential and/or privileged
material. Any review, retransmission, dissemination or other use of, or
taking of any action in reliance upon, this information by persons or
entities other than the intended recipient is prohibited according to
the Italian Law 196/2003 of the Legislature. If you received this in
error, please contact the sender and delete the material from any
computer.
Le informazioni contenute in questo messaggio di posta elettronica e nei
file allegati sono da considerarsi strettamente riservate. Il loro
utilizzo e' consentito esclusivamente al destinatario del messaggio, per
le finalita' indicate nel messaggio stesso. Qualora riceveste questo
messaggio senza esserne il destinatario, Vi preghiamo cortesemente di
darcene notizia via e-mail e di procedere alla cancellazione del
messaggio stesso dal Vostro sistema. Trattenere il messaggio stesso,
divulgarlo anche in parte, distribuirlo ad altri soggetti, copiarlo,
od utilizzarlo per finalita' diverse, costituisce comportamento
contrario ai principi dettati dal D. Lgs. 196/2003.
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
