diff --git a/dev-libs/xdna-driver/files/xdna-driver-2.21.75-try-compile-config.patch b/dev-libs/xdna-driver/files/xdna-driver-2.21.75-try-compile-config.patch new file mode 100644 index 0000000000..93fc8bfe10 --- /dev/null +++ b/dev-libs/xdna-driver/files/xdna-driver-2.21.75-try-compile-config.patch @@ -0,0 +1,18 @@ +Build using the configuration of the chosen kernel, not /proc/config.gz + +Upstream PR: https://github.com/amd/xdna-driver/pull/1285 +--- a/src/driver/tools/configure_kernel.sh ++++ b/src/driver/tools/configure_kernel.sh +@@ -67,7 +67,11 @@ try_compile() { + conftest_c="$tmpdir/conftest.c" + conftest_mk="$tmpdir/Makefile" + USE_LLVM="" +- if [ -e /proc/config.gz ]; then ++ if [ -e "${KERNEL_SRC}/.config" ]; then ++ if grep -q "CONFIG_CC_IS_CLANG=y" "${KERNEL_SRC}/.config" 2>/dev/null; then ++ USE_LLVM="LLVM=1" ++ fi ++ elif [ -e /proc/config.gz ]; then + if zgrep -q "CONFIG_CC_IS_CLANG=y" /proc/config.gz 2>/dev/null; then + USE_LLVM="LLVM=1" + fi diff --git a/dev-libs/xdna-driver/xdna-driver-2.21.75-r1.ebuild b/dev-libs/xdna-driver/xdna-driver-2.21.75-r1.ebuild index 3209dec18b..eb4e957af1 100644 --- a/dev-libs/xdna-driver/xdna-driver-2.21.75-r1.ebuild +++ b/dev-libs/xdna-driver/xdna-driver-2.21.75-r1.ebuild @@ -119,6 +119,7 @@ src_prepare() { pushd "${WORKDIR}/${P}" || die eapply "${FILESDIR}/${PN}-2.21.75-llvm-support.patch" + eapply "${FILESDIR}/${PN}-2.21.75-try-compile-config.patch" popd || die default diff --git a/dev-libs/xdna-driver/xdna-driver-999999.ebuild b/dev-libs/xdna-driver/xdna-driver-999999.ebuild index 1e9e49bdb1..04f60feff1 100644 --- a/dev-libs/xdna-driver/xdna-driver-999999.ebuild +++ b/dev-libs/xdna-driver/xdna-driver-999999.ebuild @@ -119,6 +119,11 @@ src_unpack() { src_prepare() { sed -e "s/-Werror//" -i Kbuild || die + + pushd "${WORKDIR}/${P}" || die + eapply "${FILESDIR}/${PN}-2.21.75-try-compile-config.patch" + popd || die + default }