From patchwork Thu Jan 24 19:58:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1030655 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.133; helo=hemlock.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="ripxJjT+"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43ltJy6f3tz9s9h for ; Fri, 25 Jan 2019 06:59:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D075B87B2B; Thu, 24 Jan 2019 19:59:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ON18Scz+oXQN; Thu, 24 Jan 2019 19:59:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3235B879CD; Thu, 24 Jan 2019 19:59:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1A2741BF359 for ; Thu, 24 Jan 2019 19:59:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 179F785A4B for ; Thu, 24 Jan 2019 19:59:06 +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 A21ywDb7iby7 for ; Thu, 24 Jan 2019 19:59:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A1DAD85B81 for ; Thu, 24 Jan 2019 19:59:00 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id b85so3535513pfc.3 for ; Thu, 24 Jan 2019 11:59:00 -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:mime-version :content-transfer-encoding; bh=xjc38nAaQaM6NLwz/yJzINuDlINsJNCdBqX9Nexy/6U=; b=ripxJjT+Qthk73uuW81cxxo3r5SxYMgeEhDjRaHpTk1gSepJgrswD+XrqXC0esLGPg sFTnKmAGuh2xzqTTeso6n1x2Q70jhomevP+tXZ4sHcSslQ0x+mEbMQ3a5s87NhAXhqKy X416OfmFSROa5oj1NrmBo05eNl0sFG0MTySczwNUm9L4AdTHIp9v2A+XM9H0yzTk0eWg xDW8zaqJfl4CNONWP+ZnOWSabQ4MWoFuAORlGsnCDdZlLZ5wH/hzcDSEq+GO8xvJM9ta eotOAqc9J5L/Nm1pWlpI1wIL7VQg9AkvVNNAU2Pz4cxKeMDeJodOTHFJGysWu8uPC/U5 r/Og== 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=xjc38nAaQaM6NLwz/yJzINuDlINsJNCdBqX9Nexy/6U=; b=ofMDkH+ZGzcjxrptGJ5wLuBAk918WbmIL2KvyDFLfF4G8AVYXf6ki94HYF03ljq23o TZDMyIuJ2fLGpfFPchbOLFGH0H5zova7SC+RBHcBOGwEHg4xQO4ohPvYKp8JBqzivxiI 2mVUz+ILXvmAqIBkC+YvbTquSmV2+OASgsMjJ1Rb9gUQFI3DfMIlPQ49/AFziPuoqqR2 3CxfsqqJmE2gK9D2XfGBfZSKveawtjk85JILfZ/darJgkdTJKq5jdtd5p7Ox931/rzvP lsbhyNSdN//DbtGQYHCQcOp/2rXVmtunH4b5r6t5wDlK0bKe/zZdwtymvjn+DPoUKq9Q FrTA== X-Gm-Message-State: AJcUukdUxFbKpjTkDn96BjNdCzVBHVxVkFi/m9hBbkF0C7ivlkHoN/we ZoobU/Lo7KMCDZGlHKcNN/zsn2oZDmI= X-Google-Smtp-Source: ALg8bN4zguHdgX7oIj1QQSCY0cLoFDXq07KNM8Xakfacx7vDBkVNCWZyXU3+P9d+ddriHiB1hmm5tw== X-Received: by 2002:a62:2044:: with SMTP id g65mr7838936pfg.127.1548359939828; Thu, 24 Jan 2019 11:58:59 -0800 (PST) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id a15sm25195094pgb.1.2019.01.24.11.58.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 11:58:59 -0800 (PST) From: Chris Packham To: buildroot@buildroot.org Date: Fri, 25 Jan 2019 08:58:48 +1300 Message-Id: <20190124195848.16647-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] syslog-ng: fix builds with static libc 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" Bring in an upstream patch to fix builds for targets which lack dlfcn.h and revert "package/syslog-ng: depend on !BR2_STATIC_LIBS". 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. Fixes: - http://autobuild.buildroot.net/results/c0bca852e053cd0e021205b3a949e750ae602333 Signed-off-by: Chris Packham --- Changes in v2: - squash revert and upstream fix into single patch - include URL of build failure this fixes package/syslog-ng/Config.in | 6 ++---- package/syslog-ng/syslog-ng.hash | 1 + package/syslog-ng/syslog-ng.mk | 1 + 3 files changed, 4 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 diff --git a/package/syslog-ng/syslog-ng.hash b/package/syslog-ng/syslog-ng.hash index 1f83e39ff0..69c94da02b 100644 --- a/package/syslog-ng/syslog-ng.hash +++ b/package/syslog-ng/syslog-ng.hash @@ -3,3 +3,4 @@ sha256 5cf931a9d7bead0e6d9a2c65eee8f6005a005878f59aa280f3c4294257ed5178 syslog- sha256 835219c8ca76156e6337236d1bcb8e617c0b1c2783b4a8bc478e18a86743d607 COPYING sha256 ce3324c9f22299cfc7c281e5a6ab40fbe9c2ea1a67cee87226cb8cd39db1e1d2 GPL.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LGPL.txt +sha256 feb26f77921b42fa7e5468229d883c5fae0b349cd075013eec2cb071a677179b d85121c0dc700cad4bd9735b0ee1dab9addf9dd7.patch diff --git a/package/syslog-ng/syslog-ng.mk b/package/syslog-ng/syslog-ng.mk index ecde9e8181..f96b97f30e 100644 --- a/package/syslog-ng/syslog-ng.mk +++ b/package/syslog-ng/syslog-ng.mk @@ -18,6 +18,7 @@ SYSLOG_NG_AUTORECONF = YES SYSLOG_NG_CONF_ENV = LIBS=-lrt SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \ --disable-java --disable-java-modules --disable-mongodb +SYSLOG_NG_PATCH = https://github.com/balabit/syslog-ng/commit/d85121c0dc700cad4bd9735b0ee1dab9addf9dd7.patch ifeq ($(BR2_PACKAGE_GEOIP),y) SYSLOG_NG_DEPENDENCIES += geoip