Mon Apr 18 18:13:55 2022 UTC ()
musicpd: Fix build on illumos.
(nia)
diff -r1.259 -r1.260 pkgsrc/audio/musicpd/Makefile
diff -r1.134 -r1.135 pkgsrc/audio/musicpd/distinfo
diff -r0 -r1.1 pkgsrc/audio/musicpd/patches/patch-src_util_WStringAPI.hxx
--- pkgsrc/audio/musicpd/Makefile 2022/03/28 10:43:37 1.259
+++ pkgsrc/audio/musicpd/Makefile 2022/04/18 18:13:55 1.260
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.259 2022/03/28 10:43:37 tnn Exp $
+# $NetBSD: Makefile,v 1.260 2022/04/18 18:13:55 nia Exp $
DISTNAME= mpd-0.23.6
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
@@ -88,6 +88,7 @@
OWN_DIRS_PERMS+= ${VARBASE}/lib/mpd/playlists \
${MPD_USER} ${MPD_GROUP} 0755
+LDFLAGS.SunOS+= -lnsl -lsocket
CPPFLAGS.SunOS+= -std=gnu99 -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
.include "options.mk"
--- pkgsrc/audio/musicpd/distinfo 2022/03/20 08:25:06 1.134
+++ pkgsrc/audio/musicpd/distinfo 2022/04/18 18:13:55 1.135
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.134 2022/03/20 08:25:06 wiz Exp $
+$NetBSD: distinfo,v 1.135 2022/04/18 18:13:55 nia Exp $
BLAKE2s (mpd-0.23.6.tar.xz) = 804b2600782b47177bb9ef35c5f927bd4b33f76345faf244b0335628e49e2953
SHA512 (mpd-0.23.6.tar.xz) = 1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d
Size (mpd-0.23.6.tar.xz) = 770812 bytes
SHA1 (patch-src_net_IPv6Address.hxx) = 3e0ad6e63a970a17d0d8b2403acc538d8b08342e
+SHA1 (patch-src_util_WStringAPI.hxx) = 92f39096770943c26d8aaae8a7581d4daca2d233
$NetBSD: patch-src_util_WStringAPI.hxx,v 1.1 2022/04/18 18:13:55 nia Exp $
std::wcpcpy is undefined on illumos, whereas wcpcpy isn't,
so the __sun specifics are actively harmful.
--- src/util/WStringAPI.hxx.orig 2022-03-14 17:55:47.000000000 +0000
+++ src/util/WStringAPI.hxx
@@ -125,8 +125,6 @@ UnsafeCopyStringP(wchar_t *dest, const w
/* emulate wcpcpy() */
UnsafeCopyString(dest, src);
return dest + StringLength(dest);
-#elif defined(__sun) && defined (__SVR4)
- return std::wcpcpy(dest, src);
#else
return wcpcpy(dest, src);
#endif
@@ -203,11 +201,7 @@ StringCollate(const wchar_t *a, const wc
static inline wchar_t *
DuplicateString(const wchar_t *p) noexcept
{
-#if defined(__sun) && defined (__SVR4)
- return std::wcsdup(p);
-#else
return wcsdup(p);
-#endif
}
#endif