diff options
| author | Domen Kožar <domen@dev.si> | 2016-03-22 20:59:00 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2016-03-27 15:11:13 +0200 |
| commit | 4a425483881d1e7b0c72a8ed6127bc65e0bf4032 (patch) | |
| tree | 2b48a4c883fdda32fb7e77d0853ddb65e9801fe8 /pkgs/development/libraries/libcmis | |
| parent | 1b30674165928d853203e12fdd74afb3c9ea68a9 (diff) | |
| download | nixlib-4a425483881d1e7b0c72a8ed6127bc65e0bf4032.tar nixlib-4a425483881d1e7b0c72a8ed6127bc65e0bf4032.tar.gz nixlib-4a425483881d1e7b0c72a8ed6127bc65e0bf4032.tar.bz2 nixlib-4a425483881d1e7b0c72a8ed6127bc65e0bf4032.tar.lz nixlib-4a425483881d1e7b0c72a8ed6127bc65e0bf4032.tar.xz nixlib-4a425483881d1e7b0c72a8ed6127bc65e0bf4032.tar.zst nixlib-4a425483881d1e7b0c72a8ed6127bc65e0bf4032.zip | |
cmis: fix build with gcc5
Diffstat (limited to 'pkgs/development/libraries/libcmis')
| -rw-r--r-- | pkgs/development/libraries/libcmis/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcmis/gcc5.patch | 39 |
2 files changed, 43 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 5535623298af..6e0007111bc4 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -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) diff --git a/pkgs/development/libraries/libcmis/gcc5.patch b/pkgs/development/libraries/libcmis/gcc5.patch new file mode 100644 index 000000000000..952f8e1abd70 --- /dev/null +++ b/pkgs/development/libraries/libcmis/gcc5.patch @@ -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) \ |