Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv13378
Modified Files:
firefox8.info
Added Files:
firefox8-egrep.patch
Log Message:
fix for Mountain Lion 64bit only grep or for having our 64bit egrep at front of
PATH
Index: firefox8.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/crypto/firefox8.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- firefox8.info 22 Jun 2012 18:20:39 -0000 1.4
+++ firefox8.info 7 Aug 2012 19:22:23 -0000 1.5
@@ -60,7 +60,7 @@
## nspr/configure* fixes from bug 702997, fixed for firefox11
PatchFile2: firefox8-internal-nspr-nss.patch
PatchFile2-MD5: df6e170e0df343236a26e0b58e0c9e90
-## xcode4.2 fix will be in firefox10 Bug 697881
+### xcode4.2 fix will be in firefox10 Bug 697881
PatchFile3: %n-xcode4.2-gcc4.2.patch
PatchFile3-MD5: 18471efb9ceb28c60f9f8d9835b6514f
### _oc_state_loop_filter_frag_rows_mmxext and similar symbols not present
@@ -74,12 +74,20 @@
### Bug 698592: Invalid suffix on literal operator (spaces in secmodt.h)
PatchFile4: %n-clang.patch
PatchFile4-MD5: 8bdd94ab09617c588b778c4f91d1e12d
+### egrep on Lion fails on long patterns unless forced into 32bit mode.
+### and our 64bit egrep doesn't like being forced into 32bit mode.
+### Bug 750574: Build fails with "arch: posix_spawnp: egrep: Bad CPU type in
executable"
+### Bug 775405: Build fails with "arch: posix_spawnp: egrep: Bad CPU type in
executable" when MacPorts egrep is on $PATH
+### Fixed in mozilla17
+PatchFile5: %n-egrep.patch
+PatchFile5-MD5: 38acd72d7bdd19e77ce6d2ee462660b5
PatchScript: <<
### apply the patch
/usr/bin/sed -e 's|@FINKPREFIX@|%p|g' -e 's|@FINK_ARCH_TARGET@|%m|g' -e
's|@FIREFOX_MAJOR_VERSION@|8|g' <%{PatchFile} | /usr/bin/patch -p1
/usr/bin/sed -e 's|@FINKPREFIX@|%p|g' <%{PatchFile2} | /usr/bin/patch -p1
/usr/bin/patch -p1 < %{PatchFile3}
/usr/bin/patch -p1 < %{PatchFile4}
+ /usr/bin/patch -p1 < %{PatchFile5}
### 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 :
--- NEW FILE: firefox8-egrep.patch ---
Bug 750574 - Only use "fixed" egrep command on OS X 10.7 [r=ted]
Bug 775405 - Fix build for OS X v10.7 when non-universal egrep is on $PATH
before Apple's egrep. r=ted
diff --git a/configure.in b/configure.in
--- a/configure.in 2012-08-07 14:36:13.000000000 -0400
+++ b/configure.in 2012-08-07 14:36:24.000000000 -0400
@@ -9320,24 +9320,26 @@
"
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.
+# Hack around an Apple bug that affects the egrep that comes with OS X 10.7.
+# "env ARCHPREFERENCE=i386,x86_64 arch egrep" first tries to use the 32-bit
+# Intel part of the egrep fat binary, even on 64-bit systems, and falls back on
+# the 64-bit part if it's not a fat binary, as can happen with Fink. We
+# (apparently) only need this hack when egrep's "pattern" is particularly long
+# (as in the following code) and the first egrep on our $PATH is Apple's. See
+# bug 655339.
case "$host" in
-*-apple-darwin*)
- FIXED_EGREP="arch -arch i386 egrep"
+*-apple-darwin11*)
+ FIXED_EGREP="env ARCHPREFERENCE=i386,x86_64 arch egrep"
;;
*)
FIXED_EGREP="egrep"
;;
esac
# Save the defines header file before autoconf removes it.
# (Do not add AC_DEFINE calls after this line.)
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
