mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
net-libs/gloox: fix build with GCC 12; fix bashism
Closes: https://bugs.gentoo.org/852182 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
11
net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch
Normal file
11
net-libs/gloox/files/gloox-1.0.24-bashism-configure.patch
Normal file
@@ -0,0 +1,11 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -51,7 +51,7 @@ if test -z "`${CC} check_atomicbuiltins.c -o check_atomicbuiltins 2>&1`" ; then
|
||||
HAVE_GCC_ATOMIC_BUILTINS=yes
|
||||
AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS, 1, [Define to 1 if GCC atomic builtins are available])
|
||||
AC_MSG_RESULT([yes])
|
||||
- if test $cross_compiling == "yes"; then
|
||||
+ if test $cross_compiling = "yes"; then
|
||||
# Some platforms don't seem to be fully happy for libraries using GCC atomic builtins
|
||||
# unless -lgcc and -lgcc_s are explicitly included.
|
||||
# (Errors like
|
||||
21
net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch
Normal file
21
net-libs/gloox/files/gloox-1.0.24-fix-gcc12-time.patch
Normal file
@@ -0,0 +1,21 @@
|
||||
https://bugs.gentoo.org/852182
|
||||
--- a/src/tests/tag/tag_perf.cpp
|
||||
+++ b/src/tests/tag/tag_perf.cpp
|
||||
@@ -20,6 +20,7 @@ using namespace gloox;
|
||||
#include <cstdlib>
|
||||
#include <string>
|
||||
#include <cstdio> // [s]print[f]
|
||||
+#include <ctime>
|
||||
|
||||
#include <sys/time.h>
|
||||
|
||||
--- a/src/tests/zlib/zlib_perf.cpp
|
||||
+++ b/src/tests/zlib/zlib_perf.cpp
|
||||
@@ -24,6 +24,7 @@ using namespace gloox;
|
||||
#include <string>
|
||||
#include <sys/time.h>
|
||||
#include <cstdio> // [s]print[f]
|
||||
+#include <ctime>
|
||||
|
||||
#ifdef HAVE_ZLIB
|
||||
|
||||
65
net-libs/gloox/gloox-1.0.24-r1.ebuild
Normal file
65
net-libs/gloox/gloox-1.0.24-r1.ebuild
Normal file
@@ -0,0 +1,65 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools
|
||||
|
||||
MY_P="${P/_/-}"
|
||||
DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
|
||||
HOMEPAGE="https://camaya.net/gloox/"
|
||||
SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
# Check upstream changelog: https://camaya.net/gloox/changelog/
|
||||
SLOT="0/18"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="debug gnutls idn ssl static-libs test zlib"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
idn? ( net-dns/libidn:= )
|
||||
gnutls? ( net-libs/gnutls:= )
|
||||
ssl? (
|
||||
dev-libs/openssl:0=
|
||||
)
|
||||
zlib? ( sys-libs/zlib )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-1.0.24-musl.patch"
|
||||
"${FILESDIR}/${PN}-1.0.24-Makefile.patch"
|
||||
"${FILESDIR}/${PN}-1.0.24-slibtool.patch"
|
||||
"${FILESDIR}/${PN}-1.0.24-pthread-link.patch"
|
||||
"${FILESDIR}/${PN}-1.0.24-bashism-configure.patch"
|
||||
"${FILESDIR}/${PN}-1.0.24-fix-gcc12-time.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Examples are not installed anyway, so - why should we build them?
|
||||
local myeconfargs=(
|
||||
--without-examples
|
||||
$(usex debug "--enable-debug" '')
|
||||
$(use_enable static-libs static)
|
||||
$(use_with idn libidn)
|
||||
$(use_with gnutls)
|
||||
$(use_with ssl openssl)
|
||||
$(use_with test tests)
|
||||
$(use_with zlib)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
find "${ED}" -name "*.la" -delete || die
|
||||
}
|
||||
Reference in New Issue
Block a user