Author: beat
Date: Wed Jun 23 06:48:34 2010
New Revision: 322
Log:
- Fix arch detection (don't convert amd64 to x86_64).
Reported / tested by: crsd on EFnet
Obtained from: Patches from ale@ for seamonkey2
Added:
branches/experimental/deskutils/lightning/files/patch-configure.in
branches/experimental/deskutils/lightning/files/patch-mozilla-build-autoconf-config.sub
branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-build-autoconf-config.sub
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-build-autoconf-config.sub
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-build-autoconf-config.sub
branches/experimental/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub
trunk/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub
trunk/mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub
Modified:
branches/experimental/deskutils/lightning/Makefile
branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-configure.in
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-configure.in
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
Modified: branches/experimental/deskutils/lightning/Makefile
==============================================================================
--- branches/experimental/deskutils/lightning/Makefile Tue Jun 22 09:35:25
2010 (r321)
+++ branches/experimental/deskutils/lightning/Makefile Wed Jun 23 06:48:34
2010 (r322)
@@ -83,6 +83,8 @@
${MOZSRC}/configure
pre-configure:
+ (cd ${WRKSRC} && ${AUTOCONF})
+ (cd ${MOZSRC} && ${AUTOCONF})
(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
# XXX: Workaround for bug 533070. Should be fixed in next release
Added: branches/experimental/deskutils/lightning/files/patch-configure.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/deskutils/lightning/files/patch-configure.in Wed Jun
23 06:48:34 2010 (r322)
@@ -0,0 +1,11 @@
+--- configure.in.orig 2009-08-14 11:24:58.206076928 +0200
++++ configure.in 2009-08-14 11:25:29.601293359 +0200
+@@ -5680,7 +5680,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+ esac
Added:
branches/experimental/deskutils/lightning/files/patch-mozilla-build-autoconf-config.sub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/deskutils/lightning/files/patch-mozilla-build-autoconf-config.sub
Wed Jun 23 06:48:34 2010 (r322)
@@ -0,0 +1,12 @@
+--- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000
+0100
++++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100
+@@ -403,9 +403,6 @@
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+- amd64-*)
+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
Added:
branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-build-autoconf-config.sub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-build-autoconf-config.sub
Wed Jun 23 06:48:34 2010 (r322)
@@ -0,0 +1,12 @@
+--- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08
09:52:25.000000000 +0100
++++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000
+0100
+@@ -403,9 +403,6 @@
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+- amd64-*)
+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
Modified:
branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-configure.in
==============================================================================
---
branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-configure.in
Tue Jun 22 09:35:25 2010 (r321)
+++
branches/experimental/deskutils/lightning/files/patch-mozilla-js-src-configure.in
Wed Jun 23 06:48:34 2010 (r322)
@@ -1,6 +1,15 @@
---- mozilla/js/src/configure.in.orig 2009-09-17 11:09:10.000000000 +0200
-+++ mozilla/js/src/configure.in 2009-09-17 11:09:33.000000000 +0200
-@@ -2467,10 +2467,6 @@
+--- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200
++++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200
+@@ -1218,7 +1218,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+ esac
+@@ -2466,10 +2466,6 @@
ENABLE_JIT=1
NANOJIT_ARCH=ARM
;;
Added:
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-build-autoconf-config.sub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-build-autoconf-config.sub
Wed Jun 23 06:48:34 2010 (r322)
@@ -0,0 +1,12 @@
+--- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000
+0100
++++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100
+@@ -403,9 +403,6 @@
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+- amd64-*)
+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
Added:
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-build-autoconf-config.sub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-build-autoconf-config.sub
Wed Jun 23 06:48:34 2010 (r322)
@@ -0,0 +1,12 @@
+--- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08
09:52:25.000000000 +0100
++++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000
+0100
+@@ -403,9 +403,6 @@
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+- amd64-*)
+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
Modified:
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-configure.in
==============================================================================
---
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-configure.in
Tue Jun 22 09:35:25 2010 (r321)
+++
branches/experimental/mail/thunderbird3-devel/files/patch-mozilla-js-src-configure.in
Wed Jun 23 06:48:34 2010 (r322)
@@ -1,6 +1,15 @@
---- mozilla/js/src/configure.in.orig 2009-09-17 11:09:10.000000000 +0200
-+++ mozilla/js/src/configure.in 2009-09-17 11:09:33.000000000 +0200
-@@ -2467,10 +2467,6 @@
+--- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200
++++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200
+@@ -1218,7 +1218,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+ esac
+@@ -2466,10 +2466,6 @@
ENABLE_JIT=1
NANOJIT_ARCH=ARM
;;
Added:
branches/experimental/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub
Wed Jun 23 06:48:34 2010 (r322)
@@ -0,0 +1,12 @@
+--- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000
+0100
++++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100
+@@ -403,9 +403,6 @@
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+- amd64-*)
+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
Added:
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub
Wed Jun 23 06:48:34 2010 (r322)
@@ -0,0 +1,12 @@
+--- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08
09:52:25.000000000 +0100
++++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000
+0100
+@@ -403,9 +403,6 @@
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+- amd64-*)
+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
Modified:
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
==============================================================================
---
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
Tue Jun 22 09:35:25 2010 (r321)
+++
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
Wed Jun 23 06:48:34 2010 (r322)
@@ -1,6 +1,15 @@
---- mozilla/js/src/configure.in.orig 2009-09-17 11:09:10.000000000 +0200
-+++ mozilla/js/src/configure.in 2009-09-17 11:09:33.000000000 +0200
-@@ -2467,10 +2467,6 @@
+--- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200
++++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200
+@@ -1218,7 +1218,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+ esac
+@@ -2466,10 +2466,6 @@
ENABLE_JIT=1
NANOJIT_ARCH=ARM
;;
Added: trunk/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub
Wed Jun 23 06:48:34 2010 (r322)
@@ -0,0 +1,12 @@
+--- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000
+0100
++++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100
+@@ -403,9 +403,6 @@
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+- amd64-*)
+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
Added:
trunk/mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
trunk/mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub
Wed Jun 23 06:48:34 2010 (r322)
@@ -0,0 +1,12 @@
+--- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08
09:52:25.000000000 +0100
++++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000
+0100
+@@ -403,9 +403,6 @@
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+- amd64-*)
+- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
Modified: trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in
==============================================================================
--- trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in Tue Jun
22 09:35:25 2010 (r321)
+++ trunk/mail/thunderbird3/files/patch-mozilla-js-src-configure.in Wed Jun
23 06:48:34 2010 (r322)
@@ -1,6 +1,15 @@
---- mozilla/js/src/configure.in.orig 2009-09-17 11:09:10.000000000 +0200
-+++ mozilla/js/src/configure.in 2009-09-17 11:09:33.000000000 +0200
-@@ -2467,10 +2467,6 @@
+--- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200
++++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200
+@@ -1218,7 +1218,7 @@
+ CPU_ARCH=sparc
+ ;;
+
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+ CPU_ARCH="$OS_TEST"
+ ;;
+ esac
+@@ -2466,10 +2466,6 @@
ENABLE_JIT=1
NANOJIT_ARCH=ARM
;;
_______________________________________________
freebsd-gecko@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
