Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,18 +1,16 @@
$NetBSD: patch-ai,v 1.4 2012/10/17 23:27:35 asau Exp $
$NetBSD: patch-ai,v 1.5 2015/12/12 22:41:19 asau Exp $
Install configuration files into example directory.
--- orte/etc/Makefile.in.orig 2012-08-22 14:26:19.000000000 +0000
--- orte/etc/Makefile.in.orig 2015-06-17 19:57:45.000000000 +0000
+++ orte/etc/Makefile.in
@@ -1085,6 +1085,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -1451,6 +1451,7 @@ spml_ikrit_LDFLAGS = @spml_ikrit_LDFLAGS
spml_ikrit_LIBS = @spml_ikrit_LIBS@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
+sysconfexampledir = $(pkgdatadir)/examples
sysinfo_solaris_CFLAGS = @sysinfo_solaris_CFLAGS@
sysinfo_solaris_CPPFLAGS = @sysinfo_solaris_CPPFLAGS@
sysinfo_solaris_LDFLAGS = @sysinfo_solaris_LDFLAGS@
@@ -1303,19 +1304,19 @@ uninstall-am: uninstall-local
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
@@ -1667,19 +1668,19 @@ uninstall-am: uninstall-local
# details why the mkdir is in install-data-local.
install-data-local:
@@ -37,7 +35,7 @@ Install configuration files into example directory.
fi; \
done
@@ -1326,11 +1327,11 @@ install-data-local:
@@ -1690,11 +1691,11 @@ install-data-local:
uninstall-local:
@ p="$(orte_config_files)"; \
for file in $$p; do \

View File

@@ -1,18 +1,18 @@
$NetBSD: patch-aj,v 1.3 2012/10/17 23:27:35 asau Exp $
$NetBSD: patch-aj,v 1.4 2015/12/12 22:41:19 asau Exp $
Install configuration files into example directory.
--- opal/etc/Makefile.in.orig 2012-08-22 14:25:33.000000000 +0000
+++ opal/etc/Makefile.in
@@ -35,6 +35,7 @@
#
VPATH = @srcdir@
--- opal/etc/Makefile.in.orig 2013-01-15 14:43:13.000000000 +0100
+++ opal/etc/Makefile.in 2013-01-24 12:34:41.090709828 +0100
@@ -51,6 +51,7 @@
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@
+sysconfexampledir = $(pkgdatadir)/examples
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -1302,24 +1303,24 @@ uninstall-am: uninstall-local
@@ -1535,24 +1536,24 @@
# details why the mkdir is in install-data-local.
install-data-local:
@@ -44,7 +44,7 @@ Install configuration files into example directory.
fi; \
done \
fi;
@@ -1331,11 +1332,11 @@ install-data-local:
@@ -1564,11 +1565,11 @@
uninstall-local:
@ p="$(opal_config_files)"; \
for file in $$p; do \

View File

@@ -1,18 +1,18 @@
$NetBSD: patch-ak,v 1.3 2012/10/17 23:27:35 asau Exp $
$NetBSD: patch-ak,v 1.4 2015/12/12 22:41:19 asau Exp $
Install configuration files into example directory.
--- ompi/etc/Makefile.in.orig 2012-08-22 14:24:34.000000000 +0000
+++ ompi/etc/Makefile.in
@@ -35,6 +35,7 @@
#
VPATH = @srcdir@
--- ompi/etc/Makefile.in.orig 2013-01-15 14:41:30.000000000 +0100
+++ ompi/etc/Makefile.in 2013-01-24 12:36:01.150707935 +0100
@@ -51,6 +51,7 @@
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@
+sysconfexampledir = $(pkgdatadir)/examples
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -1303,19 +1304,19 @@ uninstall-am: uninstall-local
@@ -1536,19 +1537,19 @@
# details why the mkdir is in install-data-local.
install-data-local:
@@ -37,7 +37,7 @@ Install configuration files into example directory.
fi; \
done
@@ -1326,11 +1327,11 @@ install-data-local:
@@ -1559,11 +1560,11 @@
uninstall-local:
@ p="$(ompi_config_files)"; \
for file in $$p; do \

View File

@@ -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

View File

@@ -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 :

View File

@@ -0,0 +1,15 @@
$NetBSD: patch-ompi_mpi_java_java_Makefile.in,v 1.1 2015/12/13 06:49:01 markd Exp $
Don't install jdocs - its dependent on particular javadoc version
--- ompi/mpi/java/java/Makefile.in.orig 2015-09-16 10:13:10.000000000 +0000
+++ ompi/mpi/java/java/Makefile.in
@@ -2017,7 +2017,7 @@ uninstall-am: uninstall-javaDATA uninsta
@OMPI_WANT_JAVA_BINDINGS_TRUE@jdoc-uninstall:
@OMPI_WANT_JAVA_BINDINGS_TRUE@ -rm -rf $(DESTDIR)$(docdir)/javadoc
-@OMPI_WANT_JAVA_BINDINGS_TRUE@install-data-hook: jdoc-install
+@OMPI_WANT_JAVA_BINDINGS_TRUE@install-data-hook:
@OMPI_WANT_JAVA_BINDINGS_TRUE@uninstall-local: jdoc-uninstall
# Can only put *files* in CLEANFILES; need to remove the generated doc