zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not export the wrapInstall function when porg style is not in use

Browse source
This commit is contained in:
Pierre Labastie 2017-07-04 12:17:11 +00:00
parent 45f8a9c86d
commit 322226dbf8
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/libs/func_wrt_Makefile
View file

@ -45,6 +45,7 @@ ADD_REPORT = $REPORT
ADD_CUSTOM_TOOLS = $CUSTOM_TOOLS ADD_CUSTOM_TOOLS = $CUSTOM_TOOLS
ADD_BLFS_TOOLS = $BLFS_TOOL ADD_BLFS_TOOLS = $BLFS_TOOL
PKGMNGT = $PKGMNGT PKGMNGT = $PKGMNGT
WRAP_INSTALL = $WRAP_INSTALL
export PATH := \${PATH}:/usr/sbin export PATH := \${PATH}:/usr/sbin

4
common/makefile-functions
View file

@ -115,7 +115,9 @@ define get_pkg_root2
echo "export PKG_DEST=$(SRC)/$@" >> envars; \ echo "export PKG_DEST=$(SRC)/$@" >> envars; \
echo "source packInstall.sh" >> envars; \ echo "source packInstall.sh" >> envars; \
echo "export -f packInstall" >> envars; \ echo "export -f packInstall" >> envars; \
echo "export -f wrapInstall" >> envars; \ if [ "$(WRAP_INSTALL)" = "y" ]; then \
echo "export -f wrapInstall" >> envars; \
fi; \
fi; fi;
endef endef