Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 700777A265 for ; Sun, 18 Sep 2016 15:02:44 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 24C7C85EE8; Sun, 18 Sep 2016 15:02:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A856F85E8A for ; Sun, 18 Sep 2016 15:02:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id sYa_De8PJuJ5 for ; Sun, 18 Sep 2016 15:02:43 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3D04684CBD for ; Sun, 18 Sep 2016 15:02:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3436DFBD1; Sun, 18 Sep 2016 15:02:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1474210963184640" MIME-Version: 1.0 Date: Sun, 18 Sep 2016 15:02:43 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/emulators/wine-devel To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20160918150243.3436DFBD1@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1474210963184640 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Sun Sep 18 15:02:43 UTC 2016 Modified Files: pkgsrc/emulators/wine-devel: Makefile Log Message: wine-devel: don't crash at runtime when multithreaded programs try to use networking code under NetBSD. netbsd won't let you manipulate _res in a multithreaded program and instead calls abort(). avoid the code that does this for now. it's possible that it broke the ability to resolve domains and I didn't see this yet - but I'm able to use network programs now. bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 pkgsrc/emulators/wine-devel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1474210963184640 Content-Disposition: inline Content-Length: 1142 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/wine-devel/Makefile diff -u pkgsrc/emulators/wine-devel/Makefile:1.59 pkgsrc/emulators/wine-devel/Makefile:1.60 --- pkgsrc/emulators/wine-devel/Makefile:1.59 Sat Sep 17 19:32:37 2016 +++ pkgsrc/emulators/wine-devel/Makefile Sun Sep 18 15:02:43 2016 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.59 2016/09/17 19:32:37 maya Exp $ +# $NetBSD: Makefile,v 1.60 2016/09/18 15:02:43 maya Exp $ DISTNAME= wine-1.9.18 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} @@ -54,7 +54,13 @@ PLIST_SRC= PLIST.wine32 NOT_PAX_MPROTECT_SAFE+= bin/wine #PLIST.wine32= yes .endif +# Avoid using gethostbyname_r in netbsd, it's not +# linux-like CONFIGURE_ARGS.NetBSD+= wine_cv_linux_gethostbyname_r_6=no +# NetBSD doesn't allow manipulation of _res by +# multithreaded programs. avoid its use, networking +# still works fine. +CONFIGURE_ARGS.NetBSD+= ac_cv_header_resolv_h=no .if !empty(MACHINE_ARCH:Mx86_64) CONFIGURE_ARGS+= --enable-win64 --libdir=${PREFIX}/lib NOT_PAX_MPROTECT_SAFE+= bin/wine64 --_----------=_1474210963184640--