Indeed. Bugs go to the "lowest" branch they occur on. Branches get merged with higher branches every once in a while, so then the fix gets propagated.
So please graft. If you graft, a merge shouldn't cause a conflict.
On 19/09/14 12:56, Dimitar Nedev wrote:
Yes, It should go to the Oct2014 branch as well. I was planning to graft it, although thinking about it now, committing to the Oct2014 branch would've been easier.
Best, Dimitar
On 2014-Sep-19, at 11:47 , Sjoerd Mullender sjoerd@monetdb.org wrote:
Shouldn't this go to the Oct2014 branch?
On 19/09/14 11:45, Dimitar Nedev wrote:
Changeset: 10ae6a3308bf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=10ae6a3308bf Modified Files: configure.ag Branch: default Log Message:
Disable -pthread for Clang 6.* This is in line OS X Yosemite and more specifically Xcode 6.0.1 shipping with Clang verion 6
diffs (19 lines):
diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -1885,11 +1885,11 @@ if test "x$have_pthread" != xno; then save_LIBS="$LIBS" save_CPPFLAGS="$CPPFLAGS" case $GCC-$have_pthread-$CC_ver in
yes-auto-clang-5.*|yes-yes-clang-5.*)# clang 5.* (at least on Mac OSX Mavericks) does not
yes-auto-clang-5.*|yes-yes-clang-5.*|yes-auto-clang-6.*|yes-yes-clang-6.*)# clang 5.*/6.* (Xcode 6.0) does not # seem to have / require -pthread as compiler
# option; on Mac OSX Mavericks, "Apple LLVM version# 5.0 (clang-500.2.79) (based on LLVM 3.3svn)"
# option; on Mac OS X Yosamite, "Apple LLVM# version 6.0 (clang-600.0.51) (based on LLVM 3.5svn)" # complains about "error: argument unused during # compilation: '-pthread'". # However, disabling -pthread completely might be
checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
-- Sjoerd Mullender
developers-list mailing list developers-list@monetdb.org https://www.monetdb.org/mailman/listinfo/developers-list
developers-list mailing list developers-list@monetdb.org https://www.monetdb.org/mailman/listinfo/developers-list