Kurt Roeckx wrote: > On Tue, Nov 01, 2011 at 09:09:27PM -0500, Jonathan Nieder wrote:
>> As bug#582952 explains, as soon as dash stops pretending not to know >> how to set the $LINENO variable, autoconf will stop rejecting it and >> falling back to bash, provoking some build failures with non-portable >> configure scripts. Alas. > > This has been commited already in git upstream: Looking it over again, Roland's portability patch which is already in sid should have taken care of this. Unfortunately, do-autoreconf seems to have been generated against the unpatched source. So how about this? --- debian/changelog | 9 + debian/control | 5 +- debian/patches/do-autoreconf.diff | 415 ------------------------------------- debian/patches/series | 1 - debian/rules | 11 +- 5 files changed, 18 insertions(+), 423 deletions(-) delete mode 100644 debian/patches/do-autoreconf.diff diff --git a/debian/changelog b/debian/changelog index 64fa9433..4012ab2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,15 @@ elfutils (0.152-1.1) local; urgency=low * Allow "debian/rules clean" as non-root. + * Run autotools at build time. + - debian/control: Build-Depends: autoconf, automake. + - debian/rules: + - config.status: + - depend on configure.ac, not configure. + - autoreconf -fis. + - clean: remove autotools-generated files to avoid .diff.gz + changes when built twice in a row. + - debian/patches: remove do-autoreconf.diff. -- Jonathan Nieder <jrnie...@gmail.com> Wed, 16 Nov 2011 03:50:26 -0600 diff --git a/debian/control b/debian/control index 83b0fd05..4b5969fd 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,10 @@ Source: elfutils Priority: optional Maintainer: Kurt Roeckx <k...@roeckx.be> Uploaders: Christian Aichinger <gre...@gmx.net> -Build-Depends: debhelper (>= 5.0.0), autotools-dev, bzip2, zlib1g-dev, libbz2-dev, liblzma-dev, m4, gettext +Build-Depends: debhelper (>= 5.0.0), + bzip2, zlib1g-dev, libbz2-dev, liblzma-dev, + autoconf, automake, + m4, gettext Build-Conflicts: autoconf2.13, automake1.4 Standards-Version: 3.8.4 Section: libs diff --git a/debian/patches/do-autoreconf.diff b/debian/patches/do-autoreconf.diff deleted file mode 100644 index 8dc99ac7..00000000 --- a/debian/patches/do-autoreconf.diff +++ /dev/null @@ -1,415 +0,0 @@ -Generated by running autoreconf -f - -Index: elfutils-0.152/backends/Makefile.in -=================================================================== ---- elfutils-0.152.orig/backends/Makefile.in 2011-02-26 13:59:09.000000000 +0000 -+++ elfutils-0.152/backends/Makefile.in 2011-02-26 14:00:25.000000000 +0000 -@@ -77,39 +77,54 @@ - am__objects_4 = ia64_init.$(OBJEXT) ia64_symbol.$(OBJEXT) \ - ia64_regs.$(OBJEXT) ia64_retval.$(OBJEXT) - libebl_ia64_pic_a_OBJECTS = $(am_libebl_ia64_pic_a_OBJECTS) -+libebl_m68k_pic_a_AR = $(AR) $(ARFLAGS) -+libebl_m68k_pic_a_LIBADD = -+am__objects_5 = m68k_init.$(OBJEXT) m68k_symbol.$(OBJEXT) \ -+ m68k_regs.$(OBJEXT) -+libebl_m68k_pic_a_OBJECTS = $(am_libebl_m68k_pic_a_OBJECTS) -+libebl_mips_pic_a_AR = $(AR) $(ARFLAGS) -+libebl_mips_pic_a_LIBADD = -+am__objects_6 = mips_init.$(OBJEXT) mips_symbol.$(OBJEXT) \ -+ mips_regs.$(OBJEXT) mips_retval.$(OBJEXT) -+libebl_mips_pic_a_OBJECTS = $(am_libebl_mips_pic_a_OBJECTS) -+libebl_parisc_pic_a_AR = $(AR) $(ARFLAGS) -+libebl_parisc_pic_a_LIBADD = -+am__objects_7 = parisc_init.$(OBJEXT) parisc_symbol.$(OBJEXT) \ -+ parisc_regs.$(OBJEXT) parisc_retval.$(OBJEXT) -+libebl_parisc_pic_a_OBJECTS = $(am_libebl_parisc_pic_a_OBJECTS) - libebl_ppc64_pic_a_AR = $(AR) $(ARFLAGS) - libebl_ppc64_pic_a_LIBADD = --am__objects_5 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \ -+am__objects_8 = ppc64_init.$(OBJEXT) ppc64_symbol.$(OBJEXT) \ - ppc64_retval.$(OBJEXT) ppc64_corenote.$(OBJEXT) \ - ppc_regs.$(OBJEXT) ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) \ - ppc_syscall.$(OBJEXT) - libebl_ppc64_pic_a_OBJECTS = $(am_libebl_ppc64_pic_a_OBJECTS) - libebl_ppc_pic_a_AR = $(AR) $(ARFLAGS) - libebl_ppc_pic_a_LIBADD = --am__objects_6 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \ -+am__objects_9 = ppc_init.$(OBJEXT) ppc_symbol.$(OBJEXT) \ - ppc_retval.$(OBJEXT) ppc_regs.$(OBJEXT) ppc_corenote.$(OBJEXT) \ - ppc_auxv.$(OBJEXT) ppc_attrs.$(OBJEXT) ppc_syscall.$(OBJEXT) - libebl_ppc_pic_a_OBJECTS = $(am_libebl_ppc_pic_a_OBJECTS) - libebl_s390_pic_a_AR = $(AR) $(ARFLAGS) - libebl_s390_pic_a_LIBADD = --am__objects_7 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \ -+am__objects_10 = s390_init.$(OBJEXT) s390_symbol.$(OBJEXT) \ - s390_regs.$(OBJEXT) s390_retval.$(OBJEXT) - libebl_s390_pic_a_OBJECTS = $(am_libebl_s390_pic_a_OBJECTS) - libebl_sh_pic_a_AR = $(AR) $(ARFLAGS) - libebl_sh_pic_a_LIBADD = --am__objects_8 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \ -+am__objects_11 = sh_init.$(OBJEXT) sh_symbol.$(OBJEXT) \ - sh_corenote.$(OBJEXT) sh_regs.$(OBJEXT) sh_retval.$(OBJEXT) - libebl_sh_pic_a_OBJECTS = $(am_libebl_sh_pic_a_OBJECTS) - libebl_sparc_pic_a_AR = $(AR) $(ARFLAGS) - libebl_sparc_pic_a_LIBADD = --am__objects_9 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \ -+am__objects_12 = sparc_init.$(OBJEXT) sparc_symbol.$(OBJEXT) \ - sparc_regs.$(OBJEXT) sparc_retval.$(OBJEXT) \ - sparc_corenote.$(OBJEXT) sparc64_corenote.$(OBJEXT) \ - sparc_auxv.$(OBJEXT) - libebl_sparc_pic_a_OBJECTS = $(am_libebl_sparc_pic_a_OBJECTS) - libebl_x86_64_pic_a_AR = $(AR) $(ARFLAGS) - libebl_x86_64_pic_a_LIBADD = --am__objects_10 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \ -+am__objects_13 = x86_64_init.$(OBJEXT) x86_64_symbol.$(OBJEXT) \ - x86_64_corenote.$(OBJEXT) x86_64_cfi.$(OBJEXT) \ - x86_64_retval.$(OBJEXT) x86_64_regs.$(OBJEXT) \ - i386_auxv.$(OBJEXT) x86_64_syscall.$(OBJEXT) -@@ -124,15 +139,18 @@ - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - SOURCES = $(libebl_alpha_pic_a_SOURCES) $(libebl_arm_pic_a_SOURCES) \ - $(libebl_i386_pic_a_SOURCES) $(libebl_ia64_pic_a_SOURCES) \ -- $(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \ -- $(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \ -- $(libebl_sparc_pic_a_SOURCES) $(libebl_x86_64_pic_a_SOURCES) --DIST_SOURCES = $(libebl_alpha_pic_a_SOURCES) \ -- $(libebl_arm_pic_a_SOURCES) $(libebl_i386_pic_a_SOURCES) \ -- $(libebl_ia64_pic_a_SOURCES) $(libebl_ppc64_pic_a_SOURCES) \ -+ $(libebl_m68k_pic_a_SOURCES) $(libebl_mips_pic_a_SOURCES) \ -+ $(libebl_parisc_pic_a_SOURCES) $(libebl_ppc64_pic_a_SOURCES) \ - $(libebl_ppc_pic_a_SOURCES) $(libebl_s390_pic_a_SOURCES) \ - $(libebl_sh_pic_a_SOURCES) $(libebl_sparc_pic_a_SOURCES) \ - $(libebl_x86_64_pic_a_SOURCES) -+DIST_SOURCES = $(libebl_alpha_pic_a_SOURCES) \ -+ $(libebl_arm_pic_a_SOURCES) $(libebl_i386_pic_a_SOURCES) \ -+ $(libebl_ia64_pic_a_SOURCES) $(libebl_m68k_pic_a_SOURCES) \ -+ $(libebl_mips_pic_a_SOURCES) $(libebl_parisc_pic_a_SOURCES) \ -+ $(libebl_ppc64_pic_a_SOURCES) $(libebl_ppc_pic_a_SOURCES) \ -+ $(libebl_s390_pic_a_SOURCES) $(libebl_sh_pic_a_SOURCES) \ -+ $(libebl_sparc_pic_a_SOURCES) $(libebl_x86_64_pic_a_SOURCES) - DATA = $(noinst_DATA) - HEADERS = $(noinst_HEADERS) - ETAGS = etags -@@ -270,11 +288,12 @@ - CLEANFILES = *.gcno *.gcda $(foreach m,$(modules), libebl_$(m).map \ - libebl_$(m).so $(am_libebl_$(m)_pic_a_OBJECTS)) - textrel_check = if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi --modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 -+modules = i386 sh x86_64 ia64 alpha arm sparc ppc ppc64 s390 parisc mips m68k - libebl_pic = libebl_i386_pic.a libebl_sh_pic.a libebl_x86_64_pic.a \ - libebl_ia64_pic.a libebl_alpha_pic.a libebl_arm_pic.a \ - libebl_sparc_pic.a libebl_ppc_pic.a libebl_ppc64_pic.a \ -- libebl_s390_pic.a -+ libebl_s390_pic.a libebl_parisc_pic.a libebl_mips_pic.a \ -+ libebl_m68k_pic.a - - noinst_LIBRARIES = $(libebl_pic) - noinst_DATA = $(libebl_pic:_pic.a=.so) -@@ -328,6 +347,15 @@ - s390_SRCS = s390_init.c s390_symbol.c s390_regs.c s390_retval.c - libebl_s390_pic_a_SOURCES = $(s390_SRCS) - am_libebl_s390_pic_a_OBJECTS = $(s390_SRCS:.c=.os) -+parisc_SRCS = parisc_init.c parisc_symbol.c parisc_regs.c parisc_retval.c -+libebl_parisc_pic_a_SOURCES = $(parisc_SRCS) -+am_libebl_parisc_pic_a_OBJECTS = $(parisc_SRCS:.c=.os) -+mips_SRCS = mips_init.c mips_symbol.c mips_regs.c mips_retval.c -+libebl_mips_pic_a_SOURCES = $(mips_SRCS) -+am_libebl_mips_pic_a_OBJECTS = $(mips_SRCS:.c=.os) -+m68k_SRCS = m68k_init.c m68k_symbol.c m68k_regs.c -+libebl_m68k_pic_a_SOURCES = $(m68k_SRCS) -+am_libebl_m68k_pic_a_OBJECTS = $(m68k_SRCS:.c=.os) - noinst_HEADERS = libebl_CPU.h common-reloc.c linux-core-note.c x86_corenote.c - EXTRA_DIST = $(foreach m,$(modules),$($(m)_SRCS)) $(modules:=_reloc.def) - all: all-am -@@ -383,6 +411,18 @@ - -rm -f libebl_ia64_pic.a - $(libebl_ia64_pic_a_AR) libebl_ia64_pic.a $(libebl_ia64_pic_a_OBJECTS) $(libebl_ia64_pic_a_LIBADD) - $(RANLIB) libebl_ia64_pic.a -+libebl_m68k_pic.a: $(libebl_m68k_pic_a_OBJECTS) $(libebl_m68k_pic_a_DEPENDENCIES) -+ -rm -f libebl_m68k_pic.a -+ $(libebl_m68k_pic_a_AR) libebl_m68k_pic.a $(libebl_m68k_pic_a_OBJECTS) $(libebl_m68k_pic_a_LIBADD) -+ $(RANLIB) libebl_m68k_pic.a -+libebl_mips_pic.a: $(libebl_mips_pic_a_OBJECTS) $(libebl_mips_pic_a_DEPENDENCIES) -+ -rm -f libebl_mips_pic.a -+ $(libebl_mips_pic_a_AR) libebl_mips_pic.a $(libebl_mips_pic_a_OBJECTS) $(libebl_mips_pic_a_LIBADD) -+ $(RANLIB) libebl_mips_pic.a -+libebl_parisc_pic.a: $(libebl_parisc_pic_a_OBJECTS) $(libebl_parisc_pic_a_DEPENDENCIES) -+ -rm -f libebl_parisc_pic.a -+ $(libebl_parisc_pic_a_AR) libebl_parisc_pic.a $(libebl_parisc_pic_a_OBJECTS) $(libebl_parisc_pic_a_LIBADD) -+ $(RANLIB) libebl_parisc_pic.a - libebl_ppc64_pic.a: $(libebl_ppc64_pic_a_OBJECTS) $(libebl_ppc64_pic_a_DEPENDENCIES) - -rm -f libebl_ppc64_pic.a - $(libebl_ppc64_pic_a_AR) libebl_ppc64_pic.a $(libebl_ppc64_pic_a_OBJECTS) $(libebl_ppc64_pic_a_LIBADD) -@@ -439,6 +479,17 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_regs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_retval.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ia64_symbol.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_init.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_regs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m68k_symbol.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_init.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_regs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_retval.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mips_symbol.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_init.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_regs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_retval.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parisc_symbol.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_corenote.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_init.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc64_retval.Po@am__quote@ ---- elfutils-0.152.orig/aclocal.m4 -+++ elfutils-0.152/aclocal.m4 -@@ -13,8 +13,8 @@ - - m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl --m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, --[m4_warning([this file was generated for autoconf 2.66. -+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, -+[m4_warning([this file was generated for autoconf 2.67. - You have another version of autoconf. It may work, but is not guaranteed to. - If you have problems, you may need to regenerate the build system entirely. - To do so, use the procedure documented by the package, typically `autoreconf'.])]) ---- elfutils-0.152.orig/configure -+++ elfutils-0.152/configure -@@ -1,6 +1,6 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.66 for Red Hat elfutils 0.152. -+# Generated by GNU Autoconf 2.67 for Red Hat elfutils 0.152. - # - # Report bugs to <http://bugzilla.redhat.com/bugzilla/>. - # -@@ -792,8 +792,9 @@ do - fi - - case $ac_option in -- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -- *) ac_optarg=yes ;; -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. -@@ -1454,7 +1455,7 @@ test -n "$ac_init_help" && exit $ac_stat - if $ac_init_version; then - cat <<\_ACEOF - Red Hat elfutils configure 0.152 --generated by GNU Autoconf 2.66 -+generated by GNU Autoconf 2.67 - - Copyright (C) 2010 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation -@@ -1557,7 +1558,7 @@ This file contains any messages produced - running configure, to aid debugging if configure makes a mistake. - - It was created by Red Hat elfutils $as_me 0.152, which was --generated by GNU Autoconf 2.66. Invocation command line was -+generated by GNU Autoconf 2.67. Invocation command line was - - $ $0 $@ - -@@ -1815,7 +1816,7 @@ $as_echo "$as_me: loading site script $a - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "failed to load site script $ac_site_file --See \`config.log' for more details" "$LINENO" 5; } -+See \`config.log' for more details" "$LINENO" 5 ; } - fi - done - -@@ -2045,11 +2046,11 @@ am_lf=' - ' - case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) -- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; - esac - case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) -- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; -+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; - esac - - # Do `set' in a subshell so we don't clobber the current shell's -@@ -2485,7 +2486,7 @@ fi - $as_echo "$ac_cv_build" >&6; } - case $ac_cv_build in - *-*-*) ;; --*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; - esac - build=$ac_cv_build - ac_save_IFS=$IFS; IFS='-' -@@ -2518,7 +2519,7 @@ fi - $as_echo "$ac_cv_host" >&6; } - case $ac_cv_host in - *-*-*) ;; --*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; - esac - host=$ac_cv_host - ac_save_IFS=$IFS; IFS='-' -@@ -2858,7 +2859,7 @@ fi - test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "no acceptable C compiler found in \$PATH --See \`config.log' for more details" "$LINENO" 5; } -+See \`config.log' for more details" "$LINENO" 5 ; } - - # Provide some information about the compiler. - $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -@@ -2973,7 +2974,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error 77 "C compiler cannot create executables --See \`config.log' for more details" "$LINENO" 5; } -+See \`config.log' for more details" "$LINENO" 5 ; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -@@ -3016,7 +3017,7 @@ else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details" "$LINENO" 5; } -+See \`config.log' for more details" "$LINENO" 5 ; } - fi - rm -f conftest conftest$ac_cv_exeext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -@@ -3075,7 +3076,7 @@ $as_echo "$ac_try_echo"; } >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot run C compiled programs. - If you meant to cross compile, use \`--host'. --See \`config.log' for more details" "$LINENO" 5; } -+See \`config.log' for more details" "$LINENO" 5 ; } - fi - fi - fi -@@ -3127,7 +3128,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "cannot compute suffix of object files: cannot compile --See \`config.log' for more details" "$LINENO" 5; } -+See \`config.log' for more details" "$LINENO" 5 ; } - fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi -@@ -4298,7 +4299,7 @@ if test "$use_mudflap" = fail; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 - $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - as_fn_error $? "--enable-mudflap requires a compiler which understands this option --See \`config.log' for more details" "$LINENO" 5; } -+See \`config.log' for more details" "$LINENO" 5 ; } - fi - if test "$use_mudflap" = yes; then - MUDFLAP_TRUE= -@@ -5011,7 +5012,7 @@ ac_config_files="$ac_config_files versio - # 1.234<whatever> -> 1234<whatever> - case "$PACKAGE_VERSION" in - [0-9].*) eu_version=`echo "$PACKAGE_VERSION" | sed 's@\.@@'` ;; --*) as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; -+*) as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; - esac - case "$eu_version" in - *.*) -@@ -5022,7 +5023,7 @@ case "$eu_version" in - [0-9][0-9][0-9]) ;; - [0-9][0-9]) eu_extra_version="${eu_extra_version}0" ;; - [0-9]) eu_extra_version="${eu_extra_version}00" ;; -- *) as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; -+ *) as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; - esac - ;; - *) -@@ -5035,7 +5036,7 @@ case "$eu_version" in - [0-9][0-9][0-9][0-9]) eu_version="${eu_version}$eu_extra_version" ;; - [0-9][0-9][0-9]) eu_version="${eu_version}0$eu_extra_version" ;; - [0-9][0-9]) eu_version="${eu_version}00$eu_extra_version";; --*) as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; -+*) as_fn_error $? "confused by version number '$PACKAGE_VERSION'" "$LINENO" 5 ;; - esac - - # Round up to the next release API (x.y) version. -@@ -5620,7 +5621,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri - # values after options handling. - ac_log=" - This file was extended by Red Hat elfutils $as_me 0.152, which was --generated by GNU Autoconf 2.66. Invocation command line was -+generated by GNU Autoconf 2.67. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -5686,7 +5687,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ - ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - Red Hat elfutils config.status 0.152 --configured by $0, generated by GNU Autoconf 2.66, -+configured by $0, generated by GNU Autoconf 2.67, - with options \\"\$ac_cs_config\\" - - Copyright (C) 2010 Free Software Foundation, Inc. -@@ -5707,11 +5708,16 @@ ac_need_defaults=: - while test $# != 0 - do - case $1 in -- --*=*) -+ --*=?*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= -+ ac_shift=: -+ ;; - *) - ac_option=$1 - ac_optarg=$2 -@@ -5733,6 +5739,7 @@ do - $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; -@@ -5835,7 +5842,7 @@ do - "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; - "version.h") CONFIG_FILES="$CONFIG_FILES version.h:config/version.h.in" ;; - -- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; - esac - done - -@@ -6151,7 +6158,7 @@ do - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; -- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac -@@ -6179,7 +6186,7 @@ do - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || -- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" -@@ -6206,7 +6213,7 @@ $as_echo "$as_me: creating $ac_file" >&6 - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ -- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; - esac diff --git a/debian/patches/series b/debian/patches/series index 7e85bb92..12db8a50 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,5 @@ hppa_backend.diff arm_backend.diff mips_backend.diff m68k_backend.diff -do-autoreconf.diff testsuite-ignore-elflint.diff elf_additions.diff diff --git a/debian/rules b/debian/rules index 5aa6c311..693b8bb0 100755 --- a/debian/rules +++ b/debian/rules @@ -38,11 +38,9 @@ else CFLAGS += -O2 endif -config.status: configure +config.status: configure.ac dh_testdir - rm -f config/config.guess config/config.sub - ln -s /usr/share/misc/config.guess config/config.guess - ln -s /usr/share/misc/config.sub config/config.sub + autoreconf -fis CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr \ --program-prefix=eu- --enable-thread-safety @@ -65,9 +63,10 @@ endif clean: dh_testdir rm -f build-stamp - - # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean + rm -f configure version.h + rm -f INSTALL aclocal.m4 + rm -f config/depcomp config/install-sh config/missing config/ylwrap rm -f config/config.guess config/config.sub elfutils.spec rm -rf autom4te.cache -- 1.7.8.rc0 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
