Add patch to explicitly link _ctypes module with -ldl (#1537489)
Refactored patch for libxcrypt Re-enable strict symbol checks in the link editor
This commit is contained in:
parent
5a8bf97593
commit
ce6ec4f16a
3 changed files with 54 additions and 24 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From 6811089dbf34a2cef9799e1cb6d63b863b58739f Mon Sep 17 00:00:00 2001
|
||||
From bb9a8332e54fd6d2b0d4767b55c7df9a36ad3022 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
||||
Date: Sun, 21 Jan 2018 18:55:31 +0100
|
||||
Subject: [PATCH] cryptmodule: Include <crypt.h> for declaration of crypt() if
|
||||
|
|
@ -9,18 +9,18 @@ and may use an external or replacement library, like libxcrypt, for
|
|||
providing such functions.
|
||||
---
|
||||
Modules/_cryptmodule.c | 4 ++++
|
||||
configure.ac | 4 ++++
|
||||
2 files changed, 8 insertions(+)
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Modules/_cryptmodule.c b/Modules/_cryptmodule.c
|
||||
index 58d179e6a3..bb26d83f55 100644
|
||||
index 58d179e6a3..0031037b64 100644
|
||||
--- a/Modules/_cryptmodule.c
|
||||
+++ b/Modules/_cryptmodule.c
|
||||
@@ -5,6 +5,10 @@
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
+#if defined(HAVE_XCRYPT)
|
||||
+#if defined(HAVE_CRYPT_H)
|
||||
+#include <crypt.h>
|
||||
+#endif
|
||||
+
|
||||
|
|
@ -28,20 +28,18 @@ index 58d179e6a3..bb26d83f55 100644
|
|||
|
||||
/*[clinic input]
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 39e2e8e769..129c198c15 100644
|
||||
index 39e2e8e769..79397a7a24 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2816,6 +2816,10 @@ LIBS="$withval $LIBS"
|
||||
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
+# Check for libxcrypt is present.
|
||||
+PKG_CHECK_MODULES([libxcrypt], libxcrypt,
|
||||
+ AC_DEFINE([HAVE_XCRYPT], 1, [Define to 1 if libxcrypt is found.]), [])
|
||||
+
|
||||
# Check for use of the system expat library
|
||||
AC_MSG_CHECKING(for --with-system-expat)
|
||||
AC_ARG_WITH(system_expat,
|
||||
@@ -2049,7 +2049,7 @@ AC_CHECK_HEADERS(asm/types.h conio.h direct.h dlfcn.h errno.h \
|
||||
fcntl.h grp.h \
|
||||
ieeefp.h io.h langinfo.h libintl.h process.h pthread.h \
|
||||
sched.h shadow.h signal.h stropts.h termios.h \
|
||||
-unistd.h utime.h \
|
||||
+unistd.h crypt.h utime.h \
|
||||
poll.h sys/devpoll.h sys/epoll.h sys/poll.h \
|
||||
sys/audioio.h sys/xattr.h sys/bsdtty.h sys/event.h sys/file.h sys/ioctl.h \
|
||||
sys/kern_control.h sys/loadavg.h sys/lock.h sys/mkdev.h sys/modem.h \
|
||||
--
|
||||
2.16.0
|
||||
2.16.1
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue