Skip to content

Commit b798f9b

Browse files
committed
contrib: New clang patch for install_db4
Replace the clang patch with a new and improved version that also fixes the build issues with OpenBSD and FreeBSD's clang, and apply it unconditionally. This needs testing on OSX.
1 parent 1808660 commit b798f9b

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

contrib/install_db4.sh

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,11 @@ http_get "${BDB_URL}" "${BDB_VERSION}.tar.gz" "${BDB_HASH}"
6060
tar -xzvf ${BDB_VERSION}.tar.gz -C "$BDB_PREFIX"
6161
cd "${BDB_PREFIX}/${BDB_VERSION}/"
6262

63-
# Apply a patch when building on OS X to make the build work with Xcode.
64-
#
65-
if [ "$(uname)" = "Darwin" ]; then
66-
BDB_OSX_ATOMIC_PATCH_URL='https://raw.githubusercontent.com/narkoleptik/os-x-berkeleydb-patch/0007e2846ae3fc9757849f5277018f4179ad17ef/atomic.patch'
67-
BDB_OSX_ATOMIC_PATCH_HASH='ba0e2b4f53e9cb0ec58f60a979b53b8567b4565f0384886196f1fc1ef111d151'
68-
69-
http_get "${BDB_OSX_ATOMIC_PATCH_URL}" atomic.patch "${BDB_OSX_ATOMIC_PATCH_HASH}"
70-
patch -p1 < atomic.patch
71-
fi
63+
# Apply a patch necessary when building with clang and c++11 (see https://community.oracle.com/thread/3952592)
64+
CLANG_CXX11_PATCH_URL='https://gist.githubusercontent.com/LnL7/5153b251fd525fe15de69b67e63a6075/raw/7778e9364679093a32dec2908656738e16b6bdcb/clang.patch'
65+
CLANG_CXX11_PATCH_HASH='7a9a47b03fd5fb93a16ef42235fa9512db9b0829cfc3bdf90edd3ec1f44d637c'
66+
http_get "${CLANG_CXX11_PATCH_URL}" clang.patch "${CLANG_CXX11_PATCH_HASH}"
67+
patch -p2 < clang.patch
7268

7369
cd build_unix/
7470

0 commit comments

Comments
 (0)