aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Shelton <stuart@shelton.me>2016-06-05 23:04:15 +0100
committerStuart Shelton <stuart@shelton.me>2016-06-05 23:04:15 +0100
commit80c58f63a34b237de73f5fd962326bba8058c91a (patch)
tree3f12e407f1ec5c8e8db7e0f80a246de678ea5728 /sys-libs
parentUpdate sys-apps/gawk-4.1.3 (diff)
downloadsrcshelton-80c58f63a34b237de73f5fd962326bba8058c91a.tar.gz
srcshelton-80c58f63a34b237de73f5fd962326bba8058c91a.tar.bz2
srcshelton-80c58f63a34b237de73f5fd962326bba8058c91a.zip
Update sys-libs/db-5.1.29-r1
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/db/Manifest2
-rw-r--r--sys-libs/db/db-5.1.29-r1.ebuild8
2 files changed, 6 insertions, 4 deletions
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index e796e399..4083b9d8 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -5,4 +5,4 @@ AUX db-4.8.24-java-manifest-location.patch 592 SHA256 1589885b89ff465fe752c3062e
AUX db-4.8.30-rename-atomic-compare-exchange.patch 852 SHA256 a9f9e73018a275079e70d5eb9819d09c7c64356b813992a824aef04b268b1be2 SHA512 8ba96cfc3e484a839b8651214f0769b35273c6235de7e53d5118eb0347f5a477f75e3336a12f1399b7748c6b6ab95aec39c8b813d7b227dd61f37ed4ab52f7d5 WHIRLPOOL 1b2745a6b0897f05071e6e2a938655f0e6d575e5877686e67716d79eb9cc26397c57ef517ad59721dfd2534e29f7143eefb3d352b68610bc6d3e863e64adc47b
AUX db-5.1-clang-builtins.patch 836 SHA256 2f02b953d32a12ad2c95323dbbeceb9e5c02ee622af9174ca457f0f8540637a5 SHA512 671973b7f38defcb91b76287bd2dca4c55cf2ebfe3e12533882953cc8187fd7cf435d40ab3e4d351e405894d8ca65f04cbf79d18259c49816e77d5c304173c58 WHIRLPOOL edd3a7638fc838ccd9fba3ceab4c3bd175f5473c2a98c1b3d3c595fa49ea12b5f75252a8d18ae9614c0632c46b7bf2b3d937d29e44253ef91e28300b16accb7b
DIST db-5.1.29.tar.gz 32188074 SHA256 a943cb4920e62df71de1069ddca486d408f6d7a09ddbbb5637afe7a229389182 SHA512 b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0 WHIRLPOOL c2c5e335a8ed85f9dd947eb8225148c9633d21f5e17d321a6938b50d4bf061e735563cdbefb8c8aa457923ef80e778f95ad80aba4a92a381432ecf52c2a25353
-EBUILD db-5.1.29-r1.ebuild 6842 SHA256 dbd548864c0d793a6bd97b171ec7905034c66b2be3e3e79f264199c71aa06593 SHA512 c312c375a5d488f62d45b10fd660f68df488e5a18602d326aab51daf2aece691797fcdd0418e60963e5933f6f6ff4bd3cf78e0322cc248cfa70299e86300a7e3 WHIRLPOOL d740c20cd35ab3baa26874565c6929240f8c6674b6ff2aecff7c4b65415952ee28a4b3ad89fa89621a44266671e20aab53a3a1efb1fdd1117ea3f80364142b2c
+EBUILD db-5.1.29-r1.ebuild 6868 SHA256 c0c3133430ff45960e7b3de04c97caa85560318c178dee751c4d33d34dc06e46 SHA512 2d55c5dd7ed4117dff68a7e4ccfb735b6affa7455b679b25b10d6d74eca31340c91aadc5fd5f56c4556728079a79a5895f31e9d5b37ae8009474e1d17e908edd WHIRLPOOL 7c0efe21b5b70f1576b01cd903a1fd8a9c7e097905a676fcb11deb3d1e85e7394de9b8617b42820255a4165e7adf7ee6958e69cb58a8d7d653e18d8547a73046
diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r1.ebuild
index 54d4b737..73f5dc2e 100644
--- a/sys-libs/db/db-5.1.29-r1.ebuild
+++ b/sys-libs/db/db-5.1.29-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id: cac26457da2bef83a921b791f537673c4628baab $
+# $Id: 07152689e8a56e5cfb9a38ce4e2e7cf80d33a5d6 $
# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-5.1.29-r1.ebuild,v 1.3 2015/03/20 14:41:50 jlec Exp $
EAPI=5
@@ -54,7 +54,6 @@ src_prepare() {
done
epatch "${FILESDIR}"/${PN}-4.8-libtool.patch
epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch
- epatch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch
pushd dist > /dev/null || die "Cannot cd to 'dist'"
@@ -83,6 +82,9 @@ src_prepare() {
# merged upstream in 5.0.26
#epatch "${FILESDIR}"/${PN}-5.0.21-enable-dbm-autoconf.patch
+ # Needed when compiling with clang
+ epatch "${FILESDIR}"/${P}-rename-atomic-compare-exchange.patch
+
# Upstream release script grabs the dates when the script was run, so lets
# end-run them to keep the date the same.
export REAL_DB_RELEASE_DATE="$(awk \
@@ -203,7 +205,7 @@ src_install() {
[[ ${CHOST} == *-darwin* ]] && ext=jnilib #313085
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.${ext}
java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
- rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
+ rm "${ED}"/usr/"$(get_libdir)"/*.jar
fi
}