From 8fbbe954af7e25b581e7000556c46a60cafc1ef9 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 23 Jan 2013 17:58:19 +0000 Subject: Fix build with automake-1.13. --- meta-pkgs/gnuradio/distinfo | 6 ++++-- meta-pkgs/gnuradio/patches/patch-ah | 14 +++++++++++++- meta-pkgs/gnuradio/patches/patch-config_gr__standalone.m4 | 15 +++++++++++++++ .../gnuradio/patches/patch-usrp2_firmware_configure.ac | 15 +++++++++++++++ sysutils/amanda-common/Makefile.common | 6 ++++-- 5 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 meta-pkgs/gnuradio/patches/patch-config_gr__standalone.m4 create mode 100644 meta-pkgs/gnuradio/patches/patch-usrp2_firmware_configure.ac diff --git a/meta-pkgs/gnuradio/distinfo b/meta-pkgs/gnuradio/distinfo index 6e941595b15..7b5ae932d06 100644 --- a/meta-pkgs/gnuradio/distinfo +++ b/meta-pkgs/gnuradio/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2012/11/23 20:46:41 markd Exp $ +$NetBSD: distinfo,v 1.10 2013/01/23 18:44:11 wiz Exp $ SHA1 (gnuradio-3.3.0.tar.gz) = 41d5c177b173ce73404f5fe539b013c82600f73f RMD160 (gnuradio-3.3.0.tar.gz) = ae83bd8a93deaf73d730e2af0d05c9ffc4c98520 @@ -8,14 +8,16 @@ SHA1 (patch-ab) = f7db7741c27b3dd32eb104637b537b304234d12c SHA1 (patch-ac) = bfd82ea0e6dd7ed0fc5194d0027323a4adbb306b SHA1 (patch-ae) = 44c99528a5ae8fe10f473f0da9f1c41edaa8ba8d SHA1 (patch-ag) = 1707574a02ecb9391f54b9a740b350b07d14740d -SHA1 (patch-ah) = 713fd140b8143b468b8ac2422f825a1ee24d4419 +SHA1 (patch-ah) = 94760f365cdb84170f376b3b619e9d462d20e49f SHA1 (patch-ai) = 2e8291c4d8a117c9c69de0ee906fbff85485d797 SHA1 (patch-aj) = 046fb46567fcbef58143ac3eeb2d0f1fd905618e SHA1 (patch-ak) = c6d2d9289600a89cd425d1bab671b080888d9c04 SHA1 (patch-config_gr__lib64.m4) = 2263778dea1b8918033c175735f3134a6da80dc5 +SHA1 (patch-config_gr__standalone.m4) = b571e9d69ad83ecb3b65daf955e1b526f92c9ed9 SHA1 (patch-gnuradio-core_src_lib_filter_qa_gri_mmse_fir_interpolator_cc.cc) = cdfa5d89b5f5d9225468e2652248a6b6da5a36b2 SHA1 (patch-gnuradio-core_src_lib_general_gr__math.cc) = 81161e9576c3ec8259a20663eb991578f0ac40c3 SHA1 (patch-gnuradio-core_src_lib_io_gr__file__descriptor__sink.cc) = 4ac9818b722b5fc9175c4c19fb8a8126ddf48ed2 SHA1 (patch-gnuradio-core_src_lib_io_gr__file__descriptor__source.cc) = 54f4194ef35e206ef05a6dd35066037529250a57 SHA1 (patch-gnuradio-core_src_lib_io_ppio_ppdev.cc) = dd8a78c0d08c66fe4ee362e73c7be2d7c47d64bb +SHA1 (patch-usrp2_firmware_configure.ac) = b79c71afe3d84a15466e37e6ce858ee63c43b62e SHA1 (patch-usrp_host_swig_usrp_prims.i) = 2ff2f695a2ba8cb4237298be96833225f37cfec8 diff --git a/meta-pkgs/gnuradio/patches/patch-ah b/meta-pkgs/gnuradio/patches/patch-ah index efdb49048cd..10f59b22f82 100644 --- a/meta-pkgs/gnuradio/patches/patch-ah +++ b/meta-pkgs/gnuradio/patches/patch-ah @@ -1,7 +1,19 @@ -$NetBSD: patch-ah,v 1.1 2010/09/15 09:38:42 markd Exp $ +$NetBSD: patch-ah,v 1.2 2013/01/23 18:44:11 wiz Exp $ + +First chunk: automake-1.13 compat. +Second chunk: test(1) compat. --- configure.ac.orig 2010-06-03 06:45:00.000000000 +0000 +++ configure.ac +@@ -19,7 +19,7 @@ dnl Boston, MA 02110-1301, USA. + + AC_INIT + AC_PREREQ(2.57) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc]) + + AC_CANONICAL_BUILD @@ -297,8 +297,8 @@ BUILD_DATE=`date -u +"%a, %d %b %Y %R:%S AC_SUBST(BUILD_DATE) diff --git a/meta-pkgs/gnuradio/patches/patch-config_gr__standalone.m4 b/meta-pkgs/gnuradio/patches/patch-config_gr__standalone.m4 new file mode 100644 index 00000000000..464e895d152 --- /dev/null +++ b/meta-pkgs/gnuradio/patches/patch-config_gr__standalone.m4 @@ -0,0 +1,15 @@ +$NetBSD: patch-config_gr__standalone.m4,v 1.1 2013/01/23 18:44:12 wiz Exp $ + +automake-1.13 compat. + +--- config/gr_standalone.m4.orig 2010-06-01 05:04:08.000000000 +0000 ++++ config/gr_standalone.m4 +@@ -32,7 +32,7 @@ m4_define([GR_STANDALONE], + AC_PREREQ(2.57) + AC_CONFIG_SRCDIR([config/gr_standalone.m4]) + AC_CONFIG_AUX_DIR([.]) +- AM_CONFIG_HEADER(config.h) ++ AC_CONFIG_HEADERS(config.h) + + AC_CANONICAL_BUILD + AC_CANONICAL_HOST diff --git a/meta-pkgs/gnuradio/patches/patch-usrp2_firmware_configure.ac b/meta-pkgs/gnuradio/patches/patch-usrp2_firmware_configure.ac new file mode 100644 index 00000000000..7dafa3b7643 --- /dev/null +++ b/meta-pkgs/gnuradio/patches/patch-usrp2_firmware_configure.ac @@ -0,0 +1,15 @@ +$NetBSD: patch-usrp2_firmware_configure.ac,v 1.1 2013/01/23 18:44:12 wiz Exp $ + +automake-1.13 compat. + +--- usrp2/firmware/configure.ac.orig 2010-01-23 20:52:29.000000000 +0000 ++++ usrp2/firmware/configure.ac +@@ -17,7 +17,7 @@ dnl + + AC_INIT + AC_PREREQ(2.57) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_AUX_DIR([.]) + AC_CONFIG_SRCDIR([lib/u2_init.c]) + diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index 2281e62aec1..8c186601ba2 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.37 2012/07/30 07:21:11 sbd Exp $ +# $NetBSD: Makefile.common,v 1.38 2013/01/23 17:58:19 wiz Exp $ # used by sysutils/amanda-common/Makefile # used by sysutils/amanda-client/Makefile @@ -47,6 +47,8 @@ AM_PROG_PERMS= ${REAL_ROOT_USER} ${AMANDA_GROUP} 4510 USE_LIBTOOL= yes USE_TOOLS+= gzip:run gtar:run perl:run USE_TOOLS+= gmake pkg-config autoconf automake +# for autopoint +BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools PERL5_CONFIGURE= no AUTO_MKDIRS= yes @@ -83,7 +85,7 @@ pre-configure: autogen autogen: ${RUN}${_ULIMIT_CMD} cd ${WRKSRC} && \ ${PKGSRC_SETENV} ${_CONFIGURE_SCRIPT_ENV} \ - ${CONFIG_SHELL} ./autogen + autoreconf -fi .PHONY: build-perl post-build: build-perl -- cgit v1.2.3