Update for numerous lfs-files: removed deprecated configure options

Also includes some reformatting, but no changes to configuration.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/autoconf b/lfs/autoconf
index 9c58e20cc623973a3008d35a961b79b6d338d102..7e622da86cb41081fb22ab55c2303b30ff043c80 100644 (file)
--- a/lfs/autoconf
+++ b/lfs/autoconf
@@ -69,7 +69,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/automake b/lfs/automake
index 15bdad1e5e866d435813cdb139826fc1d56aefe4..0b3d9cce89574512855e5a9c033bd163d69a275d 100644 (file)
--- a/lfs/automake
+++ b/lfs/automake
@@ -81,8 +81,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
-       cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \
-                       --docdir=/usr/share/doc/automake-1.15
+       cd $(DIR_APP) && ./configure \
+               --prefix=$(PREFIX) \
+               --docdir=/usr/share/doc/automake-1.15
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd
index 73f73e18c74f3ade36b56cdb1bb4a54e405523db..7dea649a36ad314b2491cf40cb3ec871b6eb9dae 100644 (file)
--- a/lfs/cyrus-imapd
+++ b/lfs/cyrus-imapd
@@ -77,11 +77,18 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \
-                               --with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \
-                               --with-auth=unix --with-perl --with-sasl --with-idle=idled \
-                               --with-syslogfacility=MAIL --enable-listext --without-snmp \
-                               --enable-autocreate --enable-idled
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --with-service-path=/usr/lib/cyrus \
+               --with-cyrus-prefix=/usr/lib/cyrus \
+               --sysconfdir=/var/ipfire/cyrusimap \
+               --with-perl \
+               --with-sasl \
+               --with-syslogfacility=MAIL \
+               --without-snmp \
+               --enable-autocreate \
+               --enable-idled
+
        cd $(DIR_APP) && make $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        -mkdir /var/imap

diff --git a/lfs/dhcp b/lfs/dhcp
index 4c613a7d8b624be215e237fab9197d3240b60406..262a25129c31ebff2e6f8d9171e7753b28cf0c08 100644 (file)
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -107,7 +107,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --prefix=/usr \
                        --sysconfdir=/etc/dhcp \
                        --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-                       --disable-static \
                        --enable-paranoia \
                        --enable-early-chroot \
                        --disable-dhcpv6

diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 90e28ac077551caf4fc83ed02be535d0faa744f6..8e265c1e25703c47fefb347e5cf5a18a898f2200 100644 (file)
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -76,8 +76,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                        --prefix=/usr \
                        --with-root-prefix="" \
                        --enable-elf-shlibs \
-                       --disable-evms \
                        --disable-nls
+
        cd $(DIR_APP)/build && make $(MAKETUNING)
        cd $(DIR_APP)/build && make install
        cd $(DIR_APP)/build && make install-libs

diff --git a/lfs/expat b/lfs/expat
index aa9759094e9cf2c0c005ee0b4618303a4f8a3538..5bb22ec27063ddee600c0c1c3030b14e96008522 100644 (file)
--- a/lfs/expat
+++ b/lfs/expat
@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/$(THISAPP)

diff --git a/lfs/faad2 b/lfs/faad2
index bd258f79ab4d8f9f01642a417f17e81adaa3a652..7cadb9aef6a135fa4257fe23feee6da8e580359f 100644 (file)
--- a/lfs/faad2
+++ b/lfs/faad2
@@ -77,7 +77,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --enable-shared
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/fcron b/lfs/fcron
index 5cc2cd62aafa78bdf3fdea9c9e13e7feaeb19e58..b548c1310554c0ab29574b6741f25e6db3103528 100644 (file)
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -70,22 +70,22 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure    \
-           --prefix=/usr                       \
-           --disable-nls                       \
-           --without-sendmail          \
-           --with-spooldir=/var/spool/cron     \
-           --with-fifodir=/var/run             \
-           --with-piddir=/var/run              \
-           --sysconfdir=/etc                   \
-           --with-username=cron                \
-           --with-groupname=cron               \
-           --with-run-non-privileged=no        \
-           --with-fcrondyn=no          \
-           --with-sysfcrontab=no               \
-           --with-boot-install=no              \
-           --with-pam=no                       \
-           --with-selinux=no
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --without-sendmail \
+               --with-spooldir=/var/spool/cron \
+               --with-fifodir=/var/run \
+               --with-piddir=/var/run \
+               --sysconfdir=/etc \
+               --with-username=cron \
+               --with-groupname=cron \
+               --with-run-non-privileged=no \
+               --with-fcrondyn=no \
+               --with-sysfcrontab=no \
+               --with-boot-install=no \
+               --with-pam=no \
+               --with-selinux=no
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        echo "root" > /etc/fcron.allow

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 77258a0ed90bc70010138e440524f435bb010fbb..258e29b7b9e6cb41d4db6c963a26aaf5ff21e629 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-version3 \
                --enable-avfilter \
                --enable-avresample
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/fuse b/lfs/fuse
index 2639156b2196ed11bd87a1528e2677a36d845cfe..275647252b0772cda6657c05287a2ab5e21937ce 100644 (file)
--- a/lfs/fuse
+++ b/lfs/fuse
@@ -50,7 +50,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -74,7 +74,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fuse-2.9.2-namespace-conflict-fix.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-kernel-module
+       cd $(DIR_APP) && ./configure \
+       --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/ghostscript b/lfs/ghostscript
index 7ee1ce4e4a9648090b0a00706725cfa2a8b25f85..6d297dabcc1041740dacc1aadd8f1ad58ba9712f 100644 (file)
--- a/lfs/ghostscript
+++ b/lfs/ghostscript
@@ -88,8 +88,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
-                       --with-system-libtiff \
-                       --with-install-cups
+                       --with-system-libtiff
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 

diff --git a/lfs/gmp b/lfs/gmp
index 8dc9b73509cd69cc28dd775ef5f2b93ea591d146..4d55e4f76253c29e675e6a8cfdf17a42ae6890ab 100644 (file)
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -39,9 +39,7 @@ endif
 
 CONFIGURE_OPTIONS = \
        --prefix=/usr \
-       --enable-cxx \
-       --enable-mpbsd \
-       --disable-nls
+       --enable-cxx
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/groff b/lfs/groff
index a0bb0bd3f9edef46c6d065bd2dcc45fea11e2bef..e4c293bb703d6ddf0ac3d8fc51cea2dcfc46805c 100644 (file)
--- a/lfs/groff
+++ b/lfs/groff
@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && PAGE=A4 ./configure --prefix=/usr --enable-multibyte --disable-nls
+       cd $(DIR_APP) && PAGE=A4 ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        ln -svf eqn /usr/bin/geqn

diff --git a/lfs/gzip b/lfs/gzip
index 12fae78e9436641a914540f7d5bd88a5750b53ff..233c6ce4070a1f21b06053148f6dd4cf3f6f38a8 100644 (file)
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -35,10 +35,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls --bindir=/bin
+  EXTRA_CONFIG = --prefix=/usr --bindir=/bin
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
 endif
 
 ###############################################################################

diff --git a/lfs/kmod b/lfs/kmod
index dc2dc10b883d73d3d4194f579c4c2c8ae6e65390..8e0bb0d53d5165b07ce0c0c0a0e75e13f397a00a 100644 (file)
--- a/lfs/kmod
+++ b/lfs/kmod
@@ -74,7 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --prefix=/usr \
                --bindir=/bin \
                --sysconfdir=/etc \
-               --enable-zlib \
                --disable-manpages
 
 #              --libdir=/lib \

diff --git a/lfs/less b/lfs/less
index 3a35483387e582415e890e3b2317b79f5e169550..10528d866549dad51e94fd825241b3651eea4169 100644 (file)
--- a/lfs/less
+++ b/lfs/less
@@ -70,7 +70,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat
index 4166d52c7251cb8b0c64409fa4b3cd0b127be222..0e712d0c2394c63a58ff0b5b9980883bdb365665 100644 (file)
--- a/lfs/libjpeg-compat
+++ b/lfs/libjpeg-compat
@@ -72,7 +72,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --enable-static \
+               --enable-shared
+
        cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && mv -vf .libs/{libjpeg.so.62.1.0,libjpeg.so.62,libturbojpeg.so.0.0.0} /usr/lib/

diff --git a/lfs/libmpeg2 b/lfs/libmpeg2
index 6d664c9f0c20a6a6dee6d699df7bb2721aab6574..488a597378cebfda00266941c078fca18af2c039 100644 (file)
--- a/lfs/libmpeg2
+++ b/lfs/libmpeg2
@@ -77,8 +77,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared \
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --enable-shared \
                --disable-accel-detect
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/libtool b/lfs/libtool
index 01721450553d5d88009ba56b80458e8134361263..d7e9a155585554dc9bd990bdc15d21a18d32d471 100644 (file)
--- a/lfs/libtool
+++ b/lfs/libtool
@@ -75,7 +75,9 @@ dist:
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/libupnp b/lfs/libupnp
index 3f8d2b549819f4d55c60189ad10842fc5802da4f..18f5e6d8a0f5f9e5731ac661d2cb53ab372b2af6 100644 (file)
--- a/lfs/libupnp
+++ b/lfs/libupnp
@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/libusb b/lfs/libusb
index f557bd8be7d0a15e2fa98fb0eb1efc6a5b07f7a1..f7fc12420f0b4dc46b500f0bffe1603f32ca17c4 100644 (file)
--- a/lfs/libusb
+++ b/lfs/libusb
@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        echo "# Set group ownership for raw USB devices" > /etc/udev/rules.d/23-usb.rules

diff --git a/lfs/m4 b/lfs/m4
index 3864d42158f97eecf9ad4c0f9c0bb120935da348..5bb8604442527f52b045183cc6ccfd6390658aa7 100644 (file)
--- a/lfs/m4
+++ b/lfs/m4
@@ -35,12 +35,12 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_CONFIG = --prefix=/usr
   EXTRA_MAKE =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
+  EXTRA_MAKE =
 endif
 
 ###############################################################################

diff --git a/lfs/mpfr b/lfs/mpfr
index f729b8fe2f672c4c71c0c3681be2473bf7191071..cb5a29b101b9b2bf6fdd1caf4c616b98479c7fec 100644 (file)
--- a/lfs/mpfr
+++ b/lfs/mpfr
@@ -71,7 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
-                       --enable-thread-safe --disable-nls
+               --enable-thread-safe
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/nasm b/lfs/nasm
index 6eb34f101bcaa1817be8683d0cedd8294cdb7d97..5968dce7299c27d112300a13608d303615649649 100644 (file)
--- a/lfs/nasm
+++ b/lfs/nasm
@@ -70,7 +70,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP) && ./configure \
+       --prefix=/usr
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/openssh b/lfs/openssh
index 56ac55a9602480eb0b19d8fa364315c29344d45f..20a5dc1156d34f1a3dc47a27c01512c3d2499e76 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -71,29 +71,33 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc/ssh \
-                   --libexecdir=/usr/lib/openssh --with-md5-passwords \
-                   --with-privsep-path=/var/empty --disable-nls \
-                   --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --sysconfdir=/etc/ssh \
+               --libexecdir=/usr/lib/openssh \
+               --with-md5-passwords \
+               --with-privsep-path=/var/empty \
+               --with-superuser-path=/sbin:/usr/sbin:/bin:/usr/bin
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        sed -i -e 's/^#\?Port .*$$/Port 222/' \
-           -e 's/^#\?Protocol .*$$/Protocol 2/' \
-           -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
-           -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
-           -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
-           -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \
-           -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
-           -e 's/^#\?UsePAM .*$$//' \
-           -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
-           -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
-           -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
-           -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
-           -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
-           -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
-           /etc/ssh/sshd_config
+               -e 's/^#\?Protocol .*$$/Protocol 2/' \
+               -e 's/^#\?LoginGraceTime .*$$/LoginGraceTime 30s/' \
+               -e 's/^#\?PubkeyAuthentication .*$$/PubkeyAuthentication yes/' \
+               -e 's/^#\?PasswordAuthentication .*$$/PasswordAuthentication yes/' \
+               -e 's/^#\?MaxStartups .*$$/MaxStartups 5/' \
+               -e 's/^#\?IgnoreUserKnownHosts .*$$/IgnoreUserKnownHosts yes/' \
+               -e 's/^#\?UsePAM .*$$//' \
+               -e 's/^#\?X11Forwarding .*$$/X11Forwarding no/' \
+               -e 's/^#\?SyslogFacility AUTH .*$$/SyslogFacility AUTH/' \
+               -e 's/^#\?LogLevel INFO .*$$/LogLevel INFO/' \
+               -e 's/^#\?AllowTcpForwarding .*$$/AllowTcpForwarding no/' \
+               -e 's/^#\?PermitRootLogin .*$$/PermitRootLogin yes/' \
+               -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$$||' \
+               -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$$||' \
+               -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$$||' \
+               -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
+               /etc/ssh/sshd_config
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/openvmtools b/lfs/openvmtools
index 1cf9427fe2bddf42f439c27cd574db6d232e120f..b5b1fefa21ce9e09302bb6729f61067496b45acc 100644 (file)
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -81,13 +81,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -e "s/-Werror//g" -i configure.ac
        cd $(DIR_APP) && autoreconf -vfi
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-          --with-kernel-release=$(KVER)-ipfire --without-pam \
-          --disable-unity --without-gtk2 --without-gtkmm \
-          --without-procps --without-icu \
-          --without-x --with-linuxdir=/usr/src/linux \
-          --without-kernel-modules --disable-deploypkg \
-          --without-xerces-c --without-xerces
+
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --with-kernel-release=$(KVER)-ipfire \
+               --without-pam \
+               --without-gtk2 \
+               --without-gtkmm \
+               --without-procps \
+               --without-icu \
+               --without-x \
+               --with-linuxdir=/usr/src/linux \
+               --without-kernel-modules \
+               --disable-deploypkg \
+               --without-xerces
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        #install initscripts

diff --git a/lfs/patch b/lfs/patch
index c938ac8faacec50f96c1422722b77cf513a74844..065314d51b5a8e0a9fbb038ec22678affa9ecbd7 100644 (file)
--- a/lfs/patch
+++ b/lfs/patch
@@ -35,14 +35,14 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_CONFIG = --prefix=/usr
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
+  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
   EXTRA_MAKE =
-  EXTRA_INSTALL = 
+  EXTRA_INSTALL =
 endif
 
 ###############################################################################

diff --git a/lfs/python b/lfs/python
index 14ccb690c9e3111b0206759cc9c99cbd07169710..70299852c02a94d6a323fda1b9cbbec06fa3cac5 100644 (file)
--- a/lfs/python
+++ b/lfs/python
@@ -73,7 +73,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/python-2.7.13-getentropy.patch
        cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
-               --prefix=/usr --enable-shared --with-system-ffi
+               --prefix=/usr \
+               --enable-shared \
+               --with-system-ffi
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/python3 b/lfs/python3
index 0fe493ba97d86f2fda76ca87d11a0c5e813a7d25..e753d96ab23dcd889487871d1c5de3819db5918d 100644 (file)
--- a/lfs/python3
+++ b/lfs/python3
@@ -79,7 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
        rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx}
        cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \
-               --prefix=/usr --enable-shared --with-system-ffi
+               --prefix=/usr \
+               --enable-shared \
+               --with-system-ffi
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/rpcbind b/lfs/rpcbind
index 046121f362733fc7f722f80f365dbe567fddc972..c1b696de7936a2b28134e2c81111a64417a43cb6 100644 (file)
--- a/lfs/rpcbind
+++ b/lfs/rpcbind
@@ -79,7 +79,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch
-       cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root --without-systemdsystemunitdir --disable-ipv6
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --bindir=/sbin \
+               --with-rpcuser=root \
+               --without-systemdsystemunitdir
+
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make install
        #install initscripts

diff --git a/lfs/shadow b/lfs/shadow
index c445dd362f5794f4e1f16cd6230ef8aaee7be29c..30000bfa1957d64cf8dee402920087ffeb31f33c 100644 (file)
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -71,12 +71,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
-       cd $(DIR_APP) && ./configure --libdir=/lib      \
-                               --sysconfdir=/etc       \
-                               --enable-shared         \
-                               --without-selinux       \
-                               --disable-nls           \
-                               --with-group-name-max-length=32
+       cd $(DIR_APP) && ./configure \
+               --libdir=/lib \
+               --sysconfdir=/etc \
+               --enable-shared \
+               --without-selinux \
+               --disable-nls \
+               --with-group-name-max-length=32
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 

diff --git a/lfs/taglib b/lfs/taglib
index eec6e97e900f8532262af3c4a03a8691ffc2223b..058a15542398ff6a5f821cc1f8638775b1164669 100644 (file)
--- a/lfs/taglib
+++ b/lfs/taglib
@@ -53,7 +53,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
-dist: 
+dist:
        @$(PAK)
 
 ###############################################################################
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
+       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/lfs/tcl b/lfs/tcl
index 7762a1dc8f30984c3e50258262cdd796ef32a450..fb464dca350ae5791e110611557163acd33af3d5 100644 (file)
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -76,9 +76,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 ifneq "$(ROOT)" ""
-       cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR) --disable-nls
+       cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR)
 else
-       cd $(DIR_APP)/unix && ./configure --prefix=/usr --disable-nls
+       cd $(DIR_APP)/unix && ./configure --prefix=/usr
 endif
        cd $(DIR_APP)/unix && make $(MAKETUNING)
        cd $(DIR_APP)/unix && make install