From patchwork Sat Jan 19 07:19:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1027875 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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.b="gE5oM6NO"; 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 43hTjY48Qsz9sBQ for ; Sat, 19 Jan 2019 18:20:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C44422D8AB; Sat, 19 Jan 2019 07:20:12 +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 A3FtlYH6big0; Sat, 19 Jan 2019 07:20:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id C555A2D1F1; Sat, 19 Jan 2019 07:20:10 +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 7FC951BF470 for ; Sat, 19 Jan 2019 07:20:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7A78581428 for ; Sat, 19 Jan 2019 07:20:09 +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 PstNG-PdK7aj for ; Sat, 19 Jan 2019 07:20:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id 647B8817F9 for ; Sat, 19 Jan 2019 07:20:08 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id t13so7327252ply.13 for ; Fri, 18 Jan 2019 23:20:08 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=mtlXGy14W3vI4U419BmDlDs2GtrPckq/ZUIImkOdpUo=; b=gE5oM6NOhO2UQzoB2Q2dGgmN4Jq4LLKs0fTmfRpvJshMmkxJrCTGLDEXzwvA+FOMn0 uXp5FUZrsYIKgdvuVKxw2o38taZQ2xdX+4WeIGIFs2Xk3u3NntBxSr/v+SW9uvR6SGLD C1lBnEIOrTtKOOfTwD1GrHcyzvWDigBY3pZK85wVDMnCZPhze1EQuFjTI5FTiEhw3JRY yoKDOBDBUS456eLLrFZa6e87kOfmL0rXnJdHtrYcoakX0iecqHmyw9erQILP2zFckC/u dFI/Scpt/q7bQiUvqhPEkknSM7ArfDjED8aN3iqS9J3EwGZe/Cq/DVlzI5LIT6Xx8qGG 0aIA== 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=mtlXGy14W3vI4U419BmDlDs2GtrPckq/ZUIImkOdpUo=; b=fJh6mhqfKGmGuWhJQzSvU7CP3Tg7MA0ZCECTmw/dVINFgRyoqVkoXM3bjkFtIJ4Io8 xQIrNVnoM3vz2Y8yCbIh6TUjlDazE/G4+2Fr68YLKxMTUAhJrwgwr2UK87j3ZAHIAg5Z M7wb1I68Cqe8YL7YOPEntcdWKBQxnSI21agzQ+ghLZLG5pPUtDlCJMbXSOQXsC7gzAsG CS7v+xvCqmLgQeNor3kvd7nS0yQhd4kOetqYIYZ3+da3sRcHlVAb5bPsJjDRhFoSToxm ggOw7jZ5uhh6iGSKnxmtnYP/p4eEnHuCxy7Y7scbp1yIyQ3crDhSKUmsY4xR+g1BO4OQ uQsQ== X-Gm-Message-State: AJcUukea5oqEptsnUD076Bjzx7DuubZRX7EQT7Djslcc3H09wv9LUR0r QlecgTDlQTwolEIDSzEWUYyY80vmADg= X-Google-Smtp-Source: ALg8bN4D6V3pe0kcIbXW19g7KYRLKZOdjrhYzFWWUsELmOgGU1bGRFmzYEI/CE74O4iPZc3SzdP+CA== X-Received: by 2002:a17:902:a83:: with SMTP id 3mr20944438plp.276.1547882407741; Fri, 18 Jan 2019 23:20:07 -0800 (PST) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id b10sm9503370pfj.183.2019.01.18.23.20.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 23:20:07 -0800 (PST) From: Chris Packham To: buildroot@buildroot.org Date: Sat, 19 Jan 2019 20:19:47 +1300 Message-Id: <20190119071947.5472-2-judge.packham@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190119071947.5472-1-judge.packham@gmail.com> References: <20190119071947.5472-1-judge.packham@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] Revert "package/syslog-ng: depend on !BR2_STATIC_LIBS" 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This reverts commit 44dbd2907c5995b0b0c56cb2274dc60415205dd8. Now that upstream has different fix for the build issues with a static libc we can re-enable syslog-ng on these systems. Signed-off-by: Chris Packham --- package/syslog-ng/Config.in | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/syslog-ng/Config.in b/package/syslog-ng/Config.in index 6407645974..fbc236221a 100644 --- a/package/syslog-ng/Config.in +++ b/package/syslog-ng/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_SYSLOG_NG depends on BR2_USE_WCHAR # glib2 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_EVENTLOG select BR2_PACKAGE_LIBGLIB2 @@ -16,8 +15,7 @@ config BR2_PACKAGE_SYSLOG_NG https://syslog-ng.org/ -comment "syslog-ng needs a toolchain w/ dynamic library, wchar, threads" +comment "syslog-ng needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS