diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-26 12:58:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-26 12:58:05 +0200 |
| commit | b3a99d7f44680ef629ceea377cf9938fec94921d (patch) | |
| tree | d3a0cc80dbc218c086e1c5b2635a987a534c0163 /package | |
| parent | 2d4dff630b0184fff9833dbdaaa745c3371994d1 (diff) | |
| parent | 07417b486967bb96dd53e382af96ab5aee973548 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/rrdtool/Makefile | 8 | ||||
| -rw-r--r-- | package/uclibc++/patches/patch-include_unwind-cxx_h | 40 |
2 files changed, 26 insertions, 22 deletions
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index 268a108ff..36d642daf 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -11,13 +11,17 @@ PKG_DESCR:= Round Robin Database (RRD) management library and tools PKG_SECTION:= libs PKG_DEPENDS:= libart libfreetype libpng zlib PKG_BUILDDEP+= libxml2 cgilib freetype libart libpng +PKG_URL:= http://oss.oetiker.ch/ PKG_SITES:= http://oss.oetiker.ch/rrdtool/pub/ +PKG_SECTION_RRDCGI:= misc +PKG_SECTION_RRDTOOL:= misc + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDCGI})) +$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDTOOL})) CONFIGURE_ENV+= rd_cv_ieee_works=yes CONFIGURE_ARGS+= --enable-rrdcgi \ diff --git a/package/uclibc++/patches/patch-include_unwind-cxx_h b/package/uclibc++/patches/patch-include_unwind-cxx_h index 7cf6d1db9..3d7c124ca 100644 --- a/package/uclibc++/patches/patch-include_unwind-cxx_h +++ b/package/uclibc++/patches/patch-include_unwind-cxx_h @@ -1,21 +1,21 @@ -patch from OpenWrt +diff -Nur uClibc++-0.2.2.orig/include/unwind-cxx.h uClibc++-0.2.2/include/unwind-cxx.h --- uClibc++-0.2.2.orig/include/unwind-cxx.h 2007-06-04 00:51:12.000000000 +0200 -+++ uClibc++-0.2.2/include/unwind-cxx.h 2010-04-02 12:44:02.704723285 +0200 -@@ -135,6 +135,7 @@ extern std::unexpected_handler __unexpec - - // This is the exception class we report -- "GNUCC++\0". - const _Unwind_Exception_Class __gxx_exception_class -+#ifndef __ARM_EABI_UNWINDER__ - = ((((((((_Unwind_Exception_Class) 'G' - << 8 | (_Unwind_Exception_Class) 'N') - << 8 | (_Unwind_Exception_Class) 'U') -@@ -143,6 +144,9 @@ const _Unwind_Exception_Class __gxx_exce - << 8 | (_Unwind_Exception_Class) '+') - << 8 | (_Unwind_Exception_Class) '+') - << 8 | (_Unwind_Exception_Class) '\0'); -+#else -+= "GNUC++"; -+#endif - - // GNU C++ personality routine, Version 0. - extern "C" _Unwind_Reason_Code __gxx_personality_v0 ++++ uClibc++-0.2.2/include/unwind-cxx.h 2010-07-20 11:43:58.726496262 +0200 +@@ -134,6 +134,7 @@ + // These are explicitly GNU C++ specific.
+
+ // This is the exception class we report -- "GNUCC++\0".
++#ifndef __ARM_EABI_UNWINDER__
+ const _Unwind_Exception_Class __gxx_exception_class
+ = ((((((((_Unwind_Exception_Class) 'G'
+ << 8 | (_Unwind_Exception_Class) 'N')
+@@ -143,6 +144,9 @@ + << 8 | (_Unwind_Exception_Class) '+')
+ << 8 | (_Unwind_Exception_Class) '+')
+ << 8 | (_Unwind_Exception_Class) '\0');
++#else
++= "GNUC++";
++#endif
+
+ // GNU C++ personality routine, Version 0.
+ extern "C" _Unwind_Reason_Code __gxx_personality_v0
|