svn commit: r208577 - in head/release: amd64 i386 ia64 pc98 powerpc sparc64 sun4v

[Xin LI]

Author: delphij
Date: Wed May 26 18:55:40 2010
New Revision: 208577
URL: http://svn.freebsd.org/changeset/base/208577

Log:
  Reorder to have -lcrypto after -larchive.  Our linker doesn't seem to like
  the current ordering :(

Modified:
  head/release/amd64/boot_crunch.conf
  head/release/i386/boot_crunch.conf
  head/release/ia64/boot_crunch.conf
  head/release/pc98/boot_crunch.conf
  head/release/powerpc/boot_crunch.conf
  head/release/sparc64/boot_crunch.conf
  head/release/sun4v/boot_crunch.conf

Modified: head/release/amd64/boot_crunch.conf
==============================================================================
--- head/release/amd64/boot_crunch.conf	Wed May 26 18:50:16 2010	(r208576)
+++ head/release/amd64/boot_crunch.conf	Wed May 26 18:55:40 2010	(r208577)
@@ -39,6 +39,6 @@ progs ppp
 progs sysinstall
 progs usbconfig
 
-libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph
+libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
-libs -lbsdxml -larchive -lbz2 -llzma -lusb -ljail
+libs -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: head/release/i386/boot_crunch.conf
==============================================================================
--- head/release/i386/boot_crunch.conf	Wed May 26 18:50:16 2010	(r208576)
+++ head/release/i386/boot_crunch.conf	Wed May 26 18:55:40 2010	(r208577)
@@ -39,6 +39,6 @@ progs ppp
 progs sysinstall
 progs usbconfig
 
-libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph
+libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
-libs -lbsdxml -larchive -lbz2 -llzma -lusb -ljail
+libs -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: head/release/ia64/boot_crunch.conf
==============================================================================
--- head/release/ia64/boot_crunch.conf	Wed May 26 18:50:16 2010	(r208576)
+++ head/release/ia64/boot_crunch.conf	Wed May 26 18:55:40 2010	(r208577)
@@ -44,6 +44,6 @@ progs ppp
 progs sysinstall
 progs usbconfig
 
-libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph
+libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo
-libs -lgeom -lbsdxml -larchive -lbz2 -llzma -lusb -ljail
+libs -lgeom -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: head/release/pc98/boot_crunch.conf
==============================================================================
--- head/release/pc98/boot_crunch.conf	Wed May 26 18:50:16 2010	(r208576)
+++ head/release/pc98/boot_crunch.conf	Wed May 26 18:55:40 2010	(r208577)
@@ -38,6 +38,6 @@ progs arp
 progs ppp
 progs sysinstall
 
-libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph
+libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
-libs -larchive -lbz2 -llzma -ljail
+libs -larchive -lcrypto -lbz2 -llzma -ljail

Modified: head/release/powerpc/boot_crunch.conf
==============================================================================
--- head/release/powerpc/boot_crunch.conf	Wed May 26 18:50:16 2010	(r208576)
+++ head/release/powerpc/boot_crunch.conf	Wed May 26 18:55:40 2010	(r208577)
@@ -44,6 +44,6 @@ progs ppp
 progs sysinstall
 progs usbconfig
 
-libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph
+libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs
-libs -lgeom -lbsdxml -larchive -lbz2 -llzma -lusb -ljail
+libs -lgeom -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: head/release/sparc64/boot_crunch.conf
==============================================================================
--- head/release/sparc64/boot_crunch.conf	Wed May 26 18:50:16 2010	(r208576)
+++ head/release/sparc64/boot_crunch.conf	Wed May 26 18:55:40 2010	(r208577)
@@ -39,6 +39,6 @@ progs ppp
 progs sysinstall
 progs usbconfig
 
-libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph
+libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
-libs -larchive -lbz2 -llzma -lusb -ljail
+libs -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: head/release/sun4v/boot_crunch.conf
==============================================================================
--- head/release/sun4v/boot_crunch.conf	Wed May 26 18:50:16 2010	(r208576)
+++ head/release/sun4v/boot_crunch.conf	Wed May 26 18:55:40 2010	(r208577)
@@ -39,6 +39,6 @@ progs ppp
 progs sysinstall
 progs usbconfig
 
-libs -ll -ledit -lutil -lmd -lcrypt -lcrypto -lftpio -lz -lnetgraph
+libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
-libs -larchive -lbz2 -llzma -lusb -ljail
+libs -larchive -lcrypto -lbz2 -llzma -lusb -ljail