summaryrefslogtreecommitdiffstats
path: root/xorg-xserver
diff options
context:
space:
mode:
authorVlad Glagolev2015-04-25 14:32:57 +0300
committerVlad Glagolev2015-04-25 14:32:57 +0300
commit7b17606dc5043d0552a43734bd23979c9406c41c (patch)
tree3f762ea2061261ae7893610f37cb8317752fa9da /xorg-xserver
parente3c724fc86d25101002552a840147678ae5c1276 (diff)
xorg-server: fixed build with upgrading of libgcrypt and further upgrades of all crypto libraries (because of missing actual dependencies)
Diffstat (limited to 'xorg-xserver')
-rwxr-xr-xxorg-xserver/xorg-server/CONFIGURE7
-rwxr-xr-xxorg-xserver/xorg-server/DEPENDS12
-rw-r--r--xorg-xserver/xorg-server/HISTORY4
3 files changed, 22 insertions, 1 deletions
diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE
index 872c8029e1..fc3d9b63a1 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -1,6 +1,13 @@
list_remove XORG_SERVER_OPTS "--enable-multibuffer" "--disable-multibuffer"
. $GRIMOIRE/config_query_multi.function
+
+# for order see configure.ac
+config_query_list XORG_SHA1 "Choose SHA1 implementation:" \
+ nettle \
+ libgcrypt \
+ openssl &&
+
config_query XORG_XINITRC_XSESSION \
"install a .desktop file that calls the user's .xinitrc?" \
n &&
diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS
index 94f3498826..1de20a2950 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -1,5 +1,16 @@
. $GRIMOIRE/FUNCTIONS
+case "$XORG_SHA1" in
+ nettle)
+ depends nettle '--with-sha1=libnettle'
+ ;;
+ libgcrypt)
+ depends libgcrypt '--with-sha1=libgcrypt'
+ ;;
+ openssl)
+ depends SSL '--with-sha1=libcrypto'
+ ;;
+esac &&
depends xcb-util &&
depends xcb-util-image &&
@@ -157,7 +168,6 @@ depends font-misc-misc &&
depends font-alias &&
depends libpciaccess &&
depends libxtst &&
-depends SSL &&
if list_find "$XORG_SERVER_FONT_100DPI" "all"
then
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 3cac2fa3de..e668893d4e 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2015-04-25 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFIGURE: added selection of SHA1 implementation
+ * DEPENDS: fixed dependencies on a crypto library
+
2015-02-11 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: UDEV -> DEVICE-MANAGER