Date: Mon, 5 Aug 2013 07:31:58 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1298 - in trunk: Mk www/firefox www/firefox-nightly www/firefox-nightly/files www/seamonkey www/seamonkey/files Message-ID: <201308050731.r757VwpB009899@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Aug 5 07:31:57 2013
New Revision: 1298
Log:
update
Added:
trunk/www/seamonkey/files/extra-bug886095
trunk/www/seamonkey/files/patch-bug851992
trunk/www/seamonkey/files/patch-bug862759
Deleted:
trunk/www/firefox-nightly/files/patch-bug869659
trunk/www/seamonkey/files/patch-configure.in
Modified:
trunk/Mk/bsd.gecko.mk
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-bug807492
trunk/www/firefox-nightly/files/patch-bug878791
trunk/www/firefox/Makefile
trunk/www/firefox/distinfo
trunk/www/seamonkey/Makefile
trunk/www/seamonkey/distinfo
trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
trunk/www/seamonkey/files/patch-bug791305
trunk/www/seamonkey/files/patch-bug803480
trunk/www/seamonkey/files/patch-bug807492
trunk/www/seamonkey/files/patch-bug810716
trunk/www/seamonkey/files/patch-bug826985
trunk/www/seamonkey/files/patch-bug893397
trunk/www/seamonkey/files/patch-clang32-libc++-visibility-hack
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/Mk/bsd.gecko.mk Mon Aug 5 07:31:57 2013 (r1298)
@@ -593,7 +593,7 @@
hunspell_LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell
hunspell_MOZ_OPTIONS= --enable-system-hunspell
-.if ${MOZILLA_VER:R:R} >= 23
+.if ${MOZILLA_VER:R:R} >= 23 || ${MOZILLA:Mseamonkey*}
_ALL_DEPENDS+= icu
.endif
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/firefox-nightly/Makefile.hgrev Mon Aug 5 07:31:57 2013 (r1298)
@@ -1 +1 @@
-HGREV= 140387:3d40d270c031
+HGREV= 141219:0a63cd911b4f
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/firefox-nightly/distinfo Mon Aug 5 07:31:57 2013 (r1298)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/3d40d270c031.tar.bz2) = ff15308e9df860e691a04fa45cb62d3cb5be70b31240fdd53ce6e60859885f4d
-SIZE (firefox-nightly/3d40d270c031.tar.bz2) = 125204643
+SHA256 (firefox-nightly/0a63cd911b4f.tar.bz2) = e70f36159a69d1d5da04c008f2345066fe7cc169953cdb192fbfd5c9063983cf
+SIZE (firefox-nightly/0a63cd911b4f.tar.bz2) = 125005660
Modified: trunk/www/firefox-nightly/files/patch-bug807492
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug807492 Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/firefox-nightly/files/patch-bug807492 Mon Aug 5 07:31:57 2013 (r1298)
@@ -423,10 +423,10 @@
index 2a91e3d..31de641 100644
--- media/webrtc/signaling/signaling.gyp
+++ media/webrtc/signaling/signaling.gyp
-@@ -212,16 +212,29 @@
+@@ -223,16 +223,29 @@
+ 'GIPS_VER=3480',
'SIPCC_BUILD',
- 'HAVE_WINSOCK2_H',
- 'CPR_STDINT_INCLUDE=\\"mozilla/StandardInteger.h\\"'
+ 'HAVE_WINSOCK2_H'
],
'cflags_mozilla': [
Deleted: trunk/www/firefox-nightly/files/patch-bug869659
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug869659 Mon Aug 5 07:31:57 2013 (r1297)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
-diff --git configure.in configure.in
-index a374e8c..740bb28 100644
---- configure.in
-+++ configure.in
-@@ -9474,11 +9474,6 @@
- dist=$MOZ_BUILD_ROOT/dist
- ac_configure_args="$_SUBDIR_CONFIG_ARGS"
- ac_configure_args="$ac_configure_args --enable-threadsafe"
--if test "A" = "A"; then # "$MOZ_BUILDAPP" != "browser", when desktop builds this
-- # The Internationalization API is currently disabled in all non-standalone
-- # SpiderMonkey builds, but it should be turned on for desktop builds soon.
-- ac_configure_args="$ac_configure_args --disable-intl-api"
--fi
- if test "$BUILD_CTYPES"; then
- # Build js-ctypes on the platforms we can.
- ac_configure_args="$ac_configure_args --enable-ctypes"
Modified: trunk/www/firefox-nightly/files/patch-bug878791
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug878791 Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/firefox-nightly/files/patch-bug878791 Mon Aug 5 07:31:57 2013 (r1298)
@@ -1,5 +1,5 @@
---- toolkit/components/osfile/osfile_unix_allthreads.jsm.orig 2013-05-11 21:19:53.000000000 +0200
-+++ toolkit/components/osfile/osfile_unix_allthreads.jsm 2013-06-02 17:15:05.000000000 +0200
+--- toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig 2013-05-11 21:19:53.000000000 +0200
++++ toolkit/components/osfile/modules/osfile_unix_allthreads.jsm 2013-06-02 17:15:05.000000000 +0200
@@ -40,7 +40,7 @@ if (typeof Components != "undefined") {
// Open libc
let libc;
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/firefox/Makefile Mon Aug 5 07:31:57 2013 (r1298)
@@ -2,10 +2,11 @@
# $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
PORTNAME= firefox
-DISTVERSION= 23.0b10
+DISTVERSION= 23.0
PORTEPOCH= 1
CATEGORIES= www ipv6
-MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
+MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
+ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
DISTNAME= ${PORTNAME}-${DISTVERSION}.source
MAINTAINER= gecko@FreeBSD.org
@@ -55,7 +56,7 @@
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-beta
+WRKSRC:= ${WRKDIR}/mozilla-release
.if ${PORT_OPTIONS:MPGO}
USE_GCC?= yes
Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/firefox/distinfo Mon Aug 5 07:31:57 2013 (r1298)
@@ -1,2 +1,2 @@
-SHA256 (firefox-23.0b10.source.tar.bz2) = f1dce0837f2e764cc3c6a5e9aac110dddf828b644e6e4c1e643c263985e05825
-SIZE (firefox-23.0b10.source.tar.bz2) = 115307376
+SHA256 (firefox-23.0.source.tar.bz2) = 2d64bd12cfa80c57e4a7f4156c7b4fde725a6173dfe48e2fac12e1927faf563e
+SIZE (firefox-23.0.source.tar.bz2) = 115821591
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/Makefile Mon Aug 5 07:31:57 2013 (r1298)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/seamonkey/Makefile 310240 2013-01-11 16:48:10Z flo $
PORTNAME= seamonkey
-DISTVERSION= 2.19b1
+DISTVERSION= 2.20
CATEGORIES?= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -13,13 +13,13 @@
COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= nspr>=4.9.6:${PORTSDIR}/devel/nspr \
- nss>=3.14.3:${PORTSDIR}/security/nss \
+ nss>=3.15:${PORTSDIR}/security/nss \
sqlite3>=3.7.16.1:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
unzip:${PORTSDIR}/archivers/unzip
-EM_VERSION= 1.5.1
-L_VERSION= 2.4b1
+EM_VERSION= 1.5.2
+L_VERSION= 2.5b1
USE_AUTOTOOLS= autoconf213:env
USE_PYTHON_BUILD=-2.7
@@ -31,7 +31,6 @@
USE_QT4= # empty
QT_NONSTANDARD= yes
WANT_PERL= yes
-GNU_CONFIGURE= yes
ALL_TARGET= default
USE_GL= gl
USE_DOS2UNIX= mozilla/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
@@ -48,13 +47,19 @@
NOT_FOR_ARCHS= ia64
OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC
-OPTIONS_DEFAULT=CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS WEBRTC
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC
CHATZILLA_DESC?=Chatzilla IRC module
COMPOSER_DESC?= HTML Composer module
LDAP_DESC?= LDAP support for Mailnews
MAILNEWS_DESC?= Mail and News modules
+# non-client.mk objdir build broken after bug 846540
+.undef GNU_CONFIGURE
+ALL_TARGET= build
+MOZ_OPTIONS+= ${CONFIGURE_TARGET}
+MAKEFILE= ${WRKSRC}/client.mk
+
.include "${.CURDIR}/../../www/firefox/Makefile.options"
# OSS is gone after bug 852401
@@ -68,7 +73,7 @@
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-beta
+WRKSRC= ${WRKDIR}/comm-release
MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
@@ -85,7 +90,6 @@
MOZ_OPTIONS+= --enable-ldap --enable-mailnews
.endif
.if ${PORT_OPTIONS:MENIGMAIL}
-BROKEN= does not build since 2.18b1
MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail
DISTFILES+= ${EM_DISTFILE}:enigmail
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
@@ -98,6 +102,7 @@
${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \
${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile
+EXTRA_PATCHES+= ${FILESDIR}/extra-bug886095
.endif
.endif
Modified: trunk/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/distinfo Mon Aug 5 07:31:57 2013 (r1298)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.19b1.source.tar.bz2) = 7d615d18ad977a663167bdf24e94a84e03c15d3b4b458c048108686600c7c220
-SIZE (seamonkey-2.19b1.source.tar.bz2) = 136053830
-SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0
-SIZE (enigmail-1.5.1.tar.gz) = 1213954
+SHA256 (seamonkey-2.20.source.tar.bz2) = 17463fbbfe75a52317bbfb09e25dfce45539914f0559cdfe95f545408a8084fd
+SIZE (seamonkey-2.20.source.tar.bz2) = 139969292
+SHA256 (enigmail-1.5.2.tar.gz) = f20d6d1be1ab12dc2f1208d8f01227fd7e5c4dcf5d6f4bd0833a932b58973a26
+SIZE (enigmail-1.5.2.tar.gz) = 1211395
Added: trunk/www/seamonkey/files/extra-bug886095
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/extra-bug886095 Mon Aug 5 07:31:57 2013 (r1298)
@@ -0,0 +1,32 @@
+diff --git genxpi genxpi
+index a50e7ab..6083c55 100755
+--- mailnews/extensions/enigmail/genxpi~
++++ mailnews/extensions/enigmail/genxpi
+@@ -74,16 +74,17 @@ if [ ${platform} = OS2_x86-gcc3 ]; then
+ else
+ enigDllFile=platform/${platform}/components/${libPrefix}enigmime-${xpcomAbi}${dllSuffix}
+ fi
+
+ subprocessDll=${libPrefix}subprocess${dllSuffix}
+ spDllFile=platform/${platform}/lib/${libPrefix}subprocess-${xpcomAbi}${dllSuffix}
+
+ # Prepare chrome.manifest
++cp ${targetDir}/chrome.manifest ${targetDir}/chrome.manifest.save
+ cat ${srcDir}/package/chrome.manifest | \
+ sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' \
+ > ${targetDir}/chrome.manifest
+
+ # Prepare languages other than en-US
+
+ if [ -s ${srcDir}/lang/current-languages.txt ]; then
+ localeJar=chrome/${xpiModule}.jar
+@@ -147,8 +148,9 @@ zip ${xpiFile} \
+ ${localeJar} \
+ components/enigmime.xpt \
+ ${enigDllFile} \
+ ${spDllFile} \
+ chrome.manifest \
+ install.rdf
+
+ rm install.rdf chrome.manifest
++mv chrome.manifest.save chrome.manifest
Modified: trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile
==============================================================================
--- trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/files/extrapatch-enigmail-ipc-src-Makefile Mon Aug 5 07:31:57 2013 (r1298)
@@ -1,6 +1,6 @@
--- mailnews/extensions/enigmail/ipc/src/Makefile.enig~
+++ mailnews/extensions/enigmail/ipc/src/Makefile.enig
-@@ -19,26 +19,26 @@ endif
+@@ -19,13 +19,13 @@ endif
ifeq ($(OS_ARCH),NetBSD)
ifeq ($(DLL_SUFFIX),.so.1.0)
@@ -16,38 +16,7 @@
CFLAGS += -fPIC
endif
- ifeq ($(OS_ARCH),HP-UX)
- ifeq ($(GNU_CC)$(GNU_CXX),)
--LDFLAGS += -Wl,-Bsymbolic
-+LDFLAGS += -shared -Wl,-Bsymbolic
- CFLAGS += -fPIC
- endif
- endif
-
- ifeq ($(OS_ARCH),OSF1)
- ifeq ($(GNU_CC)$(GNU_CXX),)
--LDFLAGS += -B symbolic
-+LDFLAGS += -shared -B symbolic
- CFLAGS += -fPIC
- endif
- endif
---- mailnews/extensions/enigmail/ipc/src/Makefile.in~
-+++ mailnews/extensions/enigmail/ipc/src/Makefile.in
-@@ -19,26 +19,26 @@ endif
-
- ifeq ($(OS_ARCH),NetBSD)
- ifeq ($(DLL_SUFFIX),.so.1.0)
--LDFLAGS += -Wl,-Bsymbolic
-+LDFLAGS += -shared -Wl,-Bsymbolic
- CFLAGS += -fPIC
- endif
- endif
-
- ifeq ($(OS_ARCH),FreeBSD)
--LDFLAGS += -Wl,-Bsymbolic
-+LDFLAGS += -shared -Wl,-Bsymbolic
- CFLAGS += -fPIC
- endif
+@@ -36,14 +36,14 @@ endif
ifeq ($(OS_ARCH),HP-UX)
ifeq ($(GNU_CC)$(GNU_CXX),)
Modified: trunk/www/seamonkey/files/patch-bug791305
==============================================================================
--- trunk/www/seamonkey/files/patch-bug791305 Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/files/patch-bug791305 Mon Aug 5 07:31:57 2013 (r1298)
@@ -17,23 +17,6 @@
diff --git configure.in configure.in
index f0aeb5d..1c01010 100644
---- configure.in
-+++ configure.in
-@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
- #include <jpeglib.h> ],
- [ #if JPEG_LIB_VERSION < $MOZJPEG
- #error "Insufficient JPEG library version ($MOZJPEG required)."
-- #endif
-- #ifndef JCS_EXTENSIONS
-- #error "libjpeg-turbo JCS_EXTENSIONS required"
-- #endif
-- ],
-+ #endif ],
- MOZ_NATIVE_JPEG=1,
- AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
- fi
-diff --git configure.in configure.in
-index f0aeb5d..1c01010 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -4027,11 +4027,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
Modified: trunk/www/seamonkey/files/patch-bug803480
==============================================================================
--- trunk/www/seamonkey/files/patch-bug803480 Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/files/patch-bug803480 Mon Aug 5 07:31:57 2013 (r1298)
@@ -1,68 +1,5 @@
diff --git configure.in configure.in
index a0575dc..be327fd 100644
---- configure.in
-+++ configure.in
-@@ -3810,7 +3810,6 @@ MOZ_XUL=1
- MOZ_ZIPWRITER=1
- NS_PRINTING=1
- NSS_DISABLE_DBM=
--NECKO_WIFI=1
- BUILD_CTYPES=1
-
-
-@@ -5944,27 +5943,38 @@ AC_SUBST(MOZ_RDF)
- dnl
- dnl option to disable necko's wifi scanner
- dnl
-+
-+case "$OS_TARGET" in
-+ OS2)
-+ dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-+ ;;
-+ Android)
-+ if test -n "$gonkdir"; then
-+ NECKO_WIFI=1
-+ fi
-+ ;;
-+ Darwin|SunOS|WINNT)
-+ NECKO_WIFI=1
-+ ;;
-+ Linux)
-+ if test -z "$MOZ_ENABLE_DBUS"; then
-+ AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
-+ fi
-+ NECKO_WIFI=1
-+ NECKO_WIFI_DBUS=1
-+ ;;
-+esac
-+
- MOZ_ARG_DISABLE_BOOL(necko-wifi,
- [ --disable-necko-wifi Disable necko wifi scanner],
- NECKO_WIFI=,
- NECKO_WIFI=1)
-
--if test "$OS_ARCH" = "OS2"; then
-- dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-- NECKO_WIFI=
--fi
--if test "$NECKO_WIFI" -a \
-- "$OS_ARCH" != "Linux" -a \
-- "$OS_ARCH" != "Darwin" -a \
-- "$OS_ARCH" != "SunOS" -a \
-- "$OS_ARCH" != "WINNT"; then
-- AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
--fi
--
- if test "$NECKO_WIFI"; then
- AC_DEFINE(NECKO_WIFI)
- fi
- AC_SUBST(NECKO_WIFI)
-+AC_SUBST(NECKO_WIFI_DBUS)
-
- dnl
- dnl Build jsctypes on the platforms we can, unless it's explicitly disabled.
-diff --git configure.in configure.in
-index a0575dc..be327fd 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -4306,7 +4306,6 @@ NS_PRINTING=1
Modified: trunk/www/seamonkey/files/patch-bug807492
==============================================================================
--- trunk/www/seamonkey/files/patch-bug807492 Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/files/patch-bug807492 Mon Aug 5 07:31:57 2013 (r1298)
@@ -17,17 +17,17 @@
index c167461..8346c11 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5258,17 +5258,17 @@ if test -n "$MOZ_WEBRTC"; then
- *-android*|*-linuxandroid*)
- if test -n "$MOZ_B2G"; then
- MOZ_WEBRTC=1
- else
- dnl Make sure doesn't get matched by *-linux*
- MOZ_WEBRTC=
- fi
- ;;
-- *-linux*|*-mingw*|*-darwin*)
-+ *-linux*|*-mingw*|*-darwin*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
+@@ -5246,17 +5246,17 @@ if test "$NS_PRINTING"; then
+ AC_DEFINE(NS_PRINT_PREVIEW)
+ fi
+
+ dnl Turn off webrtc for OS's we don't handle yet, but allow
+ dnl --enable-webrtc to override. Can disable for everything in
+ dnl the master list above.
+ if test -n "$MOZ_WEBRTC"; then
+ case "$target" in
+- *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*)
++ *-linux*|*-mingw*|*-darwin*|*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*)
dnl Leave enabled
;;
*)
Modified: trunk/www/seamonkey/files/patch-bug810716
==============================================================================
--- trunk/www/seamonkey/files/patch-bug810716 Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/files/patch-bug810716 Mon Aug 5 07:31:57 2013 (r1298)
@@ -1,32 +1,5 @@
diff --git configure.in configure.in
index 2084be9..eb6eeb2 100644
---- configure.in
-+++ configure.in
-@@ -3369,14 +3369,19 @@ fi
- AC_CACHE_CHECK(
- [for res_ninit()],
- ac_cv_func_res_ninit,
-- [AC_TRY_LINK([
-+ [AC_TRY_RUN([
- #ifdef linux
- #define _BSD_SOURCE 1
- #endif
-+ #include <sys/types.h>
-+ #include <netinet/in.h>
-+ #include <arpa/nameser.h>
- #include <resolv.h>
-- ],
-- [int foo = res_ninit(&_res);],
-+ int main(int argc, char **argv){
-+ int foo = res_ninit(&_res);
-+ }],
- [ac_cv_func_res_ninit=yes],
-+ [ac_cv_func_res_ninit=no],
- [ac_cv_func_res_ninit=no])
- ])
-
-diff --git configure.in configure.in
-index 2084be9..eb6eeb2 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -3369,14 +3369,19 @@ fi
Modified: trunk/www/seamonkey/files/patch-bug826985
==============================================================================
--- trunk/www/seamonkey/files/patch-bug826985 Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/files/patch-bug826985 Mon Aug 5 07:31:57 2013 (r1298)
@@ -16,16 +16,16 @@
index 55e4cd1..76567b3 100644
--- mozilla/configure.in
+++ mozilla/configure.in
-@@ -5294,6 +5294,9 @@ if test -n "$MOZ_WEBRTC"; then
+@@ -5309,6 +5309,9 @@ if test -n "$MOZ_WEBRTC"; then
MOZ_VP8_ENCODER=1
MOZ_VP8_ERROR_CONCEALMENT=1
+ dnl with libv4l2 we can support more cameras
+ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
+
- if test "$MOZ_WIDGET_TOOLKIT" != "gonk"; then
- dnl OpenSLES is only available in Android 2.3 and later; we'll change this
- dnl hard dependency to a dynamic load with graceful runtime failure before
+ dnl enable once Signaling lands
+ MOZ_WEBRTC_SIGNALING=1
+ AC_DEFINE(MOZ_WEBRTC_SIGNALING)
@@ -8981,6 +8984,10 @@ elif test "${OS_TARGET}" = "Android"; then
fi
fi
Added: trunk/www/seamonkey/files/patch-bug851992
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug851992 Mon Aug 5 07:31:57 2013 (r1298)
@@ -0,0 +1,373 @@
+diff --git a/config/Makefile.in b/config/Makefile.in
+--- mozilla/config/Makefile.in
++++ mozilla/config/Makefile.in
+@@ -97,16 +97,17 @@ export:: $(export-preqs)
+ -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
+ -DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \
+ -DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \
+ -DMOZ_NATIVE_ZLIB=$(MOZ_NATIVE_ZLIB) \
+ -DMOZ_NATIVE_PNG=$(MOZ_NATIVE_PNG) \
+ -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \
+ -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \
+ -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \
++ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
+ $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
+ $(INSTALL) system_wrappers $(DIST)
+
+ GARBAGE_DIRS += system_wrappers
+ endif
+
+ ifdef WRAP_STL_INCLUDES
+ ifdef GNU_CXX
+diff --git a/config/system-headers b/config/system-headers
+--- mozilla/config/system-headers
++++ mozilla/config/system-headers
+@@ -1125,8 +1125,19 @@ gst/video/video.h
+ sys/msg.h
+ sys/ipc.h
+ sys/thr.h
+ sys/user.h
+ kvm.h
+ spawn.h
+ err.h
+ xlocale.h
++#if MOZ_NATIVE_ICU==1
++unicode/locid.h
++unicode/numsys.h
++unicode/ucal.h
++unicode/ucol.h
++unicode/udat.h
++unicode/udatpg.h
++unicode/uenum.h
++unicode/unum.h
++unicode/ustring.h
++#endif
+diff --git a/configure.in b/configure.in
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -4134,16 +4134,32 @@ if test -n "$MOZ_NATIVE_FFI"; then
+ PKG_CHECK_MODULES(MOZ_FFI, libffi > 3.0.9)
+ else
+ PKG_CHECK_MODULES(MOZ_FFI, libffi >= 3.0.9)
+ fi
+ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_FFI_LIBS"
+ fi
+
+ dnl ========================================================
++dnl system icu support
++dnl ========================================================
++MOZ_NATIVE_ICU=
++MOZ_ARG_WITH_BOOL(system-icu,
++[ --with-system-icu
++ Use system icu (located with pkgconfig)],
++ MOZ_NATIVE_ICU=1)
++
++if test -n "$MOZ_NATIVE_ICU"; then
++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
++ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
++fi
++
++AC_SUBST(MOZ_NATIVE_ICU)
++
++dnl ========================================================
+ dnl Java SDK support
+ dnl ========================================================
+
+ JAVA_BIN_PATH=
+ MOZ_ARG_WITH_STRING(java-bin-path,
+ [ --with-java-bin-path=dir
+ Location of Java binaries (java, javac, jar)],
+ JAVA_BIN_PATH=$withval)
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+--- mozilla/js/src/Makefile.in
++++ mozilla/js/src/Makefile.in
+@@ -232,48 +232,54 @@ endif
+
+ #############################################
+ # BEGIN ECMAScript Internationalization API
+ #
+
+ # ICU headers need to be available whether we build with the complete
+ # Internationalization API or not - ICU stubs rely on them.
+
++ifdef MOZ_NATIVE_ICU
++LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
++else
+ LOCAL_INCLUDES += \
+ -I$(topsrcdir)/../../intl/icu/source/common \
+ -I$(topsrcdir)/../../intl/icu/source/i18n \
+ $(NULL)
++endif
+
+ ifdef ENABLE_INTL_API
+
+ ifeq ($(OS_ARCH),WINNT)
+ # Parallel gmake is buggy on Windows
+ ICU_GMAKE_OPTIONS="-j1"
+ # Library names: On Windows, ICU uses modified library names for static
+ # and debug libraries.
+ ifdef MOZ_DEBUG
+ ICU_LIB_SUFFIX=d
+ endif
+ ICU_LIB_RENAME = $(foreach libname,$(ICU_LIB_NAMES),\
+ cp -p intl/icu/lib/s$(libname)$(ICU_LIB_SUFFIX).lib intl/icu/lib/$(libname).lib;)
+ endif
+
++ifndef MOZ_NATIVE_ICU
+ # - Build ICU as part of the "export" target, so things get built
+ # in the right order.
+ # - ICU requires GNU make according to its readme.html. pymake can't be used
+ # because it doesn't support order only dependencies.
+ # - Force ICU to use the standard suffix for object files because expandlibs
+ # will discard all files with a non-standard suffix (bug 857450).
+ # - Options for genrb: -k strict parsing; -R omit collation tailoring rules.
+ export::
+ $(GMAKE) $(ICU_GMAKE_OPTIONS) -C intl/icu STATIC_O=$(OBJ_SUFFIX) GENRBOPTS='-k -R'
+ $(ICU_LIB_RENAME)
+
+ distclean clean::
+ $(call SUBMAKE,$@,intl/icu)
++endif
+
+ endif
+
+ #
+ # END ECMAScript Internationalization API
+ #############################################
+
+
+@@ -398,17 +404,21 @@ CFLAGS += $(MOZ_ZLIB_CFLAGS)
+ EXTRA_LIBS += $(MOZ_ZLIB_LIBS)
+ # Enable zlib usage if zlib has been located. When building the browser on
+ # Windows, MOZ_ZLIB_LIBS is empty because zlib is part of libmozglue. We thus
+ # also enable zlib if mozglue is present.
+ ifneq (,$(MOZ_ZLIB_LIBS)$(MOZ_GLUE_LDFLAGS))
+ DEFINES += -DUSE_ZLIB
+ endif
+
+-SHARED_LIBRARY_LIBS += $(ICU_LIBS)
++ifdef MOZ_NATIVE_ICU
++EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS)
++else
++SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS)
++endif
+
+ # Prevent floating point errors caused by VC++ optimizations
+ ifdef _MSC_VER
+ # XXX We should add this to CXXFLAGS, too?
+ CFLAGS += -fp:precise
+
+ ifeq ($(CPU_ARCH),x86)
+ # Workaround compiler bug on PGO (Bug 721284)
+diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in
+--- mozilla/js/src/config/Makefile.in
++++ mozilla/js/src/config/Makefile.in
+@@ -54,16 +54,17 @@ include $(topsrcdir)/config/rules.mk
+
+ HOST_CFLAGS += -DUNICODE -D_UNICODE
+
+ ifdef WRAP_SYSTEM_INCLUDES
+ export:: \
+ $(call mkdir_deps,system_wrappers_js) \
+ $(NULL)
+ $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \
++ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
+ $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js
+ $(INSTALL) system_wrappers_js $(DIST)
+
+ GARBAGE_DIRS += system_wrappers_js
+ endif
+
+ GARBAGE += $(srcdir)/*.pyc *.pyc
+
+diff --git a/js/src/config/system-headers b/js/src/config/system-headers
+--- mozilla/js/src/config/system-headers
++++ mozilla/js/src/config/system-headers
+@@ -1125,8 +1125,19 @@ gst/video/video.h
+ sys/msg.h
+ sys/ipc.h
+ sys/thr.h
+ sys/user.h
+ kvm.h
+ spawn.h
+ err.h
+ xlocale.h
++#if MOZ_NATIVE_ICU==1
++unicode/locid.h
++unicode/numsys.h
++unicode/ucal.h
++unicode/ucol.h
++unicode/udat.h
++unicode/udatpg.h
++unicode/uenum.h
++unicode/unum.h
++unicode/ustring.h
++#endif
+diff --git a/js/src/configure.in b/js/src/configure.in
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -4406,59 +4406,68 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE
+ AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
+ AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
+ fi
+
+
+ dnl ========================================================
+ dnl ECMAScript Internationalization API Support (uses ICU)
+ dnl ========================================================
++ICU_LIB_NAMES=
++MOZ_NATIVE_ICU=
++MOZ_ARG_WITH_BOOL(system-icu,
++[ --with-system-icu
++ Use system icu (located with pkgconfig)],
++ MOZ_NATIVE_ICU=1)
++
++if test -n "$MOZ_NATIVE_ICU"; then
++ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
++fi
+
+ if test -n "$JS_STANDALONE"; then
+ ENABLE_INTL_API=1
+ fi
+ MOZ_ARG_ENABLE_BOOL(intl-api,
+ [ --enable-intl-api Enable ECMAScript Internationalization API (default=yes for standalone JS)],
+ ENABLE_INTL_API=1,
+ ENABLE_INTL_API= )
+
+ dnl Settings for the implementation of the ECMAScript Internationalization API
+ if test -n "$ENABLE_INTL_API"; then
+ AC_DEFINE(ENABLE_INTL_API)
+- # We build ICU as a static library.
+- AC_DEFINE(U_STATIC_IMPLEMENTATION)
+-
+- case "$OS_TARGET" in
+- WINNT)
+- ICU_LIB_NAMES="icuin icuuc icudt"
+- ;;
+- Darwin|Linux)
+- ICU_LIB_NAMES="icui18n icuuc icudata"
+- ;;
+- *)
+- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
+- esac
+-
+- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
+-else
+- ICU_LIB_NAMES=
+- ICU_LIBS=
++
++ if test -z "$MOZ_NATIVE_ICU"; then
++ case "$OS_TARGET" in
++ WINNT)
++ ICU_LIB_NAMES="icuin icuuc icudt"
++ ;;
++ Darwin|Linux)
++ ICU_LIB_NAMES="icui18n icuuc icudata"
++ ;;
++ *)
++ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
++ esac
++ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)'
++ fi
+ fi
+
+ AC_SUBST(ENABLE_INTL_API)
+ AC_SUBST(ICU_LIB_NAMES)
+-AC_SUBST(ICU_LIBS)
+-
+-dnl Source files that use ICU should have control over which parts of the ICU
+-dnl namespace they want to use.
+-AC_DEFINE(U_USING_ICU_NAMESPACE,0)
+-
++AC_SUBST(MOZ_ICU_LIBS)
++AC_SUBST(MOZ_NATIVE_ICU)
+
+ dnl Settings for ICU
+-if test -n "$ENABLE_INTL_API" ; then
++if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
++ dnl We build ICU as a static library.
++ AC_DEFINE(U_STATIC_IMPLEMENTATION)
++
++ dnl Source files that use ICU should have control over which parts of the ICU
++ dnl namespace they want to use.
++ AC_DEFINE(U_USING_ICU_NAMESPACE,0)
++
+ # Set ICU compile options
+ ICU_CPPFLAGS=""
+ # don't use icu namespace automatically in client code
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_USING_ICU_NAMESPACE=0"
+ # don't include obsolete header files
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
+ # remove chunks of the library that we don't need (yet)
+ ICU_CPPFLAGS="$ICU_CPPFLAGS -DUCONFIG_NO_LEGACY_CONVERSION"
+diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in
+--- mozilla/js/src/gdb/Makefile.in
++++ mozilla/js/src/gdb/Makefile.in
+@@ -14,16 +14,20 @@ include $(DEPTH)/config/autoconf.mk
+ # Building against js_static requires that we declare mfbt sybols "exported"
+ # on its behalf.
+ DEFINES += -DEXPORT_JS_API -DIMPL_MFBT
+
+ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
++ifdef MOZ_NATIVE_ICU
++EXTRA_LIBS += $(MOZ_ICU_LIBS)
++endif
++
+ EXTRA_LIBS += $(MOZ_FFI_LIBS)
+
+ # Place a GDB Python auto-load file next to the gdb-tests executable, both
+ # in the build directory and in the dist/bin directory.
+ PP_TARGETS += GDB_AUTOLOAD
+ GDB_AUTOLOAD := gdb-tests-gdb.py.in
+ GDB_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
+
+diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in
+--- mozilla/js/src/jsapi-tests/Makefile.in
++++ mozilla/js/src/jsapi-tests/Makefile.in
+@@ -15,16 +15,20 @@ DEFINES += -DEXPORT_JS_API
+ # Building against js_static requires that we declare mfbt sybols "exported"
+ # on its behalf.
+ DEFINES += -DIMPL_MFBT
+
+ LIBS = $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(NSPR_LIBS) $(MOZ_ZLIB_LIBS)
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
++ifdef MOZ_NATIVE_ICU
++EXTRA_LIBS += $(MOZ_ICU_LIBS)
++endif
++
+ EXTRA_LIBS += $(MOZ_FFI_LIBS)
+
+ ifdef QEMU_EXE
+ MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB)
+ endif
+
+ # Place a GDB Python auto-load file next to the jsapi-tests executable in
+ # the build directory.
+diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in
+--- mozilla/js/src/shell/Makefile.in
++++ mozilla/js/src/shell/Makefile.in
+@@ -22,16 +22,19 @@ DEFINES += -DEXPORT_JS_API
+ # Building against js_static requires that we declare mfbt sybols "exported"
+ # on its behalf.
+ DEFINES += -DIMPL_MFBT
+
+ LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX) $(MOZ_ZLIB_LIBS)
+ ifdef MOZ_NATIVE_FFI
+ EXTRA_LIBS += $(MOZ_FFI_LIBS)
+ endif
++ifdef MOZ_NATIVE_ICU
++EXTRA_LIBS += $(MOZ_ICU_LIBS)
++endif
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
+ ifeq ($(OS_ARCH),Darwin)
+ ifeq ($(TARGET_CPU),x86_64)
+ DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000
+ endif
+ endif
Added: trunk/www/seamonkey/files/patch-bug862759
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug862759 Mon Aug 5 07:31:57 2013 (r1298)
@@ -0,0 +1,10 @@
+--- mozilla/js/src/frontend/ParseMaps.cpp~
++++ mozilla/js/src/frontend/ParseMaps.cpp
+@@ -134,5 +134,5 @@ frontend::InitAtomMap(JSContext *cx, frontend::AtomIndexMap *indices, HeapPtrAto
+ }
+ }
+
+-template class AtomDecls<FullParseHandler>;
+-template class AtomDecls<SyntaxParseHandler>;
++template class frontend::AtomDecls<FullParseHandler>;
++template class frontend::AtomDecls<SyntaxParseHandler>;
Modified: trunk/www/seamonkey/files/patch-bug893397
==============================================================================
--- trunk/www/seamonkey/files/patch-bug893397 Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/files/patch-bug893397 Mon Aug 5 07:31:57 2013 (r1298)
@@ -1,18 +1,5 @@
diff --git configure.in configure.in
index 549ad06..2878d9f 100644
---- configure.in
-+++ configure.in
-@@ -8491,7 +8491,7 @@ case "$OS_TARGET" in
- NECKO_WIFI=1
- fi
- ;;
-- Darwin|SunOS|WINNT)
-+ Darwin|FreeBSD|SunOS|WINNT)
- NECKO_WIFI=1
- ;;
- Linux)
-diff --git configure.in configure.in
-index 549ad06..2878d9f 100644
--- mozilla/configure.in
+++ mozilla/configure.in
@@ -8491,7 +8491,7 @@ case "$OS_TARGET" in
Modified: trunk/www/seamonkey/files/patch-clang32-libc++-visibility-hack
==============================================================================
--- trunk/www/seamonkey/files/patch-clang32-libc++-visibility-hack Sun Aug 4 06:56:36 2013 (r1297)
+++ trunk/www/seamonkey/files/patch-clang32-libc++-visibility-hack Mon Aug 5 07:31:57 2013 (r1298)
@@ -1,22 +1,3 @@
---- configure.in~
-+++ configure.in
-@@ -2855,6 +2855,7 @@ EOF
- #pragma GCC visibility push(hidden)
- #pragma GCC visibility push(default)
- #include <string.h>
-+#include <iterator>
- #pragma GCC visibility pop
-
- __attribute__ ((visibility ("default"))) void Func() {
-@@ -2863,7 +2864,7 @@ __attribute__ ((visibility ("default"))) void Func() {
- }
- EOF
- ac_cv_have_visibility_builtin_bug=no
-- if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-+ if ! ${CXX-c++} ${CXXFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
- ac_cv_have_visibility_builtin_bug=yes
- else
- if test `grep -c "@PLT" conftest.S` = 0; then
--- mozilla/configure.in~
+++ mozilla/configure.in
@@ -2855,6 +2855,7 @@ EOF
Deleted: trunk/www/seamonkey/files/patch-configure.in
==============================================================================
--- trunk/www/seamonkey/files/patch-configure.in Mon Aug 5 07:31:57 2013 (r1297)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,49 +0,0 @@
---- configure.in.orig 2012-07-14 00:40:08.000000000 +0200
-+++ configure.in 2012-08-18 18:16:06.000000000 +0200
-@@ -3101,6 +3118,8 @@
-
- AC_SUBST(VISIBILITY_FLAGS)
-
-+MOZ_COMPILER_OPTS
-+
- dnl Checks for header files.
- dnl ========================================================
- AC_HEADER_DIRENT
-@@ -4067,29 +4086,29 @@
-
- AC_CACHE_CHECK(for __attribute__((always_inline)),
- ac_cv_attribute_always_inline,
-- [AC_TRY_COMPILE([],
-- [inline void f(void) __attribute__((always_inline));],
-+ [AC_TRY_COMPILE([inline void f(void) __attribute__((always_inline));],
-+ [],
- ac_cv_attribute_always_inline=yes,
- ac_cv_attribute_always_inline=no)])
-
- AC_CACHE_CHECK(for __attribute__((malloc)),
- ac_cv_attribute_malloc,
-- [AC_TRY_COMPILE([],
-- [void* f(int) __attribute__((malloc));],
-+ [AC_TRY_COMPILE([void* f(int) __attribute__((malloc));],
-+ [],
- ac_cv_attribute_malloc=yes,
- ac_cv_attribute_malloc=no)])
-
- AC_CACHE_CHECK(for __attribute__((warn_unused_result)),
- ac_cv_attribute_warn_unused,
-- [AC_TRY_COMPILE([],
-- [int f(void) __attribute__((warn_unused_result));],
-+ [AC_TRY_COMPILE([int f(void) __attribute__((warn_unused_result));],
-+ [],
- ac_cv_attribute_warn_unused=yes,
- ac_cv_attribute_warn_unused=no)])
-
- AC_CACHE_CHECK(for __attribute__((noreturn)),
- ac_cv_attribute_noreturn,
-- [AC_TRY_COMPILE([],
-- [void f(void) __attribute__((noreturn));],
-+ [AC_TRY_COMPILE([void f(void) __attribute__((noreturn));],
-+ [],
- ac_cv_attribute_noreturn=yes,
- ac_cv_attribute_noreturn=no)])
-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308050731.r757VwpB009899>