svn commit: r224649 - in stable/8/release: amd64 i386 ia64 pc98 picobsd/floppy.tree/sbin powerpc sparc64 sun4v

[Martin Matuska]

Author: mm
Date: Thu Aug  4 10:37:12 2011
New Revision: 224649
URL: http://svn.freebsd.org/changeset/base/224649

Log:
  MFC r208545, r208577 (unbreak make release):
  
  MFC r208545 (delphij):
  libarchive now needs libcrypto and liblzma.
  
  MFC r208577 (delphij):
  Reorder to have -lcrypto after -larchive.  Our linker doesn't seem to like
  the current ordering :(
  
  Reported by:	olgeni

Modified:
  stable/8/release/amd64/boot_crunch.conf
  stable/8/release/i386/boot_crunch.conf
  stable/8/release/ia64/boot_crunch.conf
  stable/8/release/pc98/boot_crunch.conf
  stable/8/release/powerpc/boot_crunch.conf
  stable/8/release/sparc64/boot_crunch.conf
  stable/8/release/sun4v/boot_crunch.conf
Directory Properties:
  stable/8/release/   (props changed)
  stable/8/release/doc/en_US.ISO8859-1/hardware/   (props changed)
  stable/8/release/picobsd/   (props changed)
  stable/8/release/picobsd/floppy.tree/sbin/   (props changed)
  stable/8/release/picobsd/floppy.tree/sbin/dhclient-script   (props changed)
  stable/8/release/picobsd/qemu/   (props changed)
  stable/8/release/picobsd/tinyware/login/   (props changed)
  stable/8/release/powerpc/   (props changed)

Modified: stable/8/release/amd64/boot_crunch.conf
==============================================================================
--- stable/8/release/amd64/boot_crunch.conf	Thu Aug  4 08:50:33 2011	(r224648)
+++ stable/8/release/amd64/boot_crunch.conf	Thu Aug  4 10:37:12 2011	(r224649)
@@ -41,4 +41,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
-libs -lbsdxml -larchive -lbz2 -lusb -ljail
+libs -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: stable/8/release/i386/boot_crunch.conf
==============================================================================
--- stable/8/release/i386/boot_crunch.conf	Thu Aug  4 08:50:33 2011	(r224648)
+++ stable/8/release/i386/boot_crunch.conf	Thu Aug  4 10:37:12 2011	(r224649)
@@ -41,4 +41,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
-libs -lbsdxml -larchive -lbz2 -lusb -ljail
+libs -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: stable/8/release/ia64/boot_crunch.conf
==============================================================================
--- stable/8/release/ia64/boot_crunch.conf	Thu Aug  4 08:50:33 2011	(r224648)
+++ stable/8/release/ia64/boot_crunch.conf	Thu Aug  4 10:37:12 2011	(r224649)
@@ -46,4 +46,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo
-libs -lgeom -lbsdxml -larchive -lbz2 -lusb -ljail
+libs -lgeom -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: stable/8/release/pc98/boot_crunch.conf
==============================================================================
--- stable/8/release/pc98/boot_crunch.conf	Thu Aug  4 08:50:33 2011	(r224648)
+++ stable/8/release/pc98/boot_crunch.conf	Thu Aug  4 10:37:12 2011	(r224649)
@@ -40,4 +40,4 @@ progs sysinstall
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
-libs -larchive -lbz2 -ljail
+libs -larchive -lcrypto -lbz2 -llzma -ljail

Modified: stable/8/release/powerpc/boot_crunch.conf
==============================================================================
--- stable/8/release/powerpc/boot_crunch.conf	Thu Aug  4 08:50:33 2011	(r224648)
+++ stable/8/release/powerpc/boot_crunch.conf	Thu Aug  4 10:37:12 2011	(r224649)
@@ -46,4 +46,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs
-libs -lgeom -lbsdxml -larchive -lbz2 -lusb -ljail
+libs -lgeom -lbsdxml -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: stable/8/release/sparc64/boot_crunch.conf
==============================================================================
--- stable/8/release/sparc64/boot_crunch.conf	Thu Aug  4 08:50:33 2011	(r224648)
+++ stable/8/release/sparc64/boot_crunch.conf	Thu Aug  4 10:37:12 2011	(r224649)
@@ -44,4 +44,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lgeom -lbsdxml
-libs -larchive -lbz2 -lusb -ljail
+libs -larchive -lcrypto -lbz2 -llzma -lusb -ljail

Modified: stable/8/release/sun4v/boot_crunch.conf
==============================================================================
--- stable/8/release/sun4v/boot_crunch.conf	Thu Aug  4 08:50:33 2011	(r224648)
+++ stable/8/release/sun4v/boot_crunch.conf	Thu Aug  4 10:37:12 2011	(r224649)
@@ -41,4 +41,4 @@ progs usbconfig
 
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
 libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
-libs -larchive -lbz2 -lusb -ljail
+libs -larchive -lcrypto -lbz2 -llzma -lusb -ljail