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-gfx/blender: clang/lld build fixes #34938

Closed
wants to merge 2 commits into from
Closed

media-gfx/blender: clang/lld build fixes #34938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b9b1ac
media-gfx/blender: fix error "string sub-command REGEX, mode REPLACE …
AngryLoki Jan 21, 2024
ca3d32e
media-gfx/blender: fix ld.lld: error: version script assignment error
AngryLoki Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions media-gfx/blender/blender-3.3.6-r1.ebuild
View file
Open in desktop
Expand Up @@ -214,6 +214,9 @@ src_prepare() {
}

src_configure() {
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)

append-lfs-flags

local mycmakeargs=(
Expand Down
3 changes: 3 additions & 0 deletions media-gfx/blender/blender-3.3.8.ebuild
View file
Open in desktop
Expand Up @@ -214,6 +214,9 @@ src_prepare() {
}

src_configure() {
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)

append-lfs-flags

local mycmakeargs=(
Expand Down
3 changes: 3 additions & 0 deletions media-gfx/blender/blender-3.4.1-r3.ebuild
View file
Open in desktop
Expand Up @@ -221,6 +221,9 @@ src_prepare() {
}

src_configure() {
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)

append-lfs-flags
blender_get_version

Expand Down
3 changes: 3 additions & 0 deletions media-gfx/blender/blender-3.5.1-r1.ebuild
View file
Open in desktop
Expand Up @@ -224,6 +224,9 @@ src_prepare() {
}

src_configure() {
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)

append-lfs-flags
blender_get_version

Expand Down
3 changes: 3 additions & 0 deletions media-gfx/blender/blender-3.6.0.ebuild
View file
Open in desktop
Expand Up @@ -224,6 +224,9 @@ src_prepare() {
}

src_configure() {
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)

append-lfs-flags
blender_get_version

Expand Down
3 changes: 3 additions & 0 deletions media-gfx/blender/blender-3.6.5.ebuild
View file
Open in desktop
Expand Up @@ -222,6 +222,9 @@ src_prepare() {
}

src_configure() {
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)

append-lfs-flags
blender_get_version

Expand Down
7 changes: 7 additions & 0 deletions media-gfx/blender/blender-4.0.1.ebuild
View file
Open in desktop
Expand Up @@ -141,6 +141,10 @@ BDEPEND="
)
"

PATCHES=(
"${FILESDIR}/${PN}-4.0.1-fix-cflags-cleaner.patch" # to be dropped for releases after Dec 8, 2023
)

blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp

Expand Down Expand Up @@ -233,6 +237,9 @@ src_prepare() {
}

src_configure() {
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)

append-lfs-flags
blender_get_version

Expand Down
3 changes: 3 additions & 0 deletions media-gfx/blender/blender-9999.ebuild
View file
Open in desktop
Expand Up @@ -235,6 +235,9 @@ src_prepare() {
}

src_configure() {
# Workaround for bug #922600
append-ldflags $(test-flags-CCLD -Wl,--undefined-version)

append-lfs-flags
blender_get_version

Expand Down
39 changes: 39 additions & 0 deletions media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch
View file
Open in desktop
@@ -0,0 +1,39 @@
Fix CMake Error: string sub-command REGEX, mode REPLACE needs at least 6 arguments total to command.
https://bugs.gentoo.org/922324
https://github.com/blender/blender/commit/ecd307041e4181f721bf5d2248c02ffe980edcba
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -750,11 +750,11 @@ macro(remove_c_flag
_flag)

foreach(f ${ARGV})
- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
- string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}")
+ string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
endforeach()
unset(f)
endmacro()
@@ -763,11 +763,11 @@ macro(remove_cxx_flag
_flag)

foreach(f ${ARGV})
- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL})
- string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
+ string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
endforeach()
unset(f)
endmacro()