gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-power/suspend: Fix compile on musl and newer libgcrypt

Browse Source 
Closes: https://bugs.gentoo.org/939507
Closes: https://bugs.gentoo.org/936933
Closes: https://bugs.gentoo.org/832981

Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/39367
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Christopher Byrne
2024-11-18 19:31:24 -06:00
committed by Sam James
parent f8e0c31e0c
commit 42e5f21bc0
3 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sys-power/suspend/files/suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch Normal file
View File

@@ -0,0 +1,18 @@
diff --git a/configure.ac b/configure.ac
index 5f3adb5..b7f21eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,7 +211,12 @@ fi
if test "${enable_encrypt}" = "yes"; then
CONFIG_FEATURES="${CONFIG_FEATURES} encrypt"
AC_DEFINE([CONFIG_ENCRYPT], [1], [Define if encryption enabled])
- AM_PATH_LIBGCRYPT([1:1.6.3], [], [AC_MSG_ERROR([Cannot locate >=libgcrypt-1.6.3])])
+ PKG_CONFIG="pkg-config --static"
+ PKG_CHECK_MODULES([LIBGCRYPT],
+ [libgcrypt >= 1.6.3],
+ ,
+ [AC_MSG_ERROR("Cannot locate >=libgcrypt-1.6.3")]
+ )
fi
if test "${enable_splashy}" = "yes"; then

24
sys-power/suspend/files/suspend-1.0_p20200924-fix-loff_t-for-musl.patch Normal file
View File

@@ -0,0 +1,24 @@
diff --git a/configure.ac b/configure.ac
index 5f3adb5..0c544c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,6 +126,7 @@ AC_CHECK_PROGS([M4], [m4])
AC_CHECK_PROG(PERL, perl, perl)
AC_SYS_LARGEFILE
+AC_USE_SYSTEM_EXTENSIONS
if test "${enable_create_device}" = "yes"; then
AC_CHECK_PROGS([MKNOD], [mknod])
diff --git a/swsusp.h b/swsusp.h
index 5f89902..6f4863e 100644
--- a/swsusp.h
+++ b/swsusp.h
@@ -9,6 +9,7 @@
*
*/
+#include "config.h"
#include <stdint.h>
#include <linux/fs.h>
#include <linux/suspend_ioctls.h>

8
sys-power/suspend/suspend-1.0_p20200924.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,7 +32,11 @@ BDEPEND="
S="${WORKDIR}/${PN}"
PATCHES=( "${WORKDIR}/${P}.patch" )
PATCHES=(
"${WORKDIR}/${P}.patch"
"${FILESDIR}/${PN}-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch"
"${FILESDIR}/${PN}-1.0_p20200924-fix-loff_t-for-musl.patch"
)
src_prepare() {
default