From 16a897808428ef0a36af90e11775c519ac368a480b5a81925c6df619cee27c88 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 14 Jun 2012 20:58:07 +0000 Subject: [PATCH] Accepting request 125044 from home:dimstar:branches:devel:tools - Add systemtap-automake112.patch: Fix build with automake 1.12: + Support for automatic de-ANSI-fication has been removed. + Patch taken from upstream, git commit id 5b2bc70. Using the upstream patch now. Note: the patch is >99% useless: Patching configure => it's autogenerated by autoreconf call anyway. Most projects for this reason don't even carry the generated configure script in their git tree. OBS-URL: https://build.opensuse.org/request/show/125044 OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=49 --- systemtap-automake112.patch | 92 +++++++++++++++++++++++++++++++++++++ systemtap-docs.changes | 7 +++ systemtap-docs.spec | 4 +- systemtap.spec | 7 ++- 4 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 systemtap-automake112.patch diff --git a/systemtap-automake112.patch b/systemtap-automake112.patch new file mode 100644 index 0000000..40b40a1 --- /dev/null +++ b/systemtap-automake112.patch @@ -0,0 +1,92 @@ +From 5b2bc70bd7db920c50b90cea554ca93a02cdf0b2 Mon Sep 17 00:00:00 2001 +From: Nitin A Kamble +Date: Tue, 8 May 2012 14:13:49 -0400 +Subject: [PATCH] configury: automake 1.12 as deprecated automatic de-ANSI-fication support + +Fix this issue with automake 1.12: + +| configure.ac:23: error: automatic de-ANSI-fication support has been removed + +[fche:] Note that the systemtap git repository and source releases include +autoconf- and automake-generated files, so this is only an issue for those +who have an unusual reason to regenerate them. + +Signed-Off-by: Nitin A Kamble +--- + configure | 39 --------------------------------------- + configure.ac | 1 - + 2 files changed, 0 insertions(+), 40 deletions(-) + +diff --git a/configure b/configure +index a6cd57c..89291f3 100755 +--- a/configure ++++ b/configure +@@ -682,8 +682,6 @@ MSGFMT + GETTEXT_MACRO_VERSION + USE_NLS + RANLIB +-ANSI2KNR +-U + am__fastdepCXX_FALSE + am__fastdepCXX_TRUE + CXXDEPMODE +@@ -6449,43 +6447,6 @@ if test "$am_t" != yes; then + fi + + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function prototypes" >&5 +-$as_echo_n "checking for function prototypes... " >&6; } +-if test "$ac_cv_prog_cc_c89" != no; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define PROTOTYPES 1" >>confdefs.h +- +- +-$as_echo "#define __PROTOTYPES 1" >>confdefs.h +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-if test "$ac_cv_prog_cc_stdc" != no; then +- U= ANSI2KNR= +-else +- U=_ ANSI2KNR=./ansi2knr +-fi +-# Ensure some checks needed by ansi2knr itself. +- +-for ac_header in string.h +-do : +- ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +-if test "x$ac_cv_header_string_h" = xyes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_STRING_H 1 +-_ACEOF +- +-fi +- +-done +- +- + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +diff --git a/configure.ac b/configure.ac +index 51d3960..93450d3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,7 +20,6 @@ AC_PROG_CXX + AC_PROG_CPP + AM_PROG_CC_STDC + AM_PROG_CC_C_O +-AM_C_PROTOTYPES + AC_PROG_RANLIB + AC_OBJEXT + AC_EXEEXT +-- +1.7.3.4 + + diff --git a/systemtap-docs.changes b/systemtap-docs.changes index 5a4a429..9d0dc32 100644 --- a/systemtap-docs.changes +++ b/systemtap-docs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 14 20:11:49 UTC 2012 - dimstar@opensuse.org + +- Add systemtap-automake112.patch: Fix build with automake 1.12: + + Support for automatic de-ANSI-fication has been removed. + + Patch taken from upstream, git commit id 5b2bc70. + ------------------------------------------------------------------- Sat Feb 18 01:36:46 UTC 2012 - tonyj@suse.com diff --git a/systemtap-docs.spec b/systemtap-docs.spec index d8267c1..ff9256c 100644 --- a/systemtap-docs.spec +++ b/systemtap-docs.spec @@ -23,9 +23,9 @@ BuildRequires: gcc-c++ BuildRequires: libebl-devel BuildRequires: pkg-config # for documents -BuildRequires: xmlto BuildRequires: fop BuildRequires: latex2html +BuildRequires: xmlto Version: 1.7 Release: 0 Summary: Documents and examples for systemtap @@ -37,6 +37,7 @@ Source2: README-BEFORE-ADDING-PATCHES Patch1: systemtap-docdir-fix.diff Patch2: systemtap-xmlto-fop.diff Patch3: systemtap-docs-autoconf-version.diff +Patch4: systemtap-automake112.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -49,6 +50,7 @@ This package contains the documents and examples for systemtap. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # fix interpreter diff --git a/systemtap.spec b/systemtap.spec index 6fd02bf..3863462 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -59,7 +59,12 @@ Group: Development/Tools/Debuggers Requires: %{name} = %{version}-%{release} Requires(post): /bin/systemd-tmpfiles # dependancies for systemtap shell scripts -Requires: coreutils avahi avahi-utils mozilla-nss-tools zip unzip +Requires: avahi +Requires: avahi-utils +Requires: coreutils +Requires: mozilla-nss-tools +Requires: unzip +Requires: zip %description server SystemTap is an instrumentation system for systems running Linux.