From patchwork Fri Oct 12 14:11:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Hunleth X-Patchwork-Id: 983071 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=troodon-software.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=troodon-software-com.20150623.gappssmtp.com header.i=@troodon-software-com.20150623.gappssmtp.com header.b="b9+cbiRX"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42WqjY0hBzz9s3Z for ; Sat, 13 Oct 2018 01:20:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A06CB86FD6; Fri, 12 Oct 2018 14:19:58 +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 VXjsmYxT7GQz; Fri, 12 Oct 2018 14:19:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id DFAA886D52; Fri, 12 Oct 2018 14:19:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EF2E41C10AF for ; Fri, 12 Oct 2018 14:19:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EC9BE8868D for ; Fri, 12 Oct 2018 14:19:55 +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 2I3k9wjSgMBA for ; Fri, 12 Oct 2018 14:19:54 +0000 (UTC) X-Greylist: delayed 00:07:32 by SQLgrey-1.7.6 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7DC53846A3 for ; Fri, 12 Oct 2018 14:19:54 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id u34-v6so13971589qth.3 for ; Fri, 12 Oct 2018 07:19:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troodon-software-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=TV+NxcWvmIVE6fa8ul+UMsonoUtTHuHHIcj/sh3Sz5c=; b=b9+cbiRXHVjCXs0dpBbPeoTRAtfRdTcepST3HwnPkktGkrsjHeDJmCMdd1bdo+CaZj TiQEvvhZiwy6W6ROAxTHKMT7Lb5FXCjhJKGBlKL4zWMDNh2DMxaKQBthZ1rbU38hiB6H is+VNug9QGlhbgT4+Fe4yajnkWkd6mF1dHFvh0lv7yLlEnk1Srhy+Op1TlDRQCqKo+Zu 17aFnU1hUHylzKSrxFhxebSfRUUnYC2gJO7jH97vLtkzOh/NSiHTJBaFPXpGYPyBBbZx 9f5ujLm0dEYqZYmy0plaLrQm2imr3eulyXc0MHISfHGz+i2raXVVndejWQT6XgSUJcN1 oovg== 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; bh=TV+NxcWvmIVE6fa8ul+UMsonoUtTHuHHIcj/sh3Sz5c=; b=sx/D0En9SIaBtFB4S+DwRwoeopRE2YkxeTG9hKpA6Wn5ZNO7bxVpLWHrO8X/RMUbmA xAlJ0FbzH0FV82CnrgYxQjhLpPXqS/ocf1iNBSjPC8yDs4e7cztjaf3e73wpCgNqooax 1pvQrNAI0afGorQ6mELbj77mq/KOElFG3nucJxkxFvqnOWiUn+QoUJo76y7NMcJQIzR+ k3HsT4nVmzjNuZzWYE7UqO51HiYsO+wvAHpdq+Pwk3EkHSFd8P2CAyUgPOj4kUX3Wc2+ P8g+eK2OVYEmq9kaZ7Vnov8jnEhNZTx/QnS+Kg8pXhFbdKebmPi1nXlr0jS65efK1jjd u8kA== X-Gm-Message-State: ABuFfogUBejcf1s3kyNhwNRsjavZ+mmH0Tzp3q9m1iQ9vXKicgC5Q5fW wYhvP5uy4W5/VcxIz4iA35xrKpO5HD0= X-Google-Smtp-Source: ACcGV636KB26h5402UlnFh5fESxnwsrhPs3XD4ZDopTWJC9kglzJ5k1BkWJR9NB7liGeXLzxJdbe/Q== X-Received: by 2002:ac8:64d:: with SMTP id e13-v6mr5810892qth.114.1539353541539; Fri, 12 Oct 2018 07:12:21 -0700 (PDT) Received: from sprint.hunleth.lan ([2601:152:4200:3948:8504:99c0:b242:d399]) by smtp.gmail.com with ESMTPSA id b134-v6sm872863qka.45.2018.10.12.07.12.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 07:12:20 -0700 (PDT) From: Frank Hunleth To: buildroot@buildroot.org Date: Fri, 12 Oct 2018 10:11:49 -0400 Message-Id: <20181012141149.72489-1-fhunleth@troodon-software.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/1] erlang: always use Buildroot's zlib 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" While Erlang includes a version of zlib, it's intended for Windows and there's an expectation that non-Windows platforms provide it. It's also not as regularly updated as the one in Buildroot. This change makes Erlang always use a Buildroot-provided zlib. Fixes this compile error: CC /home/buildroot/autobuild/run/instance-0/output/build/erlang-21.0/erts/emulator/zlib/obj/x86_64-buildroot-linux-musl/opt/adler32.o In file included from zlib/adler32.c:11:0: zlib/zutil.h:172:39: error: "_LFS64_LARGEFILE" is not defined [-Werror=undef] (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) ^~~~~~~~~~~~~~~~ See http://autobuild.buildroot.net/results/fc633f80c7c36a90e641487f5a888fbb767c2a54/. Signed-off-by: Frank Hunleth --- package/erlang/Config.in | 1 + package/erlang/erlang.mk | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang/Config.in b/package/erlang/Config.in index 75ba17086a..ab87eab6ff 100644 --- a/package/erlang/Config.in +++ b/package/erlang/Config.in @@ -23,6 +23,7 @@ config BR2_PACKAGE_ERLANG depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS + select BR2_PACKAGE_ZLIB help Erlang is a programming language used to build massively scalable soft real-time systems with requirements on high diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 2ac903ffea..ca0aa0b770 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -64,10 +64,9 @@ else ERLANG_CONF_OPTS += --without-odbc endif -ifeq ($(BR2_PACKAGE_ZLIB),y) +# Always use Buildroot's zlib ERLANG_CONF_OPTS += --enable-shared-zlib ERLANG_DEPENDENCIES += zlib -endif # Remove source, example, gs and wx files from staging and target. ERLANG_REMOVE_PACKAGES = gs wx