[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Final (hopefully) set of fixes for Mac OS X Mavericks.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255
Final (hopefully) set of fixes for Mac OS X Mavericks.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeCompiler.txt'
--- CMakeCompiler.txt 2013-02-07 17:24:36 +
+++ CMakeCompiler.txt 2013-10-30 14:44:09 +
@@ -245,6 +245,12 @@
IF (APPLE)
# Needed for CFUUID*() functions in util/uuid.c.
SET(CMAKE_SHARED_LINKER_FLAGS -framework CoreFoundation ${CMAKE_SHARED_LINKER_FLAGS})
+ # Due to the Zorba debugger (wrongly) relying on the C++11-only class of
+ # std::tuple, this is necessary. Oddly, this fix seems to be necesssary only
+ # on Mac OS X Mavericks.
+ IF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
+SET(CMAKE_CXX_FLAGS -std=c++11 ${CMAKE_CXX_FLAGS})
+ ENDIF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
ELSEIF (WIN32)
# Needed for UuidCreateSequential() function in util/uuid.c.
SET(requiredlibs ${requiredlibs} Rpcrt4)
@@ -262,3 +268,6 @@
required on Linux. On Ubuntu, the 'uuid-dev' package is required;
look for similar packages on other platforms.)
ENDIF (APPLE)
+
+
+# vim:set et sw=2 ts=2:
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-10-27 15:31:16 +
+++ CMakeLists.txt 2013-10-30 14:44:09 +
@@ -73,105 +73,6 @@
SET_PROPERTY (GLOBAL PROPERTY USE_FOLDERS ON)
ENDIF(ZORBA_USE_TARGET_FOLDERS)
-###
-# Check for system include files, features, etc.
-###
-INCLUDE(CheckCXXSourceCompiles)
-INCLUDE(CheckFunctionExists)
-INCLUDE(CheckIncludeFileCXX)
-INCLUDE(CheckIncludeFiles)
-INCLUDE(CheckLibraryExists)
-INCLUDE(CheckStructHasMember)
-INCLUDE(CheckSymbolExists)
-INCLUDE(CheckTypeSize)
-INCLUDE(CheckVariableExists)
-
-INCLUDE(TestBigEndian)
-TEST_BIG_ENDIAN( BIG_ENDIAN )
-IF (${BIG_ENDIAN})
- SET( ZORBA_BIG_ENDIAN 1 )
-ELSE (${BIG_ENDIAN})
- SET( ZORBA_LITTLE_ENDIAN 1 )
-ENDIF (${BIG_ENDIAN})
-
-CHECK_INCLUDE_FILES (unicode/coll.h ZORBA_HAVE_COLL_H)
-CHECK_INCLUDE_FILES (iconv.h ZORBA_HAVE_ICONV_H)
-CHECK_INCLUDE_FILES (inttypes.h ZORBA_HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILES (limits.h ZORBA_HAVE_LIMITS_H)
-CHECK_INCLUDE_FILES (stdint.h ZORBA_HAVE_STDINT_H)
-CHECK_INCLUDE_FILES (stdlib.h ZORBA_HAVE_STDLIB_H)
-CHECK_INCLUDE_FILES (sys/param.h;sys/mount.h ZORBA_HAVE_SYS_MOUNT_H)
-CHECK_INCLUDE_FILES (sys/types.h ZORBA_HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILES (tzfile.h ZORBA_HAVE_TZFILE_H)
-CHECK_INCLUDE_FILES (unicode/ustring.hZORBA_HAVE_USTRING_H)
-CHECK_INCLUDE_FILES (unicode/utypes.h ZORBA_HAVE_UTYPES_H)
-
-IF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER 10.4)
- # execinfo is found by this macro when cross compiling for Mac OS X 10.4
- # although it shouldn't be found for this platform
- CHECK_INCLUDE_FILES (execinfo.h ZORBA_HAVE_EXECINFO_H)
-ENDIF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER 10.4)
-CHECK_INCLUDE_FILE_CXX (FlexLexer.h ZORBA_HAVE_FLEXLEXER_H)
-CHECK_INCLUDE_FILES (uuid/uuid.h ZORBA_HAVE_UUID_H)
-
-CHECK_FUNCTION_EXISTS (strtof ZORBA_HAVE_STRTOF_FUNCTION)
-CHECK_FUNCTION_EXISTS (strtollZORBA_HAVE_STRTOLL_FUNCTION)
-CHECK_FUNCTION_EXISTS (_stricmp ZORBA_HAVE_STRICMP_FUNCTION)
-CHECK_FUNCTION_EXISTS (strcat_s ZORBA_HAVE_STRCAT_S_FUNCTION)
-CHECK_FUNCTION_EXISTS (strcpy_s ZORBA_HAVE_STRCPY_S_FUNCTION)
-
-SET(CMAKE_REQUIRED_LIBRARIES pthread)
-CHECK_INCLUDE_FILES (pthread.hZORBA_HAVE_PTHREAD_H)
-CHECK_FUNCTION_EXISTS(pthread_spin_init ZORBA_HAVE_PTHREAD_SPINLOCK)
-CHECK_FUNCTION_EXISTS(pthread_mutex_init ZORBA_HAVE_PTHREAD_MUTEX)
-SET(CMAKE_REQUIRED_LIBRARIES)
-
-CHECK_INCLUDE_FILES (sys/time.h;sys/resource.h ZORBA_HAVE_RUSAGE_INCLUDES)
-CHECK_FUNCTION_EXISTS (getrusage ZORBA_HAVE_RUSAGE_FUNCTION)
-
-CHECK_TYPE_SIZE(int32_t ZORBA_HAVE_INT32_T)
-CHECK_TYPE_SIZE(uint32_t ZORBA_HAVE_UINT32_T)
-CHECK_TYPE_SIZE(unsigned __int32 ZORBA_HAVE_MS_UINT32)
-CHECK_TYPE_SIZE(__int32 ZORBA_HAVE_MS_INT32)
-CHECK_TYPE_SIZE(int64_t ZORBA_HAVE_INT64_T)
-
-CHECK_STRUCT_HAS_MEMBER(struct tm tm_gmtoff time.h ZORBA_HAVE_STRUCT_TM_TM_GMTOFF)
-CHECK_STRUCT_HAS_MEMBER(struct tm __tm_gmtoff time.h ZORBA_HAVE_STRUCT_TM___TM_GMTOFF)
-
-# C++ built-in type sizes
-CHECK_TYPE_SIZE(double ZORBA_SIZEOF_DOUBLE BUILTIN_TYPES_ONLY)
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Stage BuildZorbaUbuntu failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/451/parsed_console to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-3.0 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-3.0 into lp:zorba has been updated. Commit Message changed to: Bump version to 3.0! For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 -- https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bump-3.0 into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-3.0 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 :
Votes: {'Approve': 1}
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue result for https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/245/console to view the results. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-3.0 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-3.0 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Stage TestZorbaUbuntu failed. 2 tests failed (8576 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/399/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-3.0 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-3.0 into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-3.0 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-3.0 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 -- https://code.launchpad.net/~zorba-coders/zorba/bump-3.0/+merge/193262 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Needs Fixing Per Cezar, this didn't fix the build on his Mac. Suppressing merge until this can be worked out. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Needs Fixing
I'm on OSX Mountain Lion 10.8.5, completely clean of this branch and I was
getting file not found on #include type_traits . I added -stdlib=libc++ to
the compiler flags and it fixes the error:
IF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
- SET(CMAKE_CXX_FLAGS -std=c++11 ${CMAKE_CXX_FLAGS})
+ SET(CMAKE_CXX_FLAGS -std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS})
ENDIF (CMAKE_COMPILER_IS_GNUCXX OR CLANG)
So as it stands right now without this fix, the mac build fails for me.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve Looks good, approved. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/193255 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
