pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/FlightCrew Disable use of PCH, doesn't work w...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbcb49cbfe2d
branches:  trunk
changeset: 349231:cbcb49cbfe2d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jul 02 14:43:12 2016 +0000

description:
Disable use of PCH, doesn't work with GCC on 32bit platforms.

diffstat:

 textproc/FlightCrew/distinfo                                          |   5 +-
 textproc/FlightCrew/patches/patch-src_FlightCrew_CMakeLists.txt       |  22 ++++++++++
 textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt |  13 ++++-
 3 files changed, 35 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 1466c1424c4b -r cbcb49cbfe2d textproc/FlightCrew/distinfo
--- a/textproc/FlightCrew/distinfo      Sat Jul 02 14:42:30 2016 +0000
+++ b/textproc/FlightCrew/distinfo      Sat Jul 02 14:43:12 2016 +0000
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.6 2015/11/27 21:45:19 joerg Exp $
+$NetBSD: distinfo,v 1.7 2016/07/02 14:43:12 joerg Exp $
 
 SHA1 (FlightCrew-0.7.2-Code.zip) = 16afdb4fcb30275070907c27857f89930bd8a322
 RMD160 (FlightCrew-0.7.2-Code.zip) = d6c71d8d1d9c79a0eaa211fea91cda5c1af84c7a
 SHA512 (FlightCrew-0.7.2-Code.zip) = 6933cd85bab0300ee2258106225cbf23474516c4993bc1bcad6736676169eabcaf4a5b31a6cdfc2bf4ff3be8fee9432a8048615112f330d1ac55a04874d094aa
 Size (FlightCrew-0.7.2-Code.zip) = 7794710 bytes
 SHA1 (patch-CMakeLists.txt) = 8423ab7b53fad354e04fdfd159b070a8f8bf61f9
+SHA1 (patch-src_FlightCrew_CMakeLists.txt) = 2c60cb722bb7613f007f2e3a644f1d9f8509f8ba
 SHA1 (patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp) = 53fbd6e1b1b9a11739f16383406f10ddaa253293
-SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = a505955df3d6d1901f0a331311fa401ba9fec3ba
+SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = 79b165b1b6c4801a92868d4ad1b6496f3bf0d34a
 SHA1 (patch-src_XercesExtensions_LocationAwareDOMParser.cpp) = 5c49d264d7257ea988ef1a8f335ec59799ff3fce
 SHA1 (patch-src_utf8-cpp_utf8_core.h) = 1ff6b89132f1ff671e48735ca11153d17d38fd17
diff -r 1466c1424c4b -r cbcb49cbfe2d textproc/FlightCrew/patches/patch-src_FlightCrew_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/FlightCrew/patches/patch-src_FlightCrew_CMakeLists.txt   Sat Jul 02 14:43:12 2016 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_FlightCrew_CMakeLists.txt,v 1.1 2016/07/02 14:43:12 joerg Exp $
+
+--- src/FlightCrew/CMakeLists.txt.orig 2016-07-02 09:58:43.000000000 +0000
++++ src/FlightCrew/CMakeLists.txt
+@@ -55,7 +55,7 @@ set( ALL_INCLUDES ${BoostParts_SOURCE_DI
+                   ${zipios_SOURCE_DIR} )
+ set( GCC_PCH_TARGET gccPCH_fc )
+ 
+-precompiled_header( SOURCES ALL_INCLUDES ${GCC_PCH_TARGET} ${PCH_NAME} )
++# precompiled_header( SOURCES ALL_INCLUDES ${GCC_PCH_TARGET} ${PCH_NAME} )
+ 
+ #############################################################################
+ 
+@@ -112,7 +112,7 @@ elseif( CMAKE_COMPILER_IS_GNUCXX )
+     add_definitions( -Wall )
+ 
+     # Make sure the PCH is built for GCC
+-    add_dependencies( ${PROJECT_NAME} ${GCC_PCH_TARGET} )
++    #add_dependencies( ${PROJECT_NAME} ${GCC_PCH_TARGET} )
+ endif()
+ 
+ # needed for correct Xerces header inclusion
diff -r 1466c1424c4b -r cbcb49cbfe2d textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt
--- a/textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt     Sat Jul 02 14:42:30 2016 +0000
+++ b/textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt     Sat Jul 02 14:43:12 2016 +0000
@@ -1,10 +1,17 @@
-$NetBSD: patch-src_FlightCrew_tests_CMakeLists.txt,v 1.1.1.1 2011/07/29 19:32:18 ryoon Exp $
+$NetBSD: patch-src_FlightCrew_tests_CMakeLists.txt,v 1.2 2016/07/02 14:43:12 joerg Exp $
 
 * libgtest is needed.
 
---- src/FlightCrew/tests/CMakeLists.txt.orig   2010-11-11 10:05:50.000000000 +0000
+--- src/FlightCrew/tests/CMakeLists.txt.orig   2011-08-11 21:03:56.000000000 +0000
 +++ src/FlightCrew/tests/CMakeLists.txt
-@@ -65,7 +65,7 @@ precompiled_header( TEST_SOURCES ALL_INC
+@@ -59,13 +59,13 @@ set( ALL_INCLUDES ${gtest_SOURCE_DIR}/in
+ 
+ set( GCC_PCH_TARGET gccPCH_tests )
+ 
+-precompiled_header( TEST_SOURCES ALL_INCLUDES ${GCC_PCH_TARGET} ${PCH_NAME} )
++# precompiled_header( TEST_SOURCES ALL_INCLUDES ${GCC_PCH_TARGET} ${PCH_NAME} )
+ 
+ #############################################################################
  
  add_executable( ${PROJECT_NAME} ${TEST_SOURCES} )
  



Home | Main Index | Thread Index | Old Index