commit:     efbc749948fcddf972644499e68a2bacc8c63fc5
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 15:34:49 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 15:36:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=efbc7499

sys-libs/gpm: add missing patch, issue #63

 sys-libs/gpm/Manifest                         |  1 +
 sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch | 30 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index 971a21a..c44a9ef 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -1,5 +1,6 @@
 AUX gpm-1.20.7-musl-missing-headers.patch 1811 SHA256 
1c2d857c003d280f9158ec430911f19a636fe0c8799348f59c76b8ed4a056389 SHA512 
547baf4b3c5ac8912b27c4f6e1475d23f1b0dc0e89b8490b451e98c7f0aba6a466574399477aa0e48059662ccfdcebd2d84aa093b45f00148d8638473c24718c
 WHIRLPOOL 
36884880df2fa3db7001972f8b2ac115c92c8cfecac2e8fb69c8a7790ba9618b48232b17bf85ff9655921ad38f7ac4d10ba834d702f6e7731cd4d77b67546dac
 AUX gpm-1.20.7-musl-portable-sigaction.patch 649 SHA256 
c129eebf3a6c21902e28262ef49dcad8606fcd953068c8c84dbe1fc940058e6d SHA512 
04573f095be09592de9d61d32149878f93d53c8f0d54c47ad869aa2307caabcf473abf17448ae340a9ee548cdceafe2caf2f18d1989db9f31ebef44bea31697e
 WHIRLPOOL 
d7070c12b871e653f1b174449c92891c4550c3210b91633779fd8d0637dd998cf55c2c6c87ea2a68cfa2f3044ac5eff134f50e1f0f024931b52d1041910156b9
+AUX gpm-1.20.7-sysmacros.patch 1011 SHA256 
786f6adeb7d89cbdb2b776c3aace14697b7a4ef5f6ef29113afefa972d35f285 SHA512 
05ff1649182eb5223f1835945df8590e83b92d3948461ac55424ade8711a45a1fef61ebacd9497ef0f2c98f8e008e0ba3995eaf02ea567841b77a5ffd5b1e2fe
 WHIRLPOOL 
fe8b6ce964b7fc9a4b1f1b117cbc61dd2b0c29ba698da14db7c2e1aac2eab32c7e41321bfe371bb11fce1c371c2c2937151424aa5938ee4cd7fab98b0850d253
 AUX gpm.conf.d 580 SHA256 
73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8 SHA512 
14a4306a7454d1a12fda29973b51aadd6d1a5cf4833b1be5298cfe0c1ebc63a479cc79490007ae92c6ae24368e19215dfc4bd50ef5b0cfa0fef88cf69db67065
 WHIRLPOOL 
61039423b5749f65505db3d0c3355599f5776b8807b7e79720d9498916f1dc1312070209ec470375d0bcb9a36919ad0dbde1f5c6a283454c7ea9be3cc3e33c43
 AUX gpm.rc6-2 559 SHA256 
a342f0d17362b193e4aca3b9f947c6248f2da410707fc8e81f85ef98dc816411 SHA512 
76551425be39b01311c262435a1bb92cad5cbb7ac33b118a98d88d14f564aa225d6ba6c5caae40b83a70c35a3bd75506ad6521a2d62399300fbcb544c79063ab
 WHIRLPOOL 
18655b40ec4e4be1ae273c1c5b0be43b5af7e63d44cb9ecd8a785e91fab2c7c9756ffc77e11775373938c4695e7c966b5b2e7f80389a62cfb3e012043d1a0304
 AUX gpm.service 222 SHA256 
85f7d7144de8b2b941ba118ff1e6c0579ed825bbb34b576814b05cc45c5a067d SHA512 
d710169f06a17aa372e88952bc67d1fb91c795349e9edc37f9c0bebf3bbd6502646ac9aac12ccbb5630b1b39143976e0780b9c7325d3610c3ac1683ffda7f05b
 WHIRLPOOL 
6a7df1311c6f742168bd6aca9ec3c2def2f9755c9fa9f24b60e22a158f366636cefa2d430c5ee30d05dfccd2a576d981c32134052d207608dcf8fa0a8b292b0a

diff --git a/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch 
b/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch
new file mode 100644
index 0000000..d8ab2d1
--- /dev/null
+++ b/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch
@@ -0,0 +1,30 @@
+From b350aee4ea5785a75cb6ad770f6b768c506ebb70 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vap...@gentoo.org>
+Date: Mon, 14 Mar 2016 15:39:54 -0400
+Subject: [PATCH] fix building w/newer glibc
+
+Linux C libraries are looking to disentangle sysmacros.h from the
+sys/types.h include, so make sure we pull in the header when it is
+found.
+---
+ src/daemon/open_console.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
+index 4d6c0af..6dd43e6 100644
+--- a/src/daemon/open_console.c
++++ b/src/daemon/open_console.c
+@@ -24,6 +24,10 @@
+ #include <sys/types.h>              /* major()           */
+ #include <sys/ioctl.h>              /* ioctl             */
+ 
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>          /* major() w/newer glibc */
++#endif
++
+ /* Linux specific (to be outsourced in gpm2 */
+ #include <linux/serial.h>           /* for serial console check */
+ #include <asm/ioctls.h>            /* for serial console check */
+-- 
+2.6.2
+

Reply via email to