From owner-freebsd-gecko@FreeBSD.ORG Wed Aug 22 20:20:47 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAC35106566B for ; Wed, 22 Aug 2012 20:20:47 +0000 (UTC) (envelope-from andy@neu.net) Received: from mail.neu.net (unknown [IPv6:2607:fc50:0:d300:216:3eff:fe54:f1c6]) by mx1.freebsd.org (Postfix) with ESMTP id 6B9D98FC14 for ; Wed, 22 Aug 2012 20:20:47 +0000 (UTC) Received: from neu.net (neu.net [199.48.129.194]) by mail.neu.net (8.14.5/8.14.5) with ESMTP id q7N0Kb03098085 for ; Wed, 22 Aug 2012 20:20:38 -0400 (EDT) (envelope-from andy@neu.net) Date: Wed, 22 Aug 2012 20:20:37 -0400 (EDT) From: AN To: freebsd-gecko@freebsd.org Message-ID: User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Virus-Scanned: clamav-milter 0.97.5 at my.mail.server X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=4.5 tests=RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.neu.net Subject: patch-bug753046 failed to apply cleanly X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Aug 2012 20:20:47 -0000 # make update && make makesum && make all deinstall install clean ===> Found saved configuration for firefox-nightly-17.0.102629,1 ===> Found saved configuration for firefox-nightly-17.0.102629,1 ===> Extracting for firefox-nightly-17.0.103004,1 ===> Found saved configuration for firefox-nightly-17.0.102629,1 => SHA256 Checksum OK for firefox-nightly/88d7348e0b05.tar.bz2. ===> firefox-nightly-17.0.103004,1 depends on file: /usr/local/bin/perl5.14.2 - found ===> Patching for firefox-nightly-17.0.103004,1 ===> firefox-nightly-17.0.103004,1 depends on file: /usr/local/bin/perl5.14.2 - found ===> Applying FreeBSD patches for firefox-nightly-17.0.103004,1 1 out of 3 hunks failed--saving rejects to ipc/chromium/src/base/platform_thread_posix.cc.rej => Patch patch-bug753046 failed to apply cleanly. => Patch(es) patch-browser-app-nsBrowserApp.cpp patch-bug685258 applied cleanly. *** [do-patch] Error code 1 Stop in /home/root/ff_nightly. *** [/home/root/ff_nightly/work/.patch_done.firefox._usr_local] Error code 1 Stop in /home/root/ff_nightly. *** [build] Error code 1 # cat /home/root/ff_nightly/work/mozilla-central-88d7348e0b05/ipc/chromium/src/base/platform_thread_posix.cc.rej *************** *** 102,110 **** // Note that glibc also has a 'pthread_setname_np' api, but it may not be // available everywhere and it's only benefit over using prctl directly is // that it can set the name of threads other than the current thread. - #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) pthread_set_name_np(pthread_self(), name); - #elif defined(__NetBSD__) pthread_setname_np(pthread_self(), "%s", name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0); --- 102,110 ---- // Note that glibc also has a 'pthread_setname_np' api, but it may not be // available everywhere and it's only benefit over using prctl directly is // that it can set the name of threads other than the current thread. + #if defined(OS_BSD) && !defined(OS_NETBSD) pthread_set_name_np(pthread_self(), name); + #elif defined(OS_NETBSD) pthread_setname_np(pthread_self(), "%s", name); #else prctl(PR_SET_NAME, reinterpret_cast(name), 0, 0, 0);