mrueg 14/05/26 01:22:40
Added: collectd-5.4.1-lt.patch collectd-5.4.1-nohal.patch
collectd-5.4.1-libocci.patch
collectd-5.4.1-libperl.patch
Removed: collectd-5.1.1-perl-prefix.patch
collectd-5.1.0-mongoc06.patch
collectd-4.10.3-lt.patch
collectd-5.1.0-netlink.patch
collectd-4.10.1-libperl.patch
Log:
Version bump. Cleanup old. Proxy commit for Johan Bergström. Fixes bug
#501644.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path
1.1 app-admin/collectd/files/collectd-5.4.1-lt.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.4.1-lt.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.4.1-lt.patch?rev=1.1&content-type=text/plain
Index: collectd-5.4.1-lt.patch
===================================================================
diff --git Makefile.am Makefile.am
index 5267123..a7e0d0c 100644
--- Makefile.am
+++ Makefile.am
@@ -1,6 +1,4 @@
-ACLOCAL_AMFLAGS = -I libltdl/m4
-
-SUBDIRS = libltdl src bindings .
+SUBDIRS = src bindings .
INCLUDES = $(LTDLINCL)
diff --git configure.ac configure.ac
index eaa464e..d652d46 100644
--- configure.ac
+++ configure.ac
@@ -7,7 +7,6 @@ AC_CONFIG_AUX_DIR([libltdl/config])
m4_ifdef([LT_PACKAGE_VERSION],
# libtool >= 2.2
[
- LT_CONFIG_LTDL_DIR([libltdl])
LT_INIT([dlopen])
LTDL_INIT([convenience])
AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
@@ -19,7 +18,6 @@ m4_ifdef([LT_PACKAGE_VERSION],
AC_SUBST(LTDLINCL)
AC_SUBST(LIBLTDL)
AC_LIBTOOL_DLOPEN
- AC_CONFIG_SUBDIRS(libltdl)
AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
]
)
1.1 app-admin/collectd/files/collectd-5.4.1-nohal.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.4.1-nohal.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.4.1-nohal.patch?rev=1.1&content-type=text/plain
Index: collectd-5.4.1-nohal.patch
===================================================================
diff --git configure.ac configure.ac
index 7029e1e..ad5e336 100644
--- configure.ac
+++ configure.ac
@@ -1351,18 +1351,7 @@ AC_CHECK_LIB(resolv, res_search,
AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" = "xyes")
dnl Check for HAL (hardware abstraction library)
-with_libhal="yes"
-AC_CHECK_LIB(hal,libhal_device_property_exists,
- [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal'
library])],
- [with_libhal="no"])
-if test "x$with_libhal" = "xyes"; then
- if test "x$PKG_CONFIG" != "x"; then
- BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
- BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
- AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
- AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
- fi
-fi
+with_libhal="no"
m4_divert_once([HELP_WITH], [
collectd additional packages:])
1.1 app-admin/collectd/files/collectd-5.4.1-libocci.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.4.1-libocci.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.4.1-libocci.patch?rev=1.1&content-type=text/plain
Index: collectd-5.4.1-libocci.patch
===================================================================
diff --git configure.ac configure.ac
index 7029e1e..72f6ff4 100644
--- configure.ac
+++ configure.ac
@@ -2941,14 +2941,14 @@ AC_ARG_WITH(oracle,
[AS_HELP_STRING([--with-oracle@<:@=ORACLE_HOME@:>@], [Path t
])
if test "x$ORACLE_HOME" != "x"
then
- with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public"
+ with_oracle_cppflags="-I$ORACLE_HOME/rdbms/public -locci"
if test -e "$ORACLE_HOME/lib/ldflags"
then
with_oracle_libs=`cat "$ORACLE_HOME/lib/ldflags"`
fi
#with_oracle_libs="-L$ORACLE_HOME/lib $with_oracle_libs -lclntsh"
- with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh"
+ with_oracle_libs="-L$ORACLE_HOME/lib -lclntsh -locci"
fi
if test "x$with_oracle" = "xyes"
then
1.1 app-admin/collectd/files/collectd-5.4.1-libperl.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.4.1-libperl.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-5.4.1-libperl.patch?rev=1.1&content-type=text/plain
Index: collectd-5.4.1-libperl.patch
===================================================================
diff --git configure.ac configure.ac
index ce8a9bc..eaa464e 100644
--- configure.ac
+++ configure.ac
@@ -3109,11 +3109,13 @@ if test "x$with_libperl" = "xyes" \
then
SAVE_CFLAGS="$CFLAGS"
SAVE_LDFLAGS="$LDFLAGS"
+ SAVE_LIBS="$LIBS"
dnl ARCHFLAGS="" -> disable multi -arch on OSX (see
Config_heavy.pl:fetch_string)
PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
CFLAGS="$CFLAGS $PERL_CFLAGS"
LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
+ LIBS="$LIBS -lperl -lpthread"
AC_CACHE_CHECK([for libperl],
[c_cv_have_libperl],
@@ -3132,7 +3134,10 @@ dnl ARCHFLAGS="" -> disable multi -arch on OSX (see
Config_heavy.pl:fetch_string
]]]
)],
[c_cv_have_libperl="yes"],
- [c_cv_have_libperl="no"]
+ [
+ c_cv_have_libperl="no"
+ LIBS="$SAVE_LIBS"
+ ]
)
)
