Skip to contentSkip to conversation

package/libxcrypt: support host package build

PATCH Applied James Hilliard 2 participants 4 messages Apr 1, 2024 – Apr 2, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libxcrypt: support host package build

This is needed by host-systemd.

---
 package/libxcrypt/libxcrypt.mk | 1 +
 1 file changed, 1 insertion(+)
package/libxcrypt/libxcrypt.mk +1 -0
index 9ad030fbd2..e24bc2e847 100644
@@ -18,3 +18,4 @@ LIBXCRYPT_CONF_OPTS = --disable-werror
 LIBXCRYPT_CONF_OPTS += --disable-obsolete_api
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/systemd: fix build with glibc 2.39

When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support.

As glibc's libcrypt was providing systemd's libcrypt dependency this broke any systemd build using glibc version 2.39.

To fix this add the libxcrypt dependency to systemd which is the preferred way of providing libcrypt support in systemd as the glibc variant is only used as a fallback due to being deprecated.

We should also have host-systemd depend on host-libxcrypt in case the host system does not provide glibc with libcrypt support.

Fixes:
- http://autobuild.buildroot.net/results/36e/36efcfc76c015c9b4c955c13afa0f81a98b529f4

---
 package/systemd/Config.in  | 1 +
 package/systemd/systemd.mk | 2 ++
 2 files changed, 3 insertions(+)
package/systemd/Config.in +1 -0
index aa5143d484..a94e9b73b8 100644
@@ -28,6 +28,7 @@ menuconfig BR2_PACKAGE_SYSTEMD
 	select BR2_PACKAGE_HAS_UDEV
 	select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime
 	select BR2_PACKAGE_LIBCAP
+	select BR2_PACKAGE_LIBXCRYPT
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBS
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
package/systemd/systemd.mk +2 -0
index c6b006d1fb..8987dc19a6 100644
@@ -55,6 +55,7 @@ SYSTEMD_DEPENDENCIES = \
 	host-python-jinja2 \
 	kmod \
 	libcap \
+	libxcrypt \
 	util-linux-libs \
 	$(TARGET_NLS_DEPENDENCIES)
 
@@ -882,6 +883,7 @@ HOST_SYSTEMD_DEPENDENCIES = \
 	host-util-linux \
 	host-patchelf \
 	host-libcap \
+	host-libxcrypt \
 	host-gperf \
 	host-python-jinja2
 
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH 2/2] package/systemd: fix build with glibc 2.39

James, All,

On 2024-04-01 17:40 -0600, James Hilliard spake thusly:

Quoted 11 lines

When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support.

As glibc's libcrypt was providing systemd's libcrypt dependency this broke any systemd build using glibc version 2.39.

To fix this add the libxcrypt dependency to systemd which is the preferred way of providing libcrypt support in systemd as the glibc variant is only used as a fallback due to being deprecated.

Quoted 7 lines

We should also have host-systemd depend on host-libxcrypt in case the host system does not provide glibc with libcrypt support.

Fixes:
- http://autobuild.buildroot.net/results/36e/36efcfc76c015c9b4c955c13afa0f81a98b529f4

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 44 lines
---
 package/systemd/Config.in  | 1 +
 package/systemd/systemd.mk | 2 ++
 2 files changed, 3 insertions(+)
package/systemd/Config.in +1 -0
index aa5143d484..a94e9b73b8 100644
@@ -28,6 +28,7 @@ menuconfig BR2_PACKAGE_SYSTEMD
 	select BR2_PACKAGE_HAS_UDEV
 	select BR2_PACKAGE_DBUS if !BR2_PACKAGE_DBUS_BROKER # runtime
 	select BR2_PACKAGE_LIBCAP
+	select BR2_PACKAGE_LIBXCRYPT
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBS
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
package/systemd/systemd.mk +2 -0
index c6b006d1fb..8987dc19a6 100644
@@ -55,6 +55,7 @@ SYSTEMD_DEPENDENCIES = \
 	host-python-jinja2 \
 	kmod \
 	libcap \
+	libxcrypt \
 	util-linux-libs \
 	$(TARGET_NLS_DEPENDENCIES)
 
@@ -882,6 +883,7 @@ HOST_SYSTEMD_DEPENDENCIES = \
 	host-util-linux \
 	host-patchelf \
 	host-libcap \
+	host-libxcrypt \
 	host-gperf \
 	host-python-jinja2
 
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw
In reply to James Hilliard

James, All,

On 2024-04-01 17:40 -0600, James Hilliard spake thusly:

package/libxcrypt/libxcrypt.mk LIBXCRYPT_CONF_OPTS = --disable-werror · line 18

Quoted 13 lines

This is needed by host-systemd.

---
 package/libxcrypt/libxcrypt.mk | 1 +
 1 file changed, 1 insertion(+)
package/libxcrypt/libxcrypt.mk +0 -0
index 9ad030fbd2..e24bc2e847 100644
@@ -18,3 +18,4 @@ LIBXCRYPT_CONF_OPTS = --disable-werror
 LIBXCRYPT_CONF_OPTS += --disable-obsolete_api

You had forgotten to use the same set of _CONF_OPTS for the host variant, so I added those.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 9 lines
package/libxcrypt/libxcrypt.mk +1 -0
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot