From patchwork Mon May 17 19:40:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1479825 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::138; helo=smtp1.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=kScyBVQZ; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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 4FkTxh1MRyz9sSs for ; Tue, 18 May 2021 05:40:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F40BA81D73; Mon, 17 May 2021 19:40:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id x_Aa17z5yEAf; Mon, 17 May 2021 19:40:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 61B0781987; Mon, 17 May 2021 19:40:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 6F6811BF33B for ; Mon, 17 May 2021 19:40:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5DA4481987 for ; Mon, 17 May 2021 19:40:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S1Ezwkr5lHuT for ; Mon, 17 May 2021 19:40:18 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by smtp1.osuosl.org (Postfix) with ESMTPS id CBF338101F for ; Mon, 17 May 2021 19:40:17 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id q5so7652572wrs.4 for ; Mon, 17 May 2021 12:40:17 -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=/1DeMjtnd8bN/QIrMl5iRp3lAqASjb0yaNPyTwDH/X0=; b=kScyBVQZdA5hINuERk30hLLIR6wCelp+MsksK6k9Ut8QfUp509d20CFZ7ayr1quitA NeqfeiqprNcjTYh8tAa+5/KrdLGpI2/CCcGkpk65OcnuOppq4LBDjgGDBxMK3Jx6uBpO XHkb/XGkWSrcU+XiOZ+R6U1glqXjNOKSV+tSKwpecvUKe91Ag9ujlp5AuLmH4or8BIqd 4v6i/uAkdc/bIaTXp3xxqIFAxmx5CYYY+jpCtIAKBvIZuiIYv0X8s+NK8W38pnQ9IT+a iHP8gR0q3DyzQvecXH2a3t989d8HYjK4Sz369ZqRXtQ4oM5pqcmTy0ftSxuhU3kDsrxG edZA== 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=/1DeMjtnd8bN/QIrMl5iRp3lAqASjb0yaNPyTwDH/X0=; b=lyP6q2jiGcfB4blW1Fu/xf/fVfIvRkvUe+EBYGsd42nTY4hfqp8VzDr0knJLIOAYG+ VPpytPGXnmxZchcIe7MYOZKmoaO9/TxrkILUwMern0XWioyWdn91Spd+TtPKJ9uKuwyX MGsiW9dT9Zh4h3HnTICw3H7g+pXJjYHcJiA+1sAyKsD2mafGUAq5JITENQuQfUHkN6EZ mgqnECovIY00jXF0vAs2RAdxpAkSDghVVJ3DJuS9OA1C2uqWG3vN3+7bz5CbBi1nI41P a54sBHtexTd5r3k+/ok5fbQ1QNZFJjUAqTehiJHBdoJER9dXh1FCH6oyhO3CZykggs1l mnEw== X-Gm-Message-State: AOAM531cE7xOe5OsG2NRo0HOXDHkwP/EIaYYJo7IVkB//tb/Ds9qxS0K udt27ZgJ7s44bAHSiucGuNiDLHcLR9iGXg== X-Google-Smtp-Source: ABdhPJziAGfNHXkMODBnunb0ND+ytz+ME+WA07igBXHwSNUj+f9qaABRmPGL7e7IRbBgrAHG7rahCg== X-Received: by 2002:adf:f805:: with SMTP id s5mr1538165wrp.143.1621280415713; Mon, 17 May 2021 12:40:15 -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 s18sm8218773wra.80.2021.05.17.12.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 12:40:15 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 17 May 2021 21:40:08 +0200 Message-Id: <20210517194008.1128801-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/cutelyst: fix linking with -latomic 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: Daniel Nicoletti , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Build is broken since commit 7333207eaf2900076185cba6641c6406d61c235e because upstream overrides CMAKE_EXE_LINKER_FLAGS when building with jemalloc: https://github.com/cutelyst/cutelyst/commit/7d73eba273be365f15f1ffcb3d3ee7f1d44e10fb Fixes: - http://autobuild.buildroot.org/results/ba9bccaae2cad487a66b6eb9851fc206c32d7c82 Signed-off-by: Fabrice Fontaine --- ...s.txt-don-t-override-CMAKE_EXE_LINKE.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch diff --git a/package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch b/package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch new file mode 100644 index 0000000000..45b1fcd146 --- /dev/null +++ b/package/cutelyst/0001-server-CMakeLists.txt-don-t-override-CMAKE_EXE_LINKE.patch @@ -0,0 +1,31 @@ +From c347aeb43775109cbc2824b99cb10b1b3440c191 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 17 May 2021 21:27:11 +0200 +Subject: [PATCH] server/CMakeLists.txt: don't override CMAKE_EXE_LINKER_FLAGS + +Don't override CMAKE_EXE_LINKER_FLAGS as this could break the build if +CMAKE_EXE_LINKER_FLAGS is already set by the user (for example to pass +-latomic) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/cutelyst/cutelyst/pull/312] +--- + wsgi/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt +index ec5689f7..1ed56859 100644 +--- a/wsgi/CMakeLists.txt ++++ b/wsgi/CMakeLists.txt +@@ -95,7 +95,7 @@ install(TARGETS Cutelyst${PROJECT_VERSION_MAJOR}Qt${QT_VERSION_MAJOR}Server + cxx_generalized_initializers + ) + if (JEMALLOC_FOUND) +- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} " -Wl,--no-as-needed") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed") + target_link_libraries(cutelyst-wsgi2 PRIVATE ${JEMALLOC_LIBRARIES}) + endif() + +-- +2.30.2 +