commit: 28147e538fd61399ba364a65bc51a12289e622ff Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Fri Feb 11 14:49:08 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri Feb 11 14:53:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28147e53
dev-libs/serdisplib: fix compilation with musl Closes: https://bugs.gentoo.org/830520 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-libs/serdisplib/files/serdisplib-2.02-musl.patch | 19 +++++++++++++++++++ dev-libs/serdisplib/serdisplib-2.02-r2.ebuild | 1 + 2 files changed, 20 insertions(+) diff --git a/dev-libs/serdisplib/files/serdisplib-2.02-musl.patch b/dev-libs/serdisplib/files/serdisplib-2.02-musl.patch new file mode 100644 index 000000000000..4307c6d9c9c1 --- /dev/null +++ b/dev-libs/serdisplib/files/serdisplib-2.02-musl.patch @@ -0,0 +1,19 @@ +Include <sys/type.h> before defining "ushort" macro + +sys/types.h uses a typedef to define ushort. If ushort is defined as a macro, +this will cause a compile failure. + +In file included from serdisp_control.c:43: +../include/serdisplib/serdisp_gpevents.h:75:19: error: expected identifier or '(' before 'unsigned' + 75 | #define ushort (unsigned short) + +--- a/include/serdisplib/serdisp_gpevents.h ++++ b/include/serdisplib/serdisp_gpevents.h +@@ -50,6 +50,7 @@ + #include "serdisplib/serdisp_connect.h" + #include "serdisplib/serdisp_control.h" + #include <sys/time.h> ++#include <sys/types.h> + #include <stdint.h> + + #include "../../config.h" diff --git a/dev-libs/serdisplib/serdisplib-2.02-r2.ebuild b/dev-libs/serdisplib/serdisplib-2.02-r2.ebuild index f2424cb07e9d..22cb104e7e06 100644 --- a/dev-libs/serdisplib/serdisplib-2.02-r2.ebuild +++ b/dev-libs/serdisplib/serdisplib-2.02-r2.ebuild @@ -47,6 +47,7 @@ DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" ) PATCHES=( "${FILESDIR}/${PN}-2.02-use-destdir.patch" "${FILESDIR}/${PN}-2.02-disable-static-build.patch" + "${FILESDIR}/${PN}-2.02-musl.patch" ) src_prepare() {
