From 3f37bcdf4487afa74033d6412a05ebfe69958669 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 28 Feb 2016 19:47:41 +0000 Subject: Let the compiler decide whether or not DT_RPATH vs DT_RUNPATH should be used, don't force the crap in places that definitely don't know the right answer. Bump revision. --- parallel/openmpi/Makefile | 3 +- parallel/openmpi/distinfo | 4 +- .../patches/patch-config_opal__setup__wrappers.m4 | 17 +++ parallel/openmpi/patches/patch-configure | 125 +++++++++++++++++++++ 4 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 parallel/openmpi/patches/patch-config_opal__setup__wrappers.m4 create mode 100644 parallel/openmpi/patches/patch-configure (limited to 'parallel') diff --git a/parallel/openmpi/Makefile b/parallel/openmpi/Makefile index 30745978c2c..f4a74e662d4 100644 --- a/parallel/openmpi/Makefile +++ b/parallel/openmpi/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2015/12/13 06:49:01 markd Exp $ +# $NetBSD: Makefile,v 1.34 2016/02/28 19:47:41 joerg Exp $ DISTNAME= openmpi-1.10.1 +PKGREVISION= 1 CATEGORIES= parallel MASTER_SITES= http://www.open-mpi.org/software/ompi/v1.10/downloads/ EXTRACT_SUFX= .tar.bz2 diff --git a/parallel/openmpi/distinfo b/parallel/openmpi/distinfo index 8a93462067a..7705751c48e 100644 --- a/parallel/openmpi/distinfo +++ b/parallel/openmpi/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2015/12/13 06:49:01 markd Exp $ +$NetBSD: distinfo,v 1.17 2016/02/28 19:47:41 joerg Exp $ SHA1 (openmpi-1.10.1.tar.bz2) = caf6885f323a38b9c106a7815711313843409478 RMD160 (openmpi-1.10.1.tar.bz2) = 70de0da1f31793333b51eda328a18c01c4ffa3c0 @@ -8,4 +8,6 @@ SHA1 (patch-aa) = 6fa20775c6e2abae7c9a2ae858dbb941652beab8 SHA1 (patch-ai) = 5ddce5ee190ac7bf6964176e23c0a6e624c8c1dd SHA1 (patch-aj) = 547fa12b56bd5fe4c4b58d3558d78773bd9dc5c2 SHA1 (patch-ak) = f79e69fc02510de8da3834729f471799e175bb9c +SHA1 (patch-config_opal__setup__wrappers.m4) = c3fe3cb5ff7cedcb5c847f25eea129d4299dd5d2 +SHA1 (patch-configure) = 8717730bd4958fff225d64f34d10dc70a1bc2d92 SHA1 (patch-ompi_mpi_java_java_Makefile.in) = bd61f02f56e03af9799d2ba86d66c1ded35f62f4 diff --git a/parallel/openmpi/patches/patch-config_opal__setup__wrappers.m4 b/parallel/openmpi/patches/patch-config_opal__setup__wrappers.m4 new file mode 100644 index 00000000000..d8f8b8d59dd --- /dev/null +++ b/parallel/openmpi/patches/patch-config_opal__setup__wrappers.m4 @@ -0,0 +1,17 @@ +$NetBSD: patch-config_opal__setup__wrappers.m4,v 1.1 2016/02/28 19:47:41 joerg Exp $ + +Do not second guess the compiler's choice of DT_RPATH vs DT_RUNPATH. + +--- config/opal_setup_wrappers.m4.orig 2016-02-24 13:18:55.229667898 +0000 ++++ config/opal_setup_wrappers.m4 +@@ -177,10 +177,6 @@ EOF + AC_MSG_RESULT([yes (no extra flags needed)])]) + + OPAL_VAR_SCOPE_POP +- +- # If we found RPATH support, check for RUNPATH support, too +- AS_IF([test "$WRAPPER_RPATH_SUPPORT" = "rpath"], +- [OPAL_SETUP_RUNPATH]) + ]) + + # Check to see if the linker supports the DT_RUNPATH flags via diff --git a/parallel/openmpi/patches/patch-configure b/parallel/openmpi/patches/patch-configure new file mode 100644 index 00000000000..1041c9cc7d6 --- /dev/null +++ b/parallel/openmpi/patches/patch-configure @@ -0,0 +1,125 @@ +$NetBSD: patch-configure,v 1.1 2016/02/28 19:47:41 joerg Exp $ + +--- configure.orig 2016-02-24 13:44:02.424420285 +0000 ++++ configure +@@ -307902,6 +307902,7 @@ fi + + + # Unwind the index ++ + ompi_scope_index=`expr $ompi_scope_index - 1` + ompi_scope_test=`expr $ompi_scope_index \> 0` + if test "$ompi_scope_test" = "0"; then +@@ -307922,112 +307923,6 @@ $as_echo "$as_me: WARNING: This usually + done + + +- # If we found RPATH support, check for RUNPATH support, too +- if test "$WRAPPER_RPATH_SUPPORT" = "rpath"; then : +- +- +- +- # Is the private index set? If not, set it. +- if test "x$ompi_scope_index" = "x"; then +- ompi_scope_index=1 +- fi +- +- # First, check to see if any of these variables are already set. +- # This is a simple sanity check to ensure we're not already +- # overwriting pre-existing variables (that have a non-empty +- # value). It's not a perfect check, but at least it's something. +- for ompi_var in LDFLAGS_save; do +- ompi_str="ompi_str=\"\$$ompi_var\"" +- eval $ompi_str +- +- if test "x$ompi_str" != "x"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found configure shell variable clash!" >&5 +-$as_echo "$as_me: WARNING: Found configure shell variable clash!" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$ompi_var\"," >&5 +-$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_PUSH called on \"$ompi_var\"," >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: but it is already defined with value \"$ompi_str\"" >&5 +-$as_echo "$as_me: WARNING: but it is already defined with value \"$ompi_str\"" >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +-$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} +- as_fn_error $? "Cannot continue" "$LINENO" 5 +- fi +- done +- +- # Ok, we passed the simple sanity check. Save all these names so +- # that we can unset them at the end of the scope. +- ompi_str="ompi_scope_$ompi_scope_index=\"LDFLAGS_save\"" +- eval $ompi_str +- unset ompi_str +- +- env | grep ompi_scope +- ompi_scope_index=`expr $ompi_scope_index + 1` +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if linker supports RUNPATH" >&5 +-$as_echo_n "checking if linker supports RUNPATH... " >&6; } +- # Set the output in $runpath_args +- runpath_args= +- LDFLAGS_save=$LDFLAGS +- LDFLAGS="$LDFLAGS -Wl,--enable-new-dtags" +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +-return 7; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- WRAPPER_RPATH_SUPPORT=runpath +- runpath_args="-Wl,--enable-new-dtags" +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (-Wl,--enable-new-dtags)" >&5 +-$as_echo "yes (-Wl,--enable-new-dtags)" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +- ac_ext=c +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu +- +- LDFLAGS=$LDFLAGS_save +- +- +- # Unwind the index +- ompi_scope_index=`expr $ompi_scope_index - 1` +- ompi_scope_test=`expr $ompi_scope_index \> 0` +- if test "$ompi_scope_test" = "0"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OPAL_VAR_SCOPE_POP popped too many OMPI configure scopes." >&5 +-$as_echo "$as_me: WARNING: OPAL_VAR_SCOPE_POP popped too many OMPI configure scopes." >&2;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This usually indicates an error in configure." >&5 +-$as_echo "$as_me: WARNING: This usually indicates an error in configure." >&2;} +- as_fn_error $? "Cannot continue" "$LINENO" 5 +- fi +- +- # Get the variable names from that index +- ompi_str="ompi_str=\"\$ompi_scope_$ompi_scope_index\"" +- eval $ompi_str +- +- # Iterate over all the variables and unset them all +- for ompi_var in $ompi_str; do +- unset $ompi_var +- done +- +- +-fi + + fi + if test "$enable_wrapper_rpath" = "yes" -a "$WRAPPER_RPATH_SUPPORT" = "disabled"; then : -- cgit v1.2.3