[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-libexec/

[Yuta SATOH]

commit:     969c922f679a37009f133899ea4de89c4072c9fd
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Sep  9 12:14:48 2014 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Sep  9 12:14:48 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=969c922f

freebsd-libexec-10.9999_p270665.ebuild: allow upgrade directly from 9.x to 10.1.

---
 sys-freebsd/freebsd-libexec/Manifest                             | 2 +-
 .../freebsd-libexec/freebsd-libexec-10.9999_p270665.ebuild       | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/sys-freebsd/freebsd-libexec/Manifest 
b/sys-freebsd/freebsd-libexec/Manifest
index 0caa8c2..44a6dd9 100644
--- a/sys-freebsd/freebsd-libexec/Manifest
+++ b/sys-freebsd/freebsd-libexec/Manifest
@@ -8,5 +8,5 @@ AUX rusersd.xinetd 220 SHA256 
271de1cad33a65a2a0e81e8983cbb1b7ab6e2e75bbf4c6e991
 AUX sprayd.xinetd 216 SHA256 
5b2c0e14c40c3d14f16f6fbe7b1f00d133bbae8ea27e548273a16d104afea24e SHA512 
a49824ab0421560699901f54d9faf3f38fb6f8d8f63f05e33eb11da053278838e80eaabf5963b1c2a7292ba2d2118e1efd90954b2f3b2dc01b945fbadc6ce101
 WHIRLPOOL 
3869a0e4a9f03aa3654729e611a020421ec0beef2686ca8857b5ac3d50f8db26d7c1a5eb16e90aaf5b2b33e992915f7e9e504ce6bca9fd5862c2051a7172495f
 AUX walld.xinetd 215 SHA256 
b7d8cb4b69809a2ea2f479f942c3d7752c5cb1e4b3b4b7b7b590f15616a774f0 SHA512 
ab78d32e48d660649d3415a4432a5f3e98f8a6a8854791d1d828b0dc678f58e9f24532c264c5f5b039ccd706e0bb70c369ba9fb55fc9af9d3ed9b28e10b9e830
 WHIRLPOOL 
013b60056a8f5fe46eb4e00182fe0f391a2dc915312fe7e47eb372697526ed05a53e156159fd5dd3dcbf3db44a6591461c789af31ca0e1dd967537b785462802
 EBUILD freebsd-libexec-10.0.0.9999.ebuild 2519 SHA256 
9c2a8ea10adc7a7015a0a1be1a35556a07bc3329c81391416a3792efe88b2362 SHA512 
959e6027da56dd075f2eab63905d972621746b4b59cfadfd9c3a28112011d4e6bf8d0524fec14992bf56f7ce1e8acc7874c50719cd3eb54d59391f5c8a856908
 WHIRLPOOL 
8c24bc3198ddf9a947feea6f9aa1bbf74272fdcf2a202dc759428e1b242416c3632c2b2dae6a2c64a894fffffff5003b2276e19036dfb81f8b3befc22db8d48b
-EBUILD freebsd-libexec-10.9999_p270665.ebuild 2519 SHA256 
9c2a8ea10adc7a7015a0a1be1a35556a07bc3329c81391416a3792efe88b2362 SHA512 
959e6027da56dd075f2eab63905d972621746b4b59cfadfd9c3a28112011d4e6bf8d0524fec14992bf56f7ce1e8acc7874c50719cd3eb54d59391f5c8a856908
 WHIRLPOOL 
8c24bc3198ddf9a947feea6f9aa1bbf74272fdcf2a202dc759428e1b242416c3632c2b2dae6a2c64a894fffffff5003b2276e19036dfb81f8b3befc22db8d48b
+EBUILD freebsd-libexec-10.9999_p270665.ebuild 2951 SHA256 
80eec504ab016106ecf1d9ca1abbc50a7b0cba9f6c140bda9b56f5d81839e712 SHA512 
8f821b64cbf7f23956523247b5eab6c9ee4655f80c48d4a909c79a3ad040c874885b09f44571368f6ca43d69b5676fee8c7ab8eb05cbe032dfff264dd29dc530
 WHIRLPOOL 
03c7a0005653620500a77e4c2cafb1f011def0a5be71c06e68598a42c201193d205550a01b4ea0bef46171b846c4b50d6b20bd1528a63e0fb46cdc1a9425e417
 EBUILD freebsd-libexec-9.3.0.9999.ebuild 2484 SHA256 
3ce34ec17af06590dda720857a64bfb75a5a7f85fd0c38d7f10b72ab0d65af5f SHA512 
1d0badf22482005a70ce2428c7b23c5730f7c19684b37bec0cb00b30a2ca9c4dec6eae2f4f77ad3da7324e1e62f00d33d30ea0da8c5300db863a7150f045c524
 WHIRLPOOL 
07c1464cd7a9e779e288d592d695c2b0aff9c5573ceff108fda196932419251a4cbeabecc2612255aeb12882354d4c8e77d1b17b872d3835e605a56db31e7975

diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.9999_p270665.ebuild 
b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.9999_p270665.ebuild
index d8ee578..0def9ae 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-10.9999_p270665.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-10.9999_p270665.ebuild
@@ -53,6 +53,15 @@ src_prepare() {
        if [[ ! -e "${WORKDIR}/include" ]]; then
                ln -s /usr/include "${WORKDIR}/include" || die "Symlinking 
/usr/include.."
        fi
+       # allow upgrade directly from 9.x to 10.1.
+       if has_version "<sys-freebsd/freebsd-lib-10.0"; then
+               # taken from sys/sys/elf_common.h
+               echo "#define DF_1_INTERPOSE 0x00000400" >> 
"${S}"/rtld-elf/rtld.h
+               # taken from sys/sys/fcntl.h
+               echo "#define F_DUPFD_CLOEXEC 17" >> "${S}"/rtld-elf/rtld.h
+               # taken from sys/sys/cdefs.h
+               echo '#define __compiler_membar()  __asm __volatile(" " : : : 
"memory")' >> "${S}"/rtld-elf/rtld.h
+       fi
 }
 
 setup_multilib_vars() {