Merge pull request #467 from fosslinux/fix-preseed

Fix early-preseed (and environment variables generally)
This commit is contained in:
Googulator 2024-05-10 13:07:58 +02:00 committed by GitHub
commit b988fb5764
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions

View file

@ -8,7 +8,7 @@
src_compile() { src_compile() {
cd lex cd lex
make -f Makefile.mk CC=tcc AR=tcc\ -ar LDFLAGS=-static RANLIB=true make -f Makefile.mk CC=tcc AR="tcc -ar" LDFLAGS=-static RANLIB=true LIBDIR="${LIBDIR}"
cd .. cd ..
} }
@ -18,4 +18,3 @@ src_install() {
install lex/libl.a "${DESTDIR}${LIBDIR}" install lex/libl.a "${DESTDIR}${LIBDIR}"
install -m 644 lex/ncform "${DESTDIR}${LIBDIR}/lex" install -m 644 lex/ncform "${DESTDIR}${LIBDIR}/lex"
} }

View file

@ -21,4 +21,15 @@ export SHELL=/usr/bin/bash
DESTDIR=/tmp/destdir DESTDIR=/tmp/destdir
EOF EOF
# The following values are set up in the kaem environment.
# As these are then passed through to the bash shell, they are considered
# automatically exported variables. We don't want them exported.
unset PREFIX
unset BINDIR
unset LIBDIR
unset INCDIR
unset SRCDIR
unset TMPDIR
unset DISTFILES
. /steps/env . /steps/env