Files
haikuports/dev-libs/libgcrypt/patches/libgcrypt-1.8.5.patchset
2019-09-08 15:20:15 +02:00

74 lines
1.9 KiB
Plaintext

From 8f17f183b538b6c5bd20cc69e4dcd34913cd5c3e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 5 Aug 2014 16:50:29 +0000
Subject: haiku patch
diff --git a/configure.ac b/configure.ac
index ce11162..7fc05ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -761,6 +761,7 @@ fi
AC_SEARCH_LIBS(setsockopt, [socket], ,
[AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
AC_SEARCH_LIBS(setsockopt, [nsl])
+AC_SEARCH_LIBS(socket, [network])
##################################
#### Checks for header files. ####
--
2.19.1
From 2eb88a459c5386a816e74231bc04b4f8a5b42b1e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 6 Aug 2014 22:08:04 +0000
Subject: gcc2 patch
diff --git a/src/hwf-x86.c b/src/hwf-x86.c
index 0d3a1f4..32bdfa9 100644
--- a/src/hwf-x86.c
+++ b/src/hwf-x86.c
@@ -103,7 +103,7 @@ get_xgetbv(void)
unsigned int t_eax, t_edx;
asm volatile
- ("xgetbv\n\t"
+ (".byte 0x0f, 0x01, 0xd0\n\t"
: "=a" (t_eax), "=d" (t_edx)
: "c" (0)
);
--
2.19.1
From 9f39e7bd9b26b9938e9cdebf53e3f39b21183097 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@localhost>
Date: Wed, 17 Jan 2018 22:03:45 +0000
Subject: Do not use __GNUC_PATCHLEVEL__ if it's not defined.
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index 75c49a0..794e72d 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -82,9 +82,14 @@ extern "C" {
underscore they are subject to change without notice. */
#ifdef __GNUC__
+#ifdef __GNUC_PATCHLEVEL__
#define _GCRY_GCC_VERSION (__GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
+#else
+#define _GCRY_GCC_VERSION (__GNUC__ * 10000 \
+ + __GNUC_MINOR__ * 100)
+#endif
#if _GCRY_GCC_VERSION >= 30100
#define _GCRY_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
--
2.19.1