Skip to content

Commit 007353c

Browse files
committed
fix build
1 parent ac3e189 commit 007353c

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

hosttools/0010_syslinux.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ tar -C ${CLFS}/build/${PKGNAME}-${PKGVERSION} -xvJf ${SRCDIR}/${PKGNAME}-${PKGVE
2727
# Build and install
2828

2929
cd ${CLFS}/build/${PKGNAME}-${PKGVERSION}/${PKGNAME}-${PKGVERSION}
30-
make clean
31-
make || exit 1
30+
# make clean
31+
# make || exit 1
3232
mkdir -p ${CLFS}/hosttools/share/syslinux
3333
tar -C ${CLFS}/build/${PKGNAME}-${PKGVERSION}/${PKGNAME}-${PKGVERSION} -cvf - . | tar -C ${CLFS}/hosttools/share/syslinux -xf -
3434

stage02/0035_ncurses.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source stage01_variables
44
source stage02_variables
55

66
PKGNAME=ncurses
7-
PKGVERSION=5.9
7+
PKGVERSION=6.0
88

99
# Download:
1010

@@ -18,11 +18,12 @@ cd ${CLFS}/build/${PKGNAME}-${PKGVERSION}
1818
tar xvzf ${SRCDIR}/${PKGNAME}-${PKGVERSION}.tar.gz
1919

2020
# Build and install
21-
21+
export CPPFLAGS=-P # Work around a broken mawk
22+
export CFLAGS="-I${CLFS}/cross-tools/${CLFS_TARGET}/include/kernel"
2223
cd ${CLFS}/build/${PKGNAME}-${PKGVERSION}/${PKGNAME}-${PKGVERSION}
23-
./configure --prefix=/ --without-debug --without-ada --enable-overwrite --host=${CLFS_ARCH} --without-cxx
24-
make -j $( grep -c processor /proc/cpuinfo )
25-
make install DESTDIR=${CLFS}/cross-tools/${CLFS_TARGET}
24+
./configure --prefix=/ --without-debug --without-ada --enable-overwrite --enable-widec --host=${CLFS_ARCH} --without-cxx || exit 1
25+
make -j $( grep -c processor /proc/cpuinfo ) || exit 1
26+
make install DESTDIR=${CLFS}/cross-tools/${CLFS_TARGET} || exit 1
2627
make install DESTDIR=${CLFS}/targetfs
2728

2829
# Clean up

0 commit comments

Comments
 (0)