From patchwork Sat Jun 5 15:15:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1488223 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=tPLdtEqf; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fy39c67QZz9sT6 for ; Sun, 6 Jun 2021 01:15:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1642C607AF; Sat, 5 Jun 2021 15:15:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yAroJgtAL0ny; Sat, 5 Jun 2021 15:15:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 48DCF60795; Sat, 5 Jun 2021 15:15:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C786E1BF336 for ; Sat, 5 Jun 2021 15:15:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id B6BB660795 for ; Sat, 5 Jun 2021 15:15:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BEF7eEvzYZAH for ; Sat, 5 Jun 2021 15:15:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by smtp3.osuosl.org (Postfix) with ESMTPS id 9FFA5605E0 for ; Sat, 5 Jun 2021 15:15:41 +0000 (UTC) Received: by mail-wm1-x32c.google.com with SMTP id p13-20020a05600c358db029019f44afc845so7217538wmq.3 for ; Sat, 05 Jun 2021 08:15:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+EkFkxlRn5VQZcGx0qmt6cbof+Bf/WjPUAN7q3zBmSI=; b=tPLdtEqfCeWp6tBk3JHoU/ZBZdlBkymVZTpLlG397AhLR/WxtG+3mcrB3wk2JhP6lg l6dLZUeKRm6VHb3T5gjNqsGA1W6EXImkxk7wTUKezFZpliMTtCymQmkgZwuuPECppgzD K01EwF458yqigtPSkOAVMWlwfo8tllsKymb8/zqYMZgErZyInHsMcLdGy17Vnu1EWo6q IDP0bauQ8EKNVjYbk3o8nt/2J7OO4CucgryIStcrJw1ZhEDNVdYoGRguo6WsgXvk34ec aa25tuzzQGQWR7Jv7yR2ojgjH+cNgEnHNQmfchXz0Ao1BLjNH9y9j0KcuGdh2q8addqa nvqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+EkFkxlRn5VQZcGx0qmt6cbof+Bf/WjPUAN7q3zBmSI=; b=LKZyDgFUPwKPTYFbmNWTZdCjjB5LIotl4hEZfW/fhE8K544ubfAzcFFdNQ5AV3fUZp b2RzKg+bMuupnsuRCCPsDdDl82/Yw1vcylSqVDRpSk2azD+2U89puRDOAUYdNw5TCNSK cyVXtgA673BBRcGb6v6goIBySnhhEFrzns24hVqztZ5lAQEpFIoRdZvTVHTpQ2z5kZoG lwUKKU0G1lAmnxwkx6AN7e5JNUVP38ies3YqdKFn2YOCuHIgCZTpLxIljqpnE3cWsgA7 1yhHMm6jd6m9j5uzIjNFCotf89A8SFBc1r5W1ndZEzIaJZ1CcIERAZJAvcgf1RhY0ZLe tHkA== X-Gm-Message-State: AOAM533Vmenp4jvvXIMfHYzV4aCd3zDAPJ5liOeALXve/WhVqvH5ailr x93DZ2ya2Nyfyr17EkXdGgOceW/ga+l0dw== X-Google-Smtp-Source: ABdhPJzQslzJddJzBywJ7FdSKgedFkPLoc/EAPpxJvveA8pgJDz+OTypzT5LwmwKE2s9nL+2EmJnUw== X-Received: by 2002:a1c:cc12:: with SMTP id h18mr8419805wmb.141.1622906139239; Sat, 05 Jun 2021 08:15:39 -0700 (PDT) Received: from kali.home (lfbn-ren-1-1383-171.w86-229.abo.wanadoo.fr. [86.229.230.171]) by smtp.gmail.com with ESMTPSA id m3sm10551695wrr.32.2021.06.05.08.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jun 2021 08:15:38 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 5 Jun 2021 17:15:09 +0200 Message-Id: <20210605151509.406358-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/intel-mediadriver: disable -Werror X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Louis-Paul Cordier , Bernd Kuhls , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Disable -Werror to avoid the following build failure: : error: "_FORTIFY_SOURCE" redefined [-Werror] MEDIA_BUILD_FATAL_WARNINGS option is available since version 18.2.0 and https://github.com/intel/media-driver/commit/6932fc0ffb8228245052528820adafb6743f7482 Fixes: - http://autobuild.buildroot.org/results/52638d95312e464626d1c4047b3b26d4f57a1cd2 Signed-off-by: Fabrice Fontaine --- ...akelists.txt-respect-MEDIA_BUILD_FAT.patch | 51 +++++++++++++++++++ .../intel-mediadriver/intel-mediadriver.mk | 1 + 2 files changed, 52 insertions(+) create mode 100644 package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch diff --git a/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch b/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch new file mode 100644 index 0000000000..bc7a27f4d0 --- /dev/null +++ b/package/intel-mediadriver/0003-cmrtlib-linux-CMakelists.txt-respect-MEDIA_BUILD_FAT.patch @@ -0,0 +1,51 @@ +From f09fddd6763aca237f19417de05a1f5de7f51d40 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 5 Jun 2021 16:57:32 +0200 +Subject: [PATCH] cmrtlib/linux/CMakelists.txt: respect + MEDIA_BUILD_FATAL_WARNINGS + +Respect MEDIA_BUILD_FATAL_WARNINGS to avoid the following build failure +when the user provides _FORTIFY_SOURCE: + +In file included from /home/buildroot/autobuild/instance-0/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/dlfcn.h:22, + from /home/buildroot/autobuild/instance-0/output-1/build/intel-mediadriver-19.4.0r/cmrtlib/linux/../linux/share/cm_include.h:30, + from /home/buildroot/autobuild/instance-0/output-1/build/intel-mediadriver-19.4.0r/cmrtlib/agnostic/share/cm_printf_host.cpp:23: +/home/buildroot/autobuild/instance-0/output-1/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/features.h:397:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] + 397 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O) + | ^~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/52638d95312e464626d1c4047b3b26d4f57a1cd2 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/intel/media-driver/pull/1203] +--- + cmrtlib/linux/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/cmrtlib/linux/CMakeLists.txt b/cmrtlib/linux/CMakeLists.txt +index 7a0193a8..65f71cee 100644 +--- a/cmrtlib/linux/CMakeLists.txt ++++ b/cmrtlib/linux/CMakeLists.txt +@@ -32,12 +32,16 @@ else() + + # Set up compile options that will be used for the Linux build + if(CMAKE_COMPILER_IS_GNUCC) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing ") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive -Werror") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1 -std=c++11 -fPIC -fpermissive") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") ++ if(MEDIA_BUILD_FATAL_WARNINGS) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS} -Werror") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS} -Werror") ++ endif() + + set(GCC_SECURE_LINK_FLAGS "-z relro -z now") + set(CMAKE_SKIP_RPATH ON) +-- +2.30.2 + diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 963e4b8f9c..01423b9611 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -23,6 +23,7 @@ INTEL_MEDIADRIVER_SUPPORTS_IN_SOURCE_BUILD = NO INTEL_MEDIADRIVER_CONF_OPTS = \ -DINSTALL_DRIVER_SYSCONF=OFF \ + -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ -DMEDIA_RUN_TEST_SUITE=OFF $(eval $(cmake-package))