summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-01-06 11:29:24 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-01-12 21:39:27 (GMT)
commitcb8895ceffc8140b9d40fca7eba318a49bc7da20 (patch)
tree651216172272568342f9789a1ab123746fde134b
parent4f83232e8d307f6184900c6e4a99a5f76dc66fa4 (diff)
downloadbuildroot-cb8895ceffc8140b9d40fca7eba318a49bc7da20.tar.gz
buildroot-cb8895ceffc8140b9d40fca7eba318a49bc7da20.tar.bz2
xserver_xorg-server: provide more options for SHA1 library
Until now, the X.org server was forcefully selecting OpenSSL, just to have a SHA1 implementation. However, in fact, the X.org server is capable of using a SHA1 implementation from multiple libraries: OpenSSL, libgcrypt and libsha1 amongst others. So, this patch changes the X.org server package so that we use the SHA1 functions from OpenSSL is OpenSSL is already available, or the SHA1 functions from libgcrypt is libgcrypt is already available, or if neither OpenSSL nor libgcrypt are enabled in the configuration, we select the much smaller libsha1, that has been specifically written to fulfill the X.org server requirements. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/x11r7/xserver_xorg-server/Config.in5
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk12
2 files changed, 15 insertions, 2 deletions
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index c192ef4..5b60398 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -2,7 +2,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
bool "xorg-server"
select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
select BR2_PACKAGE_MCOOKIE
- select BR2_PACKAGE_OPENSSL
+ # 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)
select BR2_PACKAGE_PIXMAN
select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 92aa4b3..140cb8b 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -51,7 +51,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_xproto \
xkeyboard-config \
pixman \
- openssl \
mcookie \
host-pkgconf
@@ -178,4 +177,15 @@ else
XSERVER_XORG_SERVER_CONF_OPT += --disable-glx
endif
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libcrypto
+XSERVER_XORG_SERVER_DEPENDENCIES += openssl
+else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libgcrypt
+XSERVER_XORG_SERVER_DEPENDENCIES += libgcrypt
+else
+XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libsha1
+XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
+endif
+
$(eval $(autotools-package))