diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2024-11-03 12:30:42 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2024-11-03 12:35:11 +0100 |
| commit | 46573bad4a55a674fb24b26ec74565e988c44811 (patch) | |
| tree | efba773b1ac019756b246d1cb0359dd88408af60 /app-crypt | |
| parent | toolchain.eclass: fix death hooks for JIT build (diff) | |
| download | gentoo-46573bad4a55a674fb24b26ec74565e988c44811.tar.gz gentoo-46573bad4a55a674fb24b26ec74565e988c44811.tar.bz2 gentoo-46573bad4a55a674fb24b26ec74565e988c44811.zip | |
app-crypt/gnupg: clarify/refresh Solaris workarounds
- Filed upstream bug for the standards problems:
https://dev.gnupg.org/T7368
- Define _XOPEN_SOURCE=500 for 2.4.6 to resolve the mismatch
- Force configure machinery to kick in for 2.5.1
Closes: https://bugs.gentoo.org/942793
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/gnupg/gnupg-2.4.6-r1.ebuild | 9 | ||||
| -rw-r--r-- | app-crypt/gnupg/gnupg-2.5.1.ebuild | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild b/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild index a9d778121bd4..0b2fe344f8c9 100644 --- a/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild +++ b/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild @@ -96,10 +96,6 @@ src_prepare() { # which in turn requires discovery in Autoconf, something that upstream deeply resents. sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \ -i "${T}"/gpg-agent-ssh.socket || die - - # definition of getpeername etc uses different things like socket_fd_t - [[ ${CHOST} == *-solaris* ]] && - append-cflags $(test-flags-CC -Wno-incompatible-pointer-types) } my_src_configure() { @@ -147,6 +143,11 @@ my_src_configure() { append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0" fi + if [[ ${CHOST} == *-solaris* ]] ; then + # https://dev.gnupg.org/T7368 + append-cppflags -D_XOPEN_SOURCE=500 + fi + # bug #663142 if use user-socket; then myconf+=( --enable-run-gnupg-user-socket ) diff --git a/app-crypt/gnupg/gnupg-2.5.1.ebuild b/app-crypt/gnupg/gnupg-2.5.1.ebuild index 382e366f6c0d..af4b2cee9a10 100644 --- a/app-crypt/gnupg/gnupg-2.5.1.ebuild +++ b/app-crypt/gnupg/gnupg-2.5.1.ebuild @@ -95,10 +95,6 @@ src_prepare() { # which in turn requires discovery in Autoconf, something that upstream deeply resents. sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \ -i "${T}"/gpg-agent-ssh.socket || die - - # definition of getpeername etc uses different things like socket_fd_t - [[ ${CHOST} == *-solaris* ]] && - append-cflags $(test-flags-CC -Wno-incompatible-pointer-types) } my_src_configure() { @@ -146,6 +142,11 @@ my_src_configure() { append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0" fi + if [[ ${CHOST} == *-solaris* ]] ; then + # https://dev.gnupg.org/T7368 + export ac_cv_should_define__xopen_source=yes + fi + # bug #663142 if use user-socket; then myconf+=( --enable-run-gnupg-user-socket ) |