freecad: rebuild against boost-1.69.0

This commit is contained in:
John 2018-12-12 12:12:56 +01:00 committed by maxice8
parent 066b1cb46e
commit fa05ceffdd
No known key found for this signature in database
GPG key ID: 543B9D4F4299F06B
3 changed files with 2011 additions and 28 deletions

View file

@ -1,30 +1,30 @@
--- src/App/Application.cpp 2018-04-06 10:48:37.000000000 +0200
+++ src/App/Application.cpp 2018-04-22 15:04:11.876136151 +0200
@@ -1063,7 +1063,9 @@
#endif
#if defined(FC_OS_LINUX)
+#ifdef __GLIBC__
#include <execinfo.h>
+#endif
#include <dlfcn.h>
#include <cxxabi.h>
#endif
#if defined(FC_OS_LINUX)
+#ifdef __GLIBC__
#include <execinfo.h>
+#endif
#include <dlfcn.h>
#include <cxxabi.h>
@@ -1075,6 +1077,7 @@
// This function produces a stack backtrace with demangled function & method names.
void printBacktrace(size_t skip=0)
{
+#ifdef __GLIBC__
void *callstack[128];
size_t nMaxFrames = sizeof(callstack) / sizeof(callstack[0]);
size_t nFrames = backtrace(callstack, nMaxFrames);
// This function produces a stack backtrace with demangled function & method names.
void printBacktrace(size_t skip=0)
{
+#ifdef __GLIBC__
void *callstack[128];
size_t nMaxFrames = sizeof(callstack) / sizeof(callstack[0]);
size_t nFrames = backtrace(callstack, nMaxFrames);
@@ -1105,6 +1108,9 @@
}
free(symbols);
+#else
+ std::cerr << "sorry, no backtrace on musl libc";
+#endif
}
#endif
}
free(symbols);
+#else
+ std::cerr << "sorry, no backtrace on musl libc";
+#endif
}
#endif

File diff suppressed because it is too large Load diff

View file

@ -5,7 +5,7 @@
# - python3: freecad code not yet ready for it, probably at 0.18
pkgname=freecad
version=0.17
revision=6
revision=7
wrksrc="FreeCAD-${version}"
build_style=cmake
@ -16,8 +16,8 @@ configure_args="
-DBUILD_QT5=OFF
-DCMAKE_INSTALL_PREFIX=${_inst_prefix}
-DCMAKE_INSTALL_LIBDIR=${_inst_prefix}/lib"
hostmakedepends="pkg-config swig doxygen graphviz"
makedepends="python-devel boost-devel boost-python libxerces-c-devel
hostmakedepends="pkg-config swig doxygen graphviz dos2unix"
makedepends="python-devel boost-devel libxerces-c-devel
zlib-devel occt-devel vtk-devel hdf5-devel openmpi-devel libmed-devel eigen
coin3-devel libshiboken-python-devel libspnav-devel pyside-tools liblz4-devel
libpyside-python-devel python-matplotlib netcdf-devel jsoncpp-devel
@ -34,6 +34,10 @@ homepage="https://freecadweb.org/"
distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz"
checksum=ae017393476b6dc7f1192bcaf91ceedc2f9b791f2495307ce7c45efadb5266fb
post_extract() {
find $wrksrc -type f -exec dos2unix {} +
}
post_install() {
# AppHomePath is computed with binary's realpath:
# do not move binaries but symlink them instead.