[Buildroot] [PATCH] package/mesa3d: remove sha1 external dependency

[Buildroot] [PATCH] package/mesa3d: remove sha1 external dependency

[Romain Naour]

--with-sha1 option was removed since mesa 1.17.0 by commit [1].

[1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=d1efa09d342bff3e5def2978a0bef748d74f9c82

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mesa3d/mesa3d.mk | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index e780dfb..0c6dd9f 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -33,17 +33,6 @@ MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
 MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh"
 endif
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MESA3D_DEPENDENCIES += openssl
-MESA3D_CONF_OPTS += --with-sha1=libcrypto
-else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
-MESA3D_DEPENDENCIES += libgcrypt
-MESA3D_CONF_OPTS += --with-sha1=libgcrypt
-else ifeq ($(BR2_PACKAGE_LIBSHA1),y)
-MESA3D_DEPENDENCIES += libsha1
-MESA3D_CONF_OPTS += --with-sha1=libsha1
-endif
-
 ifeq ($(BR2_PACKAGE_XORG7),y)
 MESA3D_DEPENDENCIES += \
 	xproto_xf86driproto \
-- 
2.9.3

[Buildroot] [PATCH] package/mesa3d: remove sha1 external dependency

[Thomas Petazzoni]

Hello,

On Sun, 26 Mar 2017 22:17:44 +0200, Romain Naour wrote:
> --with-sha1 option was removed since mesa 1.17.0 by commit [1].
> 
> [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=d1efa09d342bff3e5def2978a0bef748d74f9c82
> 
> Signed-off-by: Romain Naour <romain.naour@gmail.com>
> Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/mesa3d/mesa3d.mk | 11 -----------
>  1 file changed, 11 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH] package/mesa3d: remove sha1 external dependency

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > --with-sha1 option was removed since mesa 1.17.0 by commit [1].
 > [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=d1efa09d342bff3e5def2978a0bef748d74f9c82

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>
 > Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
 > ---
 >  package/mesa3d/mesa3d.mk | 11 -----------

What about the comment and logic in Config.in?

       # We need a SHA1 implementation. If either openssl or
        # libgcrypt are already part of the build, we'll use one of
        # them, otherwise, use the small libsha1 library.
        select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT)

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] package/mesa3d: remove sha1 external dependency

[Romain Naour]

Hi Peter,


Le 28 mars 2017 09:09, "Peter Korsgaard" <peter@korsgaard.com> a ?crit :

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > --with-sha1 option was removed since mesa 1.17.0 by commit [1].
 > [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=d1efa09d34
2bff3e5def2978a0bef748d74f9c82

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>
 > Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
 > ---
 >  package/mesa3d/mesa3d.mk | 11 -----------

What about the comment and logic in Config.in?

       # We need a SHA1 implementation. If either openssl or
        # libgcrypt are already part of the build, we'll use one of
        # them, otherwise, use the small libsha1 library.
        select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL &&
!BR2_PACKAGE_LIBGCRYPT)


I missed it...
It must be removed as well.

Can you fix this ?
Otherwise I will send a patch this evening.

Best regards,
Romain



--
Bye, Peter Korsgaard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170328/2c05fb94/attachment.html>

[Buildroot] [PATCH] package/mesa3d: remove sha1 external dependency

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

Hi,

 > What about the comment and logic in Config.in?

 >        # We need a SHA1 implementation. If either openssl or
 >         # libgcrypt are already part of the build, we'll use one of
 >         # them, otherwise, use the small libsha1 library.
 >         select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL &&
 > !BR2_PACKAGE_LIBGCRYPT)


 > I missed it...
 > It must be removed as well.

 > Can you fix this ?

Sure, I've sent a patch.

-- 
Bye, Peter Korsgaard