diff mbox series

[29/29] make.sh: Build some dependencies for glib earlier

Message ID	20221201172318.3166615-29-michael.tremer@ipfire.org
State	Accepted
Commit	5b5facc3ca025d648bbfc7161e4b6bbab787acce
Headers	From: Michael Tremer <michael.tremer@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 29/29] make.sh: Build some dependencies for glib earlier Date: Thu, 1 Dec 2022 17:23:18 +0000 Message-Id: <20221201172318.3166615-29-michael.tremer@ipfire.org> In-Reply-To: <20221201172318.3166615-1-michael.tremer@ipfire.org> References: <20221201172318.3166615-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Cc: Michael Tremer <michael.tremer@ipfire.org> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>
Series	[01/29] libgudev: New package \| [01/29] libgudev: New package [02/29] libqmi: New package [03/29] dhcpcd: Log any unhandled client events [04/29] dhcpcd.exe: Allow using the DHCP setup scripts when RED is not configured as DHCP [05/29] network: Allow passing custom options to dhcpcd [06/29] network: Add support for QMI modems [07/29] network: Drop any traces of ISDN [08/29] pppsetup.cgi: Add support for QMI profiles [09/29] pppsetup.cgi: Add support for QMI profiles [10/29] pppsetup.cgi: Move authentication above MTU [11/29] network: Remove --debug switch for dhcpcd in QMI mode [12/29] dhcpcd: Only try to obtain an IP address for IPv4 [13/29] dhcpcd.exe: Flush any configured IP addresses on shutdown [14/29] dhcpcd.exe: Actually use the received MTU [15/29] dhcpcd.exe: Only set gateway when we have received one [16/29] dhcpcd.exe: Store the default gateway when in QMI mode [17/29] dhcpcd.exe: Use DNS servers from QMI [18/29] dhcpcd.exe: Do not overwrite the default gateway when empty [19/29] dhcpcd.exe: Only touch /var/ipfire/red/active once [20/29] dhcpcd.exe: Run everything no matter how RED is configured [21/29] dhcpcd.exe: Fix typo in configuring DNS server [22/29] network: dhcpcd fails to check link state for QMI interfaces [23/29] dhcpcd.exe: Reformat the reason dispatcher [24/29] dhcpcd.exe: Ignore some events [25/29] dhcpcd.exe: Add a safety net to make sure we always have a route [26/29] network: Force dhcpcd to ask for an IP address [27/29] network: Assign "static" MAC addresses to QMI interfaces [28/29] network: Silence any output during the QMI setup [29/29] make.sh: Build some dependencies for glib earlier

Commit Message

Michael Tremer Dec. 1, 2022, 5:23 p.m. UTC

  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 make.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Peter Müller Dec. 17, 2022, 9:03 p.m. UTC | #1

Hello Michael,

currently working on Core Update 173, this patch seems to break glib (at least
that's what I am assuming, given that glib itself has not been touched in a
while):

> glib (2.71.1)                                                                                                                                                                                                            [        0 ][ FAIL ]
> 
>     'dest/tools_x86_64/bin/meson' -> '/tools_x86_64/bin/meson'
>     Updating linker cache...
>     Install done; saving file list to /usr/src/log/meson-0.64.1 ...
>     Dec 17 19:05:41: Building glib glib-2.71.1.tar.xz checksum OK
>     + cd /usr/src/lfs
>     + make -f glib LFS_BASEDIR=/usr/src install
>     ====================================== Installing glib-2.71.1 ...
>     Install started; saving file list to /usr/src/lsalr ...
>     cd /usr/src/glib-2.71.1 && meson	--prefix=/usr 		\
>     --sysconfdir=/etc	\
>     builddir/
>     Traceback (most recent call last):
>     File "/tools_x86_64/bin/meson", line 33, in <module>
>     sys.exit(load_entry_point('meson==0.64.1', 'console_scripts', 'meson')())
>     File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 287, in main
>     return run(sys.argv[1:], launcher)
>     File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 277, in run
>     set_meson_command(mainfile)
>     File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 235, in set_meson_command
>     from . import mesonlib
>     File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonlib.py", line 24, in <module>
>     from .utils.vsenv import *
>     File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/utils/vsenv.py", line 9, in <module>
>     from .universal import MesonException, is_windows, windows_detect_native_arch
>     File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/utils/universal.py", line 20, in <module>
>     import ctypes
>     File "/tools_x86_64/lib/python3.10/ctypes/__init__.py", line 8, in <module>
>     from _ctypes import Union, Structure, Array
>     ModuleNotFoundError: No module named '_ctypes'
>     make: *** [glib:74: /usr/src/log/glib-2.71.1] Error 1

Am I missing anything? How did you get this to work? :-)

Thanks, and best regards,
Peter Müller


> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
> ---
>  make.sh | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/make.sh b/make.sh
> index 0d1457d99..2cf47e6a9 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1176,6 +1176,10 @@ buildipfire() {
>    lfsmake2 xradio		KCFG=""
>    lfsmake2 linux-initrd		KCFG=""
>  
> +  lfsmake2 python3-setuptools
> +  lfsmake2 libffi
> +  lfsmake2 ninja
> +  lfsmake2 meson
>    lfsmake2 glib
>    lfsmake2 libgudev
>    lfsmake2 libgpg-error
> @@ -1204,7 +1208,6 @@ buildipfire() {
>    lfsmake2 curl
>    lfsmake2 tcl
>    lfsmake2 sqlite
> -  lfsmake2 libffi
>    lfsmake2 python3
>    lfsmake2 rust
>    lfsmake2 rust-dissimilar
> @@ -1324,8 +1327,6 @@ buildipfire() {
>    lfsmake2 nasm
>    lfsmake2 libarchive
>    lfsmake2 cmake
> -  lfsmake2 ninja
> -  lfsmake2 meson
>    lfsmake2 libjpeg
>    lfsmake2 openjpeg
>    lfsmake2 libexif
> @@ -1420,7 +1421,6 @@ buildipfire() {
>    lfsmake2 perl-Crypt-PasswdMD5
>    lfsmake2 perl-Net-Telnet
>    lfsmake2 perl-JSON
> -  lfsmake2 python3-setuptools
>    lfsmake2 python3-inotify
>    lfsmake2 python3-docutils
>    lfsmake2 python3-daemon

Michael Tremer Dec. 19, 2022, 12:49 p.m. UTC | #2

Hello,

Errm, it looks like I might have messed up my final clean build.

Obviously Python 3 must be built before python3-setuptools, meson and so on.

Could you try that for me, please?

-Michael

> On 17 Dec 2022, at 21:03, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Hello Michael,
> 
> currently working on Core Update 173, this patch seems to break glib (at least
> that's what I am assuming, given that glib itself has not been touched in a
> while):
> 
>> glib (2.71.1)                                                                                                                                                                                                            [        0 ][ FAIL ]
>> 
>>    'dest/tools_x86_64/bin/meson' -> '/tools_x86_64/bin/meson'
>>    Updating linker cache...
>>    Install done; saving file list to /usr/src/log/meson-0.64.1 ...
>>    Dec 17 19:05:41: Building glib glib-2.71.1.tar.xz checksum OK
>>    + cd /usr/src/lfs
>>    + make -f glib LFS_BASEDIR=/usr/src install
>>    ====================================== Installing glib-2.71.1 ...
>>    Install started; saving file list to /usr/src/lsalr ...
>>    cd /usr/src/glib-2.71.1 && meson --prefix=/usr \
>>    --sysconfdir=/etc \
>>    builddir/
>>    Traceback (most recent call last):
>>    File "/tools_x86_64/bin/meson", line 33, in <module>
>>    sys.exit(load_entry_point('meson==0.64.1', 'console_scripts', 'meson')())
>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 287, in main
>>    return run(sys.argv[1:], launcher)
>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 277, in run
>>    set_meson_command(mainfile)
>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 235, in set_meson_command
>>    from . import mesonlib
>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonlib.py", line 24, in <module>
>>    from .utils.vsenv import *
>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/utils/vsenv.py", line 9, in <module>
>>    from .universal import MesonException, is_windows, windows_detect_native_arch
>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/utils/universal.py", line 20, in <module>
>>    import ctypes
>>    File "/tools_x86_64/lib/python3.10/ctypes/__init__.py", line 8, in <module>
>>    from _ctypes import Union, Structure, Array
>>    ModuleNotFoundError: No module named '_ctypes'
>>    make: *** [glib:74: /usr/src/log/glib-2.71.1] Error 1
> 
> Am I missing anything? How did you get this to work? :-)
> 
> Thanks, and best regards,
> Peter Müller
> 
> 
>> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
>> ---
>> make.sh | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>> 
>> diff --git a/make.sh b/make.sh
>> index 0d1457d99..2cf47e6a9 100755
>> --- a/make.sh
>> +++ b/make.sh
>> @@ -1176,6 +1176,10 @@ buildipfire() {
>>   lfsmake2 xradio KCFG=""
>>   lfsmake2 linux-initrd KCFG=""
>> 
>> +  lfsmake2 python3-setuptools
>> +  lfsmake2 libffi
>> +  lfsmake2 ninja
>> +  lfsmake2 meson
>>   lfsmake2 glib
>>   lfsmake2 libgudev
>>   lfsmake2 libgpg-error
>> @@ -1204,7 +1208,6 @@ buildipfire() {
>>   lfsmake2 curl
>>   lfsmake2 tcl
>>   lfsmake2 sqlite
>> -  lfsmake2 libffi
>>   lfsmake2 python3
>>   lfsmake2 rust
>>   lfsmake2 rust-dissimilar
>> @@ -1324,8 +1327,6 @@ buildipfire() {
>>   lfsmake2 nasm
>>   lfsmake2 libarchive
>>   lfsmake2 cmake
>> -  lfsmake2 ninja
>> -  lfsmake2 meson
>>   lfsmake2 libjpeg
>>   lfsmake2 openjpeg
>>   lfsmake2 libexif
>> @@ -1420,7 +1421,6 @@ buildipfire() {
>>   lfsmake2 perl-Crypt-PasswdMD5
>>   lfsmake2 perl-Net-Telnet
>>   lfsmake2 perl-JSON
>> -  lfsmake2 python3-setuptools
>>   lfsmake2 python3-inotify
>>   lfsmake2 python3-docutils
>>   lfsmake2 python3-daemon

Peter Müller Dec. 20, 2022, 12:03 p.m. UTC | #3

Hello Michael,

thanks for your reply.

> Hello,
> 
> Errm, it looks like I might have messed up my final clean build.
> 
> Obviously Python 3 must be built before python3-setuptools, meson and so on.
> 
> Could you try that for me, please?

I did, but it does not make a difference. Even with some things moved before
python3-setuptools, meson, etc. pp. as well for good measure, glib build still
fails with the same error message.

Current make.sh delta is as follows:

diff --git a/make.sh b/make.sh
index 88048dbf9..bdbcc50b5 100755
--- a/make.sh
+++ b/make.sh
@@ -1176,6 +1176,11 @@ buildipfire() {
   lfsmake2 xradio              KCFG=""
   lfsmake2 linux-initrd                KCFG=""
 
+  lfsmake2 expat
+  lfsmake2 libconfig
+  lfsmake2 json-c
+  lfsmake2 tcl
+  lfsmake2 python3
   lfsmake2 python3-setuptools
   lfsmake2 libffi
   lfsmake2 ninja
@@ -1187,10 +1192,7 @@ buildipfire() {
   lfsmake2 libassuan
   lfsmake2 nettle
   lfsmake2 libsodium
-  lfsmake2 json-c
-  lfsmake2 libconfig
   lfsmake2 libevent2
-  lfsmake2 expat
   lfsmake2 apr
   lfsmake2 aprutil
   lfsmake2 unbound
@@ -1206,9 +1208,7 @@ buildipfire() {
   lfsmake2 pam
   lfsmake2 c-ares
   lfsmake2 curl
-  lfsmake2 tcl
   lfsmake2 sqlite
-  lfsmake2 python3
   lfsmake2 rust
   lfsmake2 rust-dissimilar
   lfsmake2 rust-cfg-if

Anything else I could try? :-)

Thanks, and best regards,
Peter Müller

> 
> -Michael
> 
>> On 17 Dec 2022, at 21:03, Peter Müller <peter.mueller@ipfire.org> wrote:
>>
>> Hello Michael,
>>
>> currently working on Core Update 173, this patch seems to break glib (at least
>> that's what I am assuming, given that glib itself has not been touched in a
>> while):
>>
>>> glib (2.71.1)                                                                                                                                                                                                            [        0 ][ FAIL ]
>>>
>>>    'dest/tools_x86_64/bin/meson' -> '/tools_x86_64/bin/meson'
>>>    Updating linker cache...
>>>    Install done; saving file list to /usr/src/log/meson-0.64.1 ...
>>>    Dec 17 19:05:41: Building glib glib-2.71.1.tar.xz checksum OK
>>>    + cd /usr/src/lfs
>>>    + make -f glib LFS_BASEDIR=/usr/src install
>>>    ====================================== Installing glib-2.71.1 ...
>>>    Install started; saving file list to /usr/src/lsalr ...
>>>    cd /usr/src/glib-2.71.1 && meson --prefix=/usr \
>>>    --sysconfdir=/etc \
>>>    builddir/
>>>    Traceback (most recent call last):
>>>    File "/tools_x86_64/bin/meson", line 33, in <module>
>>>    sys.exit(load_entry_point('meson==0.64.1', 'console_scripts', 'meson')())
>>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 287, in main
>>>    return run(sys.argv[1:], launcher)
>>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 277, in run
>>>    set_meson_command(mainfile)
>>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 235, in set_meson_command
>>>    from . import mesonlib
>>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonlib.py", line 24, in <module>
>>>    from .utils.vsenv import *
>>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/utils/vsenv.py", line 9, in <module>
>>>    from .universal import MesonException, is_windows, windows_detect_native_arch
>>>    File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/utils/universal.py", line 20, in <module>
>>>    import ctypes
>>>    File "/tools_x86_64/lib/python3.10/ctypes/__init__.py", line 8, in <module>
>>>    from _ctypes import Union, Structure, Array
>>>    ModuleNotFoundError: No module named '_ctypes'
>>>    make: *** [glib:74: /usr/src/log/glib-2.71.1] Error 1
>>
>> Am I missing anything? How did you get this to work? :-)
>>
>> Thanks, and best regards,
>> Peter Müller
>>
>>
>>> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
>>> ---
>>> make.sh | 8 ++++----
>>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/make.sh b/make.sh
>>> index 0d1457d99..2cf47e6a9 100755
>>> --- a/make.sh
>>> +++ b/make.sh
>>> @@ -1176,6 +1176,10 @@ buildipfire() {
>>>   lfsmake2 xradio KCFG=""
>>>   lfsmake2 linux-initrd KCFG=""
>>>
>>> +  lfsmake2 python3-setuptools
>>> +  lfsmake2 libffi
>>> +  lfsmake2 ninja
>>> +  lfsmake2 meson
>>>   lfsmake2 glib
>>>   lfsmake2 libgudev
>>>   lfsmake2 libgpg-error
>>> @@ -1204,7 +1208,6 @@ buildipfire() {
>>>   lfsmake2 curl
>>>   lfsmake2 tcl
>>>   lfsmake2 sqlite
>>> -  lfsmake2 libffi
>>>   lfsmake2 python3
>>>   lfsmake2 rust
>>>   lfsmake2 rust-dissimilar
>>> @@ -1324,8 +1327,6 @@ buildipfire() {
>>>   lfsmake2 nasm
>>>   lfsmake2 libarchive
>>>   lfsmake2 cmake
>>> -  lfsmake2 ninja
>>> -  lfsmake2 meson
>>>   lfsmake2 libjpeg
>>>   lfsmake2 openjpeg
>>>   lfsmake2 libexif
>>> @@ -1420,7 +1421,6 @@ buildipfire() {
>>>   lfsmake2 perl-Crypt-PasswdMD5
>>>   lfsmake2 perl-Net-Telnet
>>>   lfsmake2 perl-JSON
>>> -  lfsmake2 python3-setuptools
>>>   lfsmake2 python3-inotify
>>>   lfsmake2 python3-docutils
>>>   lfsmake2 python3-daemon
>

Michael Tremer Dec. 20, 2022, 4:07 p.m. UTC | #4

Hello,

Yes, you will need all the other Python dependencies for all modules to be built.

ctypes needs libffi. If there is more stuff missing, the root file will tell you.

Best,
-Michael

> On 20 Dec 2022, at 12:03, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Hello Michael,
> 
> thanks for your reply.
> 
>> Hello,
>> 
>> Errm, it looks like I might have messed up my final clean build.
>> 
>> Obviously Python 3 must be built before python3-setuptools, meson and so on.
>> 
>> Could you try that for me, please?
> 
> I did, but it does not make a difference. Even with some things moved before
> python3-setuptools, meson, etc. pp. as well for good measure, glib build still
> fails with the same error message.
> 
> Current make.sh delta is as follows:
> 
> diff --git a/make.sh b/make.sh
> index 88048dbf9..bdbcc50b5 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -1176,6 +1176,11 @@ buildipfire() {
>   lfsmake2 xradio              KCFG=""
>   lfsmake2 linux-initrd                KCFG=""
> 
> +  lfsmake2 expat
> +  lfsmake2 libconfig
> +  lfsmake2 json-c
> +  lfsmake2 tcl
> +  lfsmake2 python3
>   lfsmake2 python3-setuptools
>   lfsmake2 libffi
>   lfsmake2 ninja
> @@ -1187,10 +1192,7 @@ buildipfire() {
>   lfsmake2 libassuan
>   lfsmake2 nettle
>   lfsmake2 libsodium
> -  lfsmake2 json-c
> -  lfsmake2 libconfig
>   lfsmake2 libevent2
> -  lfsmake2 expat
>   lfsmake2 apr
>   lfsmake2 aprutil
>   lfsmake2 unbound
> @@ -1206,9 +1208,7 @@ buildipfire() {
>   lfsmake2 pam
>   lfsmake2 c-ares
>   lfsmake2 curl
> -  lfsmake2 tcl
>   lfsmake2 sqlite
> -  lfsmake2 python3
>   lfsmake2 rust
>   lfsmake2 rust-dissimilar
>   lfsmake2 rust-cfg-if
> 
> Anything else I could try? :-)
> 
> Thanks, and best regards,
> Peter Müller
> 
>> 
>> -Michael
>> 
>>> On 17 Dec 2022, at 21:03, Peter Müller <peter.mueller@ipfire.org> wrote:
>>> 
>>> Hello Michael,
>>> 
>>> currently working on Core Update 173, this patch seems to break glib (at least
>>> that's what I am assuming, given that glib itself has not been touched in a
>>> while):
>>> 
>>>> glib (2.71.1)                                                                                                                                                                                                            [        0 ][ FAIL ]
>>>> 
>>>>   'dest/tools_x86_64/bin/meson' -> '/tools_x86_64/bin/meson'
>>>>   Updating linker cache...
>>>>   Install done; saving file list to /usr/src/log/meson-0.64.1 ...
>>>>   Dec 17 19:05:41: Building glib glib-2.71.1.tar.xz checksum OK
>>>>   + cd /usr/src/lfs
>>>>   + make -f glib LFS_BASEDIR=/usr/src install
>>>>   ====================================== Installing glib-2.71.1 ...
>>>>   Install started; saving file list to /usr/src/lsalr ...
>>>>   cd /usr/src/glib-2.71.1 && meson --prefix=/usr \
>>>>   --sysconfdir=/etc \
>>>>   builddir/
>>>>   Traceback (most recent call last):
>>>>   File "/tools_x86_64/bin/meson", line 33, in <module>
>>>>   sys.exit(load_entry_point('meson==0.64.1', 'console_scripts', 'meson')())
>>>>   File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 287, in main
>>>>   return run(sys.argv[1:], launcher)
>>>>   File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 277, in run
>>>>   set_meson_command(mainfile)
>>>>   File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonmain.py", line 235, in set_meson_command
>>>>   from . import mesonlib
>>>>   File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/mesonlib.py", line 24, in <module>
>>>>   from .utils.vsenv import *
>>>>   File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/utils/vsenv.py", line 9, in <module>
>>>>   from .universal import MesonException, is_windows, windows_detect_native_arch
>>>>   File "/tools_x86_64/lib/python3.10/site-packages/mesonbuild/utils/universal.py", line 20, in <module>
>>>>   import ctypes
>>>>   File "/tools_x86_64/lib/python3.10/ctypes/__init__.py", line 8, in <module>
>>>>   from _ctypes import Union, Structure, Array
>>>>   ModuleNotFoundError: No module named '_ctypes'
>>>>   make: *** [glib:74: /usr/src/log/glib-2.71.1] Error 1
>>> 
>>> Am I missing anything? How did you get this to work? :-)
>>> 
>>> Thanks, and best regards,
>>> Peter Müller
>>> 
>>> 
>>>> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
>>>> ---
>>>> make.sh | 8 ++++----
>>>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>>> 
>>>> diff --git a/make.sh b/make.sh
>>>> index 0d1457d99..2cf47e6a9 100755
>>>> --- a/make.sh
>>>> +++ b/make.sh
>>>> @@ -1176,6 +1176,10 @@ buildipfire() {
>>>>  lfsmake2 xradio KCFG=""
>>>>  lfsmake2 linux-initrd KCFG=""
>>>> 
>>>> +  lfsmake2 python3-setuptools
>>>> +  lfsmake2 libffi
>>>> +  lfsmake2 ninja
>>>> +  lfsmake2 meson
>>>>  lfsmake2 glib
>>>>  lfsmake2 libgudev
>>>>  lfsmake2 libgpg-error
>>>> @@ -1204,7 +1208,6 @@ buildipfire() {
>>>>  lfsmake2 curl
>>>>  lfsmake2 tcl
>>>>  lfsmake2 sqlite
>>>> -  lfsmake2 libffi
>>>>  lfsmake2 python3
>>>>  lfsmake2 rust
>>>>  lfsmake2 rust-dissimilar
>>>> @@ -1324,8 +1327,6 @@ buildipfire() {
>>>>  lfsmake2 nasm
>>>>  lfsmake2 libarchive
>>>>  lfsmake2 cmake
>>>> -  lfsmake2 ninja
>>>> -  lfsmake2 meson
>>>>  lfsmake2 libjpeg
>>>>  lfsmake2 openjpeg
>>>>  lfsmake2 libexif
>>>> @@ -1420,7 +1421,6 @@ buildipfire() {
>>>>  lfsmake2 perl-Crypt-PasswdMD5
>>>>  lfsmake2 perl-Net-Telnet
>>>>  lfsmake2 perl-JSON
>>>> -  lfsmake2 python3-setuptools
>>>>  lfsmake2 python3-inotify
>>>>  lfsmake2 python3-docutils
>>>>  lfsmake2 python3-daemon
>>

diff mbox series

Patch

diff --git a/make.sh b/make.sh
index 0d1457d99..2cf47e6a9 100755
--- a/make.sh
+++ b/make.sh
@@ -1176,6 +1176,10 @@  buildipfire() {
   lfsmake2 xradio		KCFG=""
   lfsmake2 linux-initrd		KCFG=""
 
+  lfsmake2 python3-setuptools
+  lfsmake2 libffi
+  lfsmake2 ninja
+  lfsmake2 meson
   lfsmake2 glib
   lfsmake2 libgudev
   lfsmake2 libgpg-error
@@ -1204,7 +1208,6 @@  buildipfire() {
   lfsmake2 curl
   lfsmake2 tcl
   lfsmake2 sqlite
-  lfsmake2 libffi
   lfsmake2 python3
   lfsmake2 rust
   lfsmake2 rust-dissimilar
@@ -1324,8 +1327,6 @@  buildipfire() {
   lfsmake2 nasm
   lfsmake2 libarchive
   lfsmake2 cmake
-  lfsmake2 ninja
-  lfsmake2 meson
   lfsmake2 libjpeg
   lfsmake2 openjpeg
   lfsmake2 libexif
@@ -1420,7 +1421,6 @@  buildipfire() {
   lfsmake2 perl-Crypt-PasswdMD5
   lfsmake2 perl-Net-Telnet
   lfsmake2 perl-JSON
-  lfsmake2 python3-setuptools
   lfsmake2 python3-inotify
   lfsmake2 python3-docutils
   lfsmake2 python3-daemon