From d5f6378f475dcd4bfe5c1a84766c964f460c09e7 Mon Sep 17 00:00:00 2001 From: John Marino Date: Tue, 3 Nov 2015 21:03:18 +0100 Subject: [PATCH] unbreak full buildworld (liblzma order again) The lzma library is part of the "prebuild libraries" group in the buildworld makefile. Once the pthread library was required for the latest verson of xz, the order of lzma building had to move after the pthread library. This unbreaks the build after the XZ upgrade. --- Makefile.inc1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 38087653ee..dad0688511 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1014,7 +1014,7 @@ _startup_libs50= gnu/usr.bin/cc50/cc_prep \ gnu/lib/gcc50/libgcc_pic _startup_libs= lib/csu lib/libc lib/libc_rtld -_prebuild_libs= lib/libbz2 lib/liblzma lib/libz +_prebuild_libs= lib/libbz2 lib/libz _prebuild_libs+= lib/libutil _prebuild_libs+= lib/libpcap @@ -1041,7 +1041,7 @@ _generic_libs+= secure/lib _prebuild_libs+= lib/libradius lib/libsbuf lib/libtacplus lib/libm \ lib/libpam lib/libypclnt lib/lib${THREAD_LIB} \ - lib/libpthread lib/libprop lib/libdevattr + lib/libpthread lib/liblzma lib/libprop lib/libdevattr _generic_libs+= usr.bin/flex/lib -- 2.41.0