[1/1] package/glorytun: remove patch
diff mbox series

Message ID 20191018071036.25057-1-adrien@gallouet.fr
State Superseded
Headers show
Series
  • [1/1] package/glorytun: remove patch
Related show

Commit Message

Adrien Gallouët Oct. 18, 2019, 7:10 a.m. UTC
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
---
 .../glorytun/0001-Check-for-cpuid.h-too.patch | 29 -------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 package/glorytun/0001-Check-for-cpuid.h-too.patch

Comments

Arnout Vandecappelle Oct. 19, 2019, 6:50 p.m. UTC | #1
On 18/10/2019 09:10, Adrien Gallouët wrote:
> Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>

 Fabrice already posted the same patch the day before, and Peter has applied
that one.

 Regards,
 Arnout

> ---
>  .../glorytun/0001-Check-for-cpuid.h-too.patch | 29 -------------------
>  1 file changed, 29 deletions(-)
>  delete mode 100644 package/glorytun/0001-Check-for-cpuid.h-too.patch
> 
> diff --git a/package/glorytun/0001-Check-for-cpuid.h-too.patch b/package/glorytun/0001-Check-for-cpuid.h-too.patch
> deleted file mode 100644
> index c05e01a262..0000000000
> --- a/package/glorytun/0001-Check-for-cpuid.h-too.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From 00fdf8a605f019570113e0f6af64c840767846c3 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= <adrien@gallouet.fr>
> -Date: Tue, 8 Oct 2019 08:50:09 +0000
> -Subject: [PATCH] Check for cpuid.h too
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Retrieved from:
> -https://github.com/angt/aegis256/commit/00fdf8a605f019570113e0f6af64c840767846c3]
> ----
> - mud/aegis256/aegis256.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/mud/aegis256/aegis256.c b/mud/aegis256/aegis256.c
> -index 97cf171..5e3c237 100644
> ---- a/mud/aegis256/aegis256.c
> -+++ b/mud/aegis256/aegis256.c
> -@@ -7,7 +7,7 @@
> - #define __has_include(X) 0
> - #endif
> - 
> --#if __has_include("x86intrin.h")
> -+#if (__has_include("x86intrin.h") && __has_include("cpuid.h"))
> - 
> - #include <string.h>
> - #include <x86intrin.h>
>
Adrien Gallouët Oct. 20, 2019, 6:43 a.m. UTC | #2
On Sat, Oct 19, 2019 at 8:50 PM Arnout Vandecappelle <arnout@mind.be> wrote:
>
>
>
> On 18/10/2019 09:10, Adrien Gallouët wrote:
> > Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
>
>  Fabrice already posted the same patch the day before, and Peter has applied
> that one.
>
>  Regards,
>  Arnout
>
> > ---
> >  .../glorytun/0001-Check-for-cpuid.h-too.patch | 29 -------------------
> >  1 file changed, 29 deletions(-)
> >  delete mode 100644 package/glorytun/0001-Check-for-cpuid.h-too.patch
> >
> > diff --git a/package/glorytun/0001-Check-for-cpuid.h-too.patch b/package/glorytun/0001-Check-for-cpuid.h-too.patch
> > deleted file mode 100644
> > index c05e01a262..0000000000
> > --- a/package/glorytun/0001-Check-for-cpuid.h-too.patch
> > +++ /dev/null
> > @@ -1,29 +0,0 @@
> > -From 00fdf8a605f019570113e0f6af64c840767846c3 Mon Sep 17 00:00:00 2001
> > -From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= <adrien@gallouet.fr>
> > -Date: Tue, 8 Oct 2019 08:50:09 +0000
> > -Subject: [PATCH] Check for cpuid.h too
> > -MIME-Version: 1.0
> > -Content-Type: text/plain; charset=UTF-8
> > -Content-Transfer-Encoding: 8bit
> > -
> > -Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
> > -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > -[Retrieved from:
> > -https://github.com/angt/aegis256/commit/00fdf8a605f019570113e0f6af64c840767846c3]
> > ----
> > - mud/aegis256/aegis256.c | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/mud/aegis256/aegis256.c b/mud/aegis256/aegis256.c
> > -index 97cf171..5e3c237 100644
> > ---- a/mud/aegis256/aegis256.c
> > -+++ b/mud/aegis256/aegis256.c
> > -@@ -7,7 +7,7 @@
> > - #define __has_include(X) 0
> > - #endif
> > -
> > --#if __has_include("x86intrin.h")
> > -+#if (__has_include("x86intrin.h") && __has_include("cpuid.h"))
> > -
> > - #include <string.h>
> > - #include <x86intrin.h>
> >

Great :)

Patch
diff mbox series

diff --git a/package/glorytun/0001-Check-for-cpuid.h-too.patch b/package/glorytun/0001-Check-for-cpuid.h-too.patch
deleted file mode 100644
index c05e01a262..0000000000
--- a/package/glorytun/0001-Check-for-cpuid.h-too.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-From 00fdf8a605f019570113e0f6af64c840767846c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= <adrien@gallouet.fr>
-Date: Tue, 8 Oct 2019 08:50:09 +0000
-Subject: [PATCH] Check for cpuid.h too
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Retrieved from:
-https://github.com/angt/aegis256/commit/00fdf8a605f019570113e0f6af64c840767846c3]
----
- mud/aegis256/aegis256.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mud/aegis256/aegis256.c b/mud/aegis256/aegis256.c
-index 97cf171..5e3c237 100644
---- a/mud/aegis256/aegis256.c
-+++ b/mud/aegis256/aegis256.c
-@@ -7,7 +7,7 @@
- #define __has_include(X) 0
- #endif
- 
--#if __has_include("x86intrin.h")
-+#if (__has_include("x86intrin.h") && __has_include("cpuid.h"))
- 
- #include <string.h>
- #include <x86intrin.h>