Date: Sun, 24 Jan 2010 14:37:29 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r250 - in branches/experimental/deskutils/lightning: . files Message-ID: <201001241437.o0OEbTW0015108@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: andreast
Date: Sun Jan 24 14:37:29 2010
New Revision: 250
Log:
Add patch for sparc64. Do an autoconf run in the js/src directory.
Mark port as parralel safe.
Added:
branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-jslock.cpp
Modified:
branches/experimental/deskutils/lightning/Makefile
Modified: branches/experimental/deskutils/lightning/Makefile
==============================================================================
--- branches/experimental/deskutils/lightning/Makefile Sun Jan 24 14:35:35 2010 (r249)
+++ branches/experimental/deskutils/lightning/Makefile Sun Jan 24 14:37:29 2010 (r250)
@@ -15,7 +15,7 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= An integrated calendar for Thunderbird and SeaMonkey
-USE_AUTOTOOLS= libtool:22
+USE_AUTOTOOLS= autoconf:213 libtool:22
ALL_TARGET= default
CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
@@ -23,6 +23,7 @@
USE_GMAKE= yes
USE_BZIP2= yes
USE_GECKO= gecko
+MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
WANT_PERL= yes
USE_MOZILLA= -png -dbm -jpeg -xft
@@ -80,6 +81,10 @@
s|/usr/X11R6|${LOCALBASE}|g' \
${MOZSRC}/js/src/configure \
${MOZSRC}/configure
+
+pre-configure:
+ (cd ${MOZSRC}/js/src/ && ${AUTOCONF})
+
# XXX: Workaround for bug 533070. Should be fixed in next release
${CP} ${WRKSRC}/calendar/sunbird/app/*.png ${WRKSRC}/calendar/sunbird/branding/nightly/
${CP} ${WRKSRC}/calendar/sunbird/app/*.xpm ${WRKSRC}/calendar/sunbird/branding/nightly/
Added: branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-jslock.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-jslock.cpp Sun Jan 24 14:37:29 2010 (r250)
@@ -0,0 +1,37 @@
+--- mozilla/js/src/jslock.cpp.orig 2010-01-23 15:40:12.000000000 +0100
++++ mozilla/js/src/jslock.cpp 2010-01-23 15:45:20.000000000 +0100
+@@ -133,7 +133,7 @@
+ return (int)res;
+ }
+
+-#elif defined(SOLARIS) && defined(sparc) && defined(ULTRA_SPARC)
++#elif defined(__sparc)
+
+ static JS_ALWAYS_INLINE int
+ NativeCompareAndSwap(jsword *w, jsword ov, jsword nv)
+@@ -142,13 +142,18 @@
+ unsigned int res;
+ JS_ASSERT(ov != nv);
+ asm volatile ("\
+-stbar\n\
+-cas [%1],%2,%3\n\
+-cmp %2,%3\n\
+-be,a 1f\n\
+-mov 1,%0\n\
+-mov 0,%0\n\
+-1:"
++ membar #StoreLoad | #LoadLoad\n"
++# if defined (__sparc64__)
++ "casx [%1],%2,%3\n"
++# else
++ "cas [%1],%2,%3\n" /* 32-bit version */
++# endif
++ "membar #StoreLoad | #LoadLoad\n"
++ "cmp %2,%3\n"
++ "be,a 1f\n"
++ "mov 1,%0\n"
++ "mov 0,%0\n"
++ "1:"
+ : "=r" (res)
+ : "r" (w), "r" (ov), "r" (nv));
+ return (int)res;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001241437.o0OEbTW0015108>