pugixml: fixup darwin
This commit is contained in:
parent
87e6b2c50f
commit
f1fdc98884
@ -18,9 +18,6 @@ stdenv.mkDerivation rec {
|
||||
sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp
|
||||
'';
|
||||
|
||||
patches = []
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ ./no-long-long.patch ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Light-weight, simple and fast XML parser for C++ with XPath support";
|
||||
homepage = http://pugixml.org/;
|
||||
|
@ -1,19 +0,0 @@
|
||||
Get rid of long-long feature. This breaks on AppleClang compilers.
|
||||
---
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 40a7ab0..c84f0f7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -26,9 +26,9 @@ else()
|
||||
endif()
|
||||
|
||||
# Enable C++11 long long for compilers that are capable of it
|
||||
-if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
|
||||
- target_compile_features(pugixml PUBLIC cxx_long_long_type)
|
||||
-endif()
|
||||
+# if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1)
|
||||
+# target_compile_features(pugixml PUBLIC cxx_long_long_type)
|
||||
+# endif()
|
||||
|
||||
set_target_properties(pugixml PROPERTIES VERSION 1.7 SOVERSION 1)
|
||||
|
Loading…
Reference in New Issue
Block a user