From patchwork Wed Jun 9 17:11:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1490006 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=XGEm2e4i; 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 4G0YYY2yyzz9sPf for ; Thu, 10 Jun 2021 03:11:45 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0EF4683CF5; Wed, 9 Jun 2021 17:11:43 +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 ZY1QM8vo8K3C; Wed, 9 Jun 2021 17:11:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 30B8D83C92; Wed, 9 Jun 2021 17:11:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 204D21BF477 for ; Wed, 9 Jun 2021 17:11:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0E0124054B for ; Wed, 9 Jun 2021 17:11:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id b-1CviCFpbEh for ; Wed, 9 Jun 2021 17:11:37 +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 smtp4.osuosl.org (Postfix) with ESMTPS id 9B28440548 for ; Wed, 9 Jun 2021 17:11:37 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id y7so21668485wrh.7 for ; Wed, 09 Jun 2021 10:11:37 -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=NryJR7tAucMz/8vwoobn4yj6Ugyu0xo043QYukOEIxE=; b=XGEm2e4iESebnHegDmQ3yTq8EkU/DXIqtEJ0p6ezWorQmiF8161k1pRs4fTOx9utMU 3Je0WqamnBKjpkkSlHIocVf2FhrdlDAgVu6RKnPipJaMIqXOCROSLpoVLiFP+KUVGLIV nQ6ohh9n6dSLd5NUsq3IZKnO26MB1lxlULdCVM8k+Jx80oSYP1oPtnwlaUVrTbm8lsgs YJ/pTN15N/ACAuTeiOdi3zfs7Dryp55vsNcpHarnl9n0MFGongcDLjlvXGG0tDAsBAkt LAgFGy3T4DTjqUH5Ewne93L0WTWFBsoplBuTEMG76mx8Idj+KTdViyL9Lb94vBR9ZZ3i wbtg== 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=NryJR7tAucMz/8vwoobn4yj6Ugyu0xo043QYukOEIxE=; b=kctxT5YDyKFrGfw0598/Y1//wxb15cFX8RCbybctawEDOPn+HPV0nmf/vjfqL4tDI+ LlOU7xUjz2htf3ZBovZNLyFaU0UU+sljRlnPw/INdmAjn7KUBkTVIbwE1JdH8cE0cgK6 F1n29Pg1kXmqFigMTHZJsAThGpho3GZx0vriUk1PrqpaUziA9FdKBzX9OIcDgX3MuAqf tNVUf5A/f7h2CN7A/JSxLJNwMC9vr/szijX1EFOyzyJV+GnHIqpp8bHSpurbW4rBTx66 nXT58Z6RUu5yL8WmTzmvDRVpEcv9lpvgg0InLH3VtTAQ3eqqKJevvetl2nS8WusCOEpS 8NtA== X-Gm-Message-State: AOAM532ZJnLi6qlVlLOwr0i0+T5AYP0Fhz05gfYUzgTZ6W3eCR88gnv0 PwB4o47yJAd0Ea6WLZ2Csc5qXCoP7mfGkg== X-Google-Smtp-Source: ABdhPJzA0ezFnTgwqZO12oDo3+JtmSv5TB7pnAdnAWKoLKA65QfuLzriUWrvFWpBkr3tkCun72uhEQ== X-Received: by 2002:adf:fe8c:: with SMTP id l12mr926355wrr.26.1623258695479; Wed, 09 Jun 2021 10:11:35 -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 62sm663704wrm.1.2021.06.09.10.11.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 10:11:34 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 9 Jun 2021 19:11:27 +0200 Message-Id: <20210609171127.79897-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/pipewire: fix build 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" Drop 0002-meson.build-fix-build-with-uclibc-ng.patch which is not needed since 0dda1a44a0859fc15b318e493c151ca1d807ba24 which has been merged in master in commit 8d07baab43b5624ad6d73ee58f5a9d4ab8b27049 While at it, renumber 0002-meson-fix-getrandom-detection-for-uclibc.patch to 0001-meson-fix-getrandom-detection-for-uclibc.patch (patch number was wrong since its addition in commit b003cb5d16de9c92baba7dea7a6626c71cefc4fb) and also renumber remaining patch Fixes: - http://autobuild.buildroot.org/results/4d442c61b137ca1bd2dd32c6802ff0251d39e7a5 Signed-off-by: Fabrice Fontaine --- ...-fix-getrandom-detection-for-uclibc.patch} | 0 ...ch => 0002-fix-linking-with-latomic.patch} | 0 ...meson.build-fix-build-with-uclibc-ng.patch | 52 ------------------- 3 files changed, 52 deletions(-) rename package/pipewire/{0002-meson-fix-getrandom-detection-for-uclibc.patch => 0001-meson-fix-getrandom-detection-for-uclibc.patch} (100%) rename package/pipewire/{0003-fix-linking-with-latomic.patch => 0002-fix-linking-with-latomic.patch} (100%) delete mode 100644 package/pipewire/0002-meson.build-fix-build-with-uclibc-ng.patch diff --git a/package/pipewire/0002-meson-fix-getrandom-detection-for-uclibc.patch b/package/pipewire/0001-meson-fix-getrandom-detection-for-uclibc.patch similarity index 100% rename from package/pipewire/0002-meson-fix-getrandom-detection-for-uclibc.patch rename to package/pipewire/0001-meson-fix-getrandom-detection-for-uclibc.patch diff --git a/package/pipewire/0003-fix-linking-with-latomic.patch b/package/pipewire/0002-fix-linking-with-latomic.patch similarity index 100% rename from package/pipewire/0003-fix-linking-with-latomic.patch rename to package/pipewire/0002-fix-linking-with-latomic.patch diff --git a/package/pipewire/0002-meson.build-fix-build-with-uclibc-ng.patch b/package/pipewire/0002-meson.build-fix-build-with-uclibc-ng.patch deleted file mode 100644 index 36b14d3f16..0000000000 --- a/package/pipewire/0002-meson.build-fix-build-with-uclibc-ng.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8f1de87381d270a8f4e5927187ae0466a9c9504a Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 4 May 2021 22:56:54 +0200 -Subject: [PATCH] meson.build: fix build with uclibc-ng - -Build with uclib-ng fails since commit -a4b0b9afe5a782a7f4a8fe153ecf51bcb0180ae3 on: - -FAILED: src/pipewire/libpipewire-0.3.so.0.326.0.p/impl-core.c.o -/srv/storage/autobuild/run/instance-2/output-1/host/bin/mips64el-linux-gcc -Isrc/pipewire/libpipewire-0.3.so.0.326.0.p -Isrc/pipewire -I../src/pipewire -Isrc -I../src -I. -I.. -Ispa/include -I../spa/include -fdiagnostics-color=always -pipe -Wall -Winvalid-pch -Wextra -Wpedantic -std=gnu99 -O3 -fvisibility=hidden -Werror=suggest-attribute=format -Wsign-compare -Wpointer-arith -Wpointer-sign -Wformat -Wformat-security -Wimplicit-fallthrough -Wmissing-braces -Wtype-limits -Wvariadic-macros -Wno-missing-field-initializers -Wno-unused-parameter -Wno-pedantic -Wold-style-declaration -Wunused-result -DFASTPATH -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -fPIC -pthread -DHAVE_CONFIG_H -D_GNU_SOURCE -D_POSIX_C_SOURCE -MD -MQ src/pipewire/libpipewire-0.3.so.0.326.0.p/impl-core.c.o -MF src/pipewire/libpipewire-0.3.so.0.326.0.p/impl-core.c.o.d -o src/pipewire/libpipewire-0.3.so.0.326.0.p/impl-core.c.o -c ../src/pipewire/impl-core.c -../src/pipewire/impl-core.c:54:9: error: conflicting types for 'getrandom' - ssize_t getrandom(void *buf, size_t buflen, unsigned int flags) { - ^~~~~~~~~ -In file included from ../src/pipewire/impl-core.c:34: -/srv/storage/autobuild/run/instance-2/output-1/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:28:12: note: previous declaration of 'getrandom' was here - extern int getrandom(void *__buf, size_t count, unsigned int flags) - ^~~~~~~~~ - -Fix this build failure by adding -D_GNU_SOURCE as getrandom is protected -by: - -if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU - -Extracted from: - - https://github.com/wbx-github/uclibc-ng/blob/master/libc/sysdeps/linux/common/sys/random.h - -Fixes: - - http://autobuild.buildroot.org/results/a45f0ee009d90cef867dee4b1093225610fa10df - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/649] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 0a9963fb..11b63c08 100644 ---- a/meson.build -+++ b/meson.build -@@ -274,7 +274,7 @@ if cc.has_function('memfd_create', prefix : '#include ', args : [ '- - cdata.set('HAVE_MEMFD_CREATE', 1) - endif - --if cc.has_function('getrandom', prefix : '#include ') -+if cc.has_function('getrandom', prefix : '#include ', args : [ '-D_GNU_SOURCE' ]) - cdata.set('HAVE_GETRANDOM', 1) - endif - --- -2.30.2 -