]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
utfcpp: Required for build of latest version of taglib
authorAdolf Belka <adolf.belka@ipfire.org>
Mon, 17 Jun 2024 14:06:10 +0000 (16:06 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Jul 2024 09:14:10 +0000 (09:14 +0000)
- 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 <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
config/rootfiles/common/utfcpp [new file with mode: 0644]
lfs/utfcpp [new file with mode: 0644]
make.sh

diff --git a/config/rootfiles/common/utfcpp b/config/rootfiles/common/utfcpp
new file mode 100644 (file)
index 0000000..5809745
--- /dev/null
@@ -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 (file)
index 0000000..1897e4c
--- /dev/null
@@ -0,0 +1,78 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2024  IPFire Team  <info@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        = 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 f8221bc2c7decd77af2c70bf7b07af615ead747f..437fda9d5cc2f29577448ee808888091563bdcb0 100755 (executable)
--- 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