From patchwork Sat Oct 3 23:22:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1376362 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=Sll89k4s; 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 4C3jb04DCmz9sRR for ; Sun, 4 Oct 2020 10:23:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EAFDA85D26; Sat, 3 Oct 2020 23:23:05 +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 WcS4BtT3NiST; Sat, 3 Oct 2020 23:23:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BFDCB86418; Sat, 3 Oct 2020 23:23:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7FB7D1BF5DA for ; Sat, 3 Oct 2020 23:23:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7702D203E7 for ; Sat, 3 Oct 2020 23:23:03 +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 6G98OoiuN5uO for ; Sat, 3 Oct 2020 23:23:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by silver.osuosl.org (Postfix) with ESMTPS id E335E203E5 for ; Sat, 3 Oct 2020 23:23:01 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id 13so5017455wmf.0 for ; Sat, 03 Oct 2020 16:23:01 -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=sYDeHrbZQ7BTMz8ZZBmkMJPIeTXMVgBcn9Q2lJjWYyw=; b=Sll89k4sSR3VWfa3feY7F/KwpBNIxfbNhG1j2DOlcSXLTzDm9hDYDcvQvbPwy5JweL o0lEo8yNwjky+K7VH7grDDUcoh9Htz97UjqnrPrusvmrmp8uP4Hq/lm0TmLh1+ljNx6p 9qeKYKf8kRPkkFnYu0ME5v/m16RK2h+rUZ9DK+REuTIY1+pgY71yoWBKGRxMiEdsbg+R FVN0nrsE19L9qCfSYV7HZE78tRpoilt0KPHlordWqlTRFSkos1u+4zQ44r2oCxftYuTg 4kkEswkwHuwIxhnl/+qW1sWV84HoKK3/QuLS6Pn4Hetu62cFSajKZPKvrXKg6f3jHnyt N+Tw== 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=sYDeHrbZQ7BTMz8ZZBmkMJPIeTXMVgBcn9Q2lJjWYyw=; b=EV7sIt4sIauQf5BiVXhJSnnvte5G5lpYqAqjXp2+l+REYyCzMqNqrWm/kj/08Twl0i uRTh9y3RD04RDw+6XfffJ8JL8GDQwqSEGo8q390R+Y0PYtbS4bObHiSlhVcnrnybZ1Z9 +LmiHvF9YZtY+Nvl5ydnjZhEYL/4WuTnytfYP2UznIKuHq9WUnLbXaSQ5iW5FR16zOUu xW+LTz67YQAbUcaKiUepNRObdMs2VRfVp0aJYeTY7dLRkT+KuJNCX+bLQt0EcqBaF6af Wdw45KVh5oomDCr1JGn7i4TZyetC7NAYpwUWrziQVGpSiKu5RkMyXWWDeKlHzqY2zpVy LBRw== X-Gm-Message-State: AOAM531CwIWvumuHxbmnxPPYF/t8CNXkkMTH5w9xUUKi6wDHq3ccq/dU JzfMqb7LXqGxnXujfIgwjQlI+KdsPeg= X-Google-Smtp-Source: ABdhPJwml3o+tfzzMetiq3rhYb1FdUzSoL9ZrCRYh+e4E4ynQJoq/tXJTj3MajYZh5VD7yVyXhd9aQ== X-Received: by 2002:a1c:4d01:: with SMTP id o1mr9832929wmh.39.1601767379993; Sat, 03 Oct 2020 16:22:59 -0700 (PDT) Received: from adeos.home (2a01cb058f8a1800df1b0f916d55bd01.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:df1b:f91:6d55:bd01]) by smtp.gmail.com with ESMTPSA id p9sm6581912wmg.34.2020.10.03.16.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 16:22:59 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 4 Oct 2020 01:22:55 +0200 Message-Id: <20201003232256.549688-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Subject: [Buildroot] [PATCHv2 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: Romain Naour , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Fabrice Fontaine This reverts commit 80be040817e008a021219bf4423df7550723d912 because libsquirrel.so.0 and libsqstdlib.so.0 are missing in TARGET_DIR. Signed-off-by: Fabrice Fontaine Signed-off-by: Romain Naour --- ...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 -