Nimbin[12]?Mirrors & Forks / jhalfs / commits / 0861416

jhalfs git · trunk

jhalfs LFS build automation (mirror)

lfs mirror bash · first commit 2005-09-11 · last commit 2024-02-13 (2 years ago) · synced 3 days ago · upstream: git.linuxfromscratch.org/jhalfs

Python 78.4% Shell 19.8% Makefile 1.8%
git clone https://git.christianimmanuel.de/mirrors-forks/jhalfs.gitwget https://git.christianimmanuel.de/mirrors-forks/jhalfs/archive/jhalfs.tar.gz

Hide DEL_LA_FILES in internal settings

Pierre Labastie · 2023-08-30 18:20 · 08614168ec2ba3f225e66d80df0d6cf6f927d5c3

This prevent normal users to change the default while preserving
the possibility to set it to "n" for tests or whatever.
Fixes ticket #1734
 Config.in                            | 15 ++++++++-------
 common/libs/func_validate_configs.sh |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Config.in b/Config.in
index 4bf1091..c44bebb 100644
--- a/Config.in
+++ b/Config.in
@@ -556,13 +556,6 @@ depends on !BOOK_BLFS
         bool "Strip Installed Binaries/Libraries"
         default n
 
-    config    DEL_LA_FILES
-        bool "Remove libtool .la files"
-        default y
-        help
-            #-- Remove files libxxx.la installed by libtool. For a rationale
-            #   see https://blog.flameeyes.eu/tags/lafiles/
-
     config    NO_PROGRESS_BAR
         bool "DO NOT use/display progress_bar"
         default n
@@ -913,6 +906,14 @@ depends on !BOOK_BLFS
             string "Package contents list"
             default "unpacked"
 
+        config    DEL_LA_FILES
+            bool "Remove libtool .la files"
+            default y
+            help
+                #-- Remove files libxxx.la installed by libtool. Only set to
+                #   "n" if you know what you are doing. For a rationale
+                #   see https://blog.flameeyes.eu/tags/lafiles/
+
     #--- End Internal Settings
     endmenu
 
diff --git a/common/libs/func_validate_configs.sh b/common/libs/func_validate_configs.sh
index b14cf81..ec21656 100644
--- a/common/libs/func_validate_configs.sh
+++ b/common/libs/func_validate_configs.sh
@@ -29,7 +29,7 @@ inline_doc
   local -r   LFS_book="$BOOK_common INITSYS BLFS_TOOL"
 
   # Build Settings by book
-  local -r   LFS_build="$BUILD_chroot NCURSES5 DEL_LA_FILES $BUILD_common PKGMNGT FULL_LOCALE WRAP_INSTALL"
+  local -r   LFS_build="$BUILD_chroot NCURSES5 $BUILD_common PKGMNGT FULL_LOCALE WRAP_INSTALL"
 
   # System Settings by book
   local -r LFS_system="HOSTNAME INTERFACE IP_ADDR GATEWAY PREFIX BROADCAST DOMAIN DNS1 DNS2 FONT KEYMAP LOCAL LOG_LEVEL"