Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv3342
Modified Files:
firefox6.info firefox6.patch
Added Files:
firefox6-egrep.patch firefox6-xcode4.2-gcc4.2.patch
Log Message:
add fix for xcode4.2
move changes to configure.in
split patches for easier maintenance
Index: firefox6.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto/firefox6.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- firefox6.patch 17 Aug 2011 17:42:59 -0000 1.1
+++ firefox6.patch 2 Nov 2011 01:36:32 -0000 1.2
@@ -88,10 +88,10 @@
L10NBASEDIR = @L10NBASEDIR@
-diff -ruN mozilla-release-orig/configure mozilla-release/configure
---- mozilla-release-orig/configure 2011-08-11 17:56:47.000000000 -0400
-+++ mozilla-release/configure 2011-08-16 09:28:25.000000000 -0400
-@@ -6749,17 +6749,18 @@
+diff -ruN mozilla-release-orig/configure.in mozilla-release/configure.in
+--- mozilla-release-orig/configure.in 2011-09-02 16:15:20.000000000 -0400
++++ mozilla-release/configure.in 2011-11-01 17:06:31.000000000 -0400
+@@ -1876,17 +1876,18 @@
case "${host_cpu}" in
x86_64)
HOST_CFLAGS="$HOST_CFLAGS -D_AMD64_"
@@ -111,74 +111,6 @@
HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-@@ -25068,16 +25069,29 @@
- HAVE_ICONV_WITH_CONST_INPUT
- HAVE_MBRTOWC
- HAVE_SYS_MOUNT_H
- HAVE_SYS_VFS_H
- HAVE_WCRTOMB
- "
-
-
-+# Hack around an Apple bug that effects the egrep that comes with OS X 10.7.
-+# "arch -arch i386 egrep" always uses the 32-bit Intel part of the egrep fat
-+# binary, even on 64-bit systems. It should work on OS X 10.4.5 and up. We
-+# (apparently) only need this hack when egrep's "pattern" is particularly
-+# long (as in the following code). See bug 655339.
-+case "$host" in
-+x86_64-apple-darwin*)
-+ FIXED_EGREP="arch -arch i386 egrep"
-+ ;;
-+*)
-+ FIXED_EGREP="egrep"
-+ ;;
-+esac
-
- # Save the defines header file before autoconf removes it.
- # (Do not add AC_DEFINE calls after this line.)
- _CONFIG_TMP=confdefs-tmp.h
- _CONFIG_DEFS_H=mozilla-config.h
-
- cat > $_CONFIG_TMP <<\EOF
- /* List of defines generated by configure. Included with preprocessor flag,
-@@ -25092,17 +25106,17 @@
- _EGREP_PATTERN='^#define ('
- if test -n "$_NON_GLOBAL_ACDEFINES"; then
- for f in $_NON_GLOBAL_ACDEFINES; do
- _EGREP_PATTERN="${_EGREP_PATTERN}$f|"
- done
- fi
- _EGREP_PATTERN="${_EGREP_PATTERN}dummy_never_defined)"
-
-- sort confdefs.h | egrep -v "$_EGREP_PATTERN" >> $_CONFIG_TMP
-+ sort confdefs.h | $FIXED_EGREP -v "$_EGREP_PATTERN" >> $_CONFIG_TMP
-
- cat >> $_CONFIG_TMP <<\EOF
-
- #endif /* _MOZILLA_CONFIG_H_ */
-
- EOF
-
- # Only write mozilla-config.h when something changes (or it doesn't exist)
-@@ -25113,17 +25127,17 @@
- mv -f $_CONFIG_TMP $_CONFIG_DEFS_H
-
- echo ==== $_CONFIG_DEFS_H =================================
- cat $_CONFIG_DEFS_H
- fi
-
- rm -f confdefs.h.save
- mv confdefs.h confdefs.h.save
--egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
-+$FIXED_EGREP -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
- # Transform confdefs.h into DEFS.
- # Protect against shell expansion while executing Makefile rules.
- # Protect against Makefile macro expansion.
- #
- # If the first sed substitution is executed (which looks for macros that
- # take arguments), then we branch to the quote section. Otherwise,
- # look for a macro that doesn't take arguments.
- cat >confdef2opt.sed <<\_ACEOF
diff -ruN mozilla-release-orig/fink/applications/firefox.desktop
mozilla-release/fink/applications/firefox.desktop
--- mozilla-release-orig/fink/applications/firefox.desktop 1969-12-31
19:00:00.000000000 -0500
+++ mozilla-release/fink/applications/firefox.desktop 2009-04-27
16:56:30.000000000 -0400
--- NEW FILE: firefox6-egrep.patch ---
# HG changeset patch
# Parent 345ba237404d2ae78f4a4629799f9fc47a65ee2c
# User Steven Michaud <[email protected]>
Bug 655339 - Work around bug in Apple's egrep on OS X 10.7. r=ted
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -9148,16 +9148,30 @@
"
AC_CONFIG_HEADER(
netwerk/necko-config.h
xpcom/xpcom-config.h
xpcom/xpcom-private.h
)
+# Hack around an Apple bug that effects the egrep that comes with OS X 10.7.
+# "arch -arch i386 egrep" always uses the 32-bit Intel part of the egrep fat
+# binary, even on 64-bit systems. It should work on OS X 10.4.5 and up. We
+# (apparently) only need this hack when egrep's "pattern" is particularly
+# long (as in the following code). See bug 655339.
+case "$host" in
+x86_64-apple-darwin*)
+ FIXED_EGREP="arch -arch i386 egrep"
+ ;;
+*)
+ FIXED_EGREP="egrep"
+ ;;
+esac
+
# Save the defines header file before autoconf removes it.
# (Do not add AC_DEFINE calls after this line.)
_CONFIG_TMP=confdefs-tmp.h
_CONFIG_DEFS_H=mozilla-config.h
cat > $_CONFIG_TMP <<\EOF
/* List of defines generated by configure. Included with preprocessor flag,
* -include, to avoid long list of -D defines on the compile command-line.
@@ -9171,17 +9185,17 @@
_EGREP_PATTERN='^#define ('
if test -n "$_NON_GLOBAL_ACDEFINES"; then
for f in $_NON_GLOBAL_ACDEFINES; do
_EGREP_PATTERN="${_EGREP_PATTERN}$f|"
done
fi
_EGREP_PATTERN="${_EGREP_PATTERN}dummy_never_defined)"
- sort confdefs.h | egrep -v "$_EGREP_PATTERN" >> $_CONFIG_TMP
+ sort confdefs.h | $FIXED_EGREP -v "$_EGREP_PATTERN" >> $_CONFIG_TMP
cat >> $_CONFIG_TMP <<\EOF
#endif /* _MOZILLA_CONFIG_H_ */
EOF
# Only write mozilla-config.h when something changes (or it doesn't exist)
@@ -9193,17 +9207,17 @@
echo ==== $_CONFIG_DEFS_H =================================
cat $_CONFIG_DEFS_H
fi
dnl Probably shouldn't call this manually but we always want the output of DEFS
rm -f confdefs.h.save
mv confdefs.h confdefs.h.save
-egrep -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
+$FIXED_EGREP -v "$_EGREP_PATTERN" confdefs.h.save > confdefs.h
AC_OUTPUT_MAKE_DEFS()
MOZ_DEFINES=$DEFS
AC_SUBST(MOZ_DEFINES)
rm -f confdefs.h
mv confdefs.h.save confdefs.h
dnl Load the list of Makefiles to generate.
dnl To add new Makefiles, edit allmakefiles.sh.
Index: firefox6.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto/firefox6.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- firefox6.info 2 Oct 2011 16:41:12 -0000 1.4
+++ firefox6.info 2 Nov 2011 01:36:32 -0000 1.5
@@ -1,6 +1,6 @@
Package: firefox6
Version: 6.0.2
-Revision: 1
+Revision: 2
Description: Lightweight browser from mozilla.org
License: OSI-Approved
Maintainer: Hanspeter Niederstrasser <[email protected]>
@@ -19,12 +19,14 @@
x11
<<
# nspr.0d-shlibs,
+# libnss.1d-shlibs
BuildConflicts: <<
freetype,
nspr.0d
<<
BuildDepends: <<
atk1 (>= 1.20.0-1),
+ autoconf2.13-legacy,
bzip2-dev,
cairo (>= 1.6-1),
dbus-glib1.2-dev,
@@ -47,20 +49,28 @@
xft2-dev (>= 2.2.0-2),
yasm
<<
-# libnss.1d,
# nspr.0d,
+# libnss.1d,
Source:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%v/source/firefox-%v.source.tar.bz2
SourceDirectory: mozilla-release
Source-MD5: 140ca0cfd57905139f8f71a527afb283
PatchFile: %n.patch
-PatchFile-MD5: 1fab1b31b3da4809d059adf43f2fcf01
+PatchFile-MD5: 23b92f68a36c2bde014d325f028360a9
PatchFile2: %n-plugin-ipc.patch
PatchFile2-MD5: 620d7c431c62ac77291058e809ee1777
+PatchFile3: %n-xcode4.2-gcc4.2.patch
+PatchFile3-MD5: 18471efb9ceb28c60f9f8d9835b6514f
+PatchFile4: %n-egrep.patch
+PatchFile4-MD5: 08b2c8d8fcbbaceb99f7161069a20d11
+
PatchScript: <<
### apply the patch
/usr/bin/sed -e 's|@FINKPREFIX@|%p|g' -e 's|@FINK_ARCH_TARGET@|%m|g' -e
's|@FIREFOX_MAJOR_VERSION@|6|g' <%{PatchFile} | /usr/bin/patch -p1
/usr/bin/patch -p1 < %{PatchFile2}
+ /usr/bin/patch -p1 < %{PatchFile3}
+ /usr/bin/patch -p1 < %{PatchFile4}
+
### hardcode paths inside dylibs so that programs linking to them can see
them
/usr/bin/perl -pi -e 's,\@executable_path,%p/lib/%n,g' `/usr/bin/grep -lr
@executable_path .`
### -DXP_MACOSX is not always getting defined, so force __APPLE__ in those
instances :
@@ -74,8 +84,6 @@
/usr/bin/perl -pi -e 's|OS_INCLUDES \+\= \$\(XCFLAGS\)|OS_INCLUDES \+\=
\$\(FT2_CFLAGS\) \$\(XCFLAGS\)|g' gfx/cairo/cairo/src/Makefile.in
<<
### force X11 to the end
-#SetCC: clang
-#SetCXX: clang++
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib -L/usr/X11R6/lib
NoSetCPPFLAGS: true
@@ -93,7 +101,10 @@
/usr/bin/make -j1 -w -f client.mk install DESTDIR=%d
# Install NSS headers.
-#/bin/cp -R -L obj-%m-apple-darwin`uname -r`/dist/public/nss %i/include/%n/nss
+/bin/cp -R -L obj-%m-apple-darwin`uname -r`/dist/public/nss %i/include/%n/nss
+
+# Fix loading of libnssckbi.dylib when using system-libnss
+#/bin/ln -s %p/lib/nss.1d/libnssckbi.dylib %i/lib/%n/libnssckbi.dylib
# Install the GNOME .desktop launcher.
/usr/bin/install -d -m 755 %i/share/applications
@@ -174,20 +185,20 @@
lib/%N/omni.jar
<<
Shlibs: <<
+ %p/lib/%N/libfreebl3.dylib 1.0.0 %n (>= 1.5.0.10-1001)
%p/lib/%N/libmozalloc.dylib 1.0.0 %n (>= 4.0-0.b1.1)
+ %p/lib/%N/libnspr4.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/%N/libnss3.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/%N/libnssckbi.dylib 1.0.0 %n (>= 4.0-0.b1.1)
+ %p/lib/%N/libnssdbm3.dylib 1.0.0 %n (>= 3.1-2)
+ %p/lib/%N/libnssutil3.dylib 1.0.0 %n (>= 3.1-2)
+ %p/lib/%N/libplc4.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/%N/libplds4.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/%N/libsmime3.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/%N/libsoftokn3.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/%N/libssl3.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libxpcom.dylib 1.0.0 %n (>= 0.10.1-4)
%p/lib/%N/libxul.dylib 1.0.0 %n (>= 3.1-1)
- !%p/lib/%N/libfreebl3.dylib
- !%p/lib/%N/libnspr4.dylib
- !%p/lib/%N/libnss3.dylib
- !%p/lib/%N/libnssckbi.dylib
- !%p/lib/%N/libnssdbm3.dylib
- !%p/lib/%N/libnssutil3.dylib
- !%p/lib/%N/libplc4.dylib
- !%p/lib/%N/libplds4.dylib
- !%p/lib/%N/libsmime3.dylib
- !%p/lib/%N/libsoftokn3.dylib
- !%p/lib/%N/libssl3.dylib
<<
# %p/lib/%N/libgfxpsshar.dylib 1.0.0 %n (>= 1.5-1)
# %p/lib/%N/libgkgfx.dylib 1.0.0 %n (>= 0.10.1-4)
@@ -200,19 +211,8 @@
# %p/lib/%N/libxpcom_compat.dylib 1.0.0 %n (>= 0.10.1-4)
# %p/lib/%N/libxpcom_core.dylib 1.0.0 %n (>= 1.1-8)
# %p/lib/%N/libxpistub.dylib 1.0.0 %n (>= 0.10.1-4)
-# move to system nspr, nss, sqlite3
+# move to system sqlite3
# %p/lib/%N/libmozsqlite3.dylib 1.0.0 %n (>= 4.0-0.b1.1)
-# %p/lib/%N/libfreebl3.dylib 1.0.0 %n (>= 1.5.0.10-1001)
-# %p/lib/%N/libnspr4.dylib 1.0.0 %n (>= 0.10.1-4)
-# %p/lib/%N/libnss3.dylib 1.0.0 %n (>= 0.10.1-4)
-# %p/lib/%N/libnssckbi.dylib 1.0.0 %n (>= 4.0-0.b1.1)
-# %p/lib/%N/libnssdbm3.dylib 1.0.0 %n (>= 3.1-2)
-# %p/lib/%N/libnssutil3.dylib 1.0.0 %n (>= 3.1-2)
-# %p/lib/%N/libplc4.dylib 1.0.0 %n (>= 0.10.1-4)
-# %p/lib/%N/libplds4.dylib 1.0.0 %n (>= 0.10.1-4)
-# %p/lib/%N/libsmime3.dylib 1.0.0 %n (>= 0.10.1-4)
-# %p/lib/%N/libsoftokn3.dylib 1.0.0 %n (>= 0.10.1-4)
-# %p/lib/%N/libssl3.dylib 1.0.0 %n (>= 0.10.1-4)
<<
Homepage: http://www.mozilla.org/products/firefox/
DescDetail: <<
--- NEW FILE: firefox6-xcode4.2-gcc4.2.patch ---
From: Ralph Giles <[email protected]>
Bug 697881 - Fall back to gcc on darwin if there's no gcc-4.2. r=ted
Since Bug 513353, we've defaulted to gcc-4.2 on darwin.
Unfortunately the default was unconditional, and while
XCode 4.1 provided a gcc-4.2 alias, XCode 4.2 does not,
although 'gcc' is llvm-gcc 4.2.1. As such, the configure
script immediately fails.
The patch still prefers gcc-4.2, but falls back to plain
gcc if it's not available.
Note that we try $CC and $CXX from the environment first
so it is still possible to override this default.
diff -ruN mozilla-release-orig/configure.in mozilla-release/configure.in
--- mozilla-release-orig/configure.in 2011-09-02 16:15:20.000000000 -0400
+++ mozilla-release/configure.in 2011-11-01 17:06:31.000000000 -0400
@@ -199,18 +199,21 @@
x86_64)
AS=ml64;
;;
esac
fi
if test -z "$MIDL"; then MIDL=midl; fi
;;
*-darwin*)
- if test -z "$CC"; then CC=gcc-4.2; fi
- if test -z "$CXX"; then CXX=g++-4.2; fi
+ # prefer gcc-4.2 to default cc on older darwin, so
+ # use that specific version if it's available.
+ # Bug 697881 - Will be in Firefox10.
+ MOZ_PATH_PROGS(CC, $CC gcc-4.2 gcc)
+ MOZ_PATH_PROGS(CXX, $CXX g++-4.2 g++)
;;
esac
fi
COMPILE_ENVIRONMENT=1
MOZ_ARG_DISABLE_BOOL(compile-environment,
[ --disable-compile-environment
Disable compiler/library checks.],
diff --git a/js/src/configure.in b/js/src/configure.in
index 499154c..806a20b 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -168,17 +168,17 @@ dnl
==============================================================
MOZ_ARG_WITH_STRING(dist-dir,
[ --with-dist-dir=DIR Use DIR as 'dist' staging area. DIR may be
relative to the top of SpiderMonkey build tree,
or absolute.],
TOP_DIST=$withval,
TOP_DIST=dist)
AC_SUBST(TOP_DIST)
-dnl Default to MSVC for win32 and gcc-4.2 for darwin
+dnl Default to MSVC for win32
dnl ==============================================================
if test -z "$CROSS_COMPILE"; then
case "$target" in
*-mingw*)
if test -z "$CC"; then CC=cl; fi
if test -z "$CXX"; then CXX=cl; fi
if test -z "$CPP"; then CPP="cl -E -nologo"; fi
if test -z "$CXXCPP"; then CXXCPP="cl -TP -E -nologo";
ac_cv_prog_CXXCPP="$CXXCPP"; fi
@@ -191,18 +191,19 @@ case "$target" in
x86_64)
AS=ml64;
;;
esac
fi
if test -z "$MIDL"; then MIDL=midl; fi
;;
*-darwin*)
- if test -z "$CC"; then CC=gcc-4.2; fi
- if test -z "$CXX"; then CXX=g++-4.2; fi
+ # prefer gcc-4.2 to default cc on older xcode
+ MOZ_PATH_PROGS(CC, $CC gcc-4.2 gcc)
+ MOZ_PATH_PROGS(CXX, $CXX g++-4.2 g++)
;;
esac
fi
COMPILE_ENVIRONMENT=1
MOZ_ARG_DISABLE_BOOL(compile-environment,
[ --disable-compile-environment
Disable compiler/library checks.],
------------------------------------------------------------------------------
RSA® Conference 2012
Save $700 by Nov 18
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
