On Tue, 3 Jul 2012, [email protected] wrote:
Author: jbeich
Date: Tue Jul 3 16:47:45 2012
New Revision: 836
Log:
oops
Modified:
branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in
Modified:
branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in
==============================================================================
---
branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in
Tue Jul 3 16:39:43 2012 (r835)
+++
branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in
Tue Jul 3 16:47:45 2012 (r836)
@@ -1,5 +1,14 @@
--- toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500
+++ toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500
+@@ -132,7 +132,7 @@ else
+ SDK_LIBRARY = $(SHARED_LIBRARY)
+ endif
+
+-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo
+
+ ifndef MOZ_ENABLE_LIBXUL
+ EXTRA_DSO_LDOPTS += \
@@ -387,6 +387,10 @@ ifdef HAVE_CLOCK_MONOTONIC
EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
endif
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
# make update && make makesum && make all deinstall install clean
===> Found saved configuration for firefox-nightly-16.0.98091,1
===> Found saved configuration for firefox-nightly-16.0.98091,1
===> Extracting for firefox-nightly-16.0.98170,1
=> SHA256 Checksum OK for firefox-nightly/edf132b767b0.tar.bz2.
===> firefox-nightly-16.0.98170,1 depends on file:
/usr/local/bin/perl5.14.2 - found
===> Patching for firefox-nightly-16.0.98170,1
===> firefox-nightly-16.0.98170,1 depends on file:
/usr/local/bin/perl5.14.2 - found
===> Applying FreeBSD patches for firefox-nightly-16.0.98170,1
1 out of 2 hunks failed--saving rejects to toolkit/library/Makefile.in.rej
=> Patch patch-toolkit_library_Makefile.in failed to apply cleanly.
=> Patch(es) patch-alsapulse patch-browser-app-nsBrowserApp.cpp
patch-bug685258 patch-build-pgo-profileserver.py
patch-config-baseconfig.mk patch-config_autoconf.mk.in
patch-config_config.mk patch-config_mkdepend_Makefile.in
patch-configure.in patch-content__base__public__nsContentUtils.h
patch-dom-plugins-ipc-PluginMessageUtils.cpp
patch-gfx-harfbuzz-src-hb-ot-layout.cc patch-gfx-qcms-qcmstypes.h
patch-gfx-skia-Makefile.in patch-gfx-thebes-gfxPlatform.cpp
patch-gfx-ycbcr-Makefile.in patch-ipc-chromium-Makefile.in
patch-ipc-chromium-src-base-dir_reader_linux.h
patch-ipc-chromium-src-base-file_util_linux.cc
patch-ipc-chromium-src-base-file_util_posix.cc
patch-ipc-chromium-src-base-message_pump_libevent.cc
patch-ipc-chromium-src-base-platform_thread_posix.cc
patch-ipc-chromium-src-build-build_config.h patch-js-src-Makefile.in
patch-js-src-config-mkdepend_Makefile.in patch-js-src-config_config.mk
patch-js-src-configure.in patch-js-src-jscpucfg.h
patch-js-src-methodjit-MethodJIT.cpp patch-js_src_jsnum.cpp
patch-layout_generic_Makefile.in patch-media-libvpx-vpx_config.c
patch-media-libvpx-vpx_config.h patch-memory-build-mozjemalloc_compat.c
patch-memory-jemalloc-Makefile.in patch-memory-mozalloc-mozalloc.cpp
patch-memory-mozjemalloc-jemalloc.h
patch-nsprpub-pr-include-md_freebsd.cfg
patch-nsprpub-pr-include-md_freebsd.h patch-security-coreconf-FreeBSD.mk
patch-security-nss-lib-Makefile
patch-security-nss-lib-freebl-mpi-mpcpucache.c
patch-security_manager_ssl_src_nsNSSComponent.cpp
patch-toolkit-xre-nsAppRunner.cpp applied cleanly.
*** [do-patch] Error code 1
Stop in /home/root/ff_nightly.
*** [build] Error code 1
Stop in /home/root/ff_nightly.
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
