libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

just install libiberty-dev on trusty; partially undone [336] and [337]; refs #9

Browse Source
This commit is contained in:
Marc Wäckerlin
2014-04-22 09:15:40 +00:00
parent b9e36e6f4c
commit 6ae7822fcd
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure.in
View File

@@ -127,7 +127,7 @@ AC_CHECK_HEADERS(unistd.h fcntl.h, [have_exec=yes])
AC_CHECK_HEADER(dirent.h, [have_dir=yes]) AC_CHECK_HEADER(dirent.h, [have_dir=yes])
# solaris? # solaris?
AC_CHECK_HEADER(sys/old_procfs.h, [AM_CPPFLAGS="$AM_CPPFLAGS -D__solaris__"]) AC_CHECK_HEADER(sys/old_procfs.h, [AM_CPPFLAGS=-D__solaris__])
# Arguments # Arguments
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
@@ -197,22 +197,17 @@ if test "$have_stacktrace" = "yes"; then
# } bug # } bug
AC_CHECK_HEADER([demangle.h], AC_CHECK_HEADER([demangle.h],
[AC_DEFINE([HAVE_DEMANGLE_H])], [AC_DEFINE([HAVE_DEMANGLE_H])],
[AC_CHECK_HEADER([libcwd/demangle.h], [AC_MSG_WARN([Header "demangle.h" from the binutils not found!
[AC_DEFINE([HAVE_DEMANGLE_H])
AM_CPPFLAGS="$AM_CPPFLAGS -I/usr/include/libcwd"],
[AC_MSG_WARN(
[Header "demangle.h" from the binutils not found!
- unfortunately, the bintils do not install this header - unfortunately, the bintils do not install this header
(even though they should) (even though they should)
- if available, install package libcwd (Ubuntu since 13.04 Trusty)
- the required symbols are now declared in stacktrace.cxx according to my - the required symbols are now declared in stacktrace.cxx according to my
own binutils version (binutils-2.16.1) it may or may not be compatible to own binutils version (binutils-2.16.1) it may or may not be compatible to
yours])])]) yours])])
AC_SEARCH_LIBS(cplus_demangle, [demangle iberty_pic iberty cwd], AC_SEARCH_LIBS(cplus_demangle, [demangle iberty_pic iberty],
[AC_MSG_RESULT([OK, found cplus_demangle])], [AC_MSG_RESULT([OK, found cplus_demangle])],
[AC_MSG_ERROR([Function cplus_demangle not found! [AC_MSG_ERROR([Function cplus_demangle not found!
- I looked in libdemangle, libiberty and libcwd - I looked in libdemangle and libiberty
- Try "ls -l /usr/lib/libdemangle* /usr/lib/libiberty* /usr/lib/libcwd*" - Try "ls -l /usr/lib/libdemangle* /usr/lib/libiberty*"
- is one of them installed? - is one of them installed?
- If yes, try: "nm <filename> | grep cplus_demangle" - If yes, try: "nm <filename> | grep cplus_demangle"
-> is the symbol defined? -> is the symbol defined?
@@ -307,8 +302,6 @@ AC_SUBST(PACKAGENAME)
AC_SUBST(AM_CXXFLAGS) AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CPPFLAGS)
AC_SUBST(LIBS) AC_SUBST(LIBS)
DISTCHECK_CONFIGURE_FLAGS="$(env)"
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
# create output # create output
AC_OUTPUT AC_OUTPUT

1
src/mrw/checkcxx11.hxx
View File

@@ -8,7 +8,6 @@
#ifndef __MRW__CHECKCXX11__ #ifndef __MRW__CHECKCXX11__
#define __MRW__CHECKCXX11__ #define __MRW__CHECKCXX11__
// check if code is compiled with a new C++11 compiler // check if code is compiled with a new C++11 compiler
// otherwise there is a fallback wich makes everything much more compliacted // otherwise there is a fallback wich makes everything much more compliacted
# ifndef MRW__OLD_PRE11_COMPILER # ifndef MRW__OLD_PRE11_COMPILER