[FFmpeg-devel] [PATCH] configure: Add workaround for qtkit detection using ICC, compiler.

[Thilo Borgmann]

Am 06.04.14 19:58, schrieb Michael Niedermayer:
> On Sun, Apr 06, 2014 at 06:53:18PM +0200, Thilo Borgmann wrote:
>> Am 06.04.14 15:52, schrieb Michael Niedermayer:
>>> On Sun, Apr 06, 2014 at 03:02:16PM +0200, Thilo Borgmann wrote:
>>>> Like Reimar suggested on log, this works for me for proper detection of qtkit using:
>>>>
>>>> Mac OS X 10.9 with clang
>>>> Linux with gcc
>>>> Linux with icc
>>>>
>>>> -Thilo
>>>
>>>>  configure |    2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>> 96f5a6cf4915a1b8139050b48e08e1cc673871f4  0001-configure-Add-workaround-for-qtkit-detection-using-I.patch
>>>> From d9a1e4177d2bc55410c747576f8bc5820d4938ab Mon Sep 17 00:00:00 2001
>>>> From: Thilo Borgmann <thilo.borgmann at mail.de>
>>>> Date: Sun, 6 Apr 2014 14:57:24 +0200
>>>> Subject: [PATCH] configure: Add workaround for qtkit detection using ICC
>>>>  compiler.
>>>>
>>>> ---
>>>>  configure | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/configure b/configure
>>>> index f238276..945c847 100755
>>>> --- a/configure
>>>> +++ b/configure
>>>> @@ -4671,7 +4671,7 @@ enabled openssl           && { check_lib openssl/ssl.h SSL_library_init -lssl -l
>>>>                                 check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
>>>>                                 check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
>>>>                                 die "ERROR: openssl not found"; }
>>>> -enabled qtkit_indev      && { check_header_oc QTKit/QTKit.h || disable qtkit_indev; }
>>>> +enabled qtkit_indev      && { { check_header QTKit/QTKit.h && check_header_oc QTKit/QTKit.h; } || disable qtkit_indev; }
>>>
>>> applied
>>>
>>> though if someone can fix check_header_oc that would probably be
>>> better
>>>
>>> maybe by checking if a output file has been created or something like
> 
>>> that (dont forget to make sure the output file doesnt exist before
>>> the test)
> 
> where is TMPO deleted between tests ?
> 
> from what i see you just check if anything, ever created output
> not if the most recent call did

Ok TMPO was an existing file and not generated by icc... no need for a
check_exec_oc...

The patch attached works for the three test cases I have.

Thanks!

-Thilo
-------------- next part --------------
>From d48ed4fb667ca2180d4c20986dcb7ef0407b5d4d Mon Sep 17 00:00:00 2001
From: Thilo Borgmann <thilo.borgmann at mail.de>
Date: Sun, 6 Apr 2014 23:17:08 +0200
Subject: [PATCH] configure: Check for generated output in check_header_oc.

---
 configure | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index f47c39f..682c1f8 100755
--- a/configure
+++ b/configure
@@ -776,6 +776,11 @@ check_cmd(){
     "$@" >> $logfile 2>&1
 }
 
+check_stat(){
+    log check_stat "$@"
+    stat "$1" >> $logfile 2>&1
+}
+
 cc_o(){
     eval printf '%s\\n' $CC_O
 }
@@ -952,13 +957,14 @@ EOF
 
 check_header_oc(){
     log check_header_oc "$@"
+    rm -f -- "$TMPO"
     header=$1
     shift
     disable_safe $header
     {
        echo "#include <$header>"
        echo "int main(void) { return 0; }"
-    } | check_oc "$@" && enable_safe $headers
+    } | check_oc && check_stat "$TMPO" && enable_safe $headers
 }
 
 check_func(){
@@ -4668,7 +4674,7 @@ enabled openssl           && { check_lib openssl/ssl.h SSL_library_init -lssl -l
                                check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
                                check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
                                die "ERROR: openssl not found"; }
-enabled qtkit_indev      && { { check_header QTKit/QTKit.h && check_header_oc QTKit/QTKit.h; } || disable qtkit_indev; }
+enabled qtkit_indev      && { check_header_oc QTKit/QTKit.h || disable qtkit_indev; }
 
 if enabled gnutls; then
     { check_lib nettle/bignum.h nettle_mpz_get_str_256 -lnettle -lhogweed -lgmp && enable nettle; } ||
-- 
1.8.3.2