diff options
| author | Alan Pevec <apevec@redhat.com> | 2010-12-17 12:07:57 +0100 |
|---|---|---|
| committer | Alan Pevec <apevec@redhat.com> | 2010-12-17 12:10:13 +0100 |
| commit | 6ebe3e3ccf88964486d79d6150fb6fad5f4f573b (patch) | |
| tree | 9ac0bf5d4497068e3c58a1270b709349fbfa6079 | |
| parent | a9b5a4f6e38a5e7e3d3876d77c552d2abf347ea6 (diff) | |
| download | collectd-6ebe3e3ccf88964486d79d6150fb6fad5f4f573b.tar.gz collectd-6ebe3e3ccf88964486d79d6150fb6fad5f4f573b.tar.xz collectd-6ebe3e3ccf88964486d79d6150fb6fad5f4f573b.zip | |
restore configure-OpenIPMI.patch for el5
| -rw-r--r-- | collectd-4.10.2-configure-OpenIPMI.patch | 70 | ||||
| -rw-r--r-- | collectd.spec | 3 |
2 files changed, 73 insertions, 0 deletions
diff --git a/collectd-4.10.2-configure-OpenIPMI.patch b/collectd-4.10.2-configure-OpenIPMI.patch new file mode 100644 index 0000000..9bf8680 --- /dev/null +++ b/collectd-4.10.2-configure-OpenIPMI.patch @@ -0,0 +1,70 @@ +--- configure.orig 2010-11-27 11:10:52.000000000 +0100 ++++ configure 2010-12-17 11:51:20.924320896 +0100 +@@ -22796,7 +22796,7 @@ + fi + # }}} + +-# $PKG_CONFIG --exists OpenIPMIpthread {{{ ++# $PKG_CONFIG --exists OpenIPMI {{{ + with_libopenipmipthread="yes" + with_libopenipmipthread_cflags="" + with_libopenipmipthread_libs="" +@@ -22816,12 +22816,12 @@ + + if test "x$with_libopenipmipthread" = "xyes" + then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread" >&5 +-$as_echo_n "checking for libOpenIPMIpthread... " >&6; } +- $PKG_CONFIG --exists OpenIPMIpthread 2>/dev/null ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMI" >&5 ++$as_echo_n "checking for libOpenIPMI... " >&6; } ++ $PKG_CONFIG --exists OpenIPMI 2>/dev/null + if test "$?" != "0" + then +- with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMIpthread)" ++ with_libopenipmipthread="no ($PKG_CONFIG doesn't know OpenIPMI)" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libopenipmipthread" >&5 + $as_echo "$with_libopenipmipthread" >&6; } +@@ -22829,15 +22829,15 @@ + + if test "x$with_libopenipmipthread" = "xyes" + then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread CFLAGS" >&5 +-$as_echo_n "checking for libOpenIPMIpthread CFLAGS... " >&6; } +- temp_result="`$PKG_CONFIG --cflags OpenIPMIpthread`" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMI CFLAGS" >&5 ++$as_echo_n "checking for libOpenIPMI CFLAGS... " >&6; } ++ temp_result="`$PKG_CONFIG --cflags OpenIPMI`" + if test "$?" = "0" + then + with_libopenipmipthread_cflags="$temp_result" + else +- with_libopenipmipthread="no ($PKG_CONFIG --cflags OpenIPMIpthread failed)" +- temp_result="$PKG_CONFIG --cflags OpenIPMIpthread failed" ++ with_libopenipmipthread="no ($PKG_CONFIG --cflags OpenIPMI failed)" ++ temp_result="$PKG_CONFIG --cflags OpenIPMI failed" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $temp_result" >&5 + $as_echo "$temp_result" >&6; } +@@ -22845,15 +22845,15 @@ + + if test "x$with_libopenipmipthread" = "xyes" + then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMIpthread LDFLAGS" >&5 +-$as_echo_n "checking for libOpenIPMIpthread LDFLAGS... " >&6; } +- temp_result="`$PKG_CONFIG --libs OpenIPMIpthread`" ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libOpenIPMI LDFLAGS" >&5 ++$as_echo_n "checking for libOpenIPMI LDFLAGS... " >&6; } ++ temp_result="`$PKG_CONFIG --libs OpenIPMI`" + if test "$?" = "0" + then + with_libopenipmipthread_ldflags="$temp_result" + else +- with_libopenipmipthread="no ($PKG_CONFIG --libs OpenIPMIpthread failed)" +- temp_result="$PKG_CONFIG --libs OpenIPMIpthread failed" ++ with_libopenipmipthread="no ($PKG_CONFIG --libs OpenIPMI failed)" ++ temp_result="$PKG_CONFIG --libs OpenIPMI failed" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $temp_result" >&5 + $as_echo "$temp_result" >&6; } diff --git a/collectd.spec b/collectd.spec index 744b064..a757fd1 100644 --- a/collectd.spec +++ b/collectd.spec @@ -10,6 +10,8 @@ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2 Source1: collectd-httpd.conf Source2: collection.conf Patch1: %{name}-%{version}-include-collectd.d.patch +# bug 468067 "pkg-config --libs OpenIPMIpthread" fails +Patch9999: %{name}-%{version}-configure-OpenIPMI.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -176,6 +178,7 @@ This plugin collects information from virtualized guests. %prep %setup -q %patch1 -p1 +%patch9999 -p0 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in |