Date: Tue, 3 Jul 2012 16:39:43 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r835 - branches/experimental/www/firefox-nightly/files Message-ID: <201207031639.q63GdhqE040493@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207031639.q63GdhqE040493>