From 2e3c69ea48ef2978e403ac922151b58e3f5682d8 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 24 Jun 2011 01:11:09 +0000 Subject: [PATCH] Use '-Wl,-rpath,' instead of '-Wl,-rpath ' (note the comma instead of the space). It's quite mysterious how this worked in the first place for so long. git-svn-id: https://svn.dealii.org/trunk@23855 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 3 +-- deal.II/configure | 7 ++++--- deal.II/doc/news/changes.h | 18 ++++++++++++------ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index d45ce1fbd2..2836f4efe6 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1701,9 +1701,8 @@ AC_DEFUN(DEAL_II_CHECK_RPATH, AC_MSG_CHECKING([whether compiler understands option -Wl,-rpath]) AC_LINK_IFELSE( [ AC_LANG_PROGRAM([[]],[[]])], - dnl Note the 'space' at the end of the string! [ AC_MSG_RESULT(yes) - LD_PATH_OPTION="-Wl,-rpath " + LD_PATH_OPTION="-Wl,-rpath," DEAL_II_LD_UNDERSTANDS_RPATH=yes ], [ AC_MSG_RESULT(no) diff --git a/deal.II/configure b/deal.II/configure index d1f15ddb2c..54512b42ca 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -4409,7 +4409,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGS="${OLD_CXXFLAGS}" - else + + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -9502,9 +9503,9 @@ main () } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - LD_PATH_OPTION="-Wl,-rpath " + LD_PATH_OPTION="-Wl,-rpath," DEAL_II_LD_UNDERSTANDS_RPATH=yes else diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index 6ed08bb76d..576ab4d75e 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -28,7 +28,7 @@ of C++ 1x, we had code that simply did @code namespace std_cxx1x = std; @endcode -allowing you to refer to everything that was part of the compiler's namespace +allowing you to refer to everything that was part of the compiler's namespace std under the alternative name. This turned out to be untenable in connection to the changed outlined below for _1, _2, etc. Consequently, if the compiler used supports C++ 1x, we now selectively import elements of the @@ -48,7 +48,7 @@ the BOOST counterparts which are already in the global namespace. However, this leads to a conflict if one has a C++ 1x enabled compiler (e.g. GCC 4.6) and #includes certain BOOST headers, since the importation of symbols into the global namespace now leads to ambiguous names. The only solution to -the problem is to not import names into the global namespace, but rather +the problem is to not import names into the global namespace, but rather import the names from either BOOST or namespace std into the deal.II namespace std_cxx1x. The downside is that all code that uses _1, _2, etc needs to be changed to use std_cxx1x::_1, std_cxx1x::_2, etc from now on. @@ -61,6 +61,12 @@ changed to use std_cxx1x::_1, std_cxx1x::_2, etc from now on.

General

    +
  1. Fixed: On Mac OS X, linking with some external libraries such as Trilinos +sometimes failed due to a misconfiguration of linker flags. This should now be +fixed. +
    +(Praveen C, Martin Kronbichler, Wolfgang Bangerth, 2011/06/23) +
  2. Changed: Doing make clean was supposed to only remove object files but not libraries; however, it also removed the TBB libraries and a few executables. This has now been changed: make clean now only @@ -76,22 +82,22 @@ to an output stream and later retrieved to restore the state of the program.
    (Wolfgang Bangerth, 2011/06/13) -
  3. New/deprecated: The Triangulation class offers ways to get informed +
  4. New/deprecated: The Triangulation class offers ways to get informed whenever the triangulation changes. Previously, the mechanism doing this was through the Triangulation::RefinementListener class. This has been deprecated and has been superceded by a BOOST signals based mechanism that is generally more powerful and does not rely on overloading -particular virtual functions inherited from a base class. +particular virtual functions inherited from a base class. While the old mechanism should continue to work, you should consider -upgrading. For more information on the signals mechanism, see the +upgrading. For more information on the signals mechanism, see the documentation of the Triangulation class. In addition to the change above, the new implementation now offers two more signals one can subscribe to: Triangulation::Signals::clead for when the triangulation is cleared, and Triangulation::Signals::any_change that can be used for any operation that changes the mesh. Furthermore, -in a change from previous behavior, the Triangulations::Signal::create +in a change from previous behavior, the Triangulations::Signal::create signal is now also triggered when another triangulation is copied to the one that owns the signal.
    -- 2.39.5