Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

media-libs/x265: Fix build on x32 by disabling assem… #173

Merged
merged 1 commit into from
Oct 14, 2015
Merged

media-libs/x265: Fix build on x32 by disabling assem… #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions media-libs/x265/files/1.8-build-Disable-march-selection-from-CMakeLists.txt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From e89069148db716d30fb81c798d0cfd83250a9f5a Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Sat, 10 Oct 2015 00:05:41 +0100
Subject: [PATCH] build: Disable -march selection from CMakeLists.txt

x32 arch as defined on https://sites.google.com/site/x32abi is neither
X86 nor X64, then forcing -march=i686 leads to build failure as wrong
-march is used.

Forcing -march, -mfloat-abi and -mfpu for ARM is also wrong

As a global sanity sake, disable all forced -march in CMakeLists
---
source/CMakeLists.txt | 7 -------
1 file changed, 7 deletions(-)

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 764d5f2..fbc0d49 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -167,14 +167,7 @@ if(GCC)
if(NATIVE_BUILD)
if(INTEL_CXX)
add_definitions(-xhost)
- else()
- add_definitions(-march=native)
endif()
- elseif(X86 AND NOT X64)
- add_definitions(-march=i686)
- endif()
- if(ARM)
- add_definitions(-march=armv6 -mfloat-abi=hard -mfpu=vfp)
endif()
if(FPROFILE_GENERATE)
if(INTEL_CXX)
9 changes: 8 additions & 1 deletion media-libs/x265/x265-1.8.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ src_unpack() {
fi
}

src_prepare() {
epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch" # bug #510890
}

multilib_src_configure() {
append-cflags -fPIC
append-cxxflags -fPIC
Expand All @@ -51,9 +55,12 @@ multilib_src_configure() {
-DLIB_INSTALL_DIR="$(get_libdir)"
)

if [ "${ABI}" = x86 ] ; then
if [[ ${ABI} = x86 ]] ; then
use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
elif [[ ${ABI} = x32 ]] ; then
# bug #510890
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi

cmake-utils_src_configure
Expand Down
5 changes: 4 additions & 1 deletion media-libs/x265/x265-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,12 @@ multilib_src_configure() {
-DLIB_INSTALL_DIR="$(get_libdir)"
)

if [ "${ABI}" = x86 ] ; then
if [[ ${ABI} = x86 ]] ; then
use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
elif [[ ${ABI} = x32 ]] ; then
# bug #510890
mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
fi

cmake-utils_src_configure
Expand Down