| Newsgroups |
gmane.linux.lfs.automated |
| Message-ID |
<[email protected]> |
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch trunk
in repository jhalfs.
commit 2b3edd2e77466dcd05a6833e309491c5c6359e72
Author: Pierre Labastie <[email protected]>
AuthorDate: Mon Nov 1 09:13:25 2021 +0100
[Remove BLFS envars.conf]: new gen_config.xsl
Now the variables previously defined into envars.conf are in Config.in
---
BLFS/xsl/gen_config.xsl | 173 +++++++++++++++++++++++++++++++++---------------
1 file changed, 119 insertions(+), 54 deletions(-)
diff --git a/BLFS/xsl/gen_config.xsl b/BLFS/xsl/gen_config.xsl
index d301903..f112926 100644
--- a/BLFS/xsl/gen_config.xsl
+++ b/BLFS/xsl/gen_config.xsl
@@ -10,28 +10,30 @@
<xsl:apply-templates select="//list"/>
<xsl:text>comment ""
-menu "Default package for resolving MTA dependency"
+menu "Build settings"
-choice
- prompt "Mail server"
+ choice
+ prompt "Mail server for resolving the MTA dependency"
config MS_sendmail
bool "sendmail"
config MS_postfix
bool "postfix"
config MS_exim
bool "exim"
-endchoice
-config MAIL_SERVER
+ endchoice
+ config MAIL_SERVER
string
default "sendmail" if MS_sendmail
default "postfix" if MS_postfix
default "exim" if MS_exim
-endmenu
-
-choice
+ choice
prompt "Dependency level"
default DEPLVL_2
+ help
+ Packages included in the dependency graph. Note that the graph
+ itself contains all the dependency information relating those
+ packages.
config DEPLVL_1
bool "Required dependencies only"
@@ -45,59 +47,131 @@ choice
config DEPLVL_4
bool "All non external dependencies"
-endchoice
-config optDependency
+ endchoice
+ config optDependency
int
default 1 if DEPLVL_1
default 2 if DEPLVL_2
default 3 if DEPLVL_3
default 4 if DEPLVL_4
-config LANGUAGE
+ config LANGUAGE
string "LANG variable in the form ll_CC.charmap[@modifiers]"
default "en_US.UTF-8"
help
Because of the book layout, the 3 fields, ll, CC and charmap are
- mandatory. The @modfier is honoured if present.
-
-config KBLAYOUT
- string "Keyboard layout (to be used in GDM)"
- default "us"
- help
- Used in GDM for setting the login screen keyboard layout.
- See the GDM page in the book for what to put into this field
+ mandatory. The @modifier is honoured if present.
-config SUDO
+ config SUDO
bool "Build as User"
default y
help
- Select if sudo will be used (you build as a normal user)
- otherwise sudo is not needed (you build as root)
-
+ Select if sudo will be used (you build as a normal user)
+ otherwise sudo is not needed (you build as root)
-config WRAP_INSTALL
+ config WRAP_INSTALL
bool "Use `porg style' package management"
default n
help
- Select if you want the installation commands to be wrapped
- between "wrapInstall '" and "' ; packInstall" functions,
- where wrapInstall is used to set up a LD_PRELOAD library (for
- example using porg), and packInstall makes the package tarball
-
-config DEL_LA_FILES
+ Select if you want the installation commands to be wrapped
+ between "wrapInstall '" and "' ; packInstall" functions,
+ where wrapInstall is used to set up a LD_PRELOAD library (for
+ example using porg), and packInstall makes the package tarball
+
+ config PACK_INSTALL
+ string "Location of the packInstall.sh script"
+ default "/blfs_root/packInstall.sh" if !SUDO
+ default "$HOME/blfs_root/packInstall.sh" if SUDO
+ depends on WRAP_INSTALL
+ help
+ This script is needed for the proper operation of the
+ `porg style' package management. Provide an absolute
+ path.
+
+ config DEL_LA_FILES
bool "Remove libtool .la files after package installation"
default y
help
- This option should be active on any system mixing libtool
- and meson build systems. ImageMagick .la files are preserved.
+ This option should be active on any system mixing libtool
+ and meson build systems. ImageMagick .la files are preserved.
-config STATS
+ config STATS
bool "Generate statistics for the requested package(s)"
default n
help
- If you want timing and memory footprint statistics to be
- generated for the packages you build (not their dependencies),
- set this option to y.
+ If you want timing and memory footprint statistics to be
+ generated for the packages you build (not their dependencies),
+ set this option to y. Due to the book layout, several scripts
+ are not functional in this case. Please review them.
+
+endmenu
+
+menu "Build Layout"
+ config SRC_ARCHIVE
+ string "Directory of sources"
+ default "/sources"
+ config SRC_SUBDIRS
+ bool "Downloads sources to subdirectories"
+ default n
+ help
+ If this option is set, the sources will be downloaded and archived
+ into a subdirectory of the source directory, one for each page
+ of the book. Otherwise they are downloaded and archived directly
+ into the source directory
+ config BUILD_ROOT
+ string "Build directory"
+ default "/sources"
+ help
+ Directory where the build occurs. It can be the same as the
+ source directory, provided the setting of subdirectories is
+ different
+ config BUILD_SUBDIRS
+ bool "Build into subdirectories"
+ default y
+ help
+ If this option is set, the sources will be extracted into
+ subdirectories of the build directory. Otherwise, they will be
+ directly extracted into the build directory
+ config KEEP_FILES
+ bool "Keep source directory"
+ default n
+ help
+ Set this option if you want to keep the build directories
+ for further examination after installing the package
+endmenu
+
+menu "Optimization"
+ config JOBS
+ int "Number of parallel jobs"
+ default 0
+ help
+ This number will get passed to make or ninja, unless set
+ to 0, in which case, it is set to the number of processors
+ on line. Note that some packages do not respect this setting.
+ Also, "-j1" is always passed to make for install (and nothing
+ to ninja).
+ config CFG_CFLAGS
+ string "Content of variable CFLAGS"
+ default "EMPTY"
+ help
+ If set to the special string "EMPTY", then CFLAGS will be
+ unset before starting the script. Otherwise, there is no
+ content check for this variable. Double check for typos!
+ config CFG_CXXFLAGS
+ string "Content of variable CXXFLAGS"
+ default "EMPTY"
+ help
+ If set to the special string "EMPTY", then CXXFLAGS will be
+ unset before starting the script. Otherwise, there is no
+ content check for this variable. Double check for typos!
+ config CFG_LDFLAGS
+ string "Content of variable LDFLAGS"
+ default "EMPTY"
+ help
+ If set to the special string "EMPTY", then LDFLAGS will be
+ unset before starting the script. Otherwise, there is no
+ content check for this variable. Double check for typos!
+endmenu
</xsl:text>
</xsl:template>
@@ -106,7 +180,7 @@ config STATS
test=".//*[self::package or self::module]
[(version and not(inst-version)) or
string(version) != string(inst-version)]">
- <xsl:text>config	MENU_</xsl:text>
+ <xsl:text>menuconfig	MENU_</xsl:text>
<xsl:value-of select="@id"/>
<xsl:text>
bool	"</xsl:text>
@@ -114,16 +188,13 @@ bool	"</xsl:text>
<xsl:text>"
default	n
-menu "</xsl:text>
- <xsl:value-of select="name"/>
- <xsl:text>"
-depends on MENU_</xsl:text>
+if	MENU_</xsl:text>
<xsl:value-of select="@id"/>
<xsl:text>
</xsl:text>
<xsl:apply-templates select="sublist"/>
- <xsl:text>endmenu
+ <xsl:text>endif
</xsl:text>
</xsl:if>
@@ -134,7 +205,7 @@ depends on MENU_</xsl:text>
test=".//*[self::package or self::module]
[(version and not(inst-version)) or
string(version) != string(inst-version)]">
- <xsl:text>	config	MENU_</xsl:text>
+ <xsl:text>	menuconfig	MENU_</xsl:text>
<xsl:value-of select="@id"/>
<xsl:text>
	bool	"</xsl:text>
@@ -142,16 +213,13 @@ depends on MENU_</xsl:text>
<xsl:text>"
	default	n
-	menu "</xsl:text>
- <xsl:value-of select="name"/>
- <xsl:text>"
-	depends on MENU_</xsl:text>
+	if	MENU_</xsl:text>
<xsl:value-of select="@id"/>
<xsl:text>
</xsl:text>
<xsl:apply-templates select="package"/>
- <xsl:text>	endmenu
+ <xsl:text>	endif
</xsl:text>
</xsl:if>
@@ -181,7 +249,7 @@ depends on MENU_</xsl:text>
<xsl:if
test="not(version) and ./module[not(inst-version) or
string(version) != string(inst-version)]">
- <xsl:text>		config	MENU_</xsl:text>
+ <xsl:text>		menuconfig	MENU_</xsl:text>
<xsl:value-of select="translate(name,' ()','___')"/>
<xsl:text>
		bool	"</xsl:text>
@@ -189,16 +257,13 @@ depends on MENU_</xsl:text>
<xsl:text>"
		default	n
-		menu "</xsl:text>
- <xsl:value-of select="name"/>
- <xsl:text>"
-		depends on MENU_</xsl:text>
+		if	MENU_</xsl:text>
<xsl:value-of select="translate(name,' ()','___')"/>
<xsl:text>
</xsl:text>
<xsl:apply-templates select="module"/>
- <xsl:text>		endmenu
+ <xsl:text>		endif
</xsl:text>
</xsl:if>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
--
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page