From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
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>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4436767820370719723=="
List-Id: <development.lists.ipfire.org>

--===============4436767820370719723==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- lfs copies the required headers to the /usr/include directory.
- rootfile has all entries commented out as utfcpp is only required for the b=
uild.
- Added utfcpp into make.sh prior to taglib.

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 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  <info(a)ipfire.org>                 =
    #
+#                                                                           =
  #
+# 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 <http://www.gnu.org/licenses/>.     =
  #
+#                                                                           =
  #
+############################################################################=
###
+
+############################################################################=
###
+# Definitions
+############################################################################=
###
+
+include Config
+
+VER        =3D 4.0.5
+
+THISAPP    =3D utfcpp-$(VER)
+DL_FILE    =3D $(THISAPP).tar.gz
+DL_FROM    =3D $(URL_IPFIRE)
+DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
+TARGET     =3D $(DIR_INFO)/$(THISAPP)
+
+############################################################################=
###
+# Top-level Rules
+############################################################################=
###
+
+objects =3D $(DL_FILE)
+
+$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 =3D c2058dac06b7bbedb97c18fe8a2fdfa13e45afe180d6602e8c1347=
db313361c94abf06514c80a308bef6f72eea63b6a7aaeaa7985925d7f5754f5210ebf040cb
+
+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
--=20
2.45.2


--===============4436767820370719723==--