package: indentation cleanup
authorJerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Wed, 24 Dec 2014 07:54:24 +0000 (08:54 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Wed, 24 Dec 2014 10:41:05 +0000 (11:41 +0100)
Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
26 files changed:
package/binutils/binutils.mk
package/blackbox/blackbox.mk
package/cups/cups.mk
package/dbus/dbus.mk
package/ed/ed.mk
package/fontconfig/fontconfig.mk
package/gnuplot/gnuplot.mk
package/icu/icu.mk
package/imagemagick/imagemagick.mk
package/libao/libao.mk
package/libargtable2/libargtable2.mk
package/libxslt/libxslt.mk
package/metacity/metacity.mk
package/netsnmp/netsnmp.mk
package/ntp/ntp.mk
package/openssh/openssh.mk
package/php/php.mk
package/proftpd/proftpd.mk
package/rrdtool/rrdtool.mk
package/sdl_image/sdl_image.mk
package/sdl_ttf/sdl_ttf.mk
package/sed/sed.mk
package/squid/squid.mk
package/tcpdump/tcpdump.mk
package/vde2/vde2.mk
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

index 9a9bb94098a74137050e1ae614453b1ae6b2e6ef..1ff7fbafa59f91a99301e1828541bfcdbd85cb39 100644 (file)
@@ -42,15 +42,18 @@ endif
 # they also contain the gdb sources, but gdb shouldn't be built, so we
 # disable it.
 BINUTILS_DISABLE_GDB_CONF_OPTS = \
-       --disable-sim --disable-gdb
+       --disable-sim \
+       --disable-gdb
 
 # We need to specify host & target to avoid breaking ARM EABI
-BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
-               --host=$(GNU_TARGET_NAME) \
-               --target=$(GNU_TARGET_NAME) \
-               --enable-install-libiberty \
-               $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
-               $(BINUTILS_EXTRA_CONFIG_OPTIONS)
+BINUTILS_CONF_OPTS = \
+       --disable-multilib \
+       --disable-werror \
+       --host=$(GNU_TARGET_NAME) \
+       --target=$(GNU_TARGET_NAME) \
+       --enable-install-libiberty \
+       $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
+       $(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
 # Don't build documentation. It takes up extra space / build time,
 # and sometimes needs specific makeinfo versions to work
@@ -64,13 +67,16 @@ endif
 
 # "host" binutils should actually be "cross"
 # We just keep the convention of "host utility" for now
-HOST_BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
-                       --target=$(GNU_TARGET_NAME) \
-                       --disable-shared --enable-static \
-                       --with-sysroot=$(STAGING_DIR) \
-                       --enable-poison-system-directories \
-                       $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
-                       $(BINUTILS_EXTRA_CONFIG_OPTIONS)
+HOST_BINUTILS_CONF_OPTS = \
+       --disable-multilib \
+       --disable-werror \
+       --target=$(GNU_TARGET_NAME) \
+       --disable-shared \
+       --enable-static \
+       --with-sysroot=$(STAGING_DIR) \
+       --enable-poison-system-directories \
+       $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
+       $(BINUTILS_EXTRA_CONFIG_OPTIONS)
 
 # We just want libbfd and libiberty, not the full-blown binutils in staging
 define BINUTILS_INSTALL_STAGING_CMDS
index 254d46f064c685a7593e0bbcc451c4a7de71e526..a73bc5b84aa71eda246835a1330694201218aa60 100644 (file)
@@ -7,8 +7,9 @@
 BLACKBOX_VERSION = 0.70.1
 BLACKBOX_SOURCE = blackbox-$(BLACKBOX_VERSION).tar.bz2
 BLACKBOX_SITE = http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%20$(BLACKBOX_VERSION)
-BLACKBOX_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
-               --x-libraries=$(STAGING_DIR)/usr/lib
+BLACKBOX_CONF_OPTS = \
+       --x-includes=$(STAGING_DIR)/usr/include/X11 \
+       --x-libraries=$(STAGING_DIR)/usr/lib
 BLACKBOX_DEPENDENCIES = xlib_libX11
 BLACKBOX_LICENSE = MIT
 BLACKBOX_LICENSE_FILES = LICENSE
index 318571d26d163a08bb61a4ef7d696b65f9714d62..cc875743adc58ad7df6a6c3b7058a7096e65e2e3 100644 (file)
@@ -12,18 +12,20 @@ CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
 CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
-CUPS_CONF_OPTS = --without-perl \
-               --without-java \
-               --without-php \
-               --disable-gnutls \
-               --disable-gssapi \
-               --libdir=/usr/lib
+CUPS_CONF_OPTS = \
+       --without-perl \
+       --without-java \
+       --without-php \
+       --disable-gnutls \
+       --disable-gssapi \
+       --libdir=/usr/lib
 CUPS_CONFIG_SCRIPTS = cups-config
 
-CUPS_DEPENDENCIES = $(if $(BR2_PACKAGE_ZLIB),zlib) \
-                   $(if $(BR2_PACKAGE_LIBPNG),libpng) \
-                   $(if $(BR2_PACKAGE_JPEG),jpeg) \
-                   $(if $(BR2_PACKAGE_TIFF),tiff)
+CUPS_DEPENDENCIES = \
+       $(if $(BR2_PACKAGE_ZLIB),zlib) \
+       $(if $(BR2_PACKAGE_LIBPNG),libpng) \
+       $(if $(BR2_PACKAGE_JPEG),jpeg) \
+       $(if $(BR2_PACKAGE_TIFF),tiff)
 
 ifeq ($(BR2_PACKAGE_DBUS),y)
        CUPS_CONF_OPTS += --enable-dbus
index 77ea5026d08d76891f8242d69b6ba262c82329f8..5e4fd197f964609cb9eaab512d901e1e893a76ee 100644 (file)
@@ -22,17 +22,18 @@ endef
 DBUS_DEPENDENCIES = host-pkgconf expat
 
 DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
-DBUS_CONF_OPTS = --with-dbus-user=dbus \
-               --disable-tests \
-               --disable-asserts \
-               --enable-abstract-sockets \
-               --disable-selinux \
-               --disable-xml-docs \
-               --disable-doxygen-docs \
-               --disable-dnotify \
-               --with-xml=expat \
-               --with-system-socket=/var/run/dbus/system_bus_socket \
-               --with-system-pid-file=/var/run/messagebus.pid
+DBUS_CONF_OPTS = \
+       --with-dbus-user=dbus \
+       --disable-tests \
+       --disable-asserts \
+       --enable-abstract-sockets \
+       --disable-selinux \
+       --disable-xml-docs \
+       --disable-doxygen-docs \
+       --disable-dnotify \
+       --with-xml=expat \
+       --with-system-socket=/var/run/dbus/system_bus_socket \
+       --with-system-pid-file=/var/run/messagebus.pid
 
 ifeq ($(BR2_STATIC_LIBS),y)
 DBUS_CONF_OPTS += LIBS='-pthread'
index 1fca2fdc565484f630844fe4c5f1c76217754bac..f3bcb749b6ba814473d7c37db49768da564bbaf3 100644 (file)
@@ -6,8 +6,9 @@
 
 ED_VERSION = 1.9
 ED_SITE = $(BR2_GNU_MIRROR)/ed
-ED_CONF_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-               LDFLAGS="$(TARGET_LDFLAGS)"
+ED_CONF_OPTS = \
+       CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+       LDFLAGS="$(TARGET_LDFLAGS)"
 ED_LICENSE = GPLv3+
 ED_LICENSE_FILES = COPYING
 
index 863fa26cc3f53cb439c983e076b6cfcd76fb322c..caf997bac71b4b92b0d2cc31b8c8b1e9f0c0aff7 100644 (file)
@@ -11,9 +11,10 @@ FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf
 FONTCONFIG_LICENSE = fontconfig license
 FONTCONFIG_LICENSE_FILES = COPYING
 
-FONTCONFIG_CONF_OPTS = --with-arch=$(GNU_TARGET_NAME) \
-               --with-cache-dir=/var/cache/fontconfig \
-               --disable-docs
+FONTCONFIG_CONF_OPTS = \
+       --with-arch=$(GNU_TARGET_NAME) \
+       --with-cache-dir=/var/cache/fontconfig \
+       --disable-docs
 
 HOST_FONTCONFIG_CONF_OPTS = \
        --disable-static
index 238da6865c6b09069721a29459a20f676ce33665..4408ece5be36aa32a1b00907f4c76b163b55405d 100644 (file)
@@ -11,18 +11,19 @@ GNUPLOT_LICENSE_FILES = Copyright
 
 GNUPLOT_AUTORECONF = YES
 
-GNUPLOT_CONF_OPTS = --without-x \
-               --disable-raise-console \
-               --disable-mouse \
-               --without-tutorial \
-               --disable-demo \
-               --without-row-help \
-               --disable-history-file \
-               --without-lisp-files \
-               --disable-wxwidgets \
-               --without-lua \
-               --without-latex \
-               --without-cairo
+GNUPLOT_CONF_OPTS = \
+       --without-x \
+       --disable-raise-console \
+       --disable-mouse \
+       --without-tutorial \
+       --disable-demo \
+       --without-row-help \
+       --disable-history-file \
+       --without-lisp-files \
+       --disable-wxwidgets \
+       --without-lua \
+       --without-latex \
+       --without-cairo
 
 ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
 GNUPLOT_CONF_OPTS += --with-gd
index 0c554cad71d56ff7123f2591b762dbcf5fd4e457..c5460b22fa7cc9392b8b6c025fbbfe57e8f1063b 100644 (file)
@@ -13,8 +13,10 @@ ICU_LICENSE_FILES = license.html
 ICU_DEPENDENCIES = host-icu
 ICU_INSTALL_STAGING = YES
 ICU_CONFIG_SCRIPTS = icu-config
-ICU_CONF_OPTS = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
-               --disable-tests
+ICU_CONF_OPTS = \
+       --with-cross-build=$(HOST_ICU_DIR)/source \
+       --disable-samples \
+       --disable-tests
 HOST_ICU_CONF_OPTS = \
        --disable-samples \
        --disable-tests \
index b8e515501aa3a902650a4410e0f34ad470098263..db3b56346c025d0b3f48ab411f48975c43802b4a 100644 (file)
@@ -27,19 +27,20 @@ else
 IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=32
 endif
 
-IMAGEMAGICK_CONF_OPTS = --program-transform-name='s,,,' \
-               --disable-openmp \
-               --without-perl \
-               --without-wmf \
-               --without-openexr \
-               --without-jp2 \
-               --without-jbig \
-               --without-gvc \
-               --without-djvu \
-               --without-dps \
-               --without-gslib \
-               --without-fpx \
-               --without-x
+IMAGEMAGICK_CONF_OPTS = \
+       --program-transform-name='s,,,' \
+       --disable-openmp \
+       --without-perl \
+       --without-wmf \
+       --without-openexr \
+       --without-jp2 \
+       --without-jbig \
+       --without-gvc \
+       --without-djvu \
+       --without-dps \
+       --without-gslib \
+       --without-fpx \
+       --without-x
 
 IMAGEMAGICK_DEPENDENCIES = host-pkgconf
 
index 9dfdb96294036e8c4c21e4f0d89e77ac351483cb..a314c08d1783bb50fd13f0053f830c8f40e58d0c 100644 (file)
@@ -10,8 +10,13 @@ LIBAO_DEPENDENCIES = host-pkgconf
 LIBAO_INSTALL_STAGING = YES
 LIBAO_LICENSE = GPLv2+
 LIBAO_LICENSE_FILES = COPYING
-LIBAO_CONF_OPTS = --disable-esd --disable-wmm --disable-arts \
-                       --disable-nas --disable-pulse --disable-broken-oss
+LIBAO_CONF_OPTS = \
+       --disable-esd \
+       --disable-wmm \
+       --disable-arts \
+       --disable-nas \
+       --disable-pulse \
+       --disable-broken-oss
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 LIBAO_DEPENDENCIES += alsa-lib
index 583b0b4c0ef3afd19df9e6c65d91a4328f41b199..6b42cc0899a9c45ec60b7234151d4d4cb343eb43 100644 (file)
@@ -8,10 +8,11 @@ LIBARGTABLE2_VERSION = 13
 LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz
 LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13
 LIBARGTABLE2_INSTALL_STAGING = YES
-LIBARGTABLE2_CONF_OPTS = --disable-example \
-               --disable-kernel-module \
-               --enable-lib \
-               --enable-util
+LIBARGTABLE2_CONF_OPTS = \
+       --disable-example \
+       --disable-kernel-module \
+       --enable-lib \
+       --enable-util
 LIBARGTABLE2_LICENSE = LGPLv2+
 LIBARGTABLE2_LICENSE_FILES = COPYING
 
index 20aba08999f6079cb227fe3f9a2c5d83cf0d295b..2e5cc14b54239c0da89d9df306417552237a2885 100644 (file)
@@ -10,8 +10,11 @@ LIBXSLT_INSTALL_STAGING = YES
 LIBXSLT_LICENSE = MIT
 LIBXSLT_LICENSE_FILES = COPYING
 
-LIBXSLT_CONF_OPTS = --with-gnu-ld --without-debug \
-               --without-python --with-libxml-prefix=$(STAGING_DIR)/usr/
+LIBXSLT_CONF_OPTS = \
+       --with-gnu-ld \
+       --without-debug \
+       --without-python \
+       --with-libxml-prefix=$(STAGING_DIR)/usr/
 LIBXSLT_CONFIG_SCRIPTS = xslt-config
 LIBXSLT_DEPENDENCIES = libxml2
 
index 1d3e1430e5559b6b7497790b6919ed1389079f1c..d889779140390b2e40f377399e558395e48a4f24 100644 (file)
@@ -12,10 +12,13 @@ METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSI
 METACITY_LICENSE = GPLv2+
 METACITY_LICENSE_FILES = COPYING
 
-METACITY_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
-               --x-libraries=$(STAGING_DIR)/usr/lib \
-               --disable-glibtest --disable-gconf \
-               --disable-sm --disable-startup-notification
+METACITY_CONF_OPTS = \
+       --x-includes=$(STAGING_DIR)/usr/include/X11 \
+       --x-libraries=$(STAGING_DIR)/usr/lib \
+       --disable-glibtest \
+       --disable-gconf \
+       --disable-sm \
+       --disable-startup-notification
 
 METACITY_DEPENDENCIES = libgtk2 \
        xlib_libX11 \
index 91afffe11d8cf785cea9ea404902a0eccf0ac600..bfc2a74a97fe55a1a10b3ec2b4ae3044951b3cde 100644 (file)
@@ -11,19 +11,27 @@ NETSNMP_LICENSE = Various BSD-like
 NETSNMP_LICENSE_FILES = COPYING
 NETSNMP_INSTALL_STAGING = YES
 NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
-NETSNMP_CONF_OPTS = --with-persistent-directory=/var/lib/snmp \
-               --with-defaults --enable-mini-agent --without-rpm \
-               --with-logfile=none --without-kmem-usage $(DISABLE_IPV6) \
-               --enable-as-needed --without-perl-modules \
-               --disable-embedded-perl --disable-perl-cc-checks \
-               --disable-scripts --with-default-snmp-version="1" \
-               --enable-silent-libtool --enable-mfd-rewrites \
-               --with-sys-contact="root@localhost" \
-               --with-sys-location="Unknown" \
-               --with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \
-               --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
-               --with-out-transports="Unix" \
-               --disable-manuals
+NETSNMP_CONF_OPTS = \
+       --with-persistent-directory=/var/lib/snmp \
+       --with-defaults \
+       --enable-mini-agent \
+       --without-rpm \
+       --with-logfile=none \
+       --without-kmem-usage $(DISABLE_IPV6) \
+       --enable-as-needed \
+       --without-perl-modules \
+       --disable-embedded-perl \
+       --disable-perl-cc-checks \
+       --disable-scripts \
+       --with-default-snmp-version="1" \
+       --enable-silent-libtool \
+       --enable-mfd-rewrites \
+       --with-sys-contact="root@localhost" \
+       --with-sys-location="Unknown" \
+       --with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \
+       --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
+       --with-out-transports="Unix" \
+       --disable-manuals
 NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install
 NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
 NETSNMP_MAKE = $(MAKE1)
index 1708978f3224556e02ecc51f01fd362eab825e87..a30adc27b795d4c20c3e9e81de9b0e3a83c0d7b4 100644 (file)
@@ -13,11 +13,12 @@ NTP_AUTORECONF = YES
 NTP_LICENSE = ntp license
 NTP_LICENSE_FILES = COPYRIGHT
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
-NTP_CONF_OPTS = --with-shared \
-               --program-transform-name=s,,, \
-               --disable-tickadj \
-               --with-yielding-select=yes \
-               --disable-local-libevent
+NTP_CONF_OPTS = \
+       --with-shared \
+       --program-transform-name=s,,, \
+       --disable-tickadj \
+       --with-yielding-select=yes \
+       --disable-local-libevent
 
 ifneq ($(BR2_INET_IPV6),y)
        NTP_CONF_ENV += isc_cv_have_in6addr_any=no
index d08b468fb7448799ba37c9c9011e4446b73b0f15..be471b67c9fc9975f053d67422e6ea213946dbe3 100644 (file)
@@ -9,8 +9,14 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain
 OPENSSH_LICENSE_FILES = LICENCE
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
-OPENSSH_CONF_OPTS = --sysconfdir=/etc/ssh --disable-lastlog --disable-utmp \
-               --disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip
+OPENSSH_CONF_OPTS = \
+       --sysconfdir=/etc/ssh \
+       --disable-lastlog \
+       --disable-utmp \
+       --disable-utmpx \
+       --disable-wtmp \
+       --disable-wtmpx \
+       --disable-strip
 
 define OPENSSH_USERS
        sshd -1 sshd -1 * - - - SSH drop priv user
index 8c322ec1da55a833de5582ddd4fa1cb3c66fbeb5..a5f45743a7e58e00fae66f944b3b2cbfb6dc1516 100644 (file)
@@ -13,12 +13,13 @@ PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
 PHP_DEPENDENCIES = host-pkgconf
 PHP_LICENSE = PHP
 PHP_LICENSE_FILES = LICENSE
-PHP_CONF_OPTS = --mandir=/usr/share/man \
-               --infodir=/usr/share/info \
-               --disable-all \
-               --without-pear \
-               --with-config-file-path=/etc \
-               --disable-rpath
+PHP_CONF_OPTS = \
+       --mandir=/usr/share/man \
+       --infodir=/usr/share/info \
+       --disable-all \
+       --without-pear \
+       --with-config-file-path=/etc \
+       --disable-rpath
 PHP_CONF_ENV = EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
 
 ifeq ($(BR2_ENDIAN),"BIG")
@@ -50,33 +51,34 @@ PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
 PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)
 
 ### Extensions
-PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
-               $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \
-               $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \
-               $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \
-               $(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \
-               $(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
-               $(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \
-               $(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \
-               $(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \
-               $(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \
-               $(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \
-               $(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \
-               $(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \
-               $(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \
-               $(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \
-               $(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \
-               $(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \
-               $(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \
-               $(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \
-               $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \
-               $(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
-               $(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
-               $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \
-               $(if $(BR2_PACKAGE_PHP_EXT_FILEINFO),--enable-fileinfo) \
-               $(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath) \
-               $(if $(BR2_PACKAGE_PHP_EXT_MBSTRING),--enable-mbstring) \
-               $(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar)
+PHP_CONF_OPTS += \
+       $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
+       $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \
+       $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \
+       $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \
+       $(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \
+       $(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \
+       $(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \
+       $(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \
+       $(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \
+       $(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \
+       $(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \
+       $(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \
+       $(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \
+       $(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \
+       $(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \
+       $(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \
+       $(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \
+       $(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \
+       $(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \
+       $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \
+       $(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
+       $(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
+       $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \
+       $(if $(BR2_PACKAGE_PHP_EXT_FILEINFO),--enable-fileinfo) \
+       $(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath) \
+       $(if $(BR2_PACKAGE_PHP_EXT_MBSTRING),--enable-mbstring) \
+       $(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar)
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_MCRYPT),y)
        PHP_CONF_OPTS += --with-mcrypt=$(STAGING_DIR)/usr
index b79abe45e8b510a1b29e3e650360a0daa98f550e..59ce8447988c5b47e2cda09b3226b79c001a1d38 100644 (file)
@@ -10,17 +10,19 @@ PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source
 PROFTPD_LICENSE = GPLv2+
 PROFTPD_LICENSE_FILES = COPYING
 
-PROFTPD_CONF_ENV = ac_cv_func_setpgrp_void=yes \
-               ac_cv_func_setgrent_void=yes
-
-PROFTPD_CONF_OPTS = --localstatedir=/var/run \
-               --disable-static \
-               --disable-curses \
-               --disable-ncurses \
-               --disable-facl \
-               --disable-dso \
-               --enable-shadow \
-               --with-gnu-ld
+PROFTPD_CONF_ENV = \
+       ac_cv_func_setpgrp_void=yes \
+       ac_cv_func_setgrent_void=yes
+
+PROFTPD_CONF_OPTS = \
+       --localstatedir=/var/run \
+       --disable-static \
+       --disable-curses \
+       --disable-ncurses \
+       --disable-facl \
+       --disable-dso \
+       --enable-shadow \
+       --with-gnu-ld
 
 ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
 PROFTPD_CONF_OPTS += --with-modules=mod_rewrite
index 6d5c887272b4d1849a9cf38504cb2908a186dbea..e4226946ff3c12aed6c1cd204394365577f8640c 100644 (file)
@@ -12,11 +12,17 @@ RRDTOOL_LICENSE_FILES = COPYING COPYRIGHT
 RRDTOOL_DEPENDENCIES = host-pkgconf freetype libart libpng zlib
 RRDTOOL_AUTORECONF = YES
 RRDTOOL_INSTALL_STAGING = YES
-RRDTOOL_CONF_ENV = rd_cv_ieee_works=yes rd_cv_null_realloc=nope \
-                       ac_cv_func_mmap_fixed_mapped=yes
-RRDTOOL_CONF_OPTS = --disable-perl --disable-python --disable-ruby \
-                       --disable-tcl --program-transform-name='' \
-                       $(if $(BR2_TOOLCHAIN_HAS_THREADS),,--disable-pthread)
+RRDTOOL_CONF_ENV = \
+       rd_cv_ieee_works=yes \
+       rd_cv_null_realloc=nope \
+       ac_cv_func_mmap_fixed_mapped=yes
+RRDTOOL_CONF_OPTS = \
+       --disable-perl \
+       --disable-python \
+       --disable-ruby \
+       --disable-tcl \
+       --program-transform-name='' \
+       $(if $(BR2_TOOLCHAIN_HAS_THREADS),,--disable-pthread)
 RRDTOOL_MAKE = $(MAKE1)
 
 define RRDTOOL_REMOVE_EXAMPLES
index 951ea456c9a9e734ce0e92cca53f27e9a16be59e..b46fc6440f755591560845d71fa8d58d2d8d0542 100644 (file)
@@ -11,23 +11,24 @@ SDL_IMAGE_INSTALL_STAGING = YES
 SDL_IMAGE_LICENSE = zlib
 SDL_IMAGE_LICENSE_FILES = COPYING
 
-SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(STAGING_DIR)/usr \
-               --with-sdl-exec-prefix=$(STAGING_DIR)/usr \
-               --disable-sdltest \
-               --disable-static \
-               --enable-bmp=$(if $(BR2_PACKAGE_SDL_IMAGE_BMP),yes,no) \
-               --enable-gif=$(if $(BR2_PACKAGE_SDL_IMAGE_GIF),yes,no) \
-               --enable-jpg=$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),yes,no) \
-               --enable-lbm=$(if $(BR2_PACKAGE_SDL_IMAGE_LBM),yes,no) \
-               --enable-pcx=$(if $(BR2_PACKAGE_SDL_IMAGE_PCX),yes,no) \
-               --enable-png=$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),yes,no) \
-               --enable-pnm=$(if $(BR2_PACKAGE_SDL_IMAGE_PNM),yes,no) \
-               --enable-tga=$(if $(BR2_PACKAGE_SDL_IMAGE_TARGA),yes,no) \
-               --enable-tif=$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),yes,no) \
-               --enable-webp=$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),yes,no) \
-               --enable-xcf=$(if $(BR2_PACKAGE_SDL_IMAGE_XCF),yes,no) \
-               --enable-xpm=$(if $(BR2_PACKAGE_SDL_IMAGE_XPM),yes,no) \
-               --enable-xv=$(if $(BR2_PACKAGE_SDL_IMAGE_XV),yes,no) \
+SDL_IMAGE_CONF_OPTS = \
+       --with-sdl-prefix=$(STAGING_DIR)/usr \
+       --with-sdl-exec-prefix=$(STAGING_DIR)/usr \
+       --disable-sdltest \
+       --disable-static \
+       --enable-bmp=$(if $(BR2_PACKAGE_SDL_IMAGE_BMP),yes,no) \
+       --enable-gif=$(if $(BR2_PACKAGE_SDL_IMAGE_GIF),yes,no) \
+       --enable-jpg=$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),yes,no) \
+       --enable-lbm=$(if $(BR2_PACKAGE_SDL_IMAGE_LBM),yes,no) \
+       --enable-pcx=$(if $(BR2_PACKAGE_SDL_IMAGE_PCX),yes,no) \
+       --enable-png=$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),yes,no) \
+       --enable-pnm=$(if $(BR2_PACKAGE_SDL_IMAGE_PNM),yes,no) \
+       --enable-tga=$(if $(BR2_PACKAGE_SDL_IMAGE_TARGA),yes,no) \
+       --enable-tif=$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),yes,no) \
+       --enable-webp=$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),yes,no) \
+       --enable-xcf=$(if $(BR2_PACKAGE_SDL_IMAGE_XCF),yes,no) \
+       --enable-xpm=$(if $(BR2_PACKAGE_SDL_IMAGE_XPM),yes,no) \
+       --enable-xv=$(if $(BR2_PACKAGE_SDL_IMAGE_XV),yes,no) \
 
 SDL_IMAGE_DEPENDENCIES = sdl \
        $(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),jpeg) \
@@ -35,13 +36,14 @@ SDL_IMAGE_DEPENDENCIES = sdl \
        $(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff) \
        $(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
 
-HOST_SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(HOST_DIR)/usr \
-               --with-sdl-exec-prefix=$(HOST_DIR)/usr \
-               --disable-sdltest \
-               --disable-static \
-               --disable-jpg-shared \
-               --disable-png-shared \
-               --disable-tif-shared \
+HOST_SDL_IMAGE_CONF_OPTS = \
+       --with-sdl-prefix=$(HOST_DIR)/usr \
+       --with-sdl-exec-prefix=$(HOST_DIR)/usr \
+       --disable-sdltest \
+       --disable-static \
+       --disable-jpg-shared \
+       --disable-png-shared \
+       --disable-tif-shared \
 
 HOST_SDL_IMAGE_DEPENDENCIES = host-libjpeg host-libpng host-sdl
 
index f316a466f35227e126ac6b215bdb53de0d5d88e5..3e494b4ca28db66d59f45afe96e5a88333a6461c 100644 (file)
@@ -12,9 +12,10 @@ SDL_TTF_LICENSE_FILES = COPYING
 
 SDL_TTF_INSTALL_STAGING = YES
 SDL_TTF_DEPENDENCIES = sdl freetype
-SDL_TTF_CONF_OPTS = --without-x \
-               --with-freetype-prefix=$(STAGING_DIR)/usr \
-               --with-sdl-prefix=$(STAGING_DIR)/usr
+SDL_TTF_CONF_OPTS = \
+       --without-x \
+       --with-freetype-prefix=$(STAGING_DIR)/usr \
+       --with-sdl-prefix=$(STAGING_DIR)/usr
 
 SDL_TTF_MAKE_OPTS = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL"  LDFLAGS="-L$(STAGING_DIR)/usr/lib"
 $(eval $(autotools-package))
index f72b8b18049a44ccbf530ff84fd0491e9d9b5e23..b819300404328112fe58d13a4cdc338abbe36293 100644 (file)
@@ -9,14 +9,15 @@ SED_SITE = $(BR2_GNU_MIRROR)/sed
 SED_LICENSE = GPLv3
 SED_LICENSE_FILES = COPYING
 
-SED_CONF_OPTS = --bindir=/usr/bin \
-               --libdir=/lib \
-               --libexecdir=/usr/lib \
-               --sysconfdir=/etc \
-               --datadir=/usr/share \
-               --mandir=/usr/share/man \
-               --infodir=/usr/share/info \
-               --include=$(STAGING_DIR)/usr/include
+SED_CONF_OPTS = \
+       --bindir=/usr/bin \
+       --libdir=/lib \
+       --libexecdir=/usr/lib \
+       --sysconfdir=/etc \
+       --datadir=/usr/share \
+       --mandir=/usr/share/man \
+       --infodir=/usr/share/info \
+       --include=$(STAGING_DIR)/usr/include
 
 define SED_MOVE_BINARY
        mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/
index 1224369ee0cd80706a1d1a1ed4d5ff2b1b611dca..e9e821dd68f2861f103ed01fd1b5eba4ddea3cf3 100644 (file)
@@ -14,23 +14,30 @@ SQUID_LICENSE_FILES = COPYING
 SQUID_AUTORECONF = YES
 SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \
        $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
-SQUID_CONF_ENV =       ac_cv_epoll_works=yes ac_cv_func_setresuid=yes \
-                       ac_cv_func_va_copy=yes ac_cv_func___va_copy=yes \
-                       ac_cv_func_strnstr=no ac_cv_have_squid=yes
-SQUID_CONF_OPTS =      --enable-async-io=8 --enable-linux-netfilter \
-                       --enable-removal-policies="lru,heap" \
-                       --with-filedescriptors=1024 --disable-ident-lookups \
-                       --with-krb5-config=no \
-                       --enable-auth-basic="fake getpwnam" \
-                       --enable-auth-digest="file" \
-                       --enable-auth-negotiate="wrapper" \
-                       --enable-auth-ntlm="fake" \
-                       --disable-strict-error-checking \
-                       --enable-external-acl-helpers="file_userip" \
-                       --with-logdir=/var/log/squid/ \
-                       --with-pidfile=/var/run/squid.pid \
-                       --with-swapdir=/var/cache/squid/ \
-                       --enable-icap-client
+SQUID_CONF_ENV = \
+       ac_cv_epoll_works=yes \
+       ac_cv_func_setresuid=yes \
+       ac_cv_func_va_copy=yes \
+       ac_cv_func___va_copy=yes \
+       ac_cv_func_strnstr=no \
+       ac_cv_have_squid=yes
+SQUID_CONF_OPTS = \
+       --enable-async-io=8 \
+       --enable-linux-netfilter \
+       --enable-removal-policies="lru,heap" \
+       --with-filedescriptors=1024 \
+       --disable-ident-lookups \
+       --with-krb5-config=no \
+       --enable-auth-basic="fake getpwnam" \
+       --enable-auth-digest="file" \
+       --enable-auth-negotiate="wrapper" \
+       --enable-auth-ntlm="fake" \
+       --disable-strict-error-checking \
+       --enable-external-acl-helpers="file_userip" \
+       --with-logdir=/var/log/squid/ \
+       --with-pidfile=/var/run/squid.pid \
+       --with-swapdir=/var/cache/squid/ \
+       --enable-icap-client
 
 # On uClibc librt needs libpthread
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
index dedeb70b03f93acc4c3605e33e1594d2afc97c77..69eb717c94bb3e8bff5cbe4136aebb600caee851 100644 (file)
@@ -8,10 +8,14 @@ TCPDUMP_VERSION = 4.6.2
 TCPDUMP_SITE = http://www.tcpdump.org/release
 TCPDUMP_LICENSE = BSD-3c
 TCPDUMP_LICENSE_FILES = LICENSE
-TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no \
-               PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
-TCPDUMP_CONF_OPTS = --without-crypto --with-system-libpcap \
-               $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
+TCPDUMP_CONF_ENV = \
+       ac_cv_linux_vers=2 \
+       td_cv_buggygetaddrinfo=no \
+       PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
+TCPDUMP_CONF_OPTS = \
+       --without-crypto \
+       --with-system-libpcap \
+       $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
 TCPDUMP_DEPENDENCIES = zlib libpcap
 # Patching aclocal.m4
 TCPDUMP_AUTORECONF = YES
index c8bcfae77abf02546b663ff11898b86b44e0613b..f4a8c846165fc0199771fe2b015db46dcb002858 100644 (file)
@@ -25,13 +25,14 @@ VDE2_AUTORECONF = YES
 #
 # Note: disabled features can be added with corresponding dependencies
 #       in future commits.
-VDE2_CONF_OPTS = --disable-experimental  \
-               --disable-cryptcab      \
-               --disable-pcap          \
-               --disable-python        \
-               --disable-profile       \
-               --disable-kernel-switch \
-               --enable-tuntap         \
+VDE2_CONF_OPTS = \
+       --disable-experimental  \
+       --disable-cryptcab      \
+       --disable-pcap          \
+       --disable-python        \
+       --disable-profile       \
+       --disable-kernel-switch \
+       --enable-tuntap         \
 
 # Package does not build in parallel due to improper make rules
 VDE2_MAKE = $(MAKE1)
index 3b691413d138fbfaae83fc090caa3e06aa77eafa..5baa51524a5939627a9248a9a073e676fbb48b46 100644 (file)
@@ -54,12 +54,15 @@ XSERVER_XORG_SERVER_DEPENDENCIES =  \
        mcookie                         \
        host-pkgconf
 
-XSERVER_XORG_SERVER_CONF_OPTS = --disable-config-hal \
-               --disable-xnest --disable-xephyr --disable-dmx \
-               --with-builder-addr=buildroot@buildroot.org \
-               CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
-               --with-fontrootdir=/usr/share/fonts/X11/ \
-               --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
+XSERVER_XORG_SERVER_CONF_OPTS = \
+       --disable-config-hal \
+       --disable-xnest \
+       --disable-xephyr \
+       --disable-dmx \
+       --with-builder-addr=buildroot@buildroot.org \
+       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
+       --with-fontrootdir=/usr/share/fonts/X11/ \
+       --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
 
 ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
@@ -69,8 +72,12 @@ XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg
 endif
 
 ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive --enable-xfbdev \
-               --disable-glx --disable-dri --disable-xsdl
+XSERVER_XORG_SERVER_CONF_OPTS += \
+       --enable-kdrive \
+       --enable-xfbdev \
+       --disable-glx \
+       --disable-dri \
+       --disable-xsdl
 define XSERVER_CREATE_X_SYMLINK
        ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
 endef