Bug#934604: aom: FTBFS on kfreebsd-any
Source: aom
Version: 1.0.0-3
Severity: important
Tags: ftbfs, patch
User: debian-kbsd@lists.debian.org
Usertags: kfreebsd
Hello,
Currently aom FTBFS on GNU/kFreeBSD due to missing port to that
architecture. The attached patches fixes that problem.
The the patches build_cmake_aom_optimization.cmake.patch and
build_cmake_aom_configure.cmake fixes the build on kfreebsd-i386 and
kfreebsd-amd64.
The package built previously on kfreebsd-amd64 but that was pure luck,
due to that the CPU was detected as generic instead of x86_64.
Thanks!
Index: aom-1.0.0/build/cmake/aom_configure.cmake
===================================================================
--- aom-1.0.0.orig/build/cmake/aom_configure.cmake
+++ aom-1.0.0/build/cmake/aom_configure.cmake
@@ -50,7 +50,7 @@ endforeach()
# Detect target CPU.
if(NOT AOM_TARGET_CPU)
- if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64" OR
+ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "amd64" OR
"${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
if(${CMAKE_SIZEOF_VOID_P} EQUAL 4)
set(AOM_TARGET_CPU "x86")
Index: aom-1.0.0/build/cmake/aom_optimization.cmake
===================================================================
--- aom-1.0.0.orig/build/cmake/aom_optimization.cmake
+++ aom-1.0.0/build/cmake/aom_optimization.cmake
@@ -83,7 +83,8 @@ function(get_asm_obj_format out_format)
if("${AOM_TARGET_CPU}" STREQUAL "x86_64")
if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
set(objformat "macho64")
- elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
+ elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux" OR "${AOM_TARGET_SYSTEM}"
+ STREQUAL "kFreeBSD")
set(objformat "elf64")
elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}"
STREQUAL "Windows")
@@ -94,7 +95,8 @@ function(get_asm_obj_format out_format)
elseif("${AOM_TARGET_CPU}" STREQUAL "x86")
if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
set(objformat "macho32")
- elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux")
+ elseif("${AOM_TARGET_SYSTEM}" STREQUAL "Linux" OR "${AOM_TARGET_SYSTEM}"
+ STREQUAL "kFreeBSD")
set(objformat "elf32")
elseif("${AOM_TARGET_SYSTEM}" STREQUAL "MSYS" OR "${AOM_TARGET_SYSTEM}"
STREQUAL "Windows")
Reply to: