Date: Tue, 17 Nov 2009 07:15:22 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r167 - branches/experimental/www/libxul-devel/files Message-ID: <200911170715.nAH7FMWa009043@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Tue Nov 17 07:15:22 2009
New Revision: 167
Log:
- Fix build on FreeBSD 6.x
Added:
branches/experimental/www/libxul-devel/files/patch-js-src-Makefile.in
- copied unchanged from r166, branches/experimental/www/firefox3-devel/files/patch-js-src-Makefile.in
Modified:
branches/experimental/www/libxul-devel/files/releng6_pulseaudio
Copied: branches/experimental/www/libxul-devel/files/patch-js-src-Makefile.in (from r166, branches/experimental/www/firefox3-devel/files/patch-js-src-Makefile.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul-devel/files/patch-js-src-Makefile.in Tue Nov 17 07:15:22 2009 (r167, copy of r166, branches/experimental/www/firefox3-devel/files/patch-js-src-Makefile.in)
@@ -0,0 +1,11 @@
+--- js/src/Makefile.in.orig 2009-05-11 15:21:19.000000000 +0200
++++ js/src/Makefile.in 2009-05-11 15:21:34.000000000 +0200
+@@ -427,7 +427,7 @@
+ endif # WINNT
+
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS += -pthread
++EXTRA_LIBS += -pthread -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32
Modified: branches/experimental/www/libxul-devel/files/releng6_pulseaudio
==============================================================================
--- branches/experimental/www/libxul-devel/files/releng6_pulseaudio Mon Nov 16 19:26:25 2009 (r166)
+++ branches/experimental/www/libxul-devel/files/releng6_pulseaudio Tue Nov 17 07:15:22 2009 (r167)
@@ -1,5 +1,5 @@
---- media/libsydneyaudio/src/Makefile.in.orig 2009-08-20 21:43:41.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in 2009-08-20 21:44:17.000000000 +0200
+--- media/libsydneyaudio/src/Makefile.in.orig 2009-08-11 17:22:08.000000000 +0200
++++ media/libsydneyaudio/src/Makefile.in 2009-08-11 17:22:36.000000000 +0200
@@ -45,6 +45,12 @@
LIBRARY_NAME = sydneyaudio
FORCE_STATIC_LIB= 1
@@ -13,14 +13,14 @@
ifeq ($(OS_ARCH),Linux)
CSRCS = \
sydney_audio_alsa.c \
---- toolkit/library/Makefile.in.orig 2009-08-20 21:45:20.000000000 +0200
-+++ toolkit/library/Makefile.in 2009-08-20 21:46:25.000000000 +0200
-@@ -228,12 +228,12 @@
+--- toolkit/library/Makefile.in.orig 2009-08-11 17:22:45.000000000 +0200
++++ toolkit/library/Makefile.in 2009-08-11 17:23:22.000000000 +0200
+@@ -231,12 +231,12 @@
endif
ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
EXTRA_DSO_LDOPTS += $(FT2_LIBS)
endif
@@ -30,14 +30,3 @@
EXTRA_DSO_LDOPTS += $(FT2_LIBS)
endif
---- js/src/Makefile.in.orig 2009-08-21 00:34:43.000000000 +0200
-+++ js/src/Makefile.in 2009-08-21 00:36:59.000000000 +0200
-@@ -427,7 +427,7 @@
- endif # WINNT
-
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS += -pthread
-+EXTRA_LIBS += -pthread -lpulse -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911170715.nAH7FMWa009043>