From patchwork Sat Oct 3 20:00:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1376351 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.137; helo=fraxinus.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=ZoIJFZs2; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C3d5k1gzzz9ryj for ; Sun, 4 Oct 2020 07:00:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B87D48554A; Sat, 3 Oct 2020 20:00:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qHnSYTrdSrkG; Sat, 3 Oct 2020 20:00:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 081B585624; Sat, 3 Oct 2020 20:00:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C34461BF35B for ; Sat, 3 Oct 2020 20:00:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BFA0386816 for ; Sat, 3 Oct 2020 20:00:54 +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 hAiVctFtxDj1 for ; Sat, 3 Oct 2020 20:00:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id A4EDD86803 for ; Sat, 3 Oct 2020 20:00:53 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id m6so5427533wrn.0 for ; Sat, 03 Oct 2020 13:00:53 -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=GA+IjuD45Uw/8NLeHK8soqAv16l10n6j3knVH77zkUI=; b=ZoIJFZs2RtebAo2YTijED6k8FtHkrrkhwcuiwB3aAVMMmeNiEYKVXhhyX7cGhO24yN 3tzYv0PUY+/uh+E2iqfAemy781vRLR0bgf9wwGpaKEZO/9f1AOhTKVxGgxEdScqMzppl juYcdk9jswooFszgFrcYr24hGLz82yLSEwC14CM0VAPiPSIxgREIH23QsHBcwSbHufPy TuQm0GcMMCseAG8gZVT2vbP3EOY/GoSmxeXlDeMYMSfVk3XUrRFpux8BQFgzx3TRTBEL 8NhIuksDoszGo5HUIh+R6Z/in2YRMjujfkLvs5AvG+qj/eBAk8pxIBoz//PZ23qROf93 0EDA== 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=GA+IjuD45Uw/8NLeHK8soqAv16l10n6j3knVH77zkUI=; b=YHudJZ/V7KrrNlTi1+K/Cmlb+ncSgps7G+dClE9M30nCEO5exTo5Abnb0SserG2YTf K+TR6HjZ2mJAfIzOsjhwKS/hNAiOMNujV31hXE82kr2jl4zsyzhB8KITZI185kif8DhR JFxMu2+XSKh1PGqEKxdBIqroWpBhBrYR3a1bar/aivIVtJbn1GXRfJOr3auyKfm8q6D2 QEOj81YB25Uln2eTBSnhUPm3CkE0VHunp2NgIlE5suFv/FZWsvhWtcT+nmlY4Vxp3KVN HPZkZQaqBrMvL8yLySjq+alUWj2LzyQ4fqH6isvr44ga9bnRqdVOSedGYbIR0IN6cY1d 3EGg== X-Gm-Message-State: AOAM531+4rWjgc/dNEt6a5+4mjxW3KkdVANi2TROUfsthfnp0xQVkxAx 4/J08Vf0SbWyjCrGLKjQxXiPCyNc86WuFA== X-Google-Smtp-Source: ABdhPJwaVNoiGGSiQLqFuEoI08ANhvcFbhswHfMn78iJCE+U2OqgWP6IqE6cv8aURLYuQB6gsGCnmw== X-Received: by 2002:adf:e391:: with SMTP id e17mr9039147wrm.289.1601755251799; Sat, 03 Oct 2020 13:00:51 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id q13sm6485622wra.93.2020.10.03.13.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 13:00:51 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 3 Oct 2020 22:00:12 +0200 Message-Id: <20201003200013.228007-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] Revert "package/supertux: 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: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This reverts commit 80be040817e008a021219bf4423df7550723d912. Signed-off-by: Fabrice Fontaine --- ...ass-DISABLE_STATIC-to-external-squir.patch | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 package/supertux/0001-CMakeLists.txt-pass-DISABLE_STATIC-to-external-squir.patch diff --git a/package/supertux/0001-CMakeLists.txt-pass-DISABLE_STATIC-to-external-squir.patch b/package/supertux/0001-CMakeLists.txt-pass-DISABLE_STATIC-to-external-squir.patch deleted file mode 100644 index 43652d0906..0000000000 --- a/package/supertux/0001-CMakeLists.txt-pass-DISABLE_STATIC-to-external-squir.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 95590485d7cd95611eeac1fc06226d45f235c63a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 13 Sep 2020 22:09:49 +0200 -Subject: [PATCH] CMakeLists.txt: pass DISABLE_STATIC to external/squirrel - -external/squirrel will always build a static binary and library except -if DISABLE_STATIC is defined so define it to avoid the following build -failure with RELRO_FULL: - -/home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: CMakeFiles/sq_static.dir/sq.c.o: relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a PIE object; recompile with -fPIC -/home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: final link failed: nonrepresentable section on output -collect2: error: ld returned 1 exit status - -Fixes: - - http://autobuild.buildroot.org/results/46e8f5e622ce450a89bc6d70f4bfd38182557901 - - http://autobuild.buildroot.org/results/a43720492d817e4555d728546da9114e3ccba952 - -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ae0d653b..bb4358b01 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -411,6 +411,7 @@ ExternalProject_Add(squirrel - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} - -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX} -+ -DDISABLE_STATIC=ON - -DINSTALL_INC_DIR=include) - - if(WIN32) -@@ -424,10 +425,10 @@ if(WIN32) - #For debug run purposes - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mk/msvc/run_supertux.bat.in" "${PROJECT_BINARY_DIR}/run_supertux.bat") - else() -- add_library(squirrel_lib STATIC IMPORTED) -- set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}squirrel_static${CMAKE_STATIC_LIBRARY_SUFFIX}") -- add_library(sqstdlib_lib STATIC IMPORTED) -- set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}") -+ add_library(squirrel_lib SHARED IMPORTED) -+ set_target_properties(squirrel_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}squirrel${CMAKE_SHARED_LIBRARY_SUFFIX}") -+ add_library(sqstdlib_lib SHARED IMPORTED) -+ set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}sqstdlib${CMAKE_SHARED_LIBRARY_SUFFIX}") - endif() - - include_directories(SYSTEM ${SQUIRREL_PREFIX}/include) --- -2.28.0 - From patchwork Sat Oct 3 20:00:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1376352 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.136; helo=silver.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=ElowuwkI; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C3d5r1cKmz9sT6 for ; Sun, 4 Oct 2020 07:01:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D07D92039D; Sat, 3 Oct 2020 20:01:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7NB1fwS5kAV4; Sat, 3 Oct 2020 20:00:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2863D2035E; Sat, 3 Oct 2020 20:00:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C58611BF35B for ; Sat, 3 Oct 2020 20:00:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BC8AC86816 for ; Sat, 3 Oct 2020 20:00:57 +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 wFJc3UzGwRae for ; Sat, 3 Oct 2020 20:00:57 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id E7C4286803 for ; Sat, 3 Oct 2020 20:00:56 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id m6so5427658wrn.0 for ; Sat, 03 Oct 2020 13:00:56 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=c4fwdnvJJkybC71Lpw4NBbhjLEM2jLocXKj05C3tfuk=; b=ElowuwkIzXs8DOUusP1rSoBHxhEXxnU6noM2Dzu860Itx/RUy46suoQro9Jao6qYZ3 T9vxe8sbmydDER5pKpknwWuNdBsXhKWblFI3K/YWP1/bCBNHC3PUyU4UkENkHmqTOYFD WtV7/5xrQDkJjbeUA7cTEzDl8wS04BUsENajtQZ0mgyyRBiqHpq5ronWMMx0x9VaWUas NXFrPrFZxs39JdGCfnJGKUd+9e261+s36eyCfZjxYORp2jbY/6HFJ9BxeVb68nRCXuKX I0RLqwGzq4uPpXXE+YZ7oPrryDOuSTBdcf3C4PBNh+iWlEnQ6+/xG0I3MsnvVcdqpWVA U2tg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=c4fwdnvJJkybC71Lpw4NBbhjLEM2jLocXKj05C3tfuk=; b=quJ3vkodko1BCwmeqD8rzA2h0yJc5trcJgAb+Ovc5Eufrzcu3hNk1JgCJnolqb+jCD a711SvNG9oklwRQtGA/sXNjFCjyADtUr4ZB1HOjUzBxxpYTt0WAIXCXUARjwcORufo0U zYMfcxYMz00KJ92x2Xi7tWkB1B6vdHenhZf/Q8h54Ay0w2lBP18I4fGYIfBULsfv0U8h 26jhe9/nq5fvtqaujVj4gVBlfyxAkHp9f2KKlP3ZWA/zkzYgIRYpciBSjZjtkP+BQPBQ 0rRvm3S1H5IRMRw1xa5svqRHkDemuy5kipQqynwddW1dAvjUs6HYHqSpvThNSgAPhiYb u73Q== X-Gm-Message-State: AOAM530v6orkiYgamF59PfjptYhP5zru3jxqjPemvo6Ty4UWntOnV2b+ iJgodGPvmmodAJQdCBMQoEjma0Hwk2MMdA== X-Google-Smtp-Source: ABdhPJyseQJY1TS+3gaVQLEK3zLJmpz/Yug+7iY3bzMkYDdLFEF5C29Kp22XPMuk3nVfA4MmeIdqPw== X-Received: by 2002:adf:f88d:: with SMTP id u13mr3648207wrp.213.1601755255158; Sat, 03 Oct 2020 13:00:55 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id q13sm6485622wra.93.2020.10.03.13.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 13:00:54 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 3 Oct 2020 22:00:13 +0200 Message-Id: <20201003200013.228007-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201003200013.228007-1-fontaine.fabrice@gmail.com> References: <20201003200013.228007-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/supertux: 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: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/46e8f5e622ce450a89bc6d70f4bfd38182557901 - http://autobuild.buildroot.org/results/a43720492d817e4555d728546da9114e3ccba952 Signed-off-by: Fabrice Fontaine --- ...MakeLists.txt-disable-building-of-sq.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/supertux/0001-CMakeLists.txt-disable-building-of-sq.patch diff --git a/package/supertux/0001-CMakeLists.txt-disable-building-of-sq.patch b/package/supertux/0001-CMakeLists.txt-disable-building-of-sq.patch new file mode 100644 index 0000000000..dac5943056 --- /dev/null +++ b/package/supertux/0001-CMakeLists.txt-disable-building-of-sq.patch @@ -0,0 +1,36 @@ +From 9268f8bee6f57a74226c1db7a9b3643506970ff8 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 3 Oct 2020 16:55:46 +0200 +Subject: [PATCH] CMakeLists.txt: disable building of sq + +Build of sq_static raises the following build failure with RELRO: + +/home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: CMakeFiles/sq_static.dir/sq.c.o: relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a PIE object; recompile with -fPIC +/home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-musl/8.3.0/../../../../x86_64-buildroot-linux-musl/bin/ld: final link failed: nonrepresentable section on output +collect2: error: ld returned 1 exit status + +Fixes: + - http://autobuild.buildroot.org/results/46e8f5e622ce450a89bc6d70f4bfd38182557901 + - http://autobuild.buildroot.org/results/a43720492d817e4555d728546da9114e3ccba952 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/SuperTux/supertux/issues/1536] +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/external/squirrel/CMakeLists.txt b/external/squirrel/CMakeLists.txt +index 4a37b6a..dea4922 100644 +--- a/external/squirrel/CMakeLists.txt ++++ b/external/squirrel/CMakeLists.txt +@@ -52,7 +52,6 @@ endif() + + add_subdirectory(squirrel) + add_subdirectory(sqstdlib) +-add_subdirectory(sq) + + if(NOT WIN32 AND NOT DEFINED DISABLE_DYNAMIC) + set_target_properties(squirrel sqstdlib PROPERTIES SOVERSION 0 VERSION 0.0.0) +-- +2.28.0 +