Date: Wed, 22 Aug 2012 20:20:37 -0400 (EDT) From: AN <andy@neu.net> To: freebsd-gecko@freebsd.org Subject: patch-bug753046 failed to apply cleanly Message-ID: <alpine.BSF.2.00.1208222009110.97852@mail.neu.net>
next in thread | raw e-mail | index | archive | help
# 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<uintptr_t>(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<uintptr_t>(name), 0, 0, 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1208222009110.97852>