[FFmpeg-devel] Revert "configure: check that the required header for Linux Perf is available"

Submitted by Clément Bœsch on May 8, 2018, 3:21 p.m.

Details

Message ID 20180508152108.16415-1-u@pkh.me
State New
Headers show

Commit Message

Clément Bœsch May 8, 2018, 3:21 p.m.
This reverts commit 234a5e08313c6b8b0774796dfa1f285a3f877d14.

Linux perf is not enabled if you set --target=android, which you are
supposed to when building for Android.
---
 configure | 3 ---
 1 file changed, 3 deletions(-)

Comments

James Almer May 8, 2018, 3:24 p.m.
On 5/8/2018 12:21 PM, Clément Bœsch wrote:
> This reverts commit 234a5e08313c6b8b0774796dfa1f285a3f877d14.
> 
> Linux perf is not enabled if you set --target=android, which you are

Isn't it --target-os=android?

> supposed to when building for Android.
> ---
>  configure | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/configure b/configure
> index 7c143238a8..bdca93a9ee 100755
> --- a/configure
> +++ b/configure
> @@ -2018,7 +2018,6 @@ HEADERS_LIST="
>      ES2_gl_h
>      gsm_h
>      io_h
> -    linux_perf_event_h
>      machine_ioctl_bt848_h
>      machine_ioctl_meteor_h
>      malloc_h
> @@ -2483,7 +2482,6 @@ simd_align_32_if_any="avx"
>  simd_align_64_if_any="avx512"
>  
>  # system capabilities
> -linux_perf_deps="linux_perf_event_h"
>  symver_if_any="symver_asm_label symver_gnu_asm"
>  valgrind_backtrace_conflict="optimizations"
>  valgrind_backtrace_deps="valgrind_valgrind_h"
> @@ -5811,7 +5809,6 @@ check_header dxgidebug.h
>  check_header dxva.h
>  check_header dxva2api.h -D_WIN32_WINNT=0x0600
>  check_header io.h
> -check_header linux/perf_event.h
>  check_header libcrystalhd/libcrystalhd_if.h
>  check_header malloc.h
>  check_header net/udplite.h
> 

Assuming this is mentioned in the documentation (Our only Android fate
client doesn't set this for example, which prompted this "fix", but it
might have been an honest mistake) then this LGTM. Otherwise it
definitely needs a mention somewhere.

Patch hide | download patch | download mbox

diff --git a/configure b/configure
index 7c143238a8..bdca93a9ee 100755
--- a/configure
+++ b/configure
@@ -2018,7 +2018,6 @@  HEADERS_LIST="
     ES2_gl_h
     gsm_h
     io_h
-    linux_perf_event_h
     machine_ioctl_bt848_h
     machine_ioctl_meteor_h
     malloc_h
@@ -2483,7 +2482,6 @@  simd_align_32_if_any="avx"
 simd_align_64_if_any="avx512"
 
 # system capabilities
-linux_perf_deps="linux_perf_event_h"
 symver_if_any="symver_asm_label symver_gnu_asm"
 valgrind_backtrace_conflict="optimizations"
 valgrind_backtrace_deps="valgrind_valgrind_h"
@@ -5811,7 +5809,6 @@  check_header dxgidebug.h
 check_header dxva.h
 check_header dxva2api.h -D_WIN32_WINNT=0x0600
 check_header io.h
-check_header linux/perf_event.h
 check_header libcrystalhd/libcrystalhd_if.h
 check_header malloc.h
 check_header net/udplite.h