From owner-freebsd-gecko@FreeBSD.ORG  Tue Jul  3 16:39:57 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 689AD1065670
	for <freebsd-gecko@freebsd.org>; Tue,  3 Jul 2012 16:39:57 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id E90D28FC12
	for <freebsd-gecko@freebsd.org>; Tue,  3 Jul 2012 16:39:56 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q63Gdnjb040778
	for <freebsd-gecko@freebsd.org>; Tue, 3 Jul 2012 16:39:49 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q63GdhqE040493
	for freebsd-gecko@freebsd.org; Tue, 3 Jul 2012 16:39:43 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Tue, 3 Jul 2012 16:39:43 GMT
Message-Id: <201207031639.q63GdhqE040493@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
	svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r835 - branches/experimental/www/firefox-nightly/files
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jul 2012 16:39:57 -0000

Author: jbeich
Date: Tue Jul  3 16:39:43 2012
New Revision: 835

Log:
don't try to link against system -lmemory

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	Mon Jul  2 21:05:44 2012	(r834)
+++ branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in	Tue Jul  3 16:39:43 2012	(r835)
@@ -1,22 +1,13 @@
 --- 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 += \
-@@ -619,6 +619,10 @@ DEFINES += -DENABLE_LAYOUTDEBUG
- endif
+@@ -387,6 +387,10 @@ ifdef HAVE_CLOCK_MONOTONIC
+ EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
  endif
  
 +ifdef MOZ_MEMORY
-+EXTRA_DSO_LDOPTS += -lmemory
++EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,memory,$(DIST)/lib)
 +endif
 +
- ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_PROFILE_USE))
- # Wrap linker to measure peak virtual memory usage.
- LD := $(PYTHON) $(topsrcdir)/build/link.py $(CURDIR)/linker-vsize $(LD)
+ ifeq (android,$(MOZ_WIDGET_TOOLKIT))
+ OS_LIBS += -lGLESv2
+ endif