From patchwork Fri Apr 29 12:05:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 5570 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KqWR10nYPz3x1y for ; Fri, 29 Apr 2022 12:05:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KqWQz5pkhz5MG; Fri, 29 Apr 2022 12:05:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KqWQz5X9Dz2yqB; Fri, 29 Apr 2022 12:05:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KqWQy32lnz2xy3 for ; Fri, 29 Apr 2022 12:05:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KqWQx5pczz2jP; Fri, 29 Apr 2022 12:05:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1651233945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QLs+BGQmgsxrO+9DNIZPXNJkQ0ped8pRgZVt8QW/YX8=; b=fVLfuigW/mKidAWLWtbQPa3D4xWcL067HfypXJMJExgNDPN01kmdKx38KYi1RSIgRKYh4R b5vS+XRkYDm+DNAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1651233945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QLs+BGQmgsxrO+9DNIZPXNJkQ0ped8pRgZVt8QW/YX8=; b=VObjtU6jb5QB7GBU3keIKyJi0Hz9t7PE4MFTtDHtTODXdtN+fJSujK1/tdJJz8FWtPXs39 62oPXhgGyuNt4H9YN/LRApPCF1awAgCZmeQPVKzb/1+eo0emcOi72BKX416NFbyvVGAcZd DYkLo51Utvl9K2YJ33klYBbckGkDNCOe9JgpN9l/RW0A5h4fmedbNR+s1MTsY9gkSyStOe 4H9xlyNxJOpBtZSTuGa+JZO6SlKrL1LrsPCKySO3pG1JLEWXzn83TZHXDououAD6avjCwR wmeplbD250VT3RnvUYDlfu2JYACYX82Wck7V91y21X8hdAx8DdTRO1wP5kmTHg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/3] fmt: Addition of new build time dependency for mpd Date: Fri, 29 Apr 2022 14:05:21 +0200 Message-Id: <20220429120522.3484043-2-adolf.belka@ipfire.org> In-Reply-To: <20220429120522.3484043-1-adolf.belka@ipfire.org> References: <20220429120522.3484043-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - lfs and rootfile created - Added fmt to make.sh Signed-off-by: Adolf Belka --- config/rootfiles/common/fmt | 23 ++++++++++ lfs/fmt | 83 +++++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 107 insertions(+) create mode 100644 config/rootfiles/common/fmt create mode 100644 lfs/fmt diff --git a/config/rootfiles/common/fmt b/config/rootfiles/common/fmt new file mode 100644 index 000000000..d9067f14a --- /dev/null +++ b/config/rootfiles/common/fmt @@ -0,0 +1,23 @@ +#usr/include/fmt +#usr/include/fmt/args.h +#usr/include/fmt/chrono.h +#usr/include/fmt/color.h +#usr/include/fmt/compile.h +#usr/include/fmt/core.h +#usr/include/fmt/format-inl.h +#usr/include/fmt/format.h +#usr/include/fmt/locale.h +#usr/include/fmt/os.h +#usr/include/fmt/ostream.h +#usr/include/fmt/printf.h +#usr/include/fmt/ranges.h +#usr/include/fmt/xchar.h +#usr/lib/cmake/fmt +#usr/lib/cmake/fmt/fmt-config-version.cmake +#usr/lib/cmake/fmt/fmt-config.cmake +#usr/lib/cmake/fmt/fmt-targets-release.cmake +#usr/lib/cmake/fmt/fmt-targets.cmake +#usr/lib/libfmt.so +#usr/lib/libfmt.so.8 +#usr/lib/libfmt.so.8.1.1 +#usr/lib/pkgconfig/fmt.pc diff --git a/lfs/fmt b/lfs/fmt new file mode 100644 index 000000000..754de03b1 --- /dev/null +++ b/lfs/fmt @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2022 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 8.1.1 + +THISAPP = fmt-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 8f3eafd72c0eff62cfcf26a8a37e4d89c8f4a2cec6e427e3ea8d0de3010dd6e5e45ce4486335d3b433308a967915b38ca4d422d789ceda4196153329128056b9 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && mkdir -pv build + cd $(DIR_APP)/build && cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=TRUE + cd $(DIR_APP)/build && make $(MAKETUNING) + cd $(DIR_APP)/build && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 5f9f16d05..a3df48d72 100755 --- a/make.sh +++ b/make.sh @@ -1548,6 +1548,7 @@ buildipfire() { lfsmake2 vdr_dvbapi lfsmake2 vdr_eepg lfsmake2 w_scan + lfsmake2 fmt lfsmake2 mpd lfsmake2 libmpdclient lfsmake2 mpc