Update for numerous lfs-files: removed deprecated configure options
authorMatthias Fischer <matthias.fischer@ipfire.org>
Mon, 4 Dec 2017 17:25:55 +0000 (18:25 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 5 Dec 2017 17:02:24 +0000 (17:02 +0000)
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>
33 files changed:
lfs/autoconf
lfs/automake
lfs/cyrus-imapd
lfs/dhcp
lfs/e2fsprogs
lfs/expat
lfs/faad2
lfs/fcron
lfs/ffmpeg
lfs/fuse
lfs/ghostscript
lfs/gmp
lfs/groff
lfs/gzip
lfs/kmod
lfs/less
lfs/libjpeg-compat
lfs/libmpeg2
lfs/libtool
lfs/libupnp
lfs/libusb
lfs/m4
lfs/mpfr
lfs/nasm
lfs/openssh
lfs/openvmtools
lfs/patch
lfs/python
lfs/python3
lfs/rpcbind
lfs/shadow
lfs/taglib
lfs/tcl

index 9c58e20..7e622da 100644 (file)
@@ -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)
index 15bdad1..0b3d9cc 100644 (file)
@@ -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)
index 73f73e1..7dea649 100644 (file)
@@ -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
index 4c613a7..262a251 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
index 90e28ac..8e265c1 100644 (file)
@@ -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
index aa97590..5bb22ec 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)
index bd258f7..7cadb9a 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)
index 5cc2cd6..b548c13 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
index 77258a0..258e29b 100644 (file)
@@ -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)
index 2639156..2756472 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)
index 7ee1ce4..6d297da 100644 (file)
@@ -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 8dc9b73..4d55e4f 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
index a0bb0bd..e4c293b 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
index 12fae78..233c6ce 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
 
 ###############################################################################
index dc2dc10..8e0bb0d 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 \
index 3a35483..10528d8 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)
index 4166d52..0e712d0 100644 (file)
@@ -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/
index 6d664c9..488a597 100644 (file)
@@ -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)
index 0172145..d7e9a15 100644 (file)
@@ -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)
index 3f8d2b5..18f5e6d 100644 (file)
@@ -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)
index f557bd8..f7fc124 100644 (file)
@@ -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 3864d42..5bb8604 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
 
 ###############################################################################
index f729b8f..cb5a29b 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)
index 6eb34f1..5968dce 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)
index 56ac55a..20a5dc1 100644 (file)
@@ -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)
index 1cf9427..b5b1fef 100644 (file)
@@ -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
index c938ac8..065314d 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
 
 ###############################################################################
index 14ccb69..7029985 100644 (file)
@@ -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)
index 0fe493b..e753d96 100644 (file)
@@ -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)
index 046121f..c1b696d 100644 (file)
@@ -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
index c445dd3..30000bf 100644 (file)
@@ -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
 
index eec6e97..058a155 100644 (file)
@@ -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 7762a1d..fb464dc 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