[Pkg-openmpi-commits] r266 - in /openmpi/trunk/debian: changelog patches/series patches/var-copy
manuel at users.alioth.debian.org
manuel at users.alioth.debian.org
Wed Sep 1 13:23:12 UTC 2010
Author: manuel
Date: Wed Sep 1 13:23:09 2010
New Revision: 266
URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=266
Log:
Added patch to remove use of AS_VAR_GET
Added:
openmpi/trunk/debian/patches/var-copy
Modified:
openmpi/trunk/debian/changelog
openmpi/trunk/debian/patches/series
Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=266&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Wed Sep 1 13:23:09 2010
@@ -1,3 +1,9 @@
+openmpi (1.4.2-4) unstable; urgency=low
+
+ * Added patch to remove use of AS_VAR_GET. Closes: #592892.
+
+ -- Manuel Prinz <manuel at debian.org> Wed, 01 Sep 2010 15:22:42 +0200
+
openmpi (1.4.2-3) unstable; urgency=low
* Fixed build issue on kFreeBSD. Closes: #589467.
Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=266&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Wed Sep 1 13:23:09 2010
@@ -4,3 +4,4 @@
build_hurd
manpage-spelling-errors
build_kfreebsd
+var-copy
Added: openmpi/trunk/debian/patches/var-copy
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/var-copy?rev=266&op=file
==============================================================================
--- openmpi/trunk/debian/patches/var-copy (added)
+++ openmpi/trunk/debian/patches/var-copy Wed Sep 1 13:23:09 2010
@@ -1,0 +1,293 @@
+Description: Remove use of AS_VAR_GET
+ This patch removes the use of AS_VAR_GET in the build system,
+ which led to build failures.
+Origin: upstream, https://svn.open-mpi.org/trac/ompi/changeset/23679
+Author: Jeff Squyres <jsquyres at cisco.com>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592892
+Forwarded: https://svn.open-mpi.org/trac/ompi/ticket/2559
+Last-Update: 2010-09-01
+
+Index: config/f90_get_precision.m4
+===================================================================
+--- config/f90_get_precision.m4 (revision 23679)
++++ config/f90_get_precision.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -55,6 +56,6 @@
+ unset happy
+ rm -rf conftest*])
+
+- $2=AS_VAR_GET([type_var])
++ AS_VAR_COPY([$2], [type_var])
+ AS_VAR_POPDEF([type_var])dnl
+ ])
+Index: config/f90_get_sizeof.m4
+===================================================================
+--- config/f90_get_sizeof.m4 (revision 23679)
++++ config/f90_get_sizeof.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -80,6 +81,6 @@
+ unset happy ompi_conftest_h
+ rm -rf conftest*])
+
+- $2=AS_VAR_GET(type_var)
++ AS_VAR_COPY([$2], [type_var])
+ AS_VAR_POPDEF([type_var])dnl
+ ])dnl
+Index: config/f77_get_sizeof.m4
+===================================================================
+--- config/f77_get_sizeof.m4 (revision 23679)
++++ config/f77_get_sizeof.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -80,6 +81,6 @@
+ unset happy ompi_conftest_h
+ rm -rf conftest*])
+
+- $2=AS_VAR_GET(type_var)
++ AS_VAR_COPY([$2], [type_var])
+ AS_VAR_POPDEF([type_var])dnl
+ ])dnl
+Index: config/ompi_check_func_lib.m4
+===================================================================
+--- config/ompi_check_func_lib.m4 (revision 23679)
++++ config/ompi_check_func_lib.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -36,8 +37,8 @@
+ [AS_VAR_SET(ompi_var, "yes")],
+ [AS_VAR_SET(ompi_var, "not found")])
+ LIBS="$LIBS_save"])])
+- AS_IF([test "AS_VAR_GET(ompi_var)" = "yes"],
+- [LIBS="$LIBS -l$2"])
++ AS_VAR_IF(ompi_var, [yes],
++ [LIBS="$LIBS -l$2"])
+
+ # see if we actually have $1. Use AC_CHECK_FUNCS so that it
+ # does the glibc "not implemented" check. Will use the current LIBS,
+Index: config/ompi_find_type.m4
+===================================================================
+--- config/ompi_find_type.m4 (revision 23679)
++++ config/ompi_find_type.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -41,16 +42,12 @@
+ [AS_VAR_SET(type_var, "not found")],
+ [AS_VAR_SET(type_var, "$oft_real_type")])])
+
+- AS_IF([test "AS_VAR_GET(type_var)" = "not found"],
++ AS_VAR_IF(type_var, ["not found"],
+ [AC_MSG_WARN([*** Did not find corresponding C type])
+ AS_IF([test "$oft_abort_on_fail" != "no"],
+ [AC_MSG_ERROR([Cannot continue])])])
+
+- if test "AS_VAR_GET(type_var)" = "not found" ; then
+- $5=
+- else
+- $5=AS_VAR_GET(type_var)
+- fi
++ AS_VAR_IF(type_var, ["not found"], [$5=], [AS_VAR_COPY([$5], [type_var])])
+
+ unset oft_real_type oft_target_size
+
+Index: config/f90_check_type.m4
+===================================================================
+--- config/f90_check_type.m4 (revision 23679)
++++ config/f90_check_type.m4 (working copy)
+@@ -34,6 +34,6 @@
+ [AS_VAR_SET(type_var, "no")])
+ AC_LANG_POP([Fortran])])
+
+- AS_IF([test "AS_VAR_GET(type_var)" = "yes"], [$2], [$3])
++ AS_VAR_IF(type_var, [yes], [$2], [$3])
+ AS_VAR_POPDEF([type_var])dnl
+ ])dnl
+Index: config/f77_check_type.m4
+===================================================================
+--- config/f77_check_type.m4 (revision 23679)
++++ config/f77_check_type.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -34,7 +35,7 @@
+ [AS_VAR_SET(type_var, "no")])
+ AC_LANG_POP([Fortran 77])])
+
+- AS_IF([test "AS_VAR_GET(type_var)" = "yes"], [$2], [$3])
++ AS_VAR_IF(type_var, [yes], [$2], [$3])
+ AS_VAR_POPDEF([type_var])dnl
+ ])dnl
+
+Index: config/f90_get_range.m4
+===================================================================
+--- config/f90_get_range.m4 (revision 23679)
++++ config/f90_get_range.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -55,6 +56,6 @@
+ unset happy
+ rm -rf conftest*])
+
+- $2=AS_VAR_GET([type_var])
++ AS_VAR_COPY([$2], [type_var])
+ AS_VAR_POPDEF([type_var])dnl
+ ])
+Index: config/f90_get_int_kind.m4
+===================================================================
+--- config/f90_get_int_kind.m4 (revision 23679)
++++ config/f90_get_int_kind.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -54,7 +55,7 @@
+ unset happy ompi_conftest_h
+ rm -rf conftest*])
+
+- $3=AS_VAR_GET(type_var)
++ AS_VAR_COPY([$3], [type_var])
+ else
+ $3=0
+ fi
+Index: config/f77_check_real16_c_equiv.m4
+===================================================================
+--- config/f77_check_real16_c_equiv.m4 (revision 23679)
++++ config/f77_check_real16_c_equiv.m4 (working copy)
+@@ -93,7 +93,7 @@
+ ])
+ ])
+
+- ompi_real16_matches_c=AS_VAR_GET([real16_matches_c_var])
++ AS_VAR_COPY([ompi_real16_matches_c], [real16_matches_c_var])
+ AS_VAR_POPDEF([real16_matches_c_var])
+
+ AS_IF([test "$ompi_real16_matches_c" = "yes"],
+Index: config/f77_get_alignment.m4
+===================================================================
+--- config/f77_get_alignment.m4 (revision 23679)
++++ config/f77_get_alignment.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -90,7 +91,7 @@
+ AC_MSG_ERROR([Could not determine alignment of $1])])])
+ rm -rf conftest*])
+
+- $2=AS_VAR_GET([type_var])
++ AS_VAR_COPY([$2], [type_var])
+ AS_VAR_POPDEF([type_var])dnl
+ OMPI_VAR_SCOPE_POP
+ ])
+Index: config/ompi_lang_link_with_c.m4
+===================================================================
+--- config/ompi_lang_link_with_c.m4 (revision 23679)
++++ config/ompi_lang_link_with_c.m4 (working copy)
+@@ -2,6 +2,7 @@
+ dnl
+ dnl Copyright (c) 2006 Los Alamos National Security, LLC. All rights
+ dnl reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -62,6 +63,6 @@
+ rm -f conftest_c.$ac_ext
+ AC_LANG_POP(C)])
+
+- AS_IF([test "AS_VAR_GET([lang_var])" = "yes"], [$2], [$3])
++ AS_VAR_IF(lang_var, [yes], [$2], [$3])
+ AS_VAR_POPDEF([lang_var])dnl
+ ])
+Index: config/ompi_check_compiler_works.m4
+===================================================================
+--- config/ompi_check_compiler_works.m4 (revision 23679)
++++ config/ompi_check_compiler_works.m4 (working copy)
+@@ -5,6 +5,7 @@
+ dnl Corporation. All rights reserved.
+ dnl Copyright (c) 2006 Los Alamos National Security, LLC. All rights
+ dnl reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -37,7 +38,7 @@
+ [AS_VAR_SET(lang_var, ["links (cross compiling)"])],
+ [AS_VAR_SET(lang_var, ["no"])])])
+ AC_LANG_POP($1)])
+- AS_IF([test "AS_VAR_GET(lang_var)" = "no"],
++ AS_VAR_IF(lang_var, [no],
+ [cat <<EOF >&2
+ **********************************************************************
+ * It appears that your $1 compiler is unable to produce working
+Index: config/f90_find_module_include_flag.m4
+===================================================================
+--- config/f90_find_module_include_flag.m4 (revision 23679)
++++ config/f90_find_module_include_flag.m4 (working copy)
+@@ -10,6 +10,7 @@
+ dnl University of Stuttgart. All rights reserved.
+ dnl Copyright (c) 2004-2005 The Regents of the University of California.
+ dnl All rights reserved.
++dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved.
+ dnl $COPYRIGHT$
+ dnl
+ dnl Additional copyrights may follow
+@@ -71,7 +72,7 @@
+ rm -rf conftest.$$
+ ])
+
+- OMPI_FC_MODULE_FLAG=AS_VAR_GET(f90_inc_var)
++ AS_VAR_COPY([OMPI_FC_MODULE_FLAG], [f90_inc_var])
+ if test "$OMPI_FC_MODULE_FLAG" = ""; then
+ AC_MSG_WARN([*** Could not determine the f90 compiler flag to indicate where modules reside])
+ AC_MSG_ERROR([*** Cannot continue])
More information about the Pkg-openmpi-commits
mailing list