From patchwork Thu Jan 23 07:17:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yegor Yefremov X-Patchwork-Id: 313462 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 469B62C00A8 for ; Thu, 23 Jan 2014 18:17:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C7B6B8C50D; Thu, 23 Jan 2014 07:17:54 +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 N2aOnZX7xxYe; Thu, 23 Jan 2014 07:17:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 8645B8C4EF; Thu, 23 Jan 2014 07:17:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3D4601BF9CA for ; Thu, 23 Jan 2014 07:17:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 374D78C4EC for ; Thu, 23 Jan 2014 07:17:52 +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 cBdjonn6OVIb for ; Thu, 23 Jan 2014 07:17:51 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.visionsystems.de (hhlx01.vscom.de [62.145.30.242]) by whitealder.osuosl.org (Postfix) with ESMTP id BDA348C460 for ; Thu, 23 Jan 2014 07:17:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.visionsystems.de (Postfix) with ESMTP id AEBB42DCE29; Thu, 23 Jan 2014 08:17:46 +0100 (CET) Received: from mail.visionsystems.de ([127.0.0.1]) by localhost (mail.visionsystems.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 26137-03; Thu, 23 Jan 2014 08:17:33 +0100 (CET) Received: from visionsystems.de (kallisto.visionsystems.local [192.168.1.3]) by mail.visionsystems.de (Postfix) with ESMTP id B83E72DCE15; Thu, 23 Jan 2014 08:17:30 +0100 (CET) Received: from development1.visionsystems.local ([192.168.1.36]) by visionsystems.de with Microsoft SMTPSVC(6.0.3790.4675); Thu, 23 Jan 2014 08:17:28 +0100 From: yegorslists@googlemail.com To: buildroot@busybox.net Date: Thu, 23 Jan 2014 08:17:27 +0100 Message-Id: <1390461447-17521-1-git-send-email-yegorslists@googlemail.com> X-Mailer: git-send-email 1.7.7 X-OriginalArrivalTime: 23 Jan 2014 07:17:28.0985 (UTC) FILETIME=[2CA68090:01CF180B] X-Virus-Scanned: amavisd-new at visionsystems.de Subject: [Buildroot] [PATCH] zlog: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net From: Yegor Yefremov Signed-off-by: Yegor Yefremov --- package/Config.in | 1 + package/zlog/Config.in | 12 +++++++ .../zlog/zlog-01-fix-compiling-on-Buildroot.patch | 32 ++++++++++++++++++++ package/zlog/zlog.mk | 26 ++++++++++++++++ 4 files changed, 71 insertions(+), 0 deletions(-) create mode 100644 package/zlog/Config.in create mode 100644 package/zlog/zlog-01-fix-compiling-on-Buildroot.patch create mode 100644 package/zlog/zlog.mk diff --git a/package/Config.in b/package/Config.in index 397cc11..cdf7b95 100644 --- a/package/Config.in +++ b/package/Config.in @@ -763,6 +763,7 @@ source "package/protobuf-c/Config.in" source "package/schifra/Config.in" source "package/startup-notification/Config.in" source "package/tzdata/Config.in" +source "package/zlog/Config.in" endmenu menu "Security" diff --git a/package/zlog/Config.in b/package/zlog/Config.in new file mode 100644 index 0000000..478b2f8 --- /dev/null +++ b/package/zlog/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_ZLOG + bool "zlog" + depends on BR2_LARGEFILE + depends on BR2_TOOLCHAIN_HAS_THREADS + help + zlog is a reliable, high-performance, thread safe, flexible, + clear-model, pure C logging library. + + https://github.com/HardySimpson/zlog + +comment "zlog needs a toolchain w/ threads, largefile" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LARGEFILE diff --git a/package/zlog/zlog-01-fix-compiling-on-Buildroot.patch b/package/zlog/zlog-01-fix-compiling-on-Buildroot.patch new file mode 100644 index 0000000..32aa7d6 --- /dev/null +++ b/package/zlog/zlog-01-fix-compiling-on-Buildroot.patch @@ -0,0 +1,32 @@ +From a9f6a55bdb29a2bebc96a68ab53077906c25a9df Mon Sep 17 00:00:00 2001 +From: Yegor Yefremov +Date: Wed, 22 Jan 2014 15:04:42 +0100 +Subject: [PATCH] Fix compiling on Buildroot + +Buildroot always specifies -D_LARGEFILE_SOURCE, -D_LARGEFILE64_SOURCE, +-D_FILE_OFFSET_BITS=64, so define them only if they are not already +defined. + +Signed-off-by: Yegor Yefremov +--- + src/fmacros.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/src/fmacros.h b/src/fmacros.h +index fa37948..059dfeb 100644 +--- a/src/fmacros.h ++++ b/src/fmacros.h +@@ -14,7 +14,11 @@ + #define _XOPEN_SOURCE + #endif + ++#ifndef _LARGEFILE_SOURCE + #define _LARGEFILE_SOURCE ++#endif ++#ifndef _FILE_OFFSET_BITS + #define _FILE_OFFSET_BITS 64 ++#endif + + #endif +-- +1.7.7 diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk new file mode 100644 index 0000000..65ce9b7 --- /dev/null +++ b/package/zlog/zlog.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# zlog +# +################################################################################ + +ZLOG_VERSION = ca6162be1608839e99c6388c28488c51ccf98e4a +ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) +ZLOG_LICENSE = GPLv2.1 +ZLOG_LICENSE_FILES = COPYING +ZLOG_INSTALL_STAGING = YES + +define ZLOG_BUILD_CMDS + $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ + -C $(@D) all +endef + +define ZLOG_INSTALL_STAGING_CMDS + $(MAKE) PREFIX=$(STAGING_DIR)/usr INCLUDE_PATH=include LIBRARY_PATH=lib -C $(@D) install +endef + +define ZLOG_INSTALL_TARGET_CMDS + $(MAKE) PREFIX=$(TARGET_DIR)/usr INCLUDE_PATH=include LIBRARY_PATH=lib -C $(@D) install +endef + +$(eval $(generic-package))