Skip to contentSkip to conversation

package/mesa3d: remove sha1 external dependency

PATCH New Romain Naour 3 participants 5 messages Mar 26, 2017 – Mar 28, 2017

lore
Share & tools
lore

Romain Naour

author
#0 lore raw

PATCH 1/1 package/mesa3d: remove sha1 external dependency

--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 <[email protected]>
Cc Bernd Kuhls <[email protected]>
---
 package/mesa3d/mesa3d.mk | 11 -----------
 1 file changed, 11 deletions(-)
package/mesa3d/mesa3d.mk +0 -11
index e780dfb..0c6dd9f 100644
@@ -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 \
Signature · 1 line
2.9.3
Applied
#1 lore raw

PATCH 1/1 package/mesa3d: remove sha1 external dependency

Hello,

Quoted 9 lines · 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 <[email protected]>
Cc Bernd Kuhls <[email protected]>
---
 package/mesa3d/mesa3d.mk | 11 -----------
 1 file changed, 11 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 package/mesa3d: remove sha1 external dependency

In reply to Romain Naour
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> 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 <[email protected]>
Cc Bernd Kuhls <[email protected]>
---
 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)

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 1/1 package/mesa3d: remove sha1 external dependency

Hi Peter,

Le 28 mars 2017 09:09, "Peter Korsgaard" <[email protected]> a ?crit :

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> 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

Quoted 4 lines
Signed-off-by Romain Naour <[email protected]>
Cc Bernd Kuhls <[email protected]>
---
 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>

#4 lore raw

PATCH 1/1 package/mesa3d: remove sha1 external dependency

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

Hi,

Quoted 9 lines

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)

Quoted 4 lines

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

Can you fix this ?

Sure, I've sent a patch.

Signature · 1 line
Bye, Peter Korsgaard