Changeset 9ef12f7

Timestamp:

06/05/2020 10:18:27 AM (4 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

36f5dce

Parents:

7e0a1b8

Message:

Use a private name for MAKEFLAGS in jhalfs, so that it does not propagate
to top make, when ticking "Run the makefile"

Files:

• common/common-functions (modified) (1 diff)
• jhalfs (modified) (1 diff)
• optimize/opt_config.d/noOpt (modified) (1 diff)
• optimize/optimize_functions (modified) (3 diffs)

common/common-functions

@@ -37 +37 @@
     if [ -e "$MKFILE" ] ; then
       echo -ne "Building the system...\n"
+      if { echo try tty; tty; }; then
       cd "$JHALFSDIR" && make
       echo -ne "done\n"
+      else echo there is no terminal!!; fi
     fi
   fi

jhalfs

@@ -369 +369 @@
   # The number of parallel jobs is taken from configuration now
   # shellcheck disable=SC2034
-  MAKEFLAGS="-j${N_PARALLEL}"
+  JH_MAKEFLAGS="-j${N_PARALLEL}"
   # Validate optimize settings, if required
   validate_opt_settings

optimize/opt_config.d/noOpt

@@ -9 +9 @@
 #          doing.  By default, this is set to disable optimization
 #          of packages known to have build or runtime failure.
-#
-#          Also, if you what to use MAKEFLAGS but no build
-#          optimizations, set this mode in DEF_OPT_MODE
 #
 # Usage: - Apply optimization string to each variable

optimize/optimize_functions

@@ -19 +19 @@
   echo -e "asking for support.${OFF}\n"
 
-  echo -e "MAKEFLAGS: ${L_arrow}${BOLD}${MAKEFLAGS}${OFF}${R_arrow}"
-  [[ "$MAKEFLAGS" = "unset" ]] && echo
-  [[ "$MAKEFLAGS" != "unset" ]] && \
+  echo -e "MAKEFLAGS: ${L_arrow}${BOLD}${JH_MAKEFLAGS}${OFF}${R_arrow}"
+  [ -n "$JH_MAKEFLAGS" ] && \
   echo -e "BLACK_LIST: ${L_arrow}${BOLD}${BLACK_LIST}${OFF}${R_arrow}\n"
 
@@ -79 +78 @@
     MKF=unset
   else
-    MKF=$MAKEFLAGS
+    MKF=$JH_MAKEFLAGS
   fi
 
@@ -85 +84 @@
 (
 cat << EOF
-        @echo "export MAKEFLAGS=\"$MAKEFLAGS\"" >> envars
+        @echo "export MAKEFLAGS=\"$JH_MAKEFLAGS\"" >> envars
 EOF
 ) >> $MKFILE.tmp