Repository: geode-native Updated Branches: refs/heads/develop 709ef5f75 -> d898e629b
GEODE-3279: Fixes Solaris packer image and builds. - Install some toold via OpenCSW. - Install CMake from source to avoid conflicts in pkg. - Corrects compiler issue on ambiguous statement. Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/d898e629 Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/d898e629 Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/d898e629 Branch: refs/heads/develop Commit: d898e629bb050838851f76ffca0e49161dafd9b6 Parents: 709ef5f Author: Jacob Barrett <jbarr...@pivotal.io> Authored: Thu Jul 20 14:43:28 2017 -0700 Committer: Jacob Barrett <jbarr...@pivotal.io> Committed: Thu Jul 20 14:43:28 2017 -0700 ---------------------------------------------------------------------- packer/build-solaris-x86.json | 3 ++- packer/solaris/install-build-tools.sh | 11 ++++----- packer/solaris/install-cmake.sh | 34 ++++++++++++++++++++++++++++ packer/solaris/install-solarisstudio.sh | 4 ++-- packer/solaris/install-test-tools.sh | 3 --- src/cppcache/src/LRUList.hpp | 4 ++-- 6 files changed, 45 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/d898e629/packer/build-solaris-x86.json ---------------------------------------------------------------------- diff --git a/packer/build-solaris-x86.json b/packer/build-solaris-x86.json index 69389b8..b01519e 100644 --- a/packer/build-solaris-x86.json +++ b/packer/build-solaris-x86.json @@ -38,7 +38,8 @@ "scripts":[ "solaris/install-opencsw.sh", "solaris/install-build-tools.sh", - "solaris/install-solarisstudio.sh" + "solaris/install-solarisstudio.sh", + "solaris/install-cmake.sh" ] }, { http://git-wip-us.apache.org/repos/asf/geode-native/blob/d898e629/packer/solaris/install-build-tools.sh ---------------------------------------------------------------------- diff --git a/packer/solaris/install-build-tools.sh b/packer/solaris/install-build-tools.sh index 9a7bbed..11ab841 100755 --- a/packer/solaris/install-build-tools.sh +++ b/packer/solaris/install-build-tools.sh @@ -17,8 +17,6 @@ set -x -e -o pipefail -# Remove meta-packages that prevent installation of updated tools -pkg uninstall -v entire consolidation/userland/userland-incorporation pkg change-facet \ facet.version-lock.consolidation/java-8/java-8-incorporation=false @@ -26,12 +24,13 @@ pkg change-facet \ pkg install -v --accept \ system/header \ developer/assembler \ - developer/documentation-tool/doxygen \ developer/java/jdk-8 \ developer/build/gnu-make \ - developer/build/cmake \ archiver/gnu-tar \ text/gnu-patch -# dependent perl package conflict developer/versioning/git -/opt/csw/bin/pkgutil -i -y git +# too many conflicts with system libraries, use opencsw +/opt/csw/bin/pkgutil -U +/opt/csw/bin/pkgutil -i -y \ + git \ + doxygen http://git-wip-us.apache.org/repos/asf/geode-native/blob/d898e629/packer/solaris/install-cmake.sh ---------------------------------------------------------------------- diff --git a/packer/solaris/install-cmake.sh b/packer/solaris/install-cmake.sh new file mode 100644 index 0000000..402ea11 --- /dev/null +++ b/packer/solaris/install-cmake.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +set -x -e -o pipefail + +NCPU=4 + +pushd `mktemp -d` +wget -O - https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz | \ + gtar --strip-components=1 -zxf - +./bootstrap --system-curl --no-qt-gui --parallel=$NCPU -- -DBUILD_CursesDialog=off +gmake -j$NCPU +gmake install +popd + +p='PATH=$PATH:/usr/local/bin; export PATH' +echo "$p" >> ~/.profile +echo "$p" >> ~/.bashrc +echo "$p" >> /etc/skel/.profile +echo "$p" >> /etc/skel/.bashrc http://git-wip-us.apache.org/repos/asf/geode-native/blob/d898e629/packer/solaris/install-solarisstudio.sh ---------------------------------------------------------------------- diff --git a/packer/solaris/install-solarisstudio.sh b/packer/solaris/install-solarisstudio.sh index f3b61cf..ce23cc5 100644 --- a/packer/solaris/install-solarisstudio.sh +++ b/packer/solaris/install-solarisstudio.sh @@ -26,9 +26,9 @@ pkg set-publisher \ -c /var/pkg/ssl/pkg.oracle.com.certificate.pem \ -G '*' -g https://pkg.oracle.com/solarisstudio/release solarisstudio -pkg install --accept -v developerstudio-125/c++ developerstudio-125/dbx +pkg install --accept -v developerstudio-126/c++ developerstudio-126/dbx -p='PATH=$PATH:/opt/developerstudio12.5/bin; export PATH' +p='PATH=$PATH:/opt/developerstudio12.6/bin; export PATH' echo "$p" >> ~/.profile echo "$p" >> ~/.bashrc echo "$p" >> /etc/skel/.profile http://git-wip-us.apache.org/repos/asf/geode-native/blob/d898e629/packer/solaris/install-test-tools.sh ---------------------------------------------------------------------- diff --git a/packer/solaris/install-test-tools.sh b/packer/solaris/install-test-tools.sh index b7b543d..2cbeb9d 100755 --- a/packer/solaris/install-test-tools.sh +++ b/packer/solaris/install-test-tools.sh @@ -17,13 +17,10 @@ set -x -e -o pipefail -# Remove meta-packages that prevent installation of updated tools -pkg uninstall -v entire consolidation/userland/userland-incorporation pkg change-facet \ facet.version-lock.consolidation/java-8/java-8-incorporation=false # Install required tools pkg install -v --accept \ developer/java/jdk-8 \ - developer/build/cmake \ archiver/gnu-tar http://git-wip-us.apache.org/repos/asf/geode-native/blob/d898e629/src/cppcache/src/LRUList.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/LRUList.hpp b/src/cppcache/src/LRUList.hpp index 71342f9..654ec06 100644 --- a/src/cppcache/src/LRUList.hpp +++ b/src/cppcache/src/LRUList.hpp @@ -48,11 +48,11 @@ class CPPCACHE_EXPORT LRUEntryProperties { inline void clearRecentlyUsed() { m_bits &= ~RECENTLY_USED_BITS; } inline bool testRecentlyUsed() const { - return (m_bits & RECENTLY_USED_BITS) == RECENTLY_USED_BITS; + return (m_bits.load() & RECENTLY_USED_BITS) == RECENTLY_USED_BITS; } inline bool testEvicted() const { - return (m_bits & EVICTED_BITS) == EVICTED_BITS; + return (m_bits.load() & EVICTED_BITS) == EVICTED_BITS; } inline void setEvicted() { m_bits |= EVICTED_BITS; }
