From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: Re: [PATCH v2 07/11] Drop intltool add-on Date: Thu, 20 May 2021 16:13:43 +0200 Message-ID: <359420e5-3f73-49a3-358b-db77e072ac24@ipfire.org> In-Reply-To: <53763519-6564-4CC2-AF25-8E1ACFBE47FD@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3610269415012982654==" List-Id: --===============3610269415012982654== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Michael, thanks for your reply. I am a bit puzzled by it: Yes, I would have expected us to need intltool for = building packages - but only in the toolchain. If I understood you correctly, we used to rely o= n an add-on for building core packages? That would be - um - interesting. :-) If so, do we have more candidates such as intltool? Thanks, and best regards, Peter M=C3=BCller > Hello, >=20 > We need this as a build dependency of probably a hundred packages :) >=20 > I will keep this and move it into the core system. >=20 > -Michael >=20 >> On 17 May 2021, at 22:57, Peter M=C3=BCller w= rote: >> >> As discussed in https://wiki.ipfire.org/devel/telco/2021-05-03. >> >> Signed-off-by: Peter M=C3=BCller >> --- >> config/rootfiles/packages/intltool | 13 ----- >> lfs/intltool | 85 ------------------------------ >> make.sh | 1 - >> 3 files changed, 99 deletions(-) >> delete mode 100644 config/rootfiles/packages/intltool >> delete mode 100644 lfs/intltool >> >> diff --git a/config/rootfiles/packages/intltool b/config/rootfiles/package= s/intltool >> deleted file mode 100644 >> index e1421fad7..000000000 >> --- a/config/rootfiles/packages/intltool >> +++ /dev/null >> @@ -1,13 +0,0 @@ >> -usr/bin/intltool-extract >> -usr/bin/intltool-merge >> -usr/bin/intltool-prepare >> -usr/bin/intltool-update >> -usr/bin/intltoolize >> -#usr/share/aclocal/intltool.m4 >> -#usr/share/intltool >> -#usr/share/intltool/Makefile.in.in >> -#usr/share/man/man8/intltool-extract.8 >> -#usr/share/man/man8/intltool-merge.8 >> -#usr/share/man/man8/intltool-prepare.8 >> -#usr/share/man/man8/intltool-update.8 >> -#usr/share/man/man8/intltoolize.8 >> diff --git a/lfs/intltool b/lfs/intltool >> deleted file mode 100644 >> index 234262f62..000000000 >> --- a/lfs/intltool >> +++ /dev/null >> @@ -1,85 +0,0 @@ >> -#########################################################################= ###### >> -# = # >> -# IPFire.org - A linux based firewall = # >> -# Copyright (C) 2007-2018 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 =3D 0.40.5 >> - >> -THISAPP =3D intltool-$(VER) >> -DL_FILE =3D $(THISAPP).tar.bz2 >> -DL_FROM =3D $(URL_IPFIRE) >> -DIR_APP =3D $(DIR_SRC)/$(THISAPP) >> -TARGET =3D $(DIR_INFO)/$(THISAPP) >> -PROG =3D intltool >> -PAK_VER =3D 1 >> - >> -DEPS =3D >> - >> -#########################################################################= ###### >> -# Top-level Rules >> -#########################################################################= ###### >> - >> -objects =3D $(DL_FILE) >> - >> -$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >> - >> -$(DL_FILE)_MD5 =3D 3e7ded6f50d88cf8b8bb505eaf591775 >> - >> -install : $(TARGET) >> - >> -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >> - >> -download :$(patsubst %,$(DIR_DL)/%,$(objects)) >> - >> -md5 : $(subst %,%_MD5,$(objects)) >> - >> - >> -#########################################################################= ###### >> -# Downloading, checking, md5sum >> -#########################################################################= ###### >> - >> -$(patsubst %,$(DIR_CHK)/%,$(objects)) : >> - @$(CHECK) >> - >> -$(patsubst %,$(DIR_DL)/%,$(objects)) : >> - @$(LOAD) >> - >> -$(subst %,%_MD5,$(objects)) : >> - @$(MD5) >> - >> -dist:=20 >> - @$(PAK) >> - >> -#########################################################################= ###### >> -# Installation Details >> -#########################################################################= ###### >> - >> -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> - @$(PREBUILD) >> - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) >> - cd $(DIR_APP) && ./configure --prefix=3D/usr >> - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) >> - cd $(DIR_APP) && make install >> - @rm -rf $(DIR_APP) >> - @$(POSTBUILD) >> diff --git a/make.sh b/make.sh >> index 3bca46d8f..56c93fb79 100755 >> --- a/make.sh >> +++ b/make.sh >> @@ -1385,7 +1385,6 @@ buildipfire() { >> lfsmake2 openvpn >> lfsmake2 mpage >> lfsmake2 dbus >> - lfsmake2 intltool >> lfsmake2 libdaemon >> lfsmake2 avahi >> lfsmake2 cups >> --=20 >> 2.26.2 >=20 --===============3610269415012982654==--