r2643 - in jhalfs/branches/experimental: . common optimize

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri May 5 10:51:56 PDT 2006


Author: manuel
Date: 2006-05-05 11:51:56 -0600 (Fri, 05 May 2006)
New Revision: 2643

Added:
   jhalfs/branches/experimental/optimize/opt_config
   jhalfs/branches/experimental/optimize/opt_config.d/
   jhalfs/branches/experimental/optimize/opt_override
Removed:
   jhalfs/branches/experimental/common/opt_config
   jhalfs/branches/experimental/common/opt_config.d/
   jhalfs/branches/experimental/common/opt_override
Modified:
   jhalfs/branches/experimental/master.sh
Log:
Moved optimize files to their own module.

Deleted: jhalfs/branches/experimental/common/opt_config
===================================================================
--- jhalfs/branches/experimental/common/opt_config	2006-05-05 17:42:59 UTC (rev 2642)
+++ jhalfs/branches/experimental/common/opt_config	2006-05-05 17:51:56 UTC (rev 2643)
@@ -1,38 +0,0 @@
-#####
-#
-# optimization configuration file
-#
-#####
-#
-#$Id$
-#
-
-#--- Default optimization mode
-#    This level is overridden by definitions in common/opt_override;
-#    in this way, packages can be tuned independently.  For example,
-#    if you have trouble building a package in mode defOpt, add
-#    the package to common/opt_override with a different mode.
-DEF_OPT_LVL=defOpt
-
-
-#--- Active optimization variables
-#    Variables listed here will be set as defined in the appropriate
-#    file in common/opt_config.d/; others will be ignored.
-ACTIVE_OPT_VARS="CFLAGS CXXFLAGS LDFLAGS \
-                 OTHER_CFLAGS OTHER_CXXFLAGS OTHER_LDFLAGS"
-
-#--- Load optimization modes
-#    To add modes, create a working template..
-#      cp opt_config.d/defOpt opt_config.d/newMode
-#    ..and edit it as desired.
-#
-#    To inherit another mode and add to it, see opt_config.d/defOpt_fPIC
-#    as an example.  Given opt_config.d/modeA_modeB_modeC, modeB inherits
-#    the optimizations of modeA by sourcing it, and modeC inherits those
-#    of modeB (which includes those of modeA).
-#
-#    Add packages that are to use this mode to opt_override with:
-#      echo 'myPkg  newMode' >> opt_override
-for mode in $COMMON_DIR/opt_config.d/* ; do
-  source $mode
-done

Deleted: jhalfs/branches/experimental/common/opt_override
===================================================================
--- jhalfs/branches/experimental/common/opt_override	2006-05-05 17:42:59 UTC (rev 2642)
+++ jhalfs/branches/experimental/common/opt_override	2006-05-05 17:51:56 UTC (rev 2643)
@@ -1,5 +0,0 @@
-binutils       noOpt
-gcc            noOpt
-glibc          noOpt
-grub           noOpt
-zlib           defOpt_fPIC

Modified: jhalfs/branches/experimental/master.sh
===================================================================
--- jhalfs/branches/experimental/master.sh	2006-05-05 17:42:59 UTC (rev 2642)
+++ jhalfs/branches/experimental/master.sh	2006-05-05 17:51:56 UTC (rev 2643)
@@ -57,8 +57,8 @@
 [[ $VERBOSITY > 0 ]] && echo "OK"
 #
 [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization config..."
-source $COMMON_DIR/opt_config
-[[ $? > 0 ]] && echo " $COMMON_DIR/opt_config did not load.." && exit
+source optimize/opt_config
+[[ $? > 0 ]] && echo " optimize/opt_config did not load.." && exit
 [[ $VERBOSITY > 0 ]] && echo "OK"
 #
 [[ $VERBOSITY > 0 ]] && echo -n "Loading compare module..."
@@ -488,7 +488,7 @@
 
 if [[ "$PWD" != "$JHALFSDIR" ]]; then
   cp $COMMON_DIR/makefile-functions $JHALFSDIR/
-  [[ "$OPTIMIZE" != "0" ]] && cp $COMMON_DIR/opt_override $JHALFSDIR/
+  [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
   if [[ "$COMPARE" != "0" ]] ; then
     mkdir -p $JHALFSDIR/extras
     cp extras/* $JHALFSDIR/extras

Copied: jhalfs/branches/experimental/optimize/opt_config (from rev 2641, jhalfs/branches/experimental/common/opt_config)
===================================================================
--- jhalfs/branches/experimental/optimize/opt_config	                        (rev 0)
+++ jhalfs/branches/experimental/optimize/opt_config	2006-05-05 17:51:56 UTC (rev 2643)
@@ -0,0 +1,38 @@
+#####
+#
+# optimization configuration file
+#
+#####
+#
+#$Id$
+#
+
+#--- Default optimization mode
+#    This level is overridden by definitions in common/opt_override;
+#    in this way, packages can be tuned independently.  For example,
+#    if you have trouble building a package in mode defOpt, add
+#    the package to common/opt_override with a different mode.
+DEF_OPT_LVL=defOpt
+
+
+#--- Active optimization variables
+#    Variables listed here will be set as defined in the appropriate
+#    file in common/opt_config.d/; others will be ignored.
+ACTIVE_OPT_VARS="CFLAGS CXXFLAGS LDFLAGS \
+                 OTHER_CFLAGS OTHER_CXXFLAGS OTHER_LDFLAGS"
+
+#--- Load optimization modes
+#    To add modes, create a working template..
+#      cp opt_config.d/defOpt opt_config.d/newMode
+#    ..and edit it as desired.
+#
+#    To inherit another mode and add to it, see opt_config.d/defOpt_fPIC
+#    as an example.  Given opt_config.d/modeA_modeB_modeC, modeB inherits
+#    the optimizations of modeA by sourcing it, and modeC inherits those
+#    of modeB (which includes those of modeA).
+#
+#    Add packages that are to use this mode to opt_override with:
+#      echo 'myPkg  newMode' >> opt_override
+for mode in $COMMON_DIR/opt_config.d/* ; do
+  source $mode
+done

Copied: jhalfs/branches/experimental/optimize/opt_config.d (from rev 2641, jhalfs/branches/experimental/common/opt_config.d)

Copied: jhalfs/branches/experimental/optimize/opt_override (from rev 2641, jhalfs/branches/experimental/common/opt_override)
===================================================================
--- jhalfs/branches/experimental/optimize/opt_override	                        (rev 0)
+++ jhalfs/branches/experimental/optimize/opt_override	2006-05-05 17:51:56 UTC (rev 2643)
@@ -0,0 +1,5 @@
+binutils       noOpt
+gcc            noOpt
+glibc          noOpt
+grub           noOpt
+zlib           defOpt_fPIC




More information about the alfs-log mailing list