Skip to content

Commit 39b1b74

Browse files
committed
packages: cleanup export/unset workflow
1 parent 9a7402a commit 39b1b74

3 files changed

Lines changed: 14 additions & 2 deletions

File tree

packages/nftables.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ compile_nftables() {
7676
install_nftables() {
7777
echo "[+] installing nftables"
7878
make DESTDIR=${ROOTDIR} install
79+
80+
unset LIBMNL_CFLAGS
81+
unset LIBMNL_LIBS
82+
unset LIBNFTNL_CFLAGS
83+
unset LIBNFTNL_LIBS
7984
}
8085

8186
build_nftables() {

packages/rtinfo.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ compile_rtinfo() {
4646
install_rtinfo() {
4747
echo "[+] installing rtinfo (client)"
4848
cp -a rtinfo-client "${ROOTDIR}"/usr/bin/
49+
50+
unset CFLAGS
51+
unset LDFLAGS
4952
}
5053

5154
build_rtinfo() {

packages/zflist.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,22 @@ build_capnpc() {
3535
prepare_zflist() {
3636
echo "[+] preparing zflist"
3737
make mrproper
38-
39-
sed -i s/'-lcurl -lssl'/'-lcurl -lzstd -lssl'/g zflist/Makefile
4038
}
4139

4240
compile_zflist() {
41+
export CFLAGS="-I${ROOTDIR}/usr/include"
42+
export LDFLAGS="-L${ROOTDIR}/usr/lib"
43+
4344
cd libflist
4445
make ${MAKEOPTS}
4546
cd ..
4647

4748
cd zflist
4849
make production
4950
cd ..
51+
52+
unset CFLAGS
53+
unset LDFLAGS
5054
}
5155

5256
install_zflist() {

0 commit comments

Comments
 (0)