From b3c580af5814d78ebb4f189e8aee2be1de65ebf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Mon, 3 Aug 2020 21:39:44 -0300 Subject: [PATCH] anope: link against libintl on musl. --- srcpkgs/anope/patches/fix-musl-cross.patch | 23 ---------------------- srcpkgs/anope/template | 9 +++++++-- 2 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/anope/patches/fix-musl-cross.patch diff --git a/srcpkgs/anope/patches/fix-musl-cross.patch b/srcpkgs/anope/patches/fix-musl-cross.patch deleted file mode 100644 index 6e6050aed50..00000000000 --- a/srcpkgs/anope/patches/fix-musl-cross.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/language.cpp b/src/language.cpp -index 8b7b0ee..9a97093 100644 ---- src/language.cpp -+++ src/language.cpp -@@ -75,7 +75,7 @@ const char *Language::Translate(const NickCore *nc, const char *string) - - #if GETTEXT_FOUND - --#ifdef __USE_GNU_GETTEXT -+#if defined(__USE_GNU_GETTEXT) && defined(_nl_msg_cat_cntr) - extern "C" int _nl_msg_cat_cntr; - #endif - -@@ -87,7 +87,7 @@ const char *Language::Translate(const char *lang, const char *string) - if (!lang || !*lang) - lang = Config->DefLanguage.c_str(); - --#ifdef __USE_GNU_GETTEXT -+#if defined(__USE_GNU_GETTEXT) && defined(_nl_msg_cat_cntr) - ++_nl_msg_cat_cntr; - #endif - - diff --git a/srcpkgs/anope/template b/srcpkgs/anope/template index 227d8226c68..42b05622161 100644 --- a/srcpkgs/anope/template +++ b/srcpkgs/anope/template @@ -1,7 +1,7 @@ # Template file for 'anope' pkgname=anope version=2.0.7 -revision=1 +revision=2 wrksrc="${pkgname}-${version}-source" build_style=cmake configure_args="-DINSTDIR=../install -DRUNGROUP=_anope -DDEFUMASK=077 @@ -20,6 +20,11 @@ make_dirs=" /var/lib/anope 755 _anope _anope /var/log/anope 755 _anope _anope" +if [ "$XBPS_TARGET_LIBC" = musl ]; then + makedepends+=" gettext-devel" + LDFLAGS="-lintl" +fi + pre_configure() { # prevent cmake from building include/version and running # because it breaks cross compiling (cmake can't differentiate @@ -49,7 +54,7 @@ do_install() { vbin bin/services anopeservices for conffile in conf/*example.conf; do - vsconf ${conffile} + vsconf ${conffile} done vmkdir /usr/share/anope