gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

sys-libs/compiler-rt-sanitizers: LLVM_SLOT -> LLVM_MAX_SLOT

Browse Source
This commit is contained in:
Michał Górny
2018-03-15 15:59:32 +01:00
parent ade5b255f1
commit e5afd9d075
5 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
View File

@@ -21,7 +21,7 @@ SLOT="${PV%_*}"
KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
LLVM_SLOT=${SLOT%%.*}
LLVM_MAX_SLOT=${SLOT%%.*}
RDEPEND="!=sys-libs/compiler-rt-sanitizers-${SLOT}*:0"
# llvm-4 needed for --cmakedir
DEPEND="
@@ -29,7 +29,7 @@ DEPEND="
test? (
app-portage/unsandbox
$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
sys-libs/compiler-rt:${SLOT} )
${PYTHON_DEPS}"
@@ -90,14 +90,14 @@ src_configure() {
-DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"
# they are created during src_test()
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang++"
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
)
# same flags are passed for build & tests, so we need to strip
# them down to a subset supported by clang
CC=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++ \
CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
strip-unsupported-flags
fi
@@ -110,17 +110,17 @@ src_configure() {
# copy clang over since resource_dir is located relatively to binary
# therefore, we can put our new libraries in it
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/bin/ || die
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
cp "${sys_dir}"/*builtins*.a \
"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
# we also need LLVMgold.so for gold-based tests
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/$(get_libdir)/ || die
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
fi
fi
}

24
sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild
View File

@@ -23,14 +23,14 @@ SLOT="${PV%_*}"
KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
LLVM_SLOT=${SLOT%%.*}
LLVM_MAX_SLOT=${SLOT%%.*}
# llvm-4 needed for --cmakedir
DEPEND="
>=sys-devel/llvm-4
test? (
app-portage/unsandbox
$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
sys-libs/compiler-rt:${SLOT} )
${PYTHON_DEPS}"
@@ -90,14 +90,14 @@ src_configure() {
-DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit"
# they are created during src_test()
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang++"
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
)
# same flags are passed for build & tests, so we need to strip
# them down to a subset supported by clang
CC=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++ \
CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
strip-unsupported-flags
fi
@@ -117,17 +117,17 @@ src_configure() {
# copy clang over since resource_dir is located relatively to binary
# therefore, we can put our new libraries in it
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/bin/ || die
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
cp "${sys_dir}"/*builtins*.a \
"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
# we also need LLVMgold.so for gold-based tests
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/$(get_libdir)/ || die
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
fi
fi
}

24
sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild
View File

@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86
IUSE="+clang test"
RESTRICT="!test? ( test ) !clang? ( test )"
LLVM_SLOT=${SLOT%%.*}
LLVM_MAX_SLOT=${SLOT%%.*}
# llvm-6 for new lit options
DEPEND="
>=sys-devel/llvm-6
@@ -33,7 +33,7 @@ DEPEND="
test? (
!<sys-apps/sandbox-2.13
$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
sys-libs/compiler-rt:${SLOT} )
${PYTHON_DEPS}"
@@ -102,14 +102,14 @@ src_configure() {
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
# they are created during src_test()
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang++"
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
)
# same flags are passed for build & tests, so we need to strip
# them down to a subset supported by clang
CC=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++ \
CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
strip-unsupported-flags
fi
@@ -129,17 +129,17 @@ src_configure() {
# copy clang over since resource_dir is located relatively to binary
# therefore, we can put our new libraries in it
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/bin/ || die
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
cp "${sys_dir}"/*builtins*.a \
"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
# we also need LLVMgold.so for gold-based tests
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/$(get_libdir)/ || die
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
fi
fi
}

24
sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild
View File

@@ -25,7 +25,7 @@ KEYWORDS=""
IUSE="+clang test"
RESTRICT="!test? ( test ) !clang? ( test )"
LLVM_SLOT=${SLOT%%.*}
LLVM_MAX_SLOT=${SLOT%%.*}
# llvm-6 for new lit options
DEPEND="
>=sys-devel/llvm-6
@@ -33,7 +33,7 @@ DEPEND="
test? (
!<sys-apps/sandbox-2.13
$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
sys-libs/compiler-rt:${SLOT} )
${PYTHON_DEPS}"
@@ -103,14 +103,14 @@ src_configure() {
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
# they are created during src_test()
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang++"
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
)
# same flags are passed for build & tests, so we need to strip
# them down to a subset supported by clang
CC=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++ \
CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
strip-unsupported-flags
fi
@@ -130,17 +130,17 @@ src_configure() {
# copy clang over since resource_dir is located relatively to binary
# therefore, we can put our new libraries in it
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/bin/ || die
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
cp "${sys_dir}"/*builtins*.a \
"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
# we also need LLVMgold.so for gold-based tests
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/$(get_libdir)/ || die
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
fi
fi
}

24
sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild
View File

@@ -24,7 +24,7 @@ KEYWORDS=""
IUSE="+clang test"
RESTRICT="!test? ( test ) !clang? ( test )"
LLVM_SLOT=${SLOT%%.*}
LLVM_MAX_SLOT=${SLOT%%.*}
# llvm-6 for new lit options
DEPEND="
>=sys-devel/llvm-6
@@ -32,7 +32,7 @@ DEPEND="
test? (
!<sys-apps/sandbox-2.13
$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
=sys-devel/clang-${PV%_*}*:${LLVM_SLOT}
=sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT}
sys-libs/compiler-rt:${SLOT} )
${PYTHON_DEPS}"
@@ -102,14 +102,14 @@ src_configure() {
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
# they are created during src_test()
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang++"
-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang"
-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++"
)
# same flags are passed for build & tests, so we need to strip
# them down to a subset supported by clang
CC=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++ \
CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \
CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \
strip-unsupported-flags
fi
@@ -129,17 +129,17 @@ src_configure() {
# copy clang over since resource_dir is located relatively to binary
# therefore, we can put our new libraries in it
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/bin/ || die
mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die
cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
cp "${sys_dir}"/*builtins*.a \
"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
# we also need LLVMgold.so for gold-based tests
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/$(get_libdir)/ || die
if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \
"${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die
fi
fi
}