[alfs-log] r3975 - in jhalfs/trunk/common: . libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Tue Jul 4 05:17:11 PDT 2017


Author: pierre
Date: Tue Jul  4 05:17:11 2017
New Revision: 3975

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

Modified:
   jhalfs/trunk/common/libs/func_wrt_Makefile
   jhalfs/trunk/common/makefile-functions

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
==============================================================================
--- jhalfs/trunk/common/libs/func_wrt_Makefile	Thu Jun 29 10:01:00 2017	(r3974)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile	Tue Jul  4 05:17:11 2017	(r3975)
@@ -45,6 +45,7 @@
 ADD_CUSTOM_TOOLS = $CUSTOM_TOOLS
 ADD_BLFS_TOOLS   = $BLFS_TOOL
 PKGMNGT          = $PKGMNGT
+WRAP_INSTALL     = $WRAP_INSTALL
 
 
 export PATH := \${PATH}:/usr/sbin

Modified: jhalfs/trunk/common/makefile-functions
==============================================================================
--- jhalfs/trunk/common/makefile-functions	Thu Jun 29 10:01:00 2017	(r3974)
+++ jhalfs/trunk/common/makefile-functions	Tue Jul  4 05:17:11 2017	(r3975)
@@ -115,7 +115,9 @@
     echo "export PKG_DEST=$(SRC)/$@" >> envars; \
     echo "source packInstall.sh" >> envars; \
     echo "export -f packInstall" >> envars; \
-    echo "export -f wrapInstall" >> envars; \
+    if [ "$(WRAP_INSTALL)" = "y" ]; then \
+      echo "export -f wrapInstall" >> envars; \
+    fi; \
   fi;
 endef
 


More information about the alfs-log mailing list