Removed several lfs options leading to: configure: WARNING: unrecognized options

Message ID 20210612204557.8919-1-matthias.fischer@ipfire.org
State Accepted
Commit 59fc80fc7bf1c4504cb9675dfffbdc8abae437c6
Headers
Series Removed several lfs options leading to: configure: WARNING: unrecognized options |

Commit Message

Matthias Fischer June 12, 2021, 8:45 p.m. UTC
  Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 lfs/avahi        | 1 -
 lfs/cups-filters | 1 -
 lfs/openvmtools  | 1 -
 lfs/pam          | 1 -
 lfs/sox          | 3 +--
 lfs/xfsprogs     | 3 ---
 6 files changed, 1 insertion(+), 9 deletions(-)
  

Comments

Peter Müller June 13, 2021, 6:45 a.m. UTC | #1
Hello Matthias,

thank you for this. Looks like we are having a postponed/extended spring clean this year... :-)

Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

Thanks, and best regards,
Peter Müller

> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
>  lfs/avahi        | 1 -
>  lfs/cups-filters | 1 -
>  lfs/openvmtools  | 1 -
>  lfs/pam          | 1 -
>  lfs/sox          | 3 +--
>  lfs/xfsprogs     | 3 ---
>  6 files changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/lfs/avahi b/lfs/avahi
> index 2ed13dd44..4b2b79ded 100644
> --- a/lfs/avahi
> +++ b/lfs/avahi
> @@ -88,7 +88,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  		--disable-qt5 \
>  		--disable-gtk \
>  		--disable-gtk3 \
> -		--disable-pygtk \
>  		--disable-python \
>  		--disable-pygobject \
>  		--disable-python-dbus \
> diff --git a/lfs/cups-filters b/lfs/cups-filters
> index aedaaf927..ebd04622f 100644
> --- a/lfs/cups-filters
> +++ b/lfs/cups-filters
> @@ -85,7 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  			--sysconfdir=/etc \
>  			--localstatedir=/var \
>  			--with-pdftops=hybrid \
> -			--disable-ijs \
>  			--disable-mutool \
>  			--disable-avahi
>  	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> diff --git a/lfs/openvmtools b/lfs/openvmtools
> index 5e8789130..01915d6a6 100644
> --- a/lfs/openvmtools
> +++ b/lfs/openvmtools
> @@ -87,7 +87,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  		--without-pam \
>  		--without-gtk2 \
>  		--without-gtkmm \
> -		--without-procps \
>  		--without-icu \
>  		--without-x \
>  		--with-linuxdir=/usr/src/linux \
> diff --git a/lfs/pam b/lfs/pam
> index daae2def3..463ee71da 100644
> --- a/lfs/pam
> +++ b/lfs/pam
> @@ -74,7 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	cd $(DIR_APP) && ./configure --libdir=/usr/lib \
>  		--sbindir=/lib/security \
>  		--enable-securedir=/lib/security \
> -		--enable-docdir=/usr/share/doc/Linux-PAM-$(VER) \
>  		--enable-read-both-confs \
>  		--disable-nls
>  
> diff --git a/lfs/sox b/lfs/sox
> index f2d57a6ee..8388c57fc 100644
> --- a/lfs/sox
> +++ b/lfs/sox
> @@ -78,8 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
>  	$(UPDATE_AUTOMAKE)
> -	cd $(DIR_APP) && ./configure --prefix=/usr --disable-alsa-dsp --disable-oss-dsp \
> -				--disable-sun-audio --disable-mad
> +	cd $(DIR_APP) && ./configure --prefix=/usr
>  	cd $(DIR_APP) && make $(EXTRA_MAKE)
>  	cd $(DIR_APP) && make install
>  	@rm -rf $(DIR_APP)
> diff --git a/lfs/xfsprogs b/lfs/xfsprogs
> index 29aabc0d9..47298e634 100644
> --- a/lfs/xfsprogs
> +++ b/lfs/xfsprogs
> @@ -32,9 +32,6 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  
> -CONFIGURE_OPTIONS = \
> -	--enable-readline=yes
> -
>  ifeq "$(BUILD_ARCH)" "armv5tel"
>  	CONFIGURE_OPTIONS += \
>  		--enable-lto=no
>
  

Patch

diff --git a/lfs/avahi b/lfs/avahi
index 2ed13dd44..4b2b79ded 100644
--- a/lfs/avahi
+++ b/lfs/avahi
@@ -88,7 +88,6 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--disable-qt5 \
 		--disable-gtk \
 		--disable-gtk3 \
-		--disable-pygtk \
 		--disable-python \
 		--disable-pygobject \
 		--disable-python-dbus \
diff --git a/lfs/cups-filters b/lfs/cups-filters
index aedaaf927..ebd04622f 100644
--- a/lfs/cups-filters
+++ b/lfs/cups-filters
@@ -85,7 +85,6 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--sysconfdir=/etc \
 			--localstatedir=/var \
 			--with-pdftops=hybrid \
-			--disable-ijs \
 			--disable-mutool \
 			--disable-avahi
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
diff --git a/lfs/openvmtools b/lfs/openvmtools
index 5e8789130..01915d6a6 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -87,7 +87,6 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--without-pam \
 		--without-gtk2 \
 		--without-gtkmm \
-		--without-procps \
 		--without-icu \
 		--without-x \
 		--with-linuxdir=/usr/src/linux \
diff --git a/lfs/pam b/lfs/pam
index daae2def3..463ee71da 100644
--- a/lfs/pam
+++ b/lfs/pam
@@ -74,7 +74,6 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && ./configure --libdir=/usr/lib \
 		--sbindir=/lib/security \
 		--enable-securedir=/lib/security \
-		--enable-docdir=/usr/share/doc/Linux-PAM-$(VER) \
 		--enable-read-both-confs \
 		--disable-nls
 
diff --git a/lfs/sox b/lfs/sox
index f2d57a6ee..8388c57fc 100644
--- a/lfs/sox
+++ b/lfs/sox
@@ -78,8 +78,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-alsa-dsp --disable-oss-dsp \
-				--disable-sun-audio --disable-mad
+	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/xfsprogs b/lfs/xfsprogs
index 29aabc0d9..47298e634 100644
--- a/lfs/xfsprogs
+++ b/lfs/xfsprogs
@@ -32,9 +32,6 @@  DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-CONFIGURE_OPTIONS = \
-	--enable-readline=yes
-
 ifeq "$(BUILD_ARCH)" "armv5tel"
 	CONFIGURE_OPTIONS += \
 		--enable-lto=no