From patchwork Mon Feb 10 17:45:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1235933 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=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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=cQyD9bdf; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48GYDz6QNyz9s3x for ; Tue, 11 Feb 2020 04:44:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5881484BF1; Mon, 10 Feb 2020 17:44:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7m1FOU9lToPP; Mon, 10 Feb 2020 17:44:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 36A9E84AB8; Mon, 10 Feb 2020 17:44:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1472B1BF38A for ; Mon, 10 Feb 2020 17:44:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0234C8704A for ; Mon, 10 Feb 2020 17:44:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J+gdhGHs+2ui for ; Mon, 10 Feb 2020 17:44:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 152F286587 for ; Mon, 10 Feb 2020 17:44:10 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id z7so8824276wrl.13 for ; Mon, 10 Feb 2020 09:44:10 -0800 (PST) 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=rkzuxQ6xG0UCANHQMLggG6Gu5imX1lFVUC7cSF4++pM=; b=cQyD9bdfhtPDcOGbGzfcBywhrmqZeag4aYxjT/4UFxbWnqDyGA/hBkS4iRZPKAiSXN pgrymubTEpYbEl8iGV/iru/UgqcdwzH641pnw8mZT0CMIYeV0RfcO2Tl9v5MOfZ0KO7u JIsZppPZzgL5GOy4UzGKnyXsQxkn/pOEyfpwpTlw3yj6ak0wxCtGQyRcnPaKfSeiGy+u ag5/DAmdpp1ZwfFZV8jeV5seHxOnz5/n6Q1qTyUyBiF+OpejuNfzZKtLkdAkYj7rY6xP KYTB4ec8qP6dauh1ksNN70wb1e/M5F7lJQHmowTxi7OAd4Trewqc594tHUrsnmXr9+2c MBKg== 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=rkzuxQ6xG0UCANHQMLggG6Gu5imX1lFVUC7cSF4++pM=; b=KdGm1LSKfZ3Hjjk5UJ2CYqjmFNwvqCv8wXxx7HwHO3KD2AHIW25wmddBhTtlBrbow+ 8I2et7xX3ooHzRKXZz9UqsMFYzVALlnlg7HywfBH5A5zviqfXyruJCP6SeFddDQEwJC7 iQWROvl3B6J0Nra/ZX2buYygBA4noaQMBhY4trcknDYUsEqq9dc0Bx4AELcU4m6w3wQB wE03vpER+rFNt2Uu4uHhz9QgFBcJ0KUmuWzkOc1kq63rfcVZLxGD5lRGtG935hKyIwQ8 F+LOINleM98v1Ir/HrLNXzNeEUs/Zi2u3O/WbYyadtXjBUjuFXBcBBBiywaP4Q6wHH3K UUiw== X-Gm-Message-State: APjAAAU33pH4WiDoyrBG6p8us1YnBMi61sL5Eg16o/kOA8gJTkZE34Om cQrQFNfGYVuWqmUHeRClbmPZLaWDhn0= X-Google-Smtp-Source: APXvYqzW4JUgVKiJxR2CEY8Y4AiB5M6+xkzsXTn4vsLlml4Z0CcKbo3VKBJcyYmqTN2H22wjNknr6Q== X-Received: by 2002:a5d:4a0f:: with SMTP id m15mr3084421wrq.415.1581356648156; Mon, 10 Feb 2020 09:44:08 -0800 (PST) Received: from kali.home (lfbn-ren-1-602-70.w81-53.abo.wanadoo.fr. [81.53.179.70]) by smtp.gmail.com with ESMTPSA id s15sm1293548wrp.4.2020.02.10.09.44.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2020 09:44:07 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 10 Feb 2020 18:45:11 +0100 Message-Id: <20200210174511.719351-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/ogre: fix build with RELRO 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: Romain Naour , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/b64dfcd8e576666e8a4a52da81a2f5a92b779dc7 Signed-off-by: Fabrice Fontaine --- ...ompiledHeader.cmake-Add-c-argument-t.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch diff --git a/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch b/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch new file mode 100644 index 0000000000..0971df2c09 --- /dev/null +++ b/package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch @@ -0,0 +1,57 @@ +From f480ac538eb69086d4b7db855c2a457d5d6420d4 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 10 Feb 2020 14:05:12 +0100 +Subject: [PATCH] CMake/Utils/PrecompiledHeader.cmake: Add -c argument to build + precompiled headers + +Add "-c" argument when building precompiled headers to fix build with +RELRO. + +More information on a similar issue with domoticz can be found here: +https://patchwork.ozlabs.org/patch/1187328: + +"The problem AFAICS is that if no -c or similar option is given, GCC +decides what needs to be done based on the rest of the arguments. If the +rest of the arguments include a -Wl,... option, it decides that linking +needs to be done. If the rest of the arguments are just header files, it +decides to create a precompiled header." + +Fixes: + - http://autobuild.buildroot.org/results/8fabf8d270b9257c3a9db6a2f17f1c08ec9428d3 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/OGRECave/ogre/pull/1454] +--- + CMake/Utils/PrecompiledHeader.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMake/Utils/PrecompiledHeader.cmake b/CMake/Utils/PrecompiledHeader.cmake +index a02d99acd..bfb0059db 100644 +--- a/CMake/Utils/PrecompiledHeader.cmake ++++ b/CMake/Utils/PrecompiledHeader.cmake +@@ -133,11 +133,11 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output) + STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1}) + + SET(${out_command} +- ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} ++ ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input} + ) + ELSE(CMAKE_CXX_COMPILER_ARG1) + SET(${out_command} +- ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input} ++ ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input} + ) + ENDIF(CMAKE_CXX_COMPILER_ARG1) + ELSE(CMAKE_COMPILER_IS_GNUCXX) +@@ -291,7 +291,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input) + set_target_properties(${_targetName}_pch_dephelp PROPERTIES INCLUDE_DIRECTORIES "${DIRINC}") + + #MESSAGE("_compile_FLAGS: ${_compile_FLAGS}") +- #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}") ++ #message("COMMAND ${CMAKE_CXX_COMPILER} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input}") + + ADD_CUSTOM_COMMAND( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_name}" +-- +2.24.1 +