From patchwork Fri Oct 11 12:40:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1175143 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="HrFmJHrk"; 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 46qSJf2q1Qz9sP6 for ; Fri, 11 Oct 2019 23:42:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 68BEA20372; Fri, 11 Oct 2019 12:42:06 +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 pPgvWyWyHvLl; Fri, 11 Oct 2019 12:42:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1C16120415; Fri, 11 Oct 2019 12:42:03 +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 A663B1BF292 for ; Fri, 11 Oct 2019 12:42:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9C12C880ED for ; Fri, 11 Oct 2019 12:42:00 +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 Oqqe4gYO4xHY for ; Fri, 11 Oct 2019 12:41:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2D8858809E for ; Fri, 11 Oct 2019 12:41:59 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id y135so9361926wmc.1 for ; Fri, 11 Oct 2019 05:41:59 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=l9LIqnctQou3GGSQBX9oZw9pmVC81Gpz98jNwkkUs2U=; b=HrFmJHrk9+XFlsKuwN5RuKnsU1l4Jytg1f84yLfL0V64gtq23Tz4Rr4UNzw0KSzMZw OhEzFIRxFWcQnGqDFZYSOuzUoqVUnH72XUnW61c9MdEWTJaxlkmZG7ViFFn7O7biVfQ1 4QfoBbJC6Q6o8rVoFfvrxhKyqj2rqK2hCe72YS4hvRLRhN08pZ+aEsonL/Cg56nOqR45 v2dUEho1btXQh9W1o6svbuNjWi5yCnZ/j4ddA7jOcMNWVsEVUH5hHOyaILSobYfNAk86 jki4ZKGovK2Wye8vV75jmOxCGBMxyADAFZ2So88geZx6ESwNgNjlkeRPS+KnWbldm2Ah WMEg== 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=l9LIqnctQou3GGSQBX9oZw9pmVC81Gpz98jNwkkUs2U=; b=rhynpqAOIFgwOqo/dqKyQOYCPJUkg5UPcYxozRCQF7XCsMPfA2KaXrOKJhXLXH8erE 7exVX0JfaNwlj6Q/KHXXZD2ovd+bJvo76t5CT0g7ljngN+/NaaIK/chYBnPlgFJTtfQq cLVmwjPd6mi09NcpfBjysK15y0IqugwofXYt6Pj7X4BQnIZY6vgkk6iEZRPRaYtrdcWI cV1LXS0potGRIFCxKKWdxCexaMie1EDotgnY/1DwjEvrhkQGnQAVdVBj88xAYVGynvCw 8gvbrO3CXAECgAVi1TAneurONsha+K6hqOGBJmjEN8ypepG6ItJ7TWWpWK0iAJCU1z6B oR3Q== X-Gm-Message-State: APjAAAWOQq3zeyCWKl6ePRS/i0EfJHEjMvOD9Vvr4bnunuxV+AfWPY7n mBC1/5nsPboNjKTwQaOxSDKMFz4Svko= X-Google-Smtp-Source: APXvYqxDQRY3qsd7O6c9mBv3Y4SfpaZM/hCTMS4mP0jJChISq80vF5DlJul0xZ5UThhnFZYH5wJmew== X-Received: by 2002:a7b:c395:: with SMTP id s21mr3281974wmj.114.1570797717311; Fri, 11 Oct 2019 05:41:57 -0700 (PDT) Received: from hthiery01.sab.local ([213.135.10.150]) by smtp.gmail.com with ESMTPSA id z5sm14336862wrs.54.2019.10.11.05.41.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2019 05:41:56 -0700 (PDT) From: heiko.thiery@gmail.com To: buildroot@buildroot.org Date: Fri, 11 Oct 2019 14:40:41 +0200 Message-Id: <20191011124131.28246-4-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191011124131.28246-1-heiko.thiery@gmail.com> References: <20191011124131.28246-1-heiko.thiery@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 3/9] package/libavl: add package 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: yann.morin@orange.com, michael@walle.cc, Heiko Thiery , thomas.petazzoni@bootlin.com, heiko.thiery@gmail.com, jan.kundrat@cesnet.cz Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Michael Walle Signed-off-by: Michael Walle Signed-off-by: Heiko Thiery --- DEVELOPERS | 3 ++ package/Config.in | 1 + package/libavl/0001-fix-makefile.patch | 49 ++++++++++++++++++++++++++ package/libavl/Config.in | 13 +++++++ package/libavl/libavl.hash | 5 +++ package/libavl/libavl.mk | 43 ++++++++++++++++++++++ 6 files changed, 114 insertions(+) create mode 100644 package/libavl/0001-fix-makefile.patch create mode 100644 package/libavl/Config.in create mode 100644 package/libavl/libavl.hash create mode 100644 package/libavl/libavl.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7e4d7fa94a..e8ef69efc7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1666,6 +1666,9 @@ F: package/python-pyzmq/ N: Michael Trimarchi F: package/python-spidev/ +N: Michael Walle +F: package/libavl/ + N: Michał Łyszczek F: board/altera/socrates_cyclone5/ F: board/pine64/rock64 diff --git a/package/Config.in b/package/Config.in index c3faa20d88..48a66ec7dd 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1715,6 +1715,7 @@ menu "Other" source "package/lapack/Config.in" source "package/libargtable2/Config.in" source "package/libatomic_ops/Config.in" + source "package/libavl/Config.in" source "package/libb64/Config.in" source "package/libbsd/Config.in" source "package/libcap/Config.in" diff --git a/package/libavl/0001-fix-makefile.patch b/package/libavl/0001-fix-makefile.patch new file mode 100644 index 0000000000..6cc96e5f74 --- /dev/null +++ b/package/libavl/0001-fix-makefile.patch @@ -0,0 +1,49 @@ +makefile: fix compilation and installation + +This was originally taken from: +https://sources.debian.org/data/main/liba/libavl/0.3.5-4/debian/patches/fix-makefile + +Unfortunately, the URL does not end in ".patch", therefore we cannot +use it in the FOO_PATCH variable directly. + +Signed-off-by: Michael Walle + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -6,7 +6,8 @@ + LDCONFIG ?= /sbin/ldconfig + + # Some suggestions: (-mcpu= generates i386 compatible code) +-CFLAGS ?= -O2 -fomit-frame-pointer -pipe -mcpu=i686 -w ++CFLAGS ?= -O2 -pipe -Wall -Werror ++CFLAGS += -fPIC + #CFLAGS = -O2 -fomit-frame-pointer -pipe -march=i586 -Wall -g + #CFLAGS = -O6 -fomit-frame-pointer -pipe -march=i586 -Wall -ansi -pedantic + #CFLAGS = -O6 -fomit-frame-pointer -pipe -march=i686 -Wall -ansi -pedantic +@@ -34,20 +35,21 @@ + $(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + $(LIBRARY): avl.o +- $(CC) -nostdlib -shared -Wl,-soname,libavl.so.1 $^ -o $@ -lc ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,libavl.so.1 $^ -o $@ -lc + + clean: + $(RM) *.o $(PROGRAMS) libavl.* + + install: all + $(INSTALL) -d $(DESTDIR)$(libdir) +- $(INSTALL) avl.h $(DESTDIR)$(includedir) +- $(INSTALL) $(LIBRARIES) $(DESTDIR)$(libdir) +- for i in $(LIBRARIES); do\ ++ $(INSTALL) -d $(DESTDIR)$(includedir) ++ $(INSTALL) -m 644 avl.h $(DESTDIR)$(includedir) ++ $(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) ++ for i in $(LIBRARY); do\ + $(LN) -sf $$i $(DESTDIR)$(libdir)/$${i%.*};\ + $(LN) -sf $${i%.*} $(DESTDIR)$(libdir)/$${i%.*.*};\ + done +- -$(LDCONFIG) ++ #-$(LDCONFIG) + + .PHONY: clean install all + .PRECIOUS: %.h %.c diff --git a/package/libavl/Config.in b/package/libavl/Config.in new file mode 100644 index 0000000000..20d3c5ef7d --- /dev/null +++ b/package/libavl/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LIBAVL + bool "libavl" + depends on !BR2_STATIC_LIBS + help + AVLTree is a small implementation of AVL trees for the C + programming language. + + https://packages.debian.org/buster/libavl1 + + This is not the GNU AVL library by Ben Pfaff. + +comment "libavl needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/libavl/libavl.hash b/package/libavl/libavl.hash new file mode 100644 index 0000000000..4d70f0cca9 --- /dev/null +++ b/package/libavl/libavl.hash @@ -0,0 +1,5 @@ +# From http://snapshot.debian.org/archive/debian/20160621T164030Z/pool/main/liba/libavl/libavl_0.3.5-4.dsc +sha256 4497b9e22cdd61ae2fa893b9d5fd6213dc306726d7c4be08c29e173622dca8a0 libavl_0.3.5.orig.tar.gz + +# Locally computed +sha256 767a9accfe3b110153b567983b98889469dfaae02899a632aeadbb81ad611293 COPYING diff --git a/package/libavl/libavl.mk b/package/libavl/libavl.mk new file mode 100644 index 0000000000..75ada32765 --- /dev/null +++ b/package/libavl/libavl.mk @@ -0,0 +1,43 @@ +################################################################################ +# +# libavl +# +################################################################################ + +LIBAVL_VERSION = 0.3.5 +LIBAVL_SITE = http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/liba/libavl +LIBAVL_SOURCE = libavl_$(LIBAVL_VERSION).orig.tar.gz +LIBAVL_LICENSE = LGPL-2.0+ +LIBAVL_LICENSE_FILES = COPYING +LIBAVL_INSTALL_STAGING = YES + +LIBAVL_CFLAGS = $(TARGET_CFLAGS) -fPIC +HOST_LIBAVL_CFLAGS = $(HOST_CFLAGS) -fPIC + +define LIBAVL_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ + CFLAGS="$(LIBAVL_CFLAGS)" +endef + +define LIBAVL_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install \ + prefix=/usr DESTDIR=$(STAGING_DIR) +endef + +define LIBAVL_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install \ + prefix=/usr DESTDIR=$(TARGET_DIR) +endef + +define HOST_LIBAVL_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ + CFLAGS="$(HOST_LIBAVL_CFLAGS)" +endef + +define HOST_LIBAVL_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) install \ + prefix=$(HOST_DIR) +endef + +$(eval $(generic-package)) +$(eval $(host-generic-package))