Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix early-preseed (and environment variables generally) #467

Merged
merged 1 commit into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions steps/heirloom-devtools-070527/pass1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

src_compile() {
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 ..
}

Expand All @@ -18,4 +18,3 @@ src_install() {
install lex/libl.a "${DESTDIR}${LIBDIR}"
install -m 644 lex/ncform "${DESTDIR}${LIBDIR}/lex"
}

11 changes: 11 additions & 0 deletions steps/improve/update_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,15 @@ export SHELL=/usr/bin/bash
DESTDIR=/tmp/destdir
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
Loading