From patchwork Mon Jun 17 14:06:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7884 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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4W2sB70BXqz3wxG for ; Mon, 17 Jun 2024 14:06:23 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4W2sB44t1zz5SK; Mon, 17 Jun 2024 14:06:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4W2sB44MW9z32vJ; Mon, 17 Jun 2024 14:06:20 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4W2sB11KBzz2xRp for ; Mon, 17 Jun 2024 14:06:17 +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 (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4W2sB04hGyz2PV; Mon, 17 Jun 2024 14:06:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1718633176; 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=Ca9+0k8ZfcFgztlKmcH2GaJBumP07S0uvYaB42NDtOs=; b=Fm8qXpsPwdbEP+EMXT4Jbe7+Km7hnV5ieqC5Mvbm2S0WvyiM9+WIH8ZZ/8a816sYldNxb1 Ru+HqJb5apElnpBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1718633176; 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=Ca9+0k8ZfcFgztlKmcH2GaJBumP07S0uvYaB42NDtOs=; b=SzJH3vZYlCJ093delOyFwCVnpLB8S7MvIEIazq6veChXRk9175g2tY/n6EX5XTHxGEBd3f Df9mOeBh6eWnCENve9tmSJSIiEDIH+arXoYBzNExAXj1mmEIAxBNNqb8Wb8q9FqgcfzhYi 1TJmQjGOGgclCv3gZh3KSI1BiuAbxE7BTn9JcAt/ZoBArpHIJ+5qnmcmTLEWE/s7g/gywZ 9q6qXZ9O6nV8diQBG3YERsg/kCU+sFVLh7T9/FJ7/BrATtGZASNoK+us9QnbeT6lKWfZzC 0YNCF6DE17TYsiADCaJi7Kba92IEF7ydUGWs0Kj8fQqJZyCem899H+gq1P37kg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] utfcpp: Required for build of latest version of taglib Date: Mon, 17 Jun 2024 16:06:10 +0200 Message-ID: <20240617140610.3679044-2-adolf.belka@ipfire.org> In-Reply-To: <20240617140610.3679044-1-adolf.belka@ipfire.org> References: <20240617140610.3679044-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: XOIOZMQLQMZT2WKHMJJJNDJMDQELMUIM X-Message-ID-Hash: XOIOZMQLQMZT2WKHMJJJNDJMDQELMUIM X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - lfs copies the required headers to the /usr/include directory. - rootfile has all entries commented out as utfcpp is only required for the build. - Added utfcpp into make.sh prior to taglib. Signed-off-by: Adolf Belka --- config/rootfiles/common/utfcpp | 8 ++++ lfs/utfcpp | 78 ++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 87 insertions(+) create mode 100644 config/rootfiles/common/utfcpp create mode 100644 lfs/utfcpp diff --git a/config/rootfiles/common/utfcpp b/config/rootfiles/common/utfcpp new file mode 100644 index 000000000..58097459e --- /dev/null +++ b/config/rootfiles/common/utfcpp @@ -0,0 +1,8 @@ +#usr/include/utf8 +#usr/include/utf8.h +#usr/include/utf8/checked.h +#usr/include/utf8/core.h +#usr/include/utf8/cpp11.h +#usr/include/utf8/cpp17.h +#usr/include/utf8/cpp20.h +#usr/include/utf8/unchecked.h diff --git a/lfs/utfcpp b/lfs/utfcpp new file mode 100644 index 000000000..1897e4c4d --- /dev/null +++ b/lfs/utfcpp @@ -0,0 +1,78 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 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 = 4.0.5 + +THISAPP = utfcpp-$(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 = c2058dac06b7bbedb97c18fe8a2fdfa13e45afe180d6602e8c1347db313361c94abf06514c80a308bef6f72eea63b6a7aaeaa7985925d7f5754f5210ebf040cb + +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) && cp -R source/* /usr/include/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f8221bc2c..437fda9d5 100755 --- a/make.sh +++ b/make.sh @@ -1540,6 +1540,7 @@ buildipfire() { lfsmake2 7zip lfsmake2 lynis lfsmake2 sshfs + lfsmake2 utfcpp lfsmake2 taglib lfsmake2 perl-gettext lfsmake2 perl-Sort-Naturally