JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmis: fix build with gcc5

Browse Source
This commit is contained in:
Domen Kožar 2016-03-22 20:59:00 +00:00 committed by Michael Raskin
parent 1b30674165
commit 4a42548388
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libcmis/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, libxml2, pkgconfig, curl }:
{ stdenv, fetchurl, boost, libxml2, pkgconfig, curl, autoreconfHook }:
stdenv.mkDerivation rec {
name = "libcmis-${version}";
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8";
};
buildInputs = [ boost libxml2 pkgconfig curl ];
patches = [ ./gcc5.patch ];
buildInputs = [ boost libxml2 pkgconfig curl autoreconfHook ];
configureFlags = "--without-man --with-boost=${boost.dev} --disable-werror --disable-tests";
# Cppcheck cannot find all the include files (use --check-config for details)

39
pkgs/development/libraries/libcmis/gcc5.patch Normal file
View File

@ -0,0 +1,39 @@
diff -urN libcmis-0.5.0.org/m4/boost.m4 libcmis-0.5.0/m4/boost.m4
--- libcmis-0.5.0.org/m4/boost.m4 2014-03-28 15:19:57.000000000 +0100
+++ libcmis-0.5.0/m4/boost.m4 2015-09-21 14:42:25.149565264 +0200
@@ -68,7 +68,9 @@
dnl everything else.
dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+ grep -v '#' |
tr -d '\r' |
+ tr -s '\n' ' ' |
$SED -n -e "$1" >conftest.i 2>&1],
[$3],
[$4])
@@ -201,7 +203,7 @@
AC_CACHE_CHECK([for Boost's header version],
[boost_cv_lib_version],
[m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
- _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;g;}],
+ _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
[#include <boost/version.hpp>
boost-lib-version = BOOST_LIB_VERSION],
[boost_cv_lib_version=`cat conftest.i`])])
@@ -209,7 +211,7 @@
boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
case $boost_major_version in #(
'' | *[[!0-9]]*)
- AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
+ AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
;;
esac
fi
@@ -930,6 +932,7 @@
# the same defines as GCC's).
# TODO: Move the test on GCC 4.4 up once it's released.
for i in \
+ _BOOST_gcc_test(5, 2) \
_BOOST_gcc_test(4, 3) \
_BOOST_gcc_test(4, 2) \
_BOOST_gcc_test(4, 1) \