* [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS
@ 2014-09-27 19:32 Thomas De Schampheleire
2014-09-27 19:32 ` [Buildroot] [PATCH 01 of 15] packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS Thomas De Schampheleire
` (16 more replies)
0 siblings, 17 replies; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
All,
This patch series renames the various FOO_BAR_OPT variables into
FOO_BAR_OPTS, to increase consistency between the various infrastructures
(generic vs other infras specifically).
In particular, this solves an issue detected while introducing
kconfig-package. See the description of the MAKE_OPT patch for details.
To help detecting usage of the old variables, checks are added that error
out early.
OPTS was chosen over OPT, as it is more logical (more than one option), and
since TARGET_CONFIGURE_OPTS etc. already existed.
Changes in v2:
- mostly rebasing
- add sed commands used for the replacement, for easier review (Yann)
- reorder patches and fold the check-adding-patches into one
- add two patches that fix the indentation issues caused by the renaming
This is rebased against commit 6f5bffc426f7418c555291450d482a0ceede0865.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
Thomas De Schampheleire (15)
packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS
packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS
packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS
pkg-generic: introduce helper function to check for a deprecated variable
pkg-generic: add checks on deprecated variables FOO_BAR_OPT
packages: rename misc. occurrences of _OPT into _OPTS
.mk files: remove alignment of line continuation characters
.mk files: remove alignment of assignments
boot/at91bootstrap3/at91bootstrap3.mk | 4 +-
boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 12 +-
boot/grub/grub.mk | 6 +-
boot/grub2/grub2.mk | 4 +-
boot/gummiboot/gummiboot.mk | 2 +-
boot/lpc32xxcdl/lpc32xxcdl.mk | 8 +-
boot/mxs-bootlets/mxs-bootlets.mk | 2 +-
boot/syslinux/syslinux.mk | 4 +-
boot/uboot/uboot.mk | 50 +-
boot/xloader/xloader.mk | 4 +-
docs/manual/adding-packages-autotools.txt | 14 +-
docs/manual/adding-packages-cmake.txt | 10 +-
docs/manual/adding-packages-kconfig.txt | 4 +-
docs/manual/adding-packages-luarocks.txt | 6 +-
docs/manual/adding-packages-perl.txt | 8 +-
docs/manual/adding-packages-python.txt | 20 +-
docs/manual/writing-rules.txt | 8 +-
fs/ext2/ext2.mk | 2 +-
linux/linux-ext-rtai.mk | 10 +-
linux/linux-ext-xenomai.mk | 6 +-
linux/linux.mk | 14 +-
package/acl/acl.mk | 16 +-
package/agentpp/agentpp.mk | 2 +-
package/alsa-lib/alsa-lib.mk | 30 +-
package/alsa-utils/alsa-utils.mk | 4 +-
package/apitrace/apitrace.mk | 2 +-
package/apr-util/apr-util.mk | 2 +-
package/at/at.mk | 2 +-
package/atftp/atftp.mk | 12 +-
package/atk/atk.mk | 4 +-
package/attr/attr.mk | 16 +-
package/audiofile/audiofile.mk | 6 +-
package/aumix/aumix.mk | 2 +-
package/avahi/avahi.mk | 22 +-
package/bandwidthd/bandwidthd.mk | 10 +-
package/bash/bash.mk | 4 +-
package/bcusdk/bcusdk.mk | 2 +-
package/beecrypt/beecrypt.mk | 4 +-
package/bind/bind.mk | 24 +-
package/binutils/binutils.mk | 10 +-
package/blackbox/blackbox.mk | 2 +-
package/bluez5_utils/bluez5_utils.mk | 30 +-
package/bluez_utils/bluez_utils.mk | 30 +-
package/bmon/bmon.mk | 4 +-
package/boost/boost.mk | 14 +-
package/bootutils/bootutils.mk | 2 +-
package/bridge-utils/bridge-utils.mk | 2 +-
package/busybox/busybox.mk | 2 +-
package/bwm-ng/bwm-ng.mk | 4 +-
package/cairo/cairo.mk | 58 +-
package/ccache/ccache.mk | 6 +-
package/cdrkit/cdrkit.mk | 12 +-
package/cegui06/cegui06.mk | 44 +-
package/celt051/celt051.mk | 26 +-
package/chrony/chrony.mk | 10 +-
package/cifs-utils/cifs-utils.mk | 2 +-
package/civetweb/civetweb.mk | 10 +-
package/cjson/cjson.mk | 10 +-
package/clapack/clapack.mk | 4 +-
package/classpath/classpath.mk | 24 +-
package/cloog/cloog.mk | 2 +-
package/collectd/collectd.mk | 12 +-
package/connman/connman.mk | 16 +-
package/copas/copas.mk | 2 +-
package/coreutils/coreutils.mk | 2 +-
package/coxpcall/coxpcall.mk | 2 +-
package/cppcms/cppcms.mk | 4 +-
package/cppdb/cppdb.mk | 2 +-
package/ctorrent/ctorrent.mk | 4 +-
package/cups/cups.mk | 18 +-
package/cvs/cvs.mk | 2 +-
package/cwiid/cwiid.mk | 6 +-
package/dbus-cpp/dbus-cpp.mk | 12 +-
package/dbus-glib/dbus-glib.mk | 4 +-
package/dbus-python/dbus-python.mk | 2 +-
package/dbus/dbus.mk | 16 +-
package/dhcp/dhcp.mk | 6 +-
package/dhcpcd/dhcpcd.mk | 8 +-
package/dhcpdump/dhcpdump.mk | 2 +-
package/dialog/dialog.mk | 4 +-
package/dillo/dillo.mk | 16 +-
package/directfb/directfb.mk | 56 +-
package/distcc/distcc.mk | 2 +-
package/dmalloc/dmalloc.mk | 10 +-
package/dmidecode/dmidecode.mk | 2 +-
package/dmraid/dmraid.mk | 2 +-
package/dnsmasq/dnsmasq.mk | 12 +-
package/dropbear/dropbear.mk | 8 +-
package/dtc/dtc.mk | 22 +-
package/duma/duma.mk | 4 +-
package/dvbsnoop/dvbsnoop.mk | 8 +-
package/e2fsprogs/e2fsprogs.mk | 6 +-
package/ecryptfs-utils/ecryptfs-utils.mk | 18 +-
package/ed/ed.mk | 2 +-
package/efl/libecore/libecore.mk | 46 +-
package/efl/libedbus/libedbus.mk | 12 +-
package/efl/libedje/libedje.mk | 8 +-
package/efl/libeet/libeet.mk | 4 +-
package/efl/libelementary/libelementary.mk | 6 +-
package/efl/libethumb/libethumb.mk | 2 +-
package/efl/libevas-generic-loaders/libevas-generic-loaders.mk | 6 +-
package/efl/libevas/libevas.mk | 90 +-
package/eigen/eigen.mk | 2 +-
package/elf2flt/elf2flt.mk | 2 +-
package/elfutils/elfutils.mk | 18 +-
package/enlightenment/enlightenment.mk | 26 +-
package/enscript/enscript.mk | 4 +-
package/erlang/erlang.mk | 16 +-
package/eudev/eudev.mk | 22 +-
package/evemu/evemu.mk | 6 +-
package/expat/expat.mk | 4 +-
package/expect/expect.mk | 4 +-
package/faifa/faifa.mk | 2 +-
package/fbdump/fbdump.mk | 4 +-
package/fetchmail/fetchmail.mk | 2 +-
package/ffmpeg/ffmpeg.mk | 152 +-
package/flac/flac.mk | 10 +-
package/flann/flann.mk | 2 +-
package/flickcurl/flickcurl.mk | 2 +-
package/flite/flite.mk | 4 +-
package/fltk/fltk.mk | 8 +-
package/fluxbox/fluxbox.mk | 6 +-
package/fontconfig/fontconfig.mk | 4 +-
package/foomatic-filters/foomatic-filters.mk | 6 +-
package/freerdp/freerdp.mk | 28 +-
package/freescale-imx/freescale-imx.mk | 2 +-
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 4 +-
package/freescale-imx/imx-lib/imx-lib.mk | 2 +-
package/freescale-imx/imx-vpu/imx-vpu.mk | 2 +-
package/freetype/freetype.mk | 18 +-
package/gamin/gamin.mk | 4 +-
package/gcc/gcc-final/gcc-final.mk | 22 +-
package/gcc/gcc-initial/gcc-initial.mk | 12 +-
package/gcc/gcc.mk | 52 +-
package/gd/gd.mk | 40 +-
package/gdb/gdb.mk | 28 +-
package/gdk-pixbuf/gdk-pixbuf.mk | 12 +-
package/genimage/genimage.mk | 10 +-
package/genpart/genpart.mk | 8 +-
package/gettext/gettext.mk | 6 +-
package/giblib/giblib.mk | 2 +-
package/git/git.mk | 34 +-
package/glib-networking/glib-networking.mk | 4 +-
package/glibc/glibc.mk | 6 +-
package/gmpc/gmpc.mk | 2 +-
package/gnupg/gnupg.mk | 12 +-
package/gnupg2/gnupg2.mk | 2 +-
package/gnuplot/gnuplot.mk | 10 +-
package/gnutls/gnutls.mk | 14 +-
package/google-breakpad/google-breakpad.mk | 2 +-
package/gpm/gpm.mk | 2 +-
package/grantlee/grantlee.mk | 2 +-
package/grep/grep.mk | 4 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 40 +-
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 4 +-
package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk | 2 +-
package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk | 366 ++++----
package/gstreamer/gst-plugins-base/gst-plugins-base.mk | 98 +-
package/gstreamer/gst-plugins-good/gst-plugins-good.mk | 234 ++--
package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk | 46 +-
package/gstreamer/gstreamer/gstreamer.mk | 2 +-
package/gstreamer1/gst-omx/gst-omx.mk | 4 +-
package/gstreamer1/gst1-libav/gst1-libav.mk | 46 +-
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 394 +++++-----
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 102 +-
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 246 +++---
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 42 +-
package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +-
package/gtest/gtest.mk | 2 +-
package/gtk2-engines/gtk2-engines.mk | 2 +-
package/gutenprint/gutenprint.mk | 4 +-
package/gvfs/gvfs.mk | 38 +-
package/harfbuzz/harfbuzz.mk | 18 +-
package/haserl/haserl.mk | 4 +-
package/heimdal/heimdal.mk | 2 +-
package/heirloom-mailx/heirloom-mailx.mk | 4 +-
package/hiawatha/hiawatha.mk | 6 +-
package/hplip/hplip.mk | 6 +-
package/htop/htop.mk | 2 +-
package/httping/httping.mk | 6 +-
package/icu/icu.mk | 4 +-
package/ifplugd/ifplugd.mk | 4 +-
package/igh-ethercat/igh-ethercat.mk | 18 +-
package/imagemagick/imagemagick.mk | 42 +-
package/imlib2/imlib2.mk | 26 +-
package/input-tools/input-tools.mk | 4 +-
package/iperf/iperf.mk | 2 +-
package/ipmitool/ipmitool.mk | 2 +-
package/ipsec-tools/ipsec-tools.mk | 32 +-
package/ipset/ipset.mk | 2 +-
package/iptables/iptables.mk | 2 +-
package/iputils/iputils.mk | 6 +-
package/irda-utils/irda-utils.mk | 2 +-
package/iw/iw.mk | 6 +-
package/jack2/jack2.mk | 6 +-
package/jamvm/jamvm.mk | 2 +-
package/joe/joe.mk | 4 +-
package/jpeg-turbo/jpeg-turbo.mk | 6 +-
package/json-c/json-c.mk | 2 +-
package/kbd/kbd.mk | 2 +-
package/kexec/kexec.mk | 4 +-
package/keyutils/keyutils.mk | 20 +-
package/kismet/kismet.mk | 2 +-
package/kmod/kmod.mk | 14 +-
package/knock/knock.mk | 2 +-
package/lame/lame.mk | 4 +-
package/lbase64/lbase64.mk | 2 +-
package/lbreakout2/lbreakout2.mk | 8 +-
package/lcdproc/lcdproc.mk | 4 +-
package/lcms2/lcms2.mk | 14 +-
package/lesstif/lesstif.mk | 4 +-
package/lftp/lftp.mk | 12 +-
package/libao/libao.mk | 6 +-
package/libarchive/libarchive.mk | 32 +-
package/libargtable2/libargtable2.mk | 2 +-
package/libass/libass.mk | 12 +-
package/libassuan/libassuan.mk | 2 +-
package/libatasmart/libatasmart.mk | 2 +-
package/libbluray/libbluray.mk | 4 +-
package/libcap-ng/libcap-ng.mk | 2 +-
package/libcdio/libcdio.mk | 6 +-
package/libcec/libcec.mk | 4 +-
package/libcgicc/libcgicc.mk | 2 +-
package/libcgroup/libcgroup.mk | 6 +-
package/libconfig/libconfig.mk | 4 +-
package/libconfuse/libconfuse.mk | 2 +-
package/libcurl/libcurl.mk | 14 +-
package/libdaemon/libdaemon.mk | 2 +-
package/libdnet/libdnet.mk | 10 +-
package/libdrm/libdrm.mk | 36 +-
package/libdvdnav/libdvdnav.mk | 2 +-
package/libeXosip2/libeXosip2.mk | 6 +-
package/libedit/libedit.mk | 2 +-
package/libexif/libexif.mk | 2 +-
package/libffi/libffi.mk | 2 +-
package/libftdi/libftdi.mk | 6 +-
package/libfuse/libfuse.mk | 2 +-
package/libgail/libgail.mk | 2 +-
package/libgcrypt/libgcrypt.mk | 2 +-
package/libglib2/libglib2.mk | 14 +-
package/libgpgme/libgpgme.mk | 2 +-
package/libgtk2/libgtk2.mk | 22 +-
package/libhid/libhid.mk | 2 +-
package/libidn/libidn.mk | 2 +-
package/libinput/libinput.mk | 2 +-
package/libjson/libjson.mk | 12 +-
package/libksba/libksba.mk | 2 +-
package/liblockfile/liblockfile.mk | 2 +-
package/liblog4c-localtime/liblog4c-localtime.mk | 2 +-
package/liblogging/liblogging.mk | 6 +-
package/libmad/libmad.mk | 2 +-
package/libmbim/libmbim.mk | 6 +-
package/libmemcached/libmemcached.mk | 2 +-
package/libmicrohttpd/libmicrohttpd.mk | 8 +-
package/libmpeg2/libmpeg2.mk | 6 +-
package/libndp/libndp.mk | 2 +-
package/libnfc/libnfc.mk | 6 +-
package/libnftnl/libnftnl.mk | 8 +-
package/libnl/libnl.mk | 4 +-
package/libnspr/libnspr.mk | 10 +-
package/liboauth/liboauth.mk | 2 +-
package/liboping/liboping.mk | 2 +-
package/libosip2/libosip2.mk | 2 +-
package/libpcap/libpcap.mk | 14 +-
package/libphidget/libphidget.mk | 2 +-
package/libplayer/libplayer.mk | 12 +-
package/libpng/libpng.mk | 2 +-
package/libpthsem/libpthsem.mk | 4 +-
package/libqmi/libqmi.mk | 6 +-
package/libqrencode/libqrencode.mk | 6 +-
package/libraw/libraw.mk | 2 +-
package/libreplaygain/libreplaygain.mk | 2 +-
package/libroxml/libroxml.mk | 2 +-
package/librsvg/librsvg.mk | 2 +-
package/librtlsdr/librtlsdr.mk | 4 +-
package/libsamplerate/libsamplerate.mk | 2 +-
package/libseccomp/libseccomp.mk | 18 +-
package/libsecret/libsecret.mk | 6 +-
package/libsoc/libsoc.mk | 2 +-
package/libsoup/libsoup.mk | 8 +-
package/libsoxr/libsoxr.mk | 8 +-
package/libssh2/libssh2.mk | 10 +-
package/libstrophe/libstrophe.mk | 2 +-
package/libsvg-cairo/libsvg-cairo.mk | 12 +-
package/libsvg/libsvg.mk | 14 +-
package/libtheora/libtheora.mk | 2 +-
package/libtirpc/libtirpc.mk | 2 +-
package/libtorrent/libtorrent.mk | 2 +-
package/libubox/libubox.mk | 4 +-
package/libuci/libuci.mk | 4 +-
package/libungif/libungif.mk | 8 +-
package/liburcu/liburcu.mk | 4 +-
package/libusb/libusb.mk | 6 +-
package/libv4l/libv4l.mk | 8 +-
package/libva-intel-driver/libva-intel-driver.mk | 8 +-
package/libva/libva.mk | 18 +-
package/libvncserver/libvncserver.mk | 16 +-
package/libvorbis/libvorbis.mk | 2 +-
package/libvpx/libvpx.mk | 4 +-
package/libwebsockets/libwebsockets.mk | 4 +-
package/libxml2/libxml2.mk | 12 +-
package/libxmlrpc/libxmlrpc.mk | 2 +-
package/libxslt/libxslt.mk | 6 +-
package/lighttpd/lighttpd.mk | 26 +-
package/linknx/linknx.mk | 10 +-
package/links/links.mk | 10 +-
package/linphone/linphone.mk | 6 +-
package/linux-firmware/linux-firmware.mk | 62 +-
package/linux-fusion/linux-fusion.mk | 2 +-
package/linux-pam/linux-pam.mk | 4 +-
package/linux-zigbee/linux-zigbee.mk | 8 +-
package/lite/lite.mk | 2 +-
package/ljlinenoise/ljlinenoise.mk | 2 +-
package/lm-sensors/lm-sensors.mk | 12 +-
package/lmbench/lmbench.mk | 2 +-
package/localedef/localedef.mk | 6 +-
package/log4cxx/log4cxx.mk | 2 +-
package/lpty/lpty.mk | 2 +-
package/lrandom/lrandom.mk | 2 +-
package/lrzsz/lrzsz.mk | 2 +-
package/lshw/lshw.mk | 6 +-
package/lsqlite3/lsqlite3.mk | 2 +-
package/ltp-testsuite/ltp-testsuite.mk | 4 +-
package/ltrace/ltrace.mk | 6 +-
package/ltris/ltris.mk | 4 +-
package/lttng-babeltrace/lttng-babeltrace.mk | 4 +-
package/lttng-libust/lttng-libust.mk | 6 +-
package/lttng-modules/lttng-modules.mk | 4 +-
package/lttng-tools/lttng-tools.mk | 10 +-
package/lua-coat/lua-coat.mk | 2 +-
package/lua-coatpersistent/lua-coatpersistent.mk | 2 +-
package/lua-csnappy/lua-csnappy.mk | 2 +-
package/lua-ev/lua-ev.mk | 2 +-
package/lua-messagepack/lua-messagepack.mk | 2 +-
package/lua-testmore/lua-testmore.mk | 2 +-
package/luabitop/luabitop.mk | 2 +-
package/luajit/luajit.mk | 4 +-
package/luajson/luajson.mk | 2 +-
package/lualogging/lualogging.mk | 2 +-
package/luaposix/luaposix.mk | 2 +-
package/luarocks/luarocks.mk | 8 +-
package/luasec/luasec.mk | 2 +-
package/luasocket/luasocket.mk | 2 +-
package/luasql-sqlite3/luasql-sqlite3.mk | 2 +-
package/lunit/lunit.mk | 2 +-
package/lvm2/lvm2.mk | 14 +-
package/lxc/lxc.mk | 2 +-
package/lzlib/lzlib.mk | 2 +-
package/lzma/lzma.mk | 2 +-
package/m4/m4.mk | 2 +-
package/madplay/madplay.mk | 2 +-
package/matchbox/matchbox-common/matchbox-common.mk | 2 +-
package/matchbox/matchbox-desktop/matchbox-desktop.mk | 6 +-
package/matchbox/matchbox-fakekey/matchbox-fakekey.mk | 2 +-
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +-
package/matchbox/matchbox-lib/matchbox-lib.mk | 18 +-
package/matchbox/matchbox-panel/matchbox-panel.mk | 6 +-
package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk | 2 +-
package/matchbox/matchbox-wm/matchbox-wm.mk | 8 +-
package/mcrypt/mcrypt.mk | 2 +-
package/mdadm/mdadm.mk | 4 +-
package/media-ctl/media-ctl.mk | 2 +-
package/mediastreamer/mediastreamer.mk | 42 +-
package/memcached/memcached.mk | 2 +-
package/mesa3d/mesa3d.mk | 42 +-
package/metacity/metacity.mk | 2 +-
package/midori/midori.mk | 6 +-
package/mii-diag/mii-diag.mk | 10 +-
package/minidlna/minidlna.mk | 2 +-
package/mmc-utils/mmc-utils.mk | 2 +-
package/modem-manager/modem-manager.mk | 8 +-
package/monit/monit.mk | 10 +-
package/mpd/mpd.mk | 90 +-
package/mpdecimal/mpdecimal.mk | 2 +-
package/mpfr/mpfr.mk | 2 +-
package/mpg123/mpg123.mk | 14 +-
package/mplayer/mplayer.mk | 10 +-
package/msmtp/msmtp.mk | 8 +-
package/mtd/mtd.mk | 76 +-
package/mtools/mtools.mk | 2 +-
package/mtr/mtr.mk | 2 +-
package/musepack/musepack.mk | 2 +-
package/mutt/mutt.mk | 18 +-
package/mxml/mxml.mk | 4 +-
package/mysql/mysql.mk | 12 +-
package/nano/nano.mk | 4 +-
package/nbd/nbd.mk | 2 +-
package/ncurses/ncurses.mk | 8 +-
package/ndisc6/ndisc6.mk | 2 +-
package/ne10/ne10.mk | 4 +-
package/neard/neard.mk | 4 +-
package/neon/neon.mk | 20 +-
package/netatalk/netatalk.mk | 12 +-
package/netperf/netperf.mk | 2 +-
package/netsnmp/netsnmp.mk | 20 +-
package/nettle/nettle.mk | 8 +-
package/network-manager/network-manager.mk | 20 +-
package/newt/newt.mk | 2 +-
package/nfs-utils/nfs-utils.mk | 6 +-
package/ngrep/ngrep.mk | 2 +-
package/nmap/nmap.mk | 8 +-
package/nss-mdns/nss-mdns.mk | 2 +-
package/ntfs-3g/ntfs-3g.mk | 8 +-
package/ntp/ntp.mk | 10 +-
package/nut/nut.mk | 34 +-
package/ofono/ofono.mk | 10 +-
package/ola/ola.mk | 74 +-
package/omniorb/omniorb.mk | 8 +-
package/on2-8170-modules/on2-8170-modules.mk | 2 +-
package/open2300/open2300.mk | 6 +-
package/opencv/opencv.mk | 188 ++--
package/openntpd/openntpd.mk | 2 +-
package/openobex/openobex.mk | 10 +-
package/openocd/openocd.mk | 16 +-
package/openpowerlink/openpowerlink.mk | 38 +-
package/openssh/openssh.mk | 6 +-
package/openswan/openswan.mk | 12 +-
package/openvmtools/openvmtools.mk | 16 +-
package/openvpn/openvpn.mk | 10 +-
package/opkg/opkg.mk | 6 +-
package/oprofile/oprofile.mk | 2 +-
package/opus-tools/opus-tools.mk | 8 +-
package/opus/opus.mk | 4 +-
package/orbit/orbit.mk | 2 +-
package/ortp/ortp.mk | 2 +-
package/p11-kit/p11-kit.mk | 2 +-
package/pango/pango.mk | 6 +-
package/parted/parted.mk | 12 +-
package/pcmanfm/pcmanfm.mk | 2 +-
package/pcre/pcre.mk | 12 +-
package/pcsc-lite/pcsc-lite.mk | 10 +-
package/perl-gd/perl-gd.mk | 2 +-
package/perl-xml-libxml/perl-xml-libxml.mk | 2 +-
package/perl-xml-parser/perl-xml-parser.mk | 2 +-
package/perl/perl.mk | 16 +-
package/php-geoip/php-geoip.mk | 2 +-
package/php-gnupg/php-gnupg.mk | 2 +-
package/php-imagick/php-imagick.mk | 2 +-
package/php-memcached/php-memcached.mk | 2 +-
package/php-ssh2/php-ssh2.mk | 2 +-
package/php-yaml/php-yaml.mk | 2 +-
package/php-zmq/php-zmq.mk | 2 +-
package/php/php.mk | 68 +-
package/picocom/picocom.mk | 2 +-
package/pinentry/pinentry.mk | 24 +-
package/pixman/pixman.mk | 4 +-
package/pkg-autotools.mk | 32 +-
package/pkg-cmake.mk | 30 +-
package/pkg-generic.mk | 87 +-
package/pkg-kconfig.mk | 6 +-
package/pkg-luarocks.mk | 14 +-
package/pkg-perl.mk | 26 +-
package/pkg-python.mk | 70 +-
package/pkg-utils.mk | 22 +-
package/poco/poco.mk | 44 +-
package/polarssl/polarssl.mk | 2 +-
package/polkit/polkit.mk | 2 +-
package/poppler/poppler.mk | 30 +-
package/popt/popt.mk | 2 +-
package/portaudio/portaudio.mk | 2 +-
package/postgresql/postgresql.mk | 12 +-
package/powerpc-utils/powerpc-utils.mk | 2 +-
package/pppd/pppd.mk | 8 +-
package/prboom/prboom.mk | 2 +-
package/procps-ng/procps-ng.mk | 4 +-
package/proftpd/proftpd.mk | 4 +-
package/protobuf-c/protobuf-c.mk | 2 +-
package/protobuf/protobuf.mk | 2 +-
package/psmisc/psmisc.mk | 2 +-
package/ptpd2/ptpd2.mk | 4 +-
package/pulseaudio/pulseaudio.mk | 18 +-
package/pv/pv.mk | 2 +-
package/python-dialog/python-dialog.mk | 4 +-
package/python-ipy/python-ipy.mk | 2 +-
package/python-netifaces/python-netifaces.mk | 4 +-
package/python-numpy/python-numpy.mk | 2 +-
package/python-protobuf/python-protobuf.mk | 4 +-
package/python-pyparsing/python-pyparsing.mk | 12 +-
package/python-pyro/python-pyro.mk | 4 +-
package/python-serial/python-serial.mk | 4 +-
package/python-setuptools/python-setuptools.mk | 4 +-
package/python/python.mk | 86 +-
package/python3/python3.mk | 66 +-
package/qemu/qemu.mk | 16 +-
package/qextserialport/qextserialport.mk | 4 +-
package/qjson/qjson.mk | 2 +-
package/qt/qt.mk | 76 +-
package/qt5/qt5base/qt5base.mk | 50 +-
package/quagga/quagga.mk | 28 +-
package/quota/quota.mk | 4 +-
package/qwt/qwt.mk | 2 +-
package/rdesktop/rdesktop.mk | 4 +-
package/rings/rings.mk | 2 +-
package/rp-pppoe/rp-pppoe.mk | 4 +-
package/rpcbind/rpcbind.mk | 6 +-
package/rpi-userland/rpi-userland.mk | 2 +-
package/rpm/rpm.mk | 16 +-
package/rrdtool/rrdtool.mk | 2 +-
package/rsync/rsync.mk | 4 +-
package/rsyslog/rsyslog.mk | 6 +-
package/rt-tests/rt-tests.mk | 12 +-
package/rtai/rtai.mk | 12 +-
package/rubix/rubix.mk | 4 +-
package/ruby/ruby.mk | 8 +-
package/sam-ba/sam-ba.mk | 4 +-
package/samba/samba.mk | 18 +-
package/samba4/samba4.mk | 32 +-
package/sane-backends/sane-backends.mk | 8 +-
package/schifra/schifra.mk | 4 +-
package/sconeserver/sconeserver.mk | 56 +-
package/scons/scons.mk | 2 +-
package/screen/screen.mk | 2 +-
package/sdl/sdl.mk | 22 +-
package/sdl_gfx/sdl_gfx.mk | 6 +-
package/sdl_image/sdl_image.mk | 4 +-
package/sdl_mixer/sdl_mixer.mk | 10 +-
package/sdl_net/sdl_net.mk | 2 +-
package/sdl_sound/sdl_sound.mk | 6 +-
package/sdl_ttf/sdl_ttf.mk | 4 +-
package/sed/sed.mk | 2 +-
package/setserial/setserial.mk | 2 +-
package/sg3_utils/sg3_utils.mk | 2 +-
package/shared-mime-info/shared-mime-info.mk | 4 +-
package/sispmctl/sispmctl.mk | 2 +-
package/slang/slang.mk | 16 +-
package/slirp/slirp.mk | 8 +-
package/smcroute/smcroute.mk | 2 +-
package/snmppp/snmppp.mk | 6 +-
package/socat/socat.mk | 4 +-
package/socketcand/socketcand.mk | 2 +-
package/sox/sox.mk | 30 +-
package/spawn-fcgi/spawn-fcgi.mk | 2 +-
package/speex/speex.mk | 8 +-
package/spice-protocol/spice-protocol.mk | 10 +-
package/spice/spice.mk | 50 +-
package/sqlcipher/sqlcipher.mk | 6 +-
package/sqlite/sqlite.mk | 12 +-
package/squashfs/squashfs.mk | 16 +-
package/squid/squid.mk | 6 +-
package/startup-notification/startup-notification.mk | 2 +-
package/stress/stress.mk | 2 +-
package/strongswan/strongswan.mk | 86 +-
package/stunnel/stunnel.mk | 2 +-
package/subversion/subversion.mk | 2 +-
package/sudo/sudo.mk | 2 +-
package/swig/swig.mk | 2 +-
package/sylpheed/sylpheed.mk | 6 +-
package/synergy/synergy.mk | 2 +-
package/sysstat/sysstat.mk | 6 +-
package/systemd/systemd.mk | 48 +-
package/sysvinit/sysvinit.mk | 6 +-
package/taglib/taglib.mk | 4 +-
package/tcl/tcl.mk | 4 +-
package/tcllib/tcllib.mk | 12 +-
package/tcpdump/tcpdump.mk | 2 +-
package/tcpreplay/tcpreplay.mk | 2 +-
package/tftpd/tftpd.mk | 10 +-
package/thrift/thrift.mk | 12 +-
package/tiff/tiff.mk | 26 +-
package/tn5250/tn5250.mk | 6 +-
package/torsmo/torsmo.mk | 2 +-
package/transmission/transmission.mk | 22 +-
package/tslib/tslib.mk | 2 +-
package/tstools/tstools.mk | 4 +-
package/tvheadend/tvheadend.mk | 22 +-
package/tz/tz.mk | 18 +-
package/tzdata/tzdata.mk | 18 +-
package/uboot-tools/uboot-tools.mk | 30 +-
package/uclibc/uclibc.mk | 2 +-
package/udisks/udisks.mk | 24 +-
package/ulogd/ulogd.mk | 8 +-
package/urg/urg.mk | 4 +-
package/usbmount/usbmount.mk | 4 +-
package/usbredir/usbredir.mk | 16 +-
package/usbutils/usbutils.mk | 2 +-
package/util-linux/util-linux.mk | 18 +-
package/valgrind/valgrind.mk | 8 +-
package/vde2/vde2.mk | 24 +-
package/vim/vim.mk | 2 +-
package/vlc/vlc.mk | 140 +-
package/vo-aacenc/vo-aacenc.mk | 8 +-
package/vorbis-tools/vorbis-tools.mk | 2 +-
package/vpnc/vpnc.mk | 10 +-
package/vtun/vtun.mk | 2 +-
package/wayland/wayland.mk | 2 +-
package/webkit/webkit.mk | 18 +-
package/webp/webp.mk | 2 +-
package/webrtc-audio-processing/webrtc-audio-processing.mk | 2 +-
package/weston/weston.mk | 16 +-
package/wget/wget.mk | 6 +-
package/whois/whois.mk | 6 +-
package/wireshark/wireshark.mk | 2 +-
package/wpa_supplicant/wpa_supplicant.mk | 10 +-
package/wvstreams/wvstreams.mk | 16 +-
package/x11r7/libxcb/libxcb.mk | 4 +-
package/x11r7/xapp_xcalc/xapp_xcalc.mk | 2 +-
package/x11r7/xapp_xdm/xapp_xdm.mk | 2 +-
package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk | 8 +-
package/x11r7/xapp_xrandr/xapp_xrandr.mk | 2 +-
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 14 +-
package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk | 4 +-
package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 4 +-
package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk | 4 +-
package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk | 4 +-
package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk | 4 +-
package/x11r7/xfont_font-alias/xfont_font-alias.mk | 4 +-
package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 4 +-
package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk | 4 +-
package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk | 4 +-
package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk | 4 +-
package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk | 4 +-
package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk | 4 +-
package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk | 4 +-
package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk | 4 +-
package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk | 4 +-
package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk | 4 +-
package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk | 4 +-
package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 4 +-
package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 4 +-
package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk | 4 +-
package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk | 4 +-
package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk | 4 +-
package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk | 4 +-
package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk | 4 +-
package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk | 4 +-
package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk | 4 +-
package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk | 4 +-
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 4 +-
package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk | 4 +-
package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk | 4 +-
package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk | 4 +-
package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk | 4 +-
package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk | 4 +-
package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk | 4 +-
package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk | 4 +-
package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +-
package/x11r7/xlib_libFS/xlib_libFS.mk | 2 +-
package/x11r7/xlib_libSM/xlib_libSM.mk | 2 +-
package/x11r7/xlib_libX11/xlib_libX11.mk | 4 +-
package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 2 +-
package/x11r7/xlib_libXaw/xlib_libXaw.mk | 2 +-
package/x11r7/xlib_libXext/xlib_libXext.mk | 2 +-
package/x11r7/xlib_libXfont/xlib_libXfont.mk | 4 +-
package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +-
package/x11r7/xlib_libXinerama/xlib_libXinerama.mk | 2 +-
package/x11r7/xlib_libXrandr/xlib_libXrandr.mk | 2 +-
package/x11r7/xlib_libXrender/xlib_libXrender.mk | 2 +-
package/x11r7/xlib_libXres/xlib_libXres.mk | 2 +-
package/x11r7/xlib_libXt/xlib_libXt.mk | 2 +-
package/x11r7/xlib_libXv/xlib_libXv.mk | 2 +-
package/x11r7/xlib_libXvMC/xlib_libXvMC.mk | 2 +-
package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk | 2 +-
package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 2 +-
package/x11r7/xlib_libdmx/xlib_libdmx.mk | 2 +-
package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk | 4 +-
package/x11r7/xproto_xextproto/xproto_xextproto.mk | 4 +-
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 156 +-
package/x11vnc/x11vnc.mk | 20 +-
package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 6 +-
package/xbmc/xbmc.mk | 72 +-
package/xenomai/xenomai.mk | 6 +-
package/xerces/xerces.mk | 6 +-
package/xfsprogs/xfsprogs.mk | 4 +-
package/xinetd/xinetd.mk | 8 +-
package/xmlstarlet/xmlstarlet.mk | 6 +-
package/xscreensaver/xscreensaver.mk | 4 +-
package/xterm/xterm.mk | 2 +-
package/zeromq/zeromq.mk | 4 +-
package/zmqpp/zmqpp.mk | 8 +-
package/znc/znc.mk | 18 +-
package/zxing/zxing.mk | 4 +-
toolchain/toolchain-external/toolchain-external.mk | 6 +-
672 files changed, 4175 insertions(+), 4148 deletions(-)
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 01 of 15] packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:04 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 02 of 15] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS Thomas De Schampheleire
` (15 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
While the autotools infrastructure was using FOO_MAKE_OPT, generic packages
were typically using FOO_MAKE_OPTS. This inconsistency becomes a problem
when a new infrastructure is introduced that wants to make use of
FOO_MAKE_OPT(S), and can live alongside either generic-package or
autotools-package. The new infrastructure will have to choose between either
OPT or OPTS, and thus rule out transparent usage by respectively generic
packages or generic packages. An example of such an infrastructure is
kconfig-package, which provides kconfig-related make targets.
The OPTS variant is more logical, as there are typically multiple options.
This patch renames all occurrences of FOO_MAKE_OPT in FOO_MAKE_OPTS.
Sed command used:
find * -type f | xargs sed -i 's#_MAKE_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
boot/at91bootstrap3/at91bootstrap3.mk | 4 ++--
docs/manual/adding-packages-autotools.txt | 2 +-
docs/manual/adding-packages-cmake.txt | 2 +-
docs/manual/adding-packages-kconfig.txt | 2 +-
package/avahi/avahi.mk | 2 +-
package/dnsmasq/dnsmasq.mk | 12 ++++++------
package/e2fsprogs/e2fsprogs.mk | 2 +-
package/faifa/faifa.mk | 2 +-
package/freetype/freetype.mk | 2 +-
package/gcc/gcc-initial/gcc-initial.mk | 2 +-
package/httping/httping.mk | 6 +++---
package/ipsec-tools/ipsec-tools.mk | 2 +-
package/iputils/iputils.mk | 6 +++---
package/iw/iw.mk | 6 +++---
package/libdnet/libdnet.mk | 6 +++---
package/libjson/libjson.mk | 12 ++++++------
package/libseccomp/libseccomp.mk | 2 +-
package/linux-pam/linux-pam.mk | 2 +-
package/lm-sensors/lm-sensors.mk | 12 ++++++------
package/lshw/lshw.mk | 6 +++---
package/lvm2/lvm2.mk | 2 +-
package/mdadm/mdadm.mk | 2 +-
package/mii-diag/mii-diag.mk | 4 ++--
package/mpfr/mpfr.mk | 2 +-
package/openswan/openswan.mk | 12 ++++++------
package/openvmtools/openvmtools.mk | 2 +-
package/pkg-autotools.mk | 6 +++---
package/pkg-cmake.mk | 12 ++++++------
package/pppd/pppd.mk | 8 ++++----
package/pv/pv.mk | 2 +-
package/quota/quota.mk | 2 +-
package/rp-pppoe/rp-pppoe.mk | 2 +-
package/rubix/rubix.mk | 2 +-
package/schifra/schifra.mk | 4 ++--
package/sdl_ttf/sdl_ttf.mk | 2 +-
package/setserial/setserial.mk | 2 +-
package/speex/speex.mk | 2 +-
package/sysstat/sysstat.mk | 2 +-
package/systemd/systemd.mk | 4 ++--
package/tn5250/tn5250.mk | 2 +-
package/util-linux/util-linux.mk | 2 +-
package/whois/whois.mk | 6 +++---
package/xinetd/xinetd.mk | 2 +-
package/zmqpp/zmqpp.mk | 8 ++++----
package/zxing/zxing.mk | 4 ++--
45 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk
--- a/boot/at91bootstrap3/at91bootstrap3.mk
+++ b/boot/at91bootstrap3/at91bootstrap3.mk
@@ -17,7 +17,7 @@
AT91BOOTSTRAP3_CUSTOM_PATCH_DIR = \
$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR))
-AT91BOOTSTRAP3_MAKE_OPT = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR)
+AT91BOOTSTRAP3_MAKE_OPTS = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR)
ifneq ($(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR),)
define AT91BOOTSTRAP3_APPLY_CUSTOM_PATCHES
@@ -41,7 +41,7 @@
endef
define AT91BOOTSTRAP3_BUILD_CMDS
- $(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) boot
+ $(MAKE) $(AT91BOOTSTRAP3_MAKE_OPTS) -C $(@D) boot
endef
define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -111,7 +111,7 @@
variables to pass to make in the build step. These are passed before
the +make+ command. By default, empty.
-* +LIBFOO_MAKE_OPT+, to specify additional variables to
+* +LIBFOO_MAKE_OPTS+, to specify additional variables to
pass to make in the build step. These are passed after the
+make+ command. By default, empty.
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -108,7 +108,7 @@
pass to make in the build step. These are passed before the +make+
command. By default, empty.
-* +LIBFOO_MAKE_OPT+, to specify additional variables to pass to make
+* +LIBFOO_MAKE_OPTS+, to specify additional variables to pass to make
in the build step. These are passed after the +make+ command. By
default, empty.
diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
--- a/docs/manual/adding-packages-kconfig.txt
+++ b/docs/manual/adding-packages-kconfig.txt
@@ -47,7 +47,7 @@
support, for example 'menuconfig xconfig'. By default, 'menuconfig'.
* +FOO_KCONFIG_OPT+: extra options to pass when calling the kconfig
- ediftors. This may need to include '$(FOO_MAKE_OPT)', for example. By
+ editors. This may need to include '$(FOO_MAKE_OPTS)', for example. By
default, empty.
* +FOO_KCONFIG_FIXUP_CMDS+: a list of shell commands needed to fixup the
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -138,7 +138,7 @@
AVAHI_CONF_OPT += --disable-python
endif
-AVAHI_MAKE_OPT += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
+AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
define AVAHI_USERS
avahi -1 avahi -1 * - - -
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -8,8 +8,8 @@
DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
-DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
-DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
+DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
+DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
DNSMASQ_DEPENDENCIES = host-pkgconf
DNSMASQ_LICENSE = Dual GPLv2/GPLv3
DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
@@ -37,7 +37,7 @@
# NLS requires IDN so only enable it (i18n) when IDN is true
ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext
- DNSMASQ_MAKE_OPT += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
+ DNSMASQ_MAKE_OPTS += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
DNSMASQ_COPTS += -DHAVE_IDN
DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)
endif
@@ -58,7 +58,7 @@
# liblua uses dlopen when dynamically linked
ifneq ($(BR2_PREFER_STATIC_LIB),y)
- DNSMASQ_MAKE_OPT += LIBS+="-ldl"
+ DNSMASQ_MAKE_OPTS += LIBS+="-ldl"
endif
define DNSMASQ_ENABLE_LUA
@@ -98,11 +98,11 @@
$(DNSMASQ_ENABLE_DBUS)
$(DNSMASQ_ENABLE_LUA)
$(DNSMASQ_ENABLE_CONNTRACK)
- $(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPT) all$(DNSMASQ_I18N)
+ $(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N)
endef
define DNSMASQ_INSTALL_TARGET_CMDS
- $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install$(DNSMASQ_I18N)
+ $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) install$(DNSMASQ_I18N)
mkdir -p $(TARGET_DIR)/var/lib/misc/
endef
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -31,7 +31,7 @@
E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
-E2FSPROGS_MAKE_OPT = \
+E2FSPROGS_MAKE_OPTS = \
LDCONFIG=true
define HOST_E2FSPROGS_INSTALL_CMDS
diff --git a/package/faifa/faifa.mk b/package/faifa/faifa.mk
--- a/package/faifa/faifa.mk
+++ b/package/faifa/faifa.mk
@@ -11,7 +11,7 @@
FAIFA_LICENSE = BSD-3c
FAIFA_LICENSE_FILES = COPYING
-FAIFA_MAKE_OPT += GIT_REV=$(FAIFA_VERSION)
+FAIFA_MAKE_OPTS += GIT_REV=$(FAIFA_VERSION)
# This package uses autoconf, but not automake, so we need to call
# their special autogen.sh script, and have custom target and staging
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -8,7 +8,7 @@
FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
FREETYPE_INSTALL_STAGING = YES
-FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
+FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)"
FREETYPE_LICENSE = Dual FTL/GPLv2+
FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT
FREETYPE_DEPENDENCIES = host-pkgconf
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -53,7 +53,7 @@
# We need to tell gcc that the C library will be providing the ssp
# support, as it can't guess it since the C library hasn't been built
# yet (we're gcc-initial).
-HOST_GCC_INITIAL_MAKE_OPT = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
+HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
$(eval $(host-autotools-package))
diff --git a/package/httping/httping.mk b/package/httping/httping.mk
--- a/package/httping/httping.mk
+++ b/package/httping/httping.mk
@@ -18,19 +18,19 @@
$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \
$(if $(BR2_PACKAGE_OPENSSL),openssl) \
$(if $(BR2_PACKAGE_FFTW),fftw)
-HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \
+HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \
NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \
SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no)
define HTTPING_BUILD_CMDS
- $(HTTPING_MAKE_OPT) LDFLAGS="$(HTTPING_LDFLAGS)" \
+ $(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \
$(MAKE) DEBUG=no -C $(@D)
endef
define HTTPING_INSTALL_TARGET_CMDS
- $(HTTPING_MAKE_OPT) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
+ $(HTTPING_MAKE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
endef
$(eval $(generic-package))
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -13,7 +13,7 @@
IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
# configure hardcodes -Werror, so override CFLAGS on make invocation
-IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
+IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)'
# openssl uses zlib, so we need to explicitly link with it when static
ifeq ($(BR2_PREFER_STATIC_LIB),y)
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -18,7 +18,7 @@
endif
# Disabling CAP_SETPCAP (file capabilities)
-IPUTILS_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
+IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
arping clockdiff ping rarpd rdisc tftpd tracepath
@@ -26,7 +26,7 @@
# To support md5 for ping6
IPUTILS_DEPENDENCIES += openssl
-IPUTILS_MAKE_OPT += ping6 tracepath6 traceroute6
+IPUTILS_MAKE_OPTS += ping6 tracepath6 traceroute6
define IPUTILS_IPV6_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 755 $(@D)/ping6 $(TARGET_DIR)/bin/ping6
@@ -36,7 +36,7 @@
endif
define IPUTILS_BUILD_CMDS
- $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPT)
+ $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
endef
define IPUTILS_INSTALL_TARGET_CMDS
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -10,18 +10,18 @@
IW_LICENSE = iw license
IW_LICENSE_FILES = COPYING
IW_DEPENDENCIES = host-pkgconf libnl
-IW_MAKE_OPT = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
+IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
GIT_DIR=$(IW_DIR)
ifeq ($(BR2_PREFER_STATIC_LIB),y)
# libnl needs pthread/m, so we need to explicitly with them when static
# these need to added AFTER libnl, so we have to override LIBS completely
-IW_MAKE_OPT += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
+IW_MAKE_OPTS += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
endif
define IW_BUILD_CMDS
- $(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPT) -C $(@D)
+ $(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPTS) -C $(@D)
endef
define IW_INSTALL_TARGET_CMDS
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -17,9 +17,9 @@
ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
LIBDNET_DEPENDENCIES = python
LIBDNET_CONF_OPT += --with-python
-LIBDNET_MAKE_OPT = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
-LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
-LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
+LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
+LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
+LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
endif
# Needed for autoreconf to work properly
diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk
--- a/package/libjson/libjson.mk
+++ b/package/libjson/libjson.mk
@@ -14,13 +14,13 @@
LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LIBJSON_MAKE_OPT += SHARED=0
+LIBJSON_MAKE_OPTS += SHARED=0
else
-LIBJSON_MAKE_OPT += SHARED=1
+LIBJSON_MAKE_OPTS += SHARED=1
LIBJSON_CXXFLAGS += -fPIC
endif
-LIBJSON_MAKE_OPT += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
+LIBJSON_MAKE_OPTS += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
define LIBJSON_EXTRACT_CMDS
unzip -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)
@@ -33,17 +33,17 @@
mkdir -p $(@D)/Objects_$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
$(@D)/_internal/Source/Dependencies
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
- $(LIBJSON_MAKE_OPT) -C $(@D)
+ $(LIBJSON_MAKE_OPTS) -C $(@D)
endef
define LIBJSON_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
- $(LIBJSON_MAKE_OPT) prefix=$(TARGET_DIR)/usr install -C $(@D)
+ $(LIBJSON_MAKE_OPTS) prefix=$(TARGET_DIR)/usr install -C $(@D)
endef
define LIBJSON_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
- $(LIBJSON_MAKE_OPT) prefix=$(STAGING_DIR)/usr install -C $(@D)
+ $(LIBJSON_MAKE_OPTS) prefix=$(STAGING_DIR)/usr install -C $(@D)
endef
$(eval $(generic-package))
diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
--- a/package/libseccomp/libseccomp.mk
+++ b/package/libseccomp/libseccomp.mk
@@ -13,7 +13,7 @@
# Needed for configure to find our system headers:
LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
-LIBSECCOMP_MAKE_OPT = SUBDIRS_BUILD=src
+LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
LIBSECCOMP_INSTALL_TARGET_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -23,7 +23,7 @@
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
LINUX_PAM_DEPENDENCIES += gettext
- LINUX_PAM_MAKE_OPT += LIBS=-lintl
+ LINUX_PAM_MAKE_OPTS += LIBS=-lintl
endif
# Install default pam config (deny everything)
diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -20,28 +20,28 @@
LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
-LM_SENSORS_MAKE_OPT = \
+LM_SENSORS_MAKE_OPTS = \
BUILD_STATIC_LIB=1 \
MACHINE=$(KERNEL_ARCH) \
PREFIX=/usr
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LM_SENSORS_MAKE_OPT += BUILD_SHARED_LIB=0
+LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0
else
-LM_SENSORS_MAKE_OPT += BUILD_SHARED_LIB=1
+LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=1
endif
define LM_SENSORS_BUILD_CMDS
- $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPT) -C $(@D)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPTS) -C $(@D)
endef
define LM_SENSORS_INSTALL_STAGING_CMDS
- $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
+ $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
rm -f $(addprefix $(STAGING_DIR)/usr/,$(LM_SENSORS_BINS_) $(LM_SENSORS_BINS_y))
endef
define LM_SENSORS_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
+ $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
rm -f $(addprefix $(TARGET_DIR)/usr/,$(LM_SENSORS_BINS_))
endef
diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -14,18 +14,18 @@
LSHW_CFLAGS += -DNONLS
endif
-LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
+LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all
LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
define LSHW_BUILD_CMDS
- $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT)
+ $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS)
endef
define LSHW_INSTALL_TARGET_CMDS
$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \
- $(LSHW_MAKE_OPT) install
+ $(LSHW_MAKE_OPTS) install
endef
$(eval $(generic-package))
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -32,7 +32,7 @@
endif
ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
-LVM2_MAKE_OPT = device-mapper
+LVM2_MAKE_OPTS = device-mapper
LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper
endif
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -10,7 +10,7 @@
MDADM_LICENSE = GPLv2+
MDADM_LICENSE_FILES = COPYING
-MDADM_MAKE_OPT = \
+MDADM_MAKE_OPTS = \
CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
MDADM_INSTALL_TARGET_OPT = \
diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -11,7 +11,7 @@
MII_DIAG_LICENSE = GPL # No version specified
MII_DIAG_LICENSE_FILES = mii-diag.c
-MII_DIAG_MAKE_OPT = $(TARGET_CONFIGURE_OPTS)
+MII_DIAG_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS)
define MII_DIAG_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \
@@ -22,7 +22,7 @@
MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES
define MII_DIAG_BUILD_CMDS
- $(MAKE) $(MII_DIAG_MAKE_OPT) -C $(@D) mii-diag
+ $(MAKE) $(MII_DIAG_MAKE_OPTS) -C $(@D) mii-diag
endef
define MII_DIAG_INSTALL_TARGET_CMDS
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -11,7 +11,7 @@
MPFR_LICENSE_FILES = COPYING.LESSER
MPFR_INSTALL_STAGING = YES
MPFR_DEPENDENCIES = gmp
-MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)
+MPFR_MAKE_OPTS = RANLIB=$(TARGET_RANLIB)
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -10,31 +10,31 @@
OPENSWAN_LICENSE_FILES = COPYING LICENSE
OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2
-OPENSWAN_MAKE_OPT = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
+OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
USERCOMPILE="$(TARGET_CFLAGS) -fPIE" INC_USRLOCAL=/usr \
USE_KLIPS=false USE_MAST=false USE_NM=false
ifeq ($(BR2_PACKAGE_LIBCURL),y)
OPENSWAN_DEPENDENCIES += libcurl
- OPENSWAN_MAKE_OPT += USE_LIBCURL=true
+ OPENSWAN_MAKE_OPTS += USE_LIBCURL=true
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
OPENSWAN_DEPENDENCIES += openssl
- OPENSWAN_MAKE_OPT += HAVE_OPENSSL=true
+ OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true
ifeq ($(BR2_PACKAGE_OCF_LINUX),y)
- OPENSWAN_MAKE_OPT += HAVE_OCF=true
+ OPENSWAN_MAKE_OPTS += HAVE_OCF=true
endif
endif
define OPENSWAN_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
- $(OPENSWAN_MAKE_OPT) programs
+ $(OPENSWAN_MAKE_OPTS) programs
endef
define OPENSWAN_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
- $(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
+ $(OPENSWAN_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
endef
$(eval $(generic-package))
diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk
--- a/package/openvmtools/openvmtools.mk
+++ b/package/openvmtools/openvmtools.mk
@@ -41,7 +41,7 @@
ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PAM),y)
OPENVMTOOLS_CONF_OPT += --with-pam
-OPENVMTOOLS_MAKE_OPT += CFLAGS+="-Wno-unused-local-typedefs"
+OPENVMTOOLS_MAKE_OPTS += CFLAGS+="-Wno-unused-local-typedefs"
OPENVMTOOLS_DEPENDENCIES += linux-pam
else
OPENVMTOOLS_CONF_OPT += --without-pam
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -106,7 +106,7 @@
$(2)_CONF_ENV ?=
$(2)_CONF_OPT ?=
$(2)_MAKE_ENV ?=
-$(2)_MAKE_OPT ?=
+$(2)_MAKE_OPTS ?=
$(2)_INSTALL_OPT ?= install
$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
@@ -270,11 +270,11 @@
ifndef $(2)_BUILD_CMDS
ifeq ($(4),target)
define $(2)_BUILD_CMDS
- $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+ $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR)
endef
else
define $(2)_BUILD_CMDS
- $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
+ $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR)
endef
endif
endif
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -40,7 +40,7 @@
$(2)_CONF_OPT ?=
$(2)_MAKE ?= $$(MAKE)
$(2)_MAKE_ENV ?=
-$(2)_MAKE_OPT ?=
+$(2)_MAKE_OPTS ?=
$(2)_INSTALL_HOST_OPT ?= install
$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
@@ -109,11 +109,11 @@
ifndef $(2)_BUILD_CMDS
ifeq ($(4),target)
define $(2)_BUILD_CMDS
- $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR)
+ $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR)
endef
else
define $(2)_BUILD_CMDS
- $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR)
+ $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR)
endef
endif
endif
@@ -124,7 +124,7 @@
#
ifndef $(2)_INSTALL_CMDS
define $(2)_INSTALL_CMDS
- $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
+ $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
endef
endif
@@ -134,7 +134,7 @@
#
ifndef $(2)_INSTALL_STAGING_CMDS
define $(2)_INSTALL_STAGING_CMDS
- $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
+ $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
endef
endif
@@ -144,7 +144,7 @@
#
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
- $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
+ $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
endef
endif
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -19,11 +19,11 @@
ifeq ($(BR2_PACKAGE_PPPD_FILTER),y)
PPPD_DEPENDENCIES += libpcap
- PPPD_MAKE_OPT += FILTER=y
+ PPPD_MAKE_OPTS += FILTER=y
endif
ifeq ($(BR2_INET_IPV6),y)
- PPPD_MAKE_OPT += HAVE_INET6=y
+ PPPD_MAKE_OPTS += HAVE_INET6=y
endif
# pppd bundles some but not all of the needed kernel headers. The embedded
@@ -43,7 +43,7 @@
define PPPD_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \
- -C $(@D) $(PPPD_MAKE_OPT)
+ -C $(@D) $(PPPD_MAKE_OPTS)
endef
ifeq ($(BR2_PACKAGE_PPPD_RADIUS),y)
@@ -94,7 +94,7 @@
endef
define PPPD_INSTALL_STAGING_CMDS
- $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPT) install-devel
+ $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel
endef
$(eval $(generic-package))
diff --git a/package/pv/pv.mk b/package/pv/pv.mk
--- a/package/pv/pv.mk
+++ b/package/pv/pv.mk
@@ -23,7 +23,7 @@
# configuration, as the ld default emulation may not necessarily be
# the correct one. By passing the below values for LD and LDFLAGS, we
# ensure that 'gcc' is used to do these partial linking steps.
-PV_MAKE_OPT = \
+PV_MAKE_OPTS = \
LD="$(TARGET_CC)" \
LDFLAGS="-Wl,-r -nostdlib"
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -24,7 +24,7 @@
QUOTA_LDFLAGS += -ltirpc
endif
-QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
+QUOTA_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
QUOTA_CONF_ENV = \
CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -11,7 +11,7 @@
RP_PPPOE_DEPENDENCIES = pppd
RP_PPPOE_SUBDIR = src
RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
-RP_PPPOE_MAKE_OPT = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
+RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
RP_PPPOE_CONF_OPT = --disable-debugging
RP_PPPOE_CONF_ENV = \
rpppoe_cv_pack_bitfields=normal \
diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
--- a/package/rubix/rubix.mk
+++ b/package/rubix/rubix.mk
@@ -11,7 +11,7 @@
RUBIX_LICENSE = Public Domain
RUBIX_LICENSE_FILES = LICENCE
-RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
+RUBIX_MAKE_OPTS = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
RUBIX_DEPENDENCIES = xlib_libX11
diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk
--- a/package/schifra/schifra.mk
+++ b/package/schifra/schifra.mk
@@ -11,13 +11,13 @@
SCHIFRA_LICENSE = schifra license
SCHIFRA_LICENSE_FILES = schifra_license.txt
-SCHIFRA_MAKE_OPT = COMPILER="$(TARGET_CXX)" \
+SCHIFRA_MAKE_OPTS = COMPILER="$(TARGET_CXX)" \
OPTIONS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o"
# The examples are the only buildable artefacts.
ifeq ($(BR2_PACKAGE_SCHIFRA_EXAMPLES),y)
define SCHIFRA_BUILD_CMDS
- $(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPT) all
+ $(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPTS) all
endef
define SCHIFRA_INSTALL_EXAMPLES
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -16,5 +16,5 @@
--with-freetype-prefix=$(STAGING_DIR)/usr \
--with-sdl-prefix=$(STAGING_DIR)/usr
-SDL_TTF_MAKE_OPT = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL" LDFLAGS="-L$(STAGING_DIR)/usr/lib"
+SDL_TTF_MAKE_OPTS = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL" LDFLAGS="-L$(STAGING_DIR)/usr/lib"
$(eval $(autotools-package))
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -11,7 +11,7 @@
SETSERIAL_LICENSE = GPLv2
SETSERIAL_LICENSE_FILES = debian/copyright
# make all also builds setserial.cat which needs nroff
-SETSERIAL_MAKE_OPT = setserial
+SETSERIAL_MAKE_OPTS = setserial
define SETSERIAL_APPLY_DEBIAN_PATCHES
# Touching gorhack.h is needed for the Debian patch 18 to work
diff --git a/package/speex/speex.mk b/package/speex/speex.mk
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -31,7 +31,7 @@
SPEEX_POST_CONFIGURE_HOOKS += SPEEX_LIBTOOL_FIXUP
define SPEEX_BUILD_CMDS
- $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+ $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) -C $(@D)/$($(PKG)_SUBDIR)
endef
$(eval $(autotools-package))
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -14,7 +14,7 @@
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
SYSSTAT_DEPENDENCIES += gettext
-SYSSTAT_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -lintl"
+SYSSTAT_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -lintl"
endif
# The isag tool is a post processing script that depends on tcl/tk
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -138,8 +138,8 @@
endif
# mq_getattr needs -lrt
-SYSTEMD_MAKE_OPT += LIBS=-lrt
-SYSTEMD_MAKE_OPT += LDFLAGS+=-ldl
+SYSTEMD_MAKE_OPTS += LIBS=-lrt
+SYSTEMD_MAKE_OPTS += LDFLAGS+=-ldl
define SYSTEMD_INSTALL_INIT_HOOK
ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -6,7 +6,7 @@
TN5250_VERSION = 0.17.4
TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
-TN5250_MAKE_OPT = CPPFLAGS=""
+TN5250_MAKE_OPTS = CPPFLAGS=""
TN5250_DEPENDENCIES = ncurses
TN5250_LICENSE = LGPLv2.1+
TN5250_LICENSE_FILES = COPYING
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -44,7 +44,7 @@
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
UTIL_LINUX_DEPENDENCIES += gettext
-UTIL_LINUX_MAKE_OPT += LIBS=-lintl
+UTIL_LINUX_MAKE_OPTS += LIBS=-lintl
endif
ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
diff --git a/package/whois/whois.mk b/package/whois/whois.mk
--- a/package/whois/whois.mk
+++ b/package/whois/whois.mk
@@ -10,7 +10,7 @@
# take precedence over busybox implementation
WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox)
WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
-WHOIS_MAKE_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
LIBS="$(WHOIS_EXTRA_LIBS)"
WHOIS_LICENSE = GPLv2+
WHOIS_LICENSE_FILES = COPYING
@@ -32,11 +32,11 @@
endif
define WHOIS_BUILD_CMDS
- $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPT) -C $(@D)
+ $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) -C $(@D)
endef
define WHOIS_INSTALL_TARGET_CMDS
- $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPT) \
+ $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) \
BASEDIR="$(TARGET_DIR)" install -C $(@D)
endef
diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -28,6 +28,6 @@
CFLAGS="$(XINETD_CFLAGS)" \
LIBS="$(XINETD_LIBS)"
-XINETD_MAKE_OPT = AR="$(TARGET_AR)"
+XINETD_MAKE_OPTS = AR="$(TARGET_AR)"
$(eval $(autotools-package))
diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk
--- a/package/zmqpp/zmqpp.mk
+++ b/package/zmqpp/zmqpp.mk
@@ -11,7 +11,7 @@
ZMQPP_LICENSE = LGPLv3+ with exceptions
ZMQPP_LICENSE_FILES = COPYING COPYING.LESSER
-ZMQPP_MAKE_OPT = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
+ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread
ifeq ($(BR2_PACKAGE_ZMQPP_CLIENT),y)
@@ -21,19 +21,19 @@
define ZMQPP_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
LDFLAGS="$(ZMQPP_LDFLAGS)" \
- $(ZMQPP_MAKE_OPT) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
+ $(ZMQPP_MAKE_OPTS) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
endef
define ZMQPP_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/include/zmqpp
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
- $(ZMQPP_MAKE_OPT) DESTDIR=$(TARGET_DIR) install -C $(@D)
+ $(ZMQPP_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -C $(@D)
endef
define ZMQPP_INSTALL_STAGING_CMDS
$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/zmqpp
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
- $(ZMQPP_MAKE_OPT) DESTDIR=$(STAGING_DIR) install -C $(@D)
+ $(ZMQPP_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -C $(@D)
endef
$(eval $(generic-package))
diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
--- a/package/zxing/zxing.mk
+++ b/package/zxing/zxing.mk
@@ -17,7 +17,7 @@
else
# There is no locale support in the toolchain and libiconv
# is not available so disable iconv support in zxing
-ZING_MAKE_OPT=CXXFLAGS+="-DNO_ICONV"
+ZING_MAKE_OPTS=CXXFLAGS+="-DNO_ICONV"
endif
endif
@@ -26,7 +26,7 @@
endef
define ZXING_BUILD_CMDS
- $(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPT)
+ $(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPTS)
endef
define ZXING_INSTALL_STAGING_CMDS
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 02 of 15] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
2014-09-27 19:32 ` [Buildroot] [PATCH 01 of 15] packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:05 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 03 of 15] packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS Thomas De Schampheleire
` (14 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
docs/manual/adding-packages-perl.txt | 2 +-
docs/manual/adding-packages-python.txt | 6 +++---
package/gcc/gcc-initial/gcc-initial.mk | 2 +-
package/pkg-autotools.mk | 4 ++--
package/pkg-python.mk | 12 ++++++------
package/scons/scons.mk | 2 +-
package/util-linux/util-linux.mk | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
--- a/docs/manual/adding-packages-perl.txt
+++ b/docs/manual/adding-packages-perl.txt
@@ -113,6 +113,6 @@
pass to +make pure_install+ or +perl Build install+ in the install step.
By default, empty.
-* +HOST_PERL_FOO_INSTALL_OPT+, to specify additional options to
+* +HOST_PERL_FOO_INSTALL_OPTS+, to specify additional options to
pass to +make pure_install+ or +perl Build install+ in the install step.
By default, empty.
diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
--- a/docs/manual/adding-packages-python.txt
+++ b/docs/manual/adding-packages-python.txt
@@ -128,16 +128,16 @@
passed automatically by the infrastructure.
* +PYTHON_FOO_INSTALL_TARGET_OPT+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
- +HOST_PYTHON_FOO_INSTALL_OPT+ to specify additional options to pass
+ +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
to the Python +setup.py+ script during the target installation step,
the staging installation step or the host installation,
respectively. Note that the infrastructure is automatically passing
some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT+
or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
- packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT+ (for host
+ packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT+ or
+PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
- packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT+ (for host
+ packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
setuptools packages).
* +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -54,6 +54,6 @@
# support, as it can't guess it since the C library hasn't been built
# yet (we're gcc-initial).
HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
-HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
+HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc
$(eval $(host-autotools-package))
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -107,7 +107,7 @@
$(2)_CONF_OPT ?=
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
-$(2)_INSTALL_OPT ?= install
+$(2)_INSTALL_OPTS ?= install
$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
@@ -285,7 +285,7 @@
#
ifndef $(2)_INSTALL_CMDS
define $(2)_INSTALL_CMDS
- $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPT) -C $$($$(PKG)_SRCDIR)
+ $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_SRCDIR)
endef
endif
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -45,7 +45,7 @@
HOST_PKG_PYTHON_DISTUTILS_ENV = \
PATH=$(BR_PATH)
-HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
+HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
--prefix=$(HOST_DIR)/usr
# Target setuptools-based packages
@@ -72,7 +72,7 @@
HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
PATH=$(BR_PATH)
-HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
+HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
--prefix=$(HOST_DIR)/usr
################################################################################
@@ -96,7 +96,7 @@
$(2)_ENV ?=
$(2)_BUILD_OPT ?=
-$(2)_INSTALL_OPT ?=
+$(2)_INSTALL_OPTS ?=
ifndef $(2)_SETUP_TYPE
ifdef $(3)_SETUP_TYPE
@@ -118,7 +118,7 @@
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPT =
-$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT)
+$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
endif
# Setuptools
else ifeq ($$($(2)_SETUP_TYPE),setuptools)
@@ -132,7 +132,7 @@
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPT =
-$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT)
+$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
endif
else
$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'")
@@ -241,7 +241,7 @@
(cd $$($$(PKG)_BUILDDIR)/; \
$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
$$($(2)_PYTHON_INTERPRETER) setup.py install \
- $$($$(PKG)_BASE_INSTALL_OPT) $$($$(PKG)_INSTALL_OPT))
+ $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS))
endef
endif
diff --git a/package/scons/scons.mk b/package/scons/scons.mk
--- a/package/scons/scons.mk
+++ b/package/scons/scons.mk
@@ -12,7 +12,7 @@
HOST_SCONS_NEEDS_HOST_PYTHON = python2
-HOST_SCONS_INSTALL_OPT = \
+HOST_SCONS_INSTALL_OPTS = \
--install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION)
$(eval $(host-python-package))
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -141,4 +141,4 @@
# one, so it disappears
UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
-HOST_UTIL_LINUX_INSTALL_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 03 of 15] packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
2014-09-27 19:32 ` [Buildroot] [PATCH 01 of 15] packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS Thomas De Schampheleire
2014-09-27 19:32 ` [Buildroot] [PATCH 02 of 15] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:06 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 04 of 15] packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS Thomas De Schampheleire
` (13 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_TARGET_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_TARGET_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
boot/grub2/grub2.mk | 2 +-
docs/manual/adding-packages-autotools.txt | 2 +-
docs/manual/adding-packages-cmake.txt | 2 +-
docs/manual/adding-packages-perl.txt | 2 +-
docs/manual/adding-packages-python.txt | 6 ++--
package/acl/acl.mk | 2 +-
package/attr/attr.mk | 2 +-
package/cups/cups.mk | 2 +-
package/dmraid/dmraid.mk | 2 +-
package/expat/expat.mk | 2 +-
package/expect/expect.mk | 2 +-
package/ifplugd/ifplugd.mk | 2 +-
package/libdnet/libdnet.mk | 2 +-
package/libseccomp/libseccomp.mk | 2 +-
package/lvm2/lvm2.mk | 2 +-
package/mdadm/mdadm.mk | 2 +-
package/mxml/mxml.mk | 2 +-
package/netsnmp/netsnmp.mk | 2 +-
package/php/php.mk | 2 +-
package/pkg-autotools.mk | 4 +-
package/pkg-cmake.mk | 4 +-
package/pkg-perl.mk | 8 +++---
package/pkg-python.mk | 12 +++++-----
package/quota/quota.mk | 2 +-
package/rpm/rpm.mk | 2 +-
package/rubix/rubix.mk | 2 +-
package/samba/samba.mk | 2 +-
package/screen/screen.mk | 2 +-
package/sysstat/sysstat.mk | 2 +-
package/util-linux/util-linux.mk | 2 +-
package/webkit/webkit.mk | 2 +-
package/x11r7/xapp_xcalc/xapp_xcalc.mk | 2 +-
package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk | 2 +-
package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 2 +-
package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk | 2 +-
package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk | 2 +-
package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk | 2 +-
package/x11r7/xfont_font-alias/xfont_font-alias.mk | 2 +-
package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 2 +-
package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk | 2 +-
package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk | 2 +-
package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk | 2 +-
package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk | 2 +-
package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk | 2 +-
package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk | 2 +-
package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk | 2 +-
package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk | 2 +-
package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk | 2 +-
package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk | 2 +-
package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 2 +-
package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 2 +-
package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk | 2 +-
package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk | 2 +-
package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk | 2 +-
package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk | 2 +-
package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk | 2 +-
package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk | 2 +-
package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk | 2 +-
package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk | 2 +-
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 2 +-
package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk | 2 +-
package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk | 2 +-
package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk | 2 +-
package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk | 2 +-
package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk | 2 +-
package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk | 2 +-
package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk | 2 +-
package/xenomai/xenomai.mk | 2 +-
package/xfsprogs/xfsprogs.mk | 2 +-
package/xscreensaver/xscreensaver.mk | 2 +-
package/xterm/xterm.mk | 2 +-
71 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -65,7 +65,7 @@
# directory, and the image generation process (below) will use the
# grub-mkimage tool and Grub2 modules from the host directory.
-GRUB2_INSTALL_TARGET_OPT = DESTDIR=$(HOST_DIR) install
+GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install
define GRUB2_IMAGE_INSTALLATION
mkdir -p $(dir $(GRUB2_IMAGE))
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -153,7 +153,7 @@
correct for most autotools packages. It is still possible to override
it.
-* +LIBFOO_INSTALL_TARGET_OPT+ contains the make options
+* +LIBFOO_INSTALL_TARGET_OPTS+ contains the make options
used to install the package to the target directory. By default, the
value is +DESTDIR=$(TARGET_DIR) install+. The default
value is correct for most autotools packages, but it is still possible
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -117,7 +117,7 @@
is +DESTDIR=$(STAGING_DIR) install+, which is correct for most
CMake packages. It is still possible to override it.
-* +LIBFOO_INSTALL_TARGET_OPT+ contains the make options used to
+* +LIBFOO_INSTALL_TARGET_OPTS+ contains the make options used to
install the package to the target directory. By default, the value
is +DESTDIR=$(TARGET_DIR) install+. The default value is correct
for most CMake packages, but it is still possible to override it if
diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
--- a/docs/manual/adding-packages-perl.txt
+++ b/docs/manual/adding-packages-perl.txt
@@ -109,7 +109,7 @@
options to pass to +make pure_all+ or +perl Build build+ in the build step.
By default, empty.
-* +PERL_FOO_INSTALL_TARGET_OPT+, to specify additional options to
+* +PERL_FOO_INSTALL_TARGET_OPTS+, to specify additional options to
pass to +make pure_install+ or +perl Build install+ in the install step.
By default, empty.
diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
--- a/docs/manual/adding-packages-python.txt
+++ b/docs/manual/adding-packages-python.txt
@@ -127,15 +127,15 @@
packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
passed automatically by the infrastructure.
-* +PYTHON_FOO_INSTALL_TARGET_OPT+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
+* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
+HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
to the Python +setup.py+ script during the target installation step,
the staging installation step or the host installation,
respectively. Note that the infrastructure is automatically passing
- some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT+
+ some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+
or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
- distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT+ or
+ distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS+ or
+PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
setuptools packages).
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -22,7 +22,7 @@
PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
install-dev install-lib
-ACL_INSTALL_TARGET_OPT = \
+ACL_INSTALL_TARGET_OPTS = \
prefix=$(TARGET_DIR)/usr \
exec_prefix=$(TARGET_DIR)/usr \
install install-lib
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -21,7 +21,7 @@
PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
install-dev install-lib
-ATTR_INSTALL_TARGET_OPT = \
+ATTR_INSTALL_TARGET_OPTS = \
prefix=$(TARGET_DIR)/usr \
exec_prefix=$(TARGET_DIR)/usr \
install install-lib
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -11,7 +11,7 @@
CUPS_LICENSE_FILES = LICENSE.txt
CUPS_INSTALL_STAGING = YES
CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
-CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
+CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
CUPS_CONF_OPT = --without-perl \
--without-java \
--without-php \
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -11,7 +11,7 @@
# lib and tools race with parallel make
DMRAID_MAKE = $(MAKE1)
DMRAID_INSTALL_STAGING = YES
-DMRAID_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+DMRAID_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install
DMRAID_LICENSE = GPLv2
DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -8,7 +8,7 @@
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
EXPAT_INSTALL_STAGING = YES
EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
-EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
+EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib
EXPAT_DEPENDENCIES = host-pkgconf
EXPAT_LICENSE = MIT
EXPAT_LICENSE_FILES = COPYING
diff --git a/package/expect/expect.mk b/package/expect/expect.mk
--- a/package/expect/expect.mk
+++ b/package/expect/expect.mk
@@ -15,6 +15,6 @@
EXPECT_CONF_OPT = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
# Since we don't want examples installed
-EXPECT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-binaries
+EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-binaries
$(eval $(autotools-package))
diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -11,7 +11,7 @@
IFPLUGD_AUTORECONF = YES
# install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.*
-IFPLUGD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
+IFPLUGD_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec
IFPLUGD_CONF_OPT = --disable-lynx --with-initdir=/etc/init.d/
IFPLUGD_DEPENDENCIES = libdaemon
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -18,7 +18,7 @@
LIBDNET_DEPENDENCIES = python
LIBDNET_CONF_OPT += --with-python
LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
-LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
+LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
endif
diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
--- a/package/libseccomp/libseccomp.mk
+++ b/package/libseccomp/libseccomp.mk
@@ -15,7 +15,7 @@
LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
-LIBSECCOMP_INSTALL_TARGET_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
+LIBSECCOMP_INSTALL_TARGET_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
# Not a real autotools package, but works quite OK nonetheless
$(eval $(autotools-package))
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -34,7 +34,7 @@
ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
LVM2_MAKE_OPTS = device-mapper
LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
-LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper
+LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install_device-mapper
endif
ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y)
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -13,7 +13,7 @@
MDADM_MAKE_OPTS = \
CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
-MDADM_INSTALL_TARGET_OPT = \
+MDADM_INSTALL_TARGET_OPTS = \
DESTDIR=$(TARGET_DIR)/usr -C $(MDADM_DIR) install-mdadm
define MDADM_CONFIGURE_CMDS
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -11,6 +11,6 @@
MXML_INSTALL_STAGING = YES
MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install
-MXML_INSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) install
+MXML_INSTALL_TARGET_OPTS = DSTROOT=$(TARGET_DIR) install
$(eval $(autotools-package))
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -25,7 +25,7 @@
--with-out-transports="Unix" \
--disable-manuals
NETSNMP_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install
-NETSNMP_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
+NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
NETSNMP_MAKE = $(MAKE1)
NETSNMP_CONFIG_SCRIPTS = net-snmp-config
diff --git a/package/php/php.mk b/package/php/php.mk
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -9,7 +9,7 @@
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
-PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
+PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
PHP_DEPENDENCIES = host-pkgconf
PHP_LICENSE = PHP
PHP_LICENSE_FILES = LICENSE
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -109,7 +109,7 @@
$(2)_MAKE_OPTS ?=
$(2)_INSTALL_OPTS ?= install
$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
-$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
+$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
#
@@ -325,7 +325,7 @@
#
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
- $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
+ $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_SRCDIR)
endef
endif
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -43,7 +43,7 @@
$(2)_MAKE_OPTS ?=
$(2)_INSTALL_HOST_OPT ?= install
$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
-$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
+$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
$(2)_BUILDDIR = $$($(2)_SRCDIR)
@@ -144,7 +144,7 @@
#
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
- $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
+ $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR)
endef
endif
diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
--- a/package/pkg-perl.mk
+++ b/package/pkg-perl.mk
@@ -156,9 +156,9 @@
ifndef $(2)_INSTALL_CMDS
define $(2)_INSTALL_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
- perl Build $$($(2)_INSTALL_TARGET_OPT) install; \
+ perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
else \
- $$(MAKE1) $$($(2)_INSTALL_TARGET_OPT) pure_install; \
+ $$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
fi
endef
endif
@@ -170,9 +170,9 @@
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
- perl Build $$($(2)_INSTALL_TARGET_OPT) install; \
+ perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
else \
- $$(MAKE1) $$($(2)_INSTALL_TARGET_OPT) pure_install; \
+ $$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
fi
endef
endif
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -35,7 +35,7 @@
PKG_PYTHON_DISTUTILS_BUILD_OPT = \
--executable=/usr/bin/python
-PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT = \
+PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
--prefix=$(TARGET_DIR)/usr
PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT = \
@@ -56,7 +56,7 @@
_python_prefix=/usr \
_python_exec_prefix=/usr
-PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT = \
+PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \
--prefix=$(TARGET_DIR)/usr \
--executable=/usr/bin/python \
--single-version-externally-managed \
@@ -112,7 +112,7 @@
$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPT = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
-$(2)_BASE_INSTALL_TARGET_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT)
+$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT)
else
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
@@ -126,7 +126,7 @@
$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPT =
-$(2)_BASE_INSTALL_TARGET_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT)
+$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT)
else
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
@@ -254,8 +254,8 @@
(cd $$($$(PKG)_BUILDDIR)/; \
$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
$$($(2)_PYTHON_INTERPRETER) setup.py install \
- $$($$(PKG)_BASE_INSTALL_TARGET_OPT) \
- $$($$(PKG)_INSTALL_TARGET_OPT))
+ $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \
+ $$($$(PKG)_INSTALL_TARGET_OPTS))
endef
endif
diff --git a/package/quota/quota.mk b/package/quota/quota.mk
--- a/package/quota/quota.mk
+++ b/package/quota/quota.mk
@@ -29,7 +29,7 @@
CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
# Package uses autoconf but not automake.
-QUOTA_INSTALL_TARGET_OPT = \
+QUOTA_INSTALL_TARGET_OPTS = \
ROOTDIR=$(TARGET_DIR) \
install
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -47,6 +47,6 @@
RPM_MAKE = $(MAKE1)
-RPM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) program_transform_name= install
+RPM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) program_transform_name= install
$(eval $(autotools-package))
diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
--- a/package/rubix/rubix.mk
+++ b/package/rubix/rubix.mk
@@ -7,7 +7,7 @@
RUBIX_VERSION = 1.0.5
RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
RUBIX_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix
-RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
+RUBIX_INSTALL_TARGET_OPTS = GAMESDIR=$(TARGET_DIR)/usr/games install
RUBIX_LICENSE = Public Domain
RUBIX_LICENSE_FILES = LICENCE
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -60,7 +60,7 @@
$(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),--with-readline=$(STAGING_DIR)) \
$(if $(BR2_PACKAGE_SAMBA_WINBINDD),--with-winbind,--without-winbind)
-SAMBA_INSTALL_TARGET_OPT = \
+SAMBA_INSTALL_TARGET_OPTS = \
DESTDIR=$(TARGET_DIR) -C $(SAMBA_DIR)/$(SAMBA_SUBDIR) \
installlibs installservers installbin installscripts \
$(if $(BR2_PACKAGE_SAMBA_SWAT),installswat)
diff --git a/package/screen/screen.mk b/package/screen/screen.mk
--- a/package/screen/screen.mk
+++ b/package/screen/screen.mk
@@ -12,7 +12,7 @@
SCREEN_AUTORECONF = YES
SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)"
SCREEN_MAKE = $(MAKE1)
-SCREEN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
+SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
define SCREEN_INSTALL_SCREENRC
if [ ! -f $(TARGET_DIR)/etc/screenrc ]; then \
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -19,6 +19,6 @@
# The isag tool is a post processing script that depends on tcl/tk
# among other things. So we don't install it.
-SYSSTAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install
+SYSSTAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install
$(eval $(autotools-package))
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -140,5 +140,5 @@
# MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
# one, so it disappears
UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
-UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+UTIL_LINUX_INSTALL_TARGET_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -21,7 +21,7 @@
# parallel make install deadlocks with make 3.81
WEBKIT_INSTALL_STAGING_OPT = -j1 DESTDIR=$(STAGING_DIR) install
-WEBKIT_INSTALL_TARGET_OPT = -j1 DESTDIR=$(TARGET_DIR) install
+WEBKIT_INSTALL_TARGET_OPTS = -j1 DESTDIR=$(TARGET_DIR) install
# Does not build and it's disabled by default
# in newer releases
diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
--- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
+++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
@@ -9,7 +9,7 @@
XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCALC_LICENSE = MIT
XAPP_XCALC_LICENSE_FILES = COPYING
-XAPP_XCALC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec install-data
+XAPP_XCALC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec install-data
XAPP_XCALC_DEPENDENCIES = xlib_libXaw
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -11,7 +11,7 @@
XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING
XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -11,7 +11,7 @@
XFONT_FONT_ALIAS_LICENSE_FILES = COPYING
XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ALIAS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -11,7 +11,7 @@
XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING
XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_TTF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -11,7 +11,7 @@
XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING
XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -11,7 +11,7 @@
XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -11,7 +11,7 @@
XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING
XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -11,7 +11,7 @@
XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -11,7 +11,7 @@
XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING
XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -11,7 +11,7 @@
XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -11,7 +11,7 @@
XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING
XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -11,7 +11,7 @@
XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING
XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -11,7 +11,7 @@
XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -11,7 +11,7 @@
XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -11,7 +11,7 @@
XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -11,7 +11,7 @@
XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING
XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
$(eval $(autotools-package))
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -16,7 +16,7 @@
XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING
XENOMAI_INSTALL_STAGING = YES
-XENOMAI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-user
+XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
XENOMAI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-user
XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/ --disable-doc-install
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -16,6 +16,6 @@
INSTALL_USER=root \
INSTALL_GROUP=root
-XFSPROGS_INSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) install
+XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install
$(eval $(autotools-package))
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
--- a/package/xscreensaver/xscreensaver.mk
+++ b/package/xscreensaver/xscreensaver.mk
@@ -20,6 +20,6 @@
--includedir=$(STAGING_DIR)/usr/include \
--libdir=$(STAGING_DIR)/usr/lib
-XSCREENSAVER_INSTALL_TARGET_OPT = install_prefix="$(TARGET_DIR)" install
+XSCREENSAVER_INSTALL_TARGET_OPTS = install_prefix="$(TARGET_DIR)" install
$(eval $(autotools-package))
diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
--- a/package/xterm/xterm.mk
+++ b/package/xterm/xterm.mk
@@ -8,7 +8,7 @@
XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
XTERM_SITE = ftp://invisible-island.net/xterm
XTERM_DEPENDENCIES = ncurses xlib_libXaw
-XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+XTERM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install
XTERM_LICENSE = MIT
XTERM_LICENSE_FILES = version.c
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 04 of 15] packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (2 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 03 of 15] packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:08 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS Thomas De Schampheleire
` (12 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_STAGING_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_STAGING_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
docs/manual/adding-packages-autotools.txt | 2 +-
docs/manual/adding-packages-cmake.txt | 2 +-
docs/manual/adding-packages-python.txt | 6 ++--
package/acl/acl.mk | 2 +-
package/atk/atk.mk | 2 +-
package/attr/attr.mk | 2 +-
package/cups/cups.mk | 2 +-
package/e2fsprogs/e2fsprogs.mk | 2 +-
package/expat/expat.mk | 2 +-
package/glibc/glibc.mk | 2 +-
package/libdnet/libdnet.mk | 2 +-
package/libglib2/libglib2.mk | 2 +-
package/libseccomp/libseccomp.mk | 2 +-
package/lite/lite.mk | 2 +-
package/lvm2/lvm2.mk | 2 +-
package/mxml/mxml.mk | 2 +-
package/netsnmp/netsnmp.mk | 2 +-
package/php/php.mk | 2 +-
package/pkg-autotools.mk | 4 +-
package/pkg-cmake.mk | 4 +-
package/pkg-python.mk | 12 +++++-----
package/tslib/tslib.mk | 2 +-
package/util-linux/util-linux.mk | 2 +-
package/webkit/webkit.mk | 2 +-
package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk | 2 +-
package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 2 +-
package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk | 2 +-
package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk | 2 +-
package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk | 2 +-
package/x11r7/xfont_font-alias/xfont_font-alias.mk | 2 +-
package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 2 +-
package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk | 2 +-
package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk | 2 +-
package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk | 2 +-
package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk | 2 +-
package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk | 2 +-
package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk | 2 +-
package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk | 2 +-
package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk | 2 +-
package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk | 2 +-
package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk | 2 +-
package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 2 +-
package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 2 +-
package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk | 2 +-
package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk | 2 +-
package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk | 2 +-
package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk | 2 +-
package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk | 2 +-
package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk | 2 +-
package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk | 2 +-
package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk | 2 +-
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 2 +-
package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk | 2 +-
package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk | 2 +-
package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk | 2 +-
package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk | 2 +-
package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk | 2 +-
package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk | 2 +-
package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk | 2 +-
package/xenomai/xenomai.mk | 2 +-
60 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -147,7 +147,7 @@
not. Valid values are +YES+ and +NO+. By
default, the value is +YES+
-* +LIBFOO_INSTALL_STAGING_OPT+ contains the make options
+* +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options
used to install the package to the staging directory. By default, the
value is +DESTDIR=$(STAGING_DIR) install+, which is
correct for most autotools packages. It is still possible to override
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -112,7 +112,7 @@
in the build step. These are passed after the +make+ command. By
default, empty.
-* +LIBFOO_INSTALL_STAGING_OPT+ contains the make options used to
+* +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options used to
install the package to the staging directory. By default, the value
is +DESTDIR=$(STAGING_DIR) install+, which is correct for most
CMake packages. It is still possible to override it.
diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
--- a/docs/manual/adding-packages-python.txt
+++ b/docs/manual/adding-packages-python.txt
@@ -127,16 +127,16 @@
packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
passed automatically by the infrastructure.
-* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
+* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+,
+HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
to the Python +setup.py+ script during the target installation step,
the staging installation step or the host installation,
respectively. Note that the infrastructure is automatically passing
some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+
- or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
+ or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS+ (for target distutils
packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS+ or
- +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
+ +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS+ (for target setuptools
packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
setuptools packages).
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -16,7 +16,7 @@
# While the configuration system uses autoconf, the Makefiles are
# hand-written and do not use automake. Therefore, we have to hack
# around their deficiencies by passing installation paths.
-ACL_INSTALL_STAGING_OPT = \
+ACL_INSTALL_STAGING_OPTS = \
prefix=$(STAGING_DIR)/usr \
exec_prefix=$(STAGING_DIR)/usr \
PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -11,7 +11,7 @@
ATK_LICENSE = LGPLv2+
ATK_LICENSE_FILES = COPYING
ATK_INSTALL_STAGING = YES
-ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
glib_cv_stack_grows=no glib_cv_uscore=no \
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -15,7 +15,7 @@
# While the configuration system uses autoconf, the Makefiles are
# hand-written and do not use automake. Therefore, we have to hack
# around their deficiencies by passing installation paths.
-ATTR_INSTALL_STAGING_OPT = \
+ATTR_INSTALL_STAGING_OPTS = \
prefix=$(STAGING_DIR)/usr \
exec_prefix=$(STAGING_DIR)/usr \
PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -10,7 +10,7 @@
CUPS_LICENSE = GPLv2 LGPLv2
CUPS_LICENSE_FILES = LICENSE.txt
CUPS_INSTALL_STAGING = YES
-CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
+CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
CUPS_CONF_OPT = --without-perl \
--without-java \
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -9,7 +9,7 @@
E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
E2FSPROGS_INSTALL_STAGING = YES
-E2FSPROGS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-libs
+E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs
E2FSPROGS_CONF_OPT = \
$(if $(BR2_PREFER_STATIC_LIB),,--enable-elf-shlibs) \
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -7,7 +7,7 @@
EXPAT_VERSION = 2.1.0
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
EXPAT_INSTALL_STAGING = YES
-EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
+EXPAT_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) installlib
EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib
EXPAT_DEPENDENCIES = host-pkgconf
EXPAT_LICENSE = MIT
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -30,7 +30,7 @@
GLIBC_INSTALL_STAGING = YES
-GLIBC_INSTALL_STAGING_OPT = install_root=$(STAGING_DIR) install
+GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install
# Thumb build is broken, build in ARM mode
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -19,7 +19,7 @@
LIBDNET_CONF_OPT += --with-python
LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
-LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
+LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
endif
# Needed for autoreconf to work properly
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -13,7 +13,7 @@
LIBGLIB2_AUTORECONF = YES
LIBGLIB2_INSTALL_STAGING = YES
-LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+LIBGLIB2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
LIBGLIB2_CONF_ENV = \
ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
--- a/package/libseccomp/libseccomp.mk
+++ b/package/libseccomp/libseccomp.mk
@@ -14,7 +14,7 @@
LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
-LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
+LIBSECCOMP_INSTALL_STAGING_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
LIBSECCOMP_INSTALL_TARGET_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
# Not a real autotools package, but works quite OK nonetheless
diff --git a/package/lite/lite.mk b/package/lite/lite.mk
--- a/package/lite/lite.mk
+++ b/package/lite/lite.mk
@@ -8,7 +8,7 @@
LITE_SOURCE = LiTE-$(LITE_VERSION).tar.gz
LITE_SITE = http://www.directfb.org/downloads/Libs
LITE_INSTALL_STAGING = YES
-LITE_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+LITE_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb
LITE_DEPENDENCIES = directfb
LITE_LICENSE = LGPLv2.1+
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -33,7 +33,7 @@
ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
LVM2_MAKE_OPTS = device-mapper
-LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
+LVM2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install_device-mapper
LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install_device-mapper
endif
diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
--- a/package/mxml/mxml.mk
+++ b/package/mxml/mxml.mk
@@ -10,7 +10,7 @@
MXML_LICENSE_FILES = COPYING
MXML_INSTALL_STAGING = YES
-MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install
+MXML_INSTALL_STAGING_OPTS = DSTROOT=$(STAGING_DIR) install
MXML_INSTALL_TARGET_OPTS = DSTROOT=$(TARGET_DIR) install
$(eval $(autotools-package))
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -24,7 +24,7 @@
--with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
--with-out-transports="Unix" \
--disable-manuals
-NETSNMP_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install
+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)
NETSNMP_CONFIG_SCRIPTS = net-snmp-config
diff --git a/package/php/php.mk b/package/php/php.mk
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -8,7 +8,7 @@
PHP_SITE = http://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
-PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
+PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
PHP_DEPENDENCIES = host-pkgconf
PHP_LICENSE = PHP
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -108,7 +108,7 @@
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
$(2)_INSTALL_OPTS ?= install
-$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
@@ -309,7 +309,7 @@
#
ifndef $(2)_INSTALL_STAGING_CMDS
define $(2)_INSTALL_STAGING_CMDS
- $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
+ $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_SRCDIR)
find $$(STAGING_DIR)/usr/lib* -name "*.la" | xargs --no-run-if-empty \
$$(SED) "s:$$(BASE_DIR):@BASE_DIR@:g" \
-e "s:$$(STAGING_DIR):@STAGING_DIR@:g" \
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -42,7 +42,7 @@
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
$(2)_INSTALL_HOST_OPT ?= install
-$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
@@ -134,7 +134,7 @@
#
ifndef $(2)_INSTALL_STAGING_CMDS
define $(2)_INSTALL_STAGING_CMDS
- $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
+ $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR)
endef
endif
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -38,7 +38,7 @@
PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
--prefix=$(TARGET_DIR)/usr
-PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT = \
+PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \
--prefix=$(STAGING_DIR)/usr
# Host distutils-based packages
@@ -62,7 +62,7 @@
--single-version-externally-managed \
--root=/
-PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT = \
+PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \
--prefix=$(STAGING_DIR)/usr \
--executable=/usr/bin/python \
--single-version-externally-managed \
@@ -113,7 +113,7 @@
$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPT = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
-$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT)
+$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
else
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
$(2)_BASE_BUILD_TGT = build
@@ -127,7 +127,7 @@
$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPT =
$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
-$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT)
+$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
else
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
$(2)_BASE_BUILD_TGT = build
@@ -268,8 +268,8 @@
(cd $$($$(PKG)_BUILDDIR)/; \
$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
$$($(2)_PYTHON_INTERPRETER) setup.py install \
- $$($$(PKG)_BASE_INSTALL_STAGING_OPT) \
- $$($$(PKG)_INSTALL_STAGING_OPT))
+ $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \
+ $$($$(PKG)_INSTALL_STAGING_OPTS))
endef
endif
diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
--- a/package/tslib/tslib.mk
+++ b/package/tslib/tslib.mk
@@ -11,6 +11,6 @@
TSLIB_AUTORECONF = YES
TSLIB_INSTALL_STAGING = YES
-TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+TSLIB_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
$(eval $(autotools-package))
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -139,6 +139,6 @@
# MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
# one, so it disappears
-UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
+UTIL_LINUX_INSTALL_STAGING_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
UTIL_LINUX_INSTALL_TARGET_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -20,7 +20,7 @@
WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
# parallel make install deadlocks with make 3.81
-WEBKIT_INSTALL_STAGING_OPT = -j1 DESTDIR=$(STAGING_DIR) install
+WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install
WEBKIT_INSTALL_TARGET_OPTS = -j1 DESTDIR=$(TARGET_DIR) install
# Does not build and it's disabled by default
diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
--- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_ADOBE_100DPI_LICENSE = MIT
XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
-XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
--- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_ADOBE_75DPI_LICENSE = MIT
XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
-XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
--- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE = Adobe License (no modification allowed)
XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
-XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
--- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE = Adobe License (no modification allowed)
XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
-XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
--- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -10,7 +10,7 @@
XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE = Adobe License (no modification allowed)
XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING
-XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
--- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -10,7 +10,7 @@
XFONT_FONT_ALIAS_LICENSE = MIT
XFONT_FONT_ALIAS_LICENSE_FILES = COPYING
-XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ALIAS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
--- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_ARABIC_MISC_LICENSE = MIT
XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
--- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_BH_100DPI_LICENSE = Bigelow & Holmes License (no modification)
XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
-XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
--- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_BH_75DPI_LICENSE = Bigelow & Holmes License (no modification)
XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
-XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE = Bigelow & Holmes License (no modification)
XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
-XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
--- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE = Bigelow & Holmes License (no modification)
XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
-XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
--- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -10,7 +10,7 @@
XFONT_FONT_BH_TTF_LICENSE = Bigelow & Holmes License (no modification)
XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING
-XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_TTF_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
--- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -10,7 +10,7 @@
XFONT_FONT_BH_TYPE1_LICENSE = Bigelow & Holmes License (no modification)
XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING
-XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
--- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_BITSTREAM_100DPI_LICENSE = MIT
XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
-XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
--- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -10,7 +10,7 @@
XFONT_FONT_BITSTREAM_75DPI_LICENSE = MIT
XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
-XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
--- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -10,7 +10,7 @@
XFONT_FONT_BITSTREAM_TYPE1_LICENSE = MIT
XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING
-XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
--- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -10,7 +10,7 @@
XFONT_FONT_CRONYX_CYRILLIC_LICENSE = MIT
XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
-XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
--- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_CURSOR_MISC_LICENSE = unencumbered
XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
--- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -9,7 +9,7 @@
XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
--- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_DEC_MISC_LICENSE = MIT
XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
--- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -10,7 +10,7 @@
XFONT_FONT_IBM_TYPE1_LICENSE = IBM/MIT X Consortium Courier Typefont agreement (no modification)
XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING
-XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
--- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_ISAS_MISC_LICENSE = MIT
XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
--- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -9,7 +9,7 @@
XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
--- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_MICRO_MISC_LICENSE = Public Domain
XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
--- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -10,7 +10,7 @@
XFONT_FONT_MISC_CYRILLIC_LICENSE = MIT / Public Domain
XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
-XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
--- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -10,7 +10,7 @@
XFONT_FONT_MISC_ETHIOPIC_LICENSE = MIT
XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING
-XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
--- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -10,7 +10,7 @@
XFONT_FONT_MISC_MELTHO_LICENSE = Meltho License
XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING
-XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
--- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_MISC_MISC_LICENSE = Public Domain
XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
--- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_MUTT_MISC_LICENSE = MIT
XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
--- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_SCHUMACHER_MISC_LICENSE = MIT
XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
--- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -10,7 +10,7 @@
XFONT_FONT_SCREEN_CYRILLIC_LICENSE = MIT
XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
-XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
--- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_SONY_MISC_LICENSE = MIT
XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
--- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -10,7 +10,7 @@
XFONT_FONT_SUN_MISC_LICENSE = MIT
XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
-XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
--- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -10,7 +10,7 @@
XFONT_FONT_WINITZKI_CYRILLIC_LICENSE = Public Domain
XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
-XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
--- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -10,7 +10,7 @@
XFONT_FONT_XFREE86_TYPE1_LICENSE = MIT
XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING
-XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
+XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -17,7 +17,7 @@
XENOMAI_INSTALL_STAGING = YES
XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
-XENOMAI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-user
+XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/ --disable-doc-install
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (3 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 04 of 15] packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:15 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 06 of 15] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS Thomas De Schampheleire
` (11 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_INSTALL_HOST_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_INSTALL_HOST_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
package/pkg-cmake.mk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -41,7 +41,7 @@
$(2)_MAKE ?= $$(MAKE)
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
-$(2)_INSTALL_HOST_OPT ?= install
+$(2)_INSTALL_HOST_OPTS ?= install
$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
@@ -124,7 +124,7 @@
#
ifndef $(2)_INSTALL_CMDS
define $(2)_INSTALL_CMDS
- $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
+ $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPTS) -C $$($$(PKG)_BUILDDIR)
endef
endif
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 06 of 15] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (4 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:17 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 07 of 15] packages: rename FOO_CONF_OPT into FOO_CONF_OPTS Thomas De Schampheleire
` (10 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_AUTORECONF_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_AUTORECONF_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
docs/manual/adding-packages-autotools.txt | 2 +-
package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk | 2 +-
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +-
package/pkg-autotools.mk | 4 ++--
package/webkit/webkit.mk | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -126,7 +126,7 @@
+LIBFOO_AUTORECONF=YES+. These are passed in the environment of
the 'autoreconf' command. By default, empty.
-* +LIBFOO_AUTORECONF_OPT+ to specify additional options
+* +LIBFOO_AUTORECONF_OPTS+ to specify additional options
passed to the 'autoreconf' program if
+LIBFOO_AUTORECONF=YES+. By default, empty.
diff --git a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
--- a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
+++ b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
@@ -12,7 +12,7 @@
# There is no generated configure script in the tarball.
GST_PLUGIN_X170_AUTORECONF = YES
-GST_PLUGIN_X170_AUTORECONF_OPT = -Im4/
+GST_PLUGIN_X170_AUTORECONF_OPTS = -Im4/
GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs
$(eval $(autotools-package))
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -13,7 +13,7 @@
GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+
GST1_PLUGINS_BAD_AUTORECONF = YES
-GST1_PLUGINS_BAD_AUTORECONF_OPT = -I $(@D)/common/m4
+GST1_PLUGINS_BAD_AUTORECONF_OPTS = -I $(@D)/common/m4
GST1_PLUGINS_BAD_GETTEXTIZE = YES
GST1_PLUGINS_BAD_CONF_OPT = \
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -100,7 +100,7 @@
endif
ifeq ($(4),host)
- $(2)_AUTORECONF_OPT ?= $$($(3)_AUTORECONF_OPT)
+ $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS)
endif
$(2)_CONF_ENV ?=
@@ -228,7 +228,7 @@
#
define AUTORECONF_HOOK
@$$(call MESSAGE,"Autoreconfiguring")
- $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
+ $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPTS)
$$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -17,7 +17,7 @@
# webkit-disable-tests.patch changes configure.ac therefore autoreconf required
WEBKIT_AUTORECONF = YES
-WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
+WEBKIT_AUTORECONF_OPTS = -I $(@D)/Source/autotools
# parallel make install deadlocks with make 3.81
WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 07 of 15] packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (5 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 06 of 15] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:18 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 08 of 15] packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS Thomas De Schampheleire
` (9 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_CONF_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +-
boot/grub/grub.mk | 2 +-
boot/grub2/grub2.mk | 2 +-
boot/gummiboot/gummiboot.mk | 2 +-
docs/manual/adding-packages-autotools.txt | 4 +-
docs/manual/adding-packages-cmake.txt | 4 +-
docs/manual/adding-packages-perl.txt | 2 +-
docs/manual/writing-rules.txt | 8 +-
package/acl/acl.mk | 2 +-
package/agentpp/agentpp.mk | 2 +-
package/alsa-lib/alsa-lib.mk | 30 +-
package/alsa-utils/alsa-utils.mk | 4 +-
package/apitrace/apitrace.mk | 2 +-
package/apr-util/apr-util.mk | 2 +-
package/at/at.mk | 2 +-
package/atftp/atftp.mk | 10 +-
package/atk/atk.mk | 2 +-
package/attr/attr.mk | 2 +-
package/audiofile/audiofile.mk | 6 +-
package/aumix/aumix.mk | 2 +-
package/avahi/avahi.mk | 20 +-
package/bandwidthd/bandwidthd.mk | 10 +-
package/bash/bash.mk | 4 +-
package/bcusdk/bcusdk.mk | 2 +-
package/beecrypt/beecrypt.mk | 4 +-
package/bind/bind.mk | 22 +-
package/binutils/binutils.mk | 10 +-
package/blackbox/blackbox.mk | 2 +-
package/bluez5_utils/bluez5_utils.mk | 26 +-
package/bluez_utils/bluez_utils.mk | 16 +-
package/bmon/bmon.mk | 4 +-
package/bootutils/bootutils.mk | 2 +-
package/bridge-utils/bridge-utils.mk | 2 +-
package/bwm-ng/bwm-ng.mk | 4 +-
package/cairo/cairo.mk | 58 +-
package/ccache/ccache.mk | 2 +-
package/cdrkit/cdrkit.mk | 12 +-
package/cegui06/cegui06.mk | 2 +-
package/celt051/celt051.mk | 2 +-
package/chrony/chrony.mk | 10 +-
package/cifs-utils/cifs-utils.mk | 2 +-
package/civetweb/civetweb.mk | 10 +-
package/clapack/clapack.mk | 4 +-
package/classpath/classpath.mk | 24 +-
package/cloog/cloog.mk | 2 +-
package/collectd/collectd.mk | 12 +-
package/connman/connman.mk | 6 +-
package/coreutils/coreutils.mk | 2 +-
package/cppcms/cppcms.mk | 4 +-
package/cppdb/cppdb.mk | 2 +-
package/ctorrent/ctorrent.mk | 4 +-
package/cups/cups.mk | 14 +-
package/cvs/cvs.mk | 2 +-
package/cwiid/cwiid.mk | 6 +-
package/dbus-cpp/dbus-cpp.mk | 12 +-
package/dbus-glib/dbus-glib.mk | 4 +-
package/dbus-python/dbus-python.mk | 2 +-
package/dbus/dbus.mk | 16 +-
package/dhcp/dhcp.mk | 6 +-
package/dialog/dialog.mk | 4 +-
package/dillo/dillo.mk | 16 +-
package/directfb/directfb.mk | 54 +-
package/distcc/distcc.mk | 2 +-
package/dmalloc/dmalloc.mk | 10 +-
package/dropbear/dropbear.mk | 6 +-
package/e2fsprogs/e2fsprogs.mk | 2 +-
package/ecryptfs-utils/ecryptfs-utils.mk | 6 +-
package/ed/ed.mk | 2 +-
package/efl/libecore/libecore.mk | 36 +-
package/efl/libedbus/libedbus.mk | 12 +-
package/efl/libedje/libedje.mk | 6 +-
package/efl/libeet/libeet.mk | 4 +-
package/efl/libelementary/libelementary.mk | 6 +-
package/efl/libethumb/libethumb.mk | 2 +-
package/efl/libevas-generic-loaders/libevas-generic-loaders.mk | 6 +-
package/efl/libevas/libevas.mk | 90 +-
package/elf2flt/elf2flt.mk | 2 +-
package/elfutils/elfutils.mk | 18 +-
package/enlightenment/enlightenment.mk | 2 +-
package/enscript/enscript.mk | 4 +-
package/erlang/erlang.mk | 16 +-
package/eudev/eudev.mk | 8 +-
package/evemu/evemu.mk | 6 +-
package/expect/expect.mk | 2 +-
package/fbdump/fbdump.mk | 4 +-
package/fetchmail/fetchmail.mk | 2 +-
package/ffmpeg/ffmpeg.mk | 148 +-
package/flac/flac.mk | 10 +-
package/flann/flann.mk | 2 +-
package/flickcurl/flickcurl.mk | 2 +-
package/flite/flite.mk | 4 +-
package/fltk/fltk.mk | 8 +-
package/fluxbox/fluxbox.mk | 6 +-
package/fontconfig/fontconfig.mk | 4 +-
package/foomatic-filters/foomatic-filters.mk | 6 +-
package/freerdp/freerdp.mk | 28 +-
package/freetype/freetype.mk | 14 +-
package/gamin/gamin.mk | 4 +-
package/gcc/gcc-final/gcc-final.mk | 16 +-
package/gcc/gcc-initial/gcc-initial.mk | 4 +-
package/gcc/gcc.mk | 52 +-
package/gd/gd.mk | 16 +-
package/gdb/gdb.mk | 26 +-
package/gdk-pixbuf/gdk-pixbuf.mk | 12 +-
package/gettext/gettext.mk | 6 +-
package/giblib/giblib.mk | 2 +-
package/git/git.mk | 24 +-
package/glib-networking/glib-networking.mk | 4 +-
package/gmpc/gmpc.mk | 2 +-
package/gnupg/gnupg.mk | 12 +-
package/gnupg2/gnupg2.mk | 2 +-
package/gnuplot/gnuplot.mk | 10 +-
package/gnutls/gnutls.mk | 14 +-
package/google-breakpad/google-breakpad.mk | 2 +-
package/gpm/gpm.mk | 2 +-
package/grep/grep.mk | 4 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 2 +-
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 4 +-
package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk | 366 ++++----
package/gstreamer/gst-plugins-base/gst-plugins-base.mk | 98 +-
package/gstreamer/gst-plugins-good/gst-plugins-good.mk | 234 ++--
package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk | 46 +-
package/gstreamer/gstreamer/gstreamer.mk | 2 +-
package/gstreamer1/gst-omx/gst-omx.mk | 4 +-
package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +-
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 392 +++++-----
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 102 +-
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 246 +++---
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 42 +-
package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +-
package/gtest/gtest.mk | 2 +-
package/gtk2-engines/gtk2-engines.mk | 2 +-
package/gutenprint/gutenprint.mk | 4 +-
package/gvfs/gvfs.mk | 22 +-
package/harfbuzz/harfbuzz.mk | 18 +-
package/haserl/haserl.mk | 4 +-
package/heimdal/heimdal.mk | 2 +-
package/hiawatha/hiawatha.mk | 6 +-
package/hplip/hplip.mk | 6 +-
package/htop/htop.mk | 2 +-
package/icu/icu.mk | 4 +-
package/ifplugd/ifplugd.mk | 2 +-
package/igh-ethercat/igh-ethercat.mk | 12 +-
package/imagemagick/imagemagick.mk | 42 +-
package/imlib2/imlib2.mk | 26 +-
package/iperf/iperf.mk | 2 +-
package/ipmitool/ipmitool.mk | 2 +-
package/ipsec-tools/ipsec-tools.mk | 30 +-
package/ipset/ipset.mk | 2 +-
package/iptables/iptables.mk | 2 +-
package/jamvm/jamvm.mk | 2 +-
package/joe/joe.mk | 4 +-
package/jpeg-turbo/jpeg-turbo.mk | 6 +-
package/json-c/json-c.mk | 2 +-
package/kbd/kbd.mk | 2 +-
package/kexec/kexec.mk | 4 +-
package/kismet/kismet.mk | 2 +-
package/kmod/kmod.mk | 14 +-
package/knock/knock.mk | 2 +-
package/lame/lame.mk | 4 +-
package/lbreakout2/lbreakout2.mk | 8 +-
package/lcdproc/lcdproc.mk | 4 +-
package/lcms2/lcms2.mk | 14 +-
package/lesstif/lesstif.mk | 2 +-
package/lftp/lftp.mk | 10 +-
package/libao/libao.mk | 6 +-
package/libarchive/libarchive.mk | 32 +-
package/libargtable2/libargtable2.mk | 2 +-
package/libass/libass.mk | 12 +-
package/libassuan/libassuan.mk | 2 +-
package/libbluray/libbluray.mk | 4 +-
package/libcap-ng/libcap-ng.mk | 2 +-
package/libcdio/libcdio.mk | 6 +-
package/libcec/libcec.mk | 4 +-
package/libcgicc/libcgicc.mk | 2 +-
package/libcgroup/libcgroup.mk | 6 +-
package/libconfig/libconfig.mk | 4 +-
package/libconfuse/libconfuse.mk | 2 +-
package/libcurl/libcurl.mk | 14 +-
package/libdaemon/libdaemon.mk | 2 +-
package/libdnet/libdnet.mk | 4 +-
package/libdrm/libdrm.mk | 36 +-
package/libdvdnav/libdvdnav.mk | 2 +-
package/libeXosip2/libeXosip2.mk | 6 +-
package/libedit/libedit.mk | 2 +-
package/libexif/libexif.mk | 2 +-
package/libftdi/libftdi.mk | 6 +-
package/libfuse/libfuse.mk | 2 +-
package/libgail/libgail.mk | 2 +-
package/libgcrypt/libgcrypt.mk | 2 +-
package/libglib2/libglib2.mk | 12 +-
package/libgpgme/libgpgme.mk | 2 +-
package/libgtk2/libgtk2.mk | 22 +-
package/libhid/libhid.mk | 2 +-
package/libidn/libidn.mk | 2 +-
package/libinput/libinput.mk | 2 +-
package/libksba/libksba.mk | 2 +-
package/liblockfile/liblockfile.mk | 2 +-
package/liblog4c-localtime/liblog4c-localtime.mk | 2 +-
package/liblogging/liblogging.mk | 6 +-
package/libmad/libmad.mk | 2 +-
package/libmbim/libmbim.mk | 2 +-
package/libmemcached/libmemcached.mk | 2 +-
package/libmicrohttpd/libmicrohttpd.mk | 8 +-
package/libmpeg2/libmpeg2.mk | 6 +-
package/libndp/libndp.mk | 2 +-
package/libnfc/libnfc.mk | 6 +-
package/libnftnl/libnftnl.mk | 8 +-
package/libnl/libnl.mk | 4 +-
package/libnspr/libnspr.mk | 10 +-
package/liboauth/liboauth.mk | 2 +-
package/liboping/liboping.mk | 2 +-
package/libosip2/libosip2.mk | 2 +-
package/libpcap/libpcap.mk | 14 +-
package/libphidget/libphidget.mk | 2 +-
package/libplayer/libplayer.mk | 12 +-
package/libpng/libpng.mk | 2 +-
package/libpthsem/libpthsem.mk | 4 +-
package/libqmi/libqmi.mk | 2 +-
package/libqrencode/libqrencode.mk | 6 +-
package/libraw/libraw.mk | 2 +-
package/libroxml/libroxml.mk | 2 +-
package/librsvg/librsvg.mk | 2 +-
package/librtlsdr/librtlsdr.mk | 4 +-
package/libsamplerate/libsamplerate.mk | 2 +-
package/libsecret/libsecret.mk | 6 +-
package/libsoc/libsoc.mk | 2 +-
package/libsoup/libsoup.mk | 8 +-
package/libsoxr/libsoxr.mk | 8 +-
package/libssh2/libssh2.mk | 10 +-
package/libstrophe/libstrophe.mk | 2 +-
package/libsvg-cairo/libsvg-cairo.mk | 2 +-
package/libsvg/libsvg.mk | 4 +-
package/libtheora/libtheora.mk | 2 +-
package/libtirpc/libtirpc.mk | 2 +-
package/libtorrent/libtorrent.mk | 2 +-
package/libubox/libubox.mk | 4 +-
package/libuci/libuci.mk | 4 +-
package/libungif/libungif.mk | 2 +-
package/libusb/libusb.mk | 6 +-
package/libv4l/libv4l.mk | 8 +-
package/libva-intel-driver/libva-intel-driver.mk | 8 +-
package/libva/libva.mk | 18 +-
package/libvncserver/libvncserver.mk | 16 +-
package/libvorbis/libvorbis.mk | 2 +-
package/libvpx/libvpx.mk | 4 +-
package/libwebsockets/libwebsockets.mk | 4 +-
package/libxml2/libxml2.mk | 12 +-
package/libxmlrpc/libxmlrpc.mk | 2 +-
package/libxslt/libxslt.mk | 6 +-
package/lighttpd/lighttpd.mk | 26 +-
package/linknx/linknx.mk | 10 +-
package/links/links.mk | 10 +-
package/linphone/linphone.mk | 6 +-
package/linux-pam/linux-pam.mk | 2 +-
package/linux-zigbee/linux-zigbee.mk | 8 +-
package/localedef/localedef.mk | 2 +-
package/log4cxx/log4cxx.mk | 2 +-
package/lrzsz/lrzsz.mk | 2 +-
package/ltrace/ltrace.mk | 6 +-
package/ltris/ltris.mk | 4 +-
package/lttng-tools/lttng-tools.mk | 6 +-
package/lua-ev/lua-ev.mk | 2 +-
package/luaposix/luaposix.mk | 2 +-
package/luarocks/luarocks.mk | 6 +-
package/lvm2/lvm2.mk | 8 +-
package/lxc/lxc.mk | 2 +-
package/lzma/lzma.mk | 2 +-
package/m4/m4.mk | 2 +-
package/madplay/madplay.mk | 2 +-
package/matchbox/matchbox-common/matchbox-common.mk | 2 +-
package/matchbox/matchbox-desktop/matchbox-desktop.mk | 6 +-
package/matchbox/matchbox-fakekey/matchbox-fakekey.mk | 2 +-
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +-
package/matchbox/matchbox-lib/matchbox-lib.mk | 18 +-
package/matchbox/matchbox-panel/matchbox-panel.mk | 6 +-
package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk | 2 +-
package/matchbox/matchbox-wm/matchbox-wm.mk | 8 +-
package/mcrypt/mcrypt.mk | 2 +-
package/media-ctl/media-ctl.mk | 2 +-
package/mediastreamer/mediastreamer.mk | 42 +-
package/memcached/memcached.mk | 2 +-
package/mesa3d/mesa3d.mk | 32 +-
package/metacity/metacity.mk | 2 +-
package/minidlna/minidlna.mk | 2 +-
package/modem-manager/modem-manager.mk | 8 +-
package/monit/monit.mk | 10 +-
package/mpd/mpd.mk | 90 +-
package/mpdecimal/mpdecimal.mk | 2 +-
package/mpg123/mpg123.mk | 14 +-
package/msmtp/msmtp.mk | 8 +-
package/mtools/mtools.mk | 2 +-
package/mtr/mtr.mk | 2 +-
package/mutt/mutt.mk | 18 +-
package/mysql/mysql.mk | 12 +-
package/nano/nano.mk | 4 +-
package/nbd/nbd.mk | 2 +-
package/ncurses/ncurses.mk | 8 +-
package/ndisc6/ndisc6.mk | 2 +-
package/ne10/ne10.mk | 4 +-
package/neard/neard.mk | 4 +-
package/neon/neon.mk | 20 +-
package/netatalk/netatalk.mk | 12 +-
package/netperf/netperf.mk | 2 +-
package/netsnmp/netsnmp.mk | 16 +-
package/nettle/nettle.mk | 8 +-
package/network-manager/network-manager.mk | 20 +-
package/newt/newt.mk | 2 +-
package/nfs-utils/nfs-utils.mk | 6 +-
package/ngrep/ngrep.mk | 2 +-
package/nmap/nmap.mk | 8 +-
package/nss-mdns/nss-mdns.mk | 2 +-
package/ntfs-3g/ntfs-3g.mk | 8 +-
package/ntp/ntp.mk | 10 +-
package/nut/nut.mk | 34 +-
package/ofono/ofono.mk | 10 +-
package/ola/ola.mk | 74 +-
package/omniorb/omniorb.mk | 8 +-
package/opencv/opencv.mk | 72 +-
package/openntpd/openntpd.mk | 2 +-
package/openobex/openobex.mk | 10 +-
package/openocd/openocd.mk | 10 +-
package/openpowerlink/openpowerlink.mk | 38 +-
package/openssh/openssh.mk | 6 +-
package/openvmtools/openvmtools.mk | 14 +-
package/openvpn/openvpn.mk | 10 +-
package/opkg/opkg.mk | 6 +-
package/oprofile/oprofile.mk | 2 +-
package/opus-tools/opus-tools.mk | 8 +-
package/opus/opus.mk | 4 +-
package/ortp/ortp.mk | 2 +-
package/p11-kit/p11-kit.mk | 2 +-
package/pango/pango.mk | 6 +-
package/parted/parted.mk | 12 +-
package/pcmanfm/pcmanfm.mk | 2 +-
package/pcre/pcre.mk | 12 +-
package/pcsc-lite/pcsc-lite.mk | 10 +-
package/perl-gd/perl-gd.mk | 2 +-
package/perl-xml-libxml/perl-xml-libxml.mk | 2 +-
package/perl-xml-parser/perl-xml-parser.mk | 2 +-
package/perl/perl.mk | 12 +-
package/php-geoip/php-geoip.mk | 2 +-
package/php-gnupg/php-gnupg.mk | 2 +-
package/php-imagick/php-imagick.mk | 2 +-
package/php-memcached/php-memcached.mk | 2 +-
package/php-ssh2/php-ssh2.mk | 2 +-
package/php-yaml/php-yaml.mk | 2 +-
package/php-zmq/php-zmq.mk | 2 +-
package/php/php.mk | 64 +-
package/pinentry/pinentry.mk | 24 +-
package/pixman/pixman.mk | 4 +-
package/pkg-autotools.mk | 6 +-
package/pkg-cmake.mk | 6 +-
package/pkg-perl.mk | 8 +-
package/poco/poco.mk | 6 +-
| 2 +-
package/polkit/polkit.mk | 2 +-
package/poppler/poppler.mk | 30 +-
package/popt/popt.mk | 2 +-
package/portaudio/portaudio.mk | 2 +-
package/postgresql/postgresql.mk | 12 +-
package/powerpc-utils/powerpc-utils.mk | 2 +-
package/prboom/prboom.mk | 2 +-
package/procps-ng/procps-ng.mk | 4 +-
package/proftpd/proftpd.mk | 4 +-
package/protobuf-c/protobuf-c.mk | 2 +-
package/protobuf/protobuf.mk | 2 +-
package/psmisc/psmisc.mk | 2 +-
package/ptpd2/ptpd2.mk | 4 +-
package/pulseaudio/pulseaudio.mk | 18 +-
package/python/python.mk | 26 +-
package/python3/python3.mk | 24 +-
package/quagga/quagga.mk | 28 +-
package/rdesktop/rdesktop.mk | 4 +-
package/rp-pppoe/rp-pppoe.mk | 2 +-
package/rpcbind/rpcbind.mk | 2 +-
package/rpi-userland/rpi-userland.mk | 2 +-
package/rpm/rpm.mk | 14 +-
package/rrdtool/rrdtool.mk | 2 +-
package/rsync/rsync.mk | 4 +-
package/rsyslog/rsyslog.mk | 6 +-
package/rtai/rtai.mk | 2 +-
package/ruby/ruby.mk | 8 +-
package/samba/samba.mk | 8 +-
package/samba4/samba4.mk | 32 +-
package/sane-backends/sane-backends.mk | 8 +-
package/sconeserver/sconeserver.mk | 56 +-
package/sdl/sdl.mk | 22 +-
package/sdl_gfx/sdl_gfx.mk | 6 +-
package/sdl_image/sdl_image.mk | 4 +-
package/sdl_mixer/sdl_mixer.mk | 10 +-
package/sdl_net/sdl_net.mk | 2 +-
package/sdl_sound/sdl_sound.mk | 6 +-
package/sdl_ttf/sdl_ttf.mk | 2 +-
package/sed/sed.mk | 2 +-
package/shared-mime-info/shared-mime-info.mk | 4 +-
package/sispmctl/sispmctl.mk | 2 +-
package/slang/slang.mk | 16 +-
package/smcroute/smcroute.mk | 2 +-
package/snmppp/snmppp.mk | 6 +-
package/socat/socat.mk | 4 +-
package/socketcand/socketcand.mk | 2 +-
package/sox/sox.mk | 30 +-
package/spawn-fcgi/spawn-fcgi.mk | 2 +-
package/speex/speex.mk | 6 +-
package/spice/spice.mk | 16 +-
package/sqlcipher/sqlcipher.mk | 6 +-
package/sqlite/sqlite.mk | 12 +-
package/squid/squid.mk | 4 +-
package/startup-notification/startup-notification.mk | 2 +-
package/stress/stress.mk | 2 +-
package/strongswan/strongswan.mk | 4 +-
package/stunnel/stunnel.mk | 2 +-
package/subversion/subversion.mk | 2 +-
package/sudo/sudo.mk | 2 +-
package/swig/swig.mk | 2 +-
package/sylpheed/sylpheed.mk | 6 +-
package/synergy/synergy.mk | 2 +-
package/sysstat/sysstat.mk | 2 +-
package/systemd/systemd.mk | 36 +-
package/taglib/taglib.mk | 4 +-
package/tcl/tcl.mk | 4 +-
package/tcpdump/tcpdump.mk | 2 +-
package/tcpreplay/tcpreplay.mk | 2 +-
package/tftpd/tftpd.mk | 4 +-
package/thrift/thrift.mk | 12 +-
package/tiff/tiff.mk | 26 +-
package/tn5250/tn5250.mk | 4 +-
package/torsmo/torsmo.mk | 2 +-
package/transmission/transmission.mk | 22 +-
package/udisks/udisks.mk | 4 +-
package/ulogd/ulogd.mk | 8 +-
package/urg/urg.mk | 4 +-
package/usbutils/usbutils.mk | 2 +-
package/util-linux/util-linux.mk | 10 +-
package/valgrind/valgrind.mk | 4 +-
package/vde2/vde2.mk | 2 +-
package/vim/vim.mk | 2 +-
package/vlc/vlc.mk | 140 +-
package/vo-aacenc/vo-aacenc.mk | 8 +-
package/vorbis-tools/vorbis-tools.mk | 2 +-
package/vtun/vtun.mk | 2 +-
package/wayland/wayland.mk | 2 +-
package/webkit/webkit.mk | 12 +-
package/webp/webp.mk | 2 +-
package/webrtc-audio-processing/webrtc-audio-processing.mk | 2 +-
package/weston/weston.mk | 16 +-
package/wget/wget.mk | 6 +-
package/wireshark/wireshark.mk | 2 +-
package/wvstreams/wvstreams.mk | 16 +-
package/x11r7/libxcb/libxcb.mk | 4 +-
package/x11r7/xapp_xdm/xapp_xdm.mk | 2 +-
package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk | 8 +-
package/x11r7/xapp_xrandr/xapp_xrandr.mk | 2 +-
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 14 +-
package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +-
package/x11r7/xlib_libFS/xlib_libFS.mk | 2 +-
package/x11r7/xlib_libSM/xlib_libSM.mk | 2 +-
package/x11r7/xlib_libX11/xlib_libX11.mk | 4 +-
package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 2 +-
package/x11r7/xlib_libXaw/xlib_libXaw.mk | 2 +-
package/x11r7/xlib_libXext/xlib_libXext.mk | 2 +-
package/x11r7/xlib_libXfont/xlib_libXfont.mk | 4 +-
package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +-
package/x11r7/xlib_libXinerama/xlib_libXinerama.mk | 2 +-
package/x11r7/xlib_libXrandr/xlib_libXrandr.mk | 2 +-
package/x11r7/xlib_libXrender/xlib_libXrender.mk | 2 +-
package/x11r7/xlib_libXres/xlib_libXres.mk | 2 +-
package/x11r7/xlib_libXt/xlib_libXt.mk | 2 +-
package/x11r7/xlib_libXv/xlib_libXv.mk | 2 +-
package/x11r7/xlib_libXvMC/xlib_libXvMC.mk | 2 +-
package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk | 2 +-
package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 2 +-
package/x11r7/xlib_libdmx/xlib_libdmx.mk | 2 +-
package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk | 4 +-
package/x11r7/xproto_xextproto/xproto_xextproto.mk | 4 +-
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 72 +-
package/x11vnc/x11vnc.mk | 20 +-
package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 6 +-
package/xbmc/xbmc.mk | 72 +-
package/xenomai/xenomai.mk | 2 +-
package/xerces/xerces.mk | 6 +-
package/xfsprogs/xfsprogs.mk | 2 +-
package/xmlstarlet/xmlstarlet.mk | 6 +-
package/xscreensaver/xscreensaver.mk | 2 +-
package/zeromq/zeromq.mk | 4 +-
package/znc/znc.mk | 18 +-
487 files changed, 2857 insertions(+), 2857 deletions(-)
diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
--- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -26,7 +26,7 @@
BOOT_WRAPPER_AARCH64_PRE_PATCH_HOOKS += BOOT_WRAPPER_AARCH64_FIX_DTB_NAME
-BOOT_WRAPPER_AARCH64_CONF_OPT = \
+BOOT_WRAPPER_AARCH64_CONF_OPTS = \
--with-kernel-dir=$(LINUX_DIR) \
--with-cmdline=$(BR2_TARGET_BOOT_WRAPPER_AARCH64_BOOTARGS)
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -75,7 +75,7 @@
$(HOST_CONFIGURE_OPTS) \
CFLAGS="$(HOST_CFLAGS) $(GRUB_CFLAGS) -m32"
-GRUB_CONF_OPT = \
+GRUB_CONF_OPTS = \
--disable-auto-linux-mem-opt \
$(GRUB_CONFIG-y)
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -50,7 +50,7 @@
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)"
-GRUB2_CONF_OPT = \
+GRUB2_CONF_OPTS = \
--target=$(GRUB2_TARGET) \
--with-platform=$(GRUB2_PLATFORM) \
--disable-grub-mkfont \
diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk
--- a/boot/gummiboot/gummiboot.mk
+++ b/boot/gummiboot/gummiboot.mk
@@ -21,7 +21,7 @@
GUMMIBOOT_IMGARCH = x64
endif
-GUMMIBOOT_CONF_OPT = \
+GUMMIBOOT_CONF_OPTS = \
--host=$(BR2_ARCH) \
--with-efi-libdir=$(STAGING_DIR)/usr/lib \
--with-efi-ldsdir=$(STAGING_DIR)/usr/lib \
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -22,7 +22,7 @@
09: LIBFOO_SITE = http://www.foosoftware.org/download
10: LIBFOO_INSTALL_STAGING = YES
11: LIBFOO_INSTALL_TARGET = NO
-12: LIBFOO_CONF_OPT = --disable-shared
+12: LIBFOO_CONF_OPTS = --disable-shared
13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
14:
15: $(eval $(autotools-package))
@@ -96,7 +96,7 @@
* +LIBFOO_CONF_ENV+, to specify additional environment
variables to pass to the configure script. By default, empty.
-* +LIBFOO_CONF_OPT+, to specify additional configure
+* +LIBFOO_CONF_OPTS+, to specify additional configure
options to pass to the configure script. By default, empty.
* +LIBFOO_MAKE+, to specify an alternate +make+
diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
--- a/docs/manual/adding-packages-cmake.txt
+++ b/docs/manual/adding-packages-cmake.txt
@@ -22,7 +22,7 @@
09: LIBFOO_SITE = http://www.foosoftware.org/download
10: LIBFOO_INSTALL_STAGING = YES
11: LIBFOO_INSTALL_TARGET = NO
-12: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON
+12: LIBFOO_CONF_OPTS = -DBUILD_DEMOS=ON
13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf
14:
15: $(eval $(cmake-package))
@@ -94,7 +94,7 @@
* +LIBFOO_CONF_ENV+, to specify additional environment variables to
pass to CMake. By default, empty.
-* +LIBFOO_CONF_OPT+, to specify additional configure options to pass
+* +LIBFOO_CONF_OPTS+, to specify additional configure options to pass
to CMake. By default, empty.
* +LIBFOO_MAKE+, to specify an alternate +make+ command. This is
diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
--- a/docs/manual/adding-packages-perl.txt
+++ b/docs/manual/adding-packages-perl.txt
@@ -101,7 +101,7 @@
environment variables to pass to the +perl Makefile.PL+ or +perl Build.PL+.
By default, empty.
-* +PERL_FOO_CONF_OPT+/+HOST_PERL_FOO_CONF_OPT+, to specify additional
+* +PERL_FOO_CONF_OPTS+/+HOST_PERL_FOO_CONF_OPTS+, to specify additional
configure options to pass to the +perl Makefile.PL+ or +perl Build.PL+.
By default, empty.
diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt
--- a/docs/manual/writing-rules.txt
+++ b/docs/manual/writing-rules.txt
@@ -65,7 +65,7 @@
+
---------------------
LIBFOO_VERSION = 1.0
-LIBFOO_CONF_OPT += --without-python-support
+LIBFOO_CONF_OPTS += --without-python-support
---------------------
+
Do not align the +=+ signs.
@@ -90,17 +90,17 @@
+
---------------------
ifeq ($(BR2_PACKAGE_PYTHON),y)
-LIBFOO_CONF_OPT += --with-python-support
+LIBFOO_CONF_OPTS += --with-python-support
LIBFOO_DEPENDENCIES += python
else
-LIBFOO_CONF_OPT += --without-python-support
+LIBFOO_CONF_OPTS += --without-python-support
endif
---------------------
+
NO:
+
---------------------
-LIBFOO_CONF_OPT += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support
+LIBFOO_CONF_OPTS += --with$(if $(BR2_PACKAGE_PYTHON),,out)-python-support
LIBFOO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,)
---------------------
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -9,7 +9,7 @@
ACL_SITE = http://download.savannah.gnu.org/releases/acl
ACL_INSTALL_STAGING = YES
ACL_DEPENDENCIES = attr
-ACL_CONF_OPT = --enable-gettext=no
+ACL_CONF_OPTS = --enable-gettext=no
ACL_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk
--- a/package/agentpp/agentpp.mk
+++ b/package/agentpp/agentpp.mk
@@ -11,7 +11,7 @@
AGENTPP_LICENSE_FILES = LICENSE-2_0.txt
AGENTPP_INSTALL_STAGING = YES
AGENTPP_DEPENDENCIES = host-pkgconf snmppp
-AGENTPP_CONF_OPT += \
+AGENTPP_CONF_OPTS += \
--disable-proxy \
--disable-forwarder \
--disable-rpath
diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -12,45 +12,45 @@
ALSA_LIB_INSTALL_STAGING = YES
ALSA_LIB_CFLAGS = $(TARGET_CFLAGS)
ALSA_LIB_AUTORECONF = YES
-ALSA_LIB_CONF_OPT = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
+ALSA_LIB_CONF_OPTS = --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
--with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
--with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \
--without-versioned
# Can't build with static & shared at the same time (1.0.25+)
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-ALSA_LIB_CONF_OPT += --enable-shared=no
+ALSA_LIB_CONF_OPTS += --enable-shared=no
else
-ALSA_LIB_CONF_OPT += --enable-static=no
+ALSA_LIB_CONF_OPTS += --enable-static=no
endif
ifneq ($(BR2_PACKAGE_ALSA_LIB_ALOAD),y)
-ALSA_LIB_CONF_OPT += --disable-aload
+ALSA_LIB_CONF_OPTS += --disable-aload
endif
ifneq ($(BR2_PACKAGE_ALSA_LIB_MIXER),y)
-ALSA_LIB_CONF_OPT += --disable-mixer
+ALSA_LIB_CONF_OPTS += --disable-mixer
endif
ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM),y)
-ALSA_LIB_CONF_OPT += --disable-pcm
+ALSA_LIB_CONF_OPTS += --disable-pcm
endif
ifneq ($(BR2_PACKAGE_ALSA_LIB_RAWMIDI),y)
-ALSA_LIB_CONF_OPT += --disable-rawmidi
+ALSA_LIB_CONF_OPTS += --disable-rawmidi
endif
ifneq ($(BR2_PACKAGE_ALSA_LIB_HWDEP),y)
-ALSA_LIB_CONF_OPT += --disable-hwdep
+ALSA_LIB_CONF_OPTS += --disable-hwdep
endif
ifneq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y)
-ALSA_LIB_CONF_OPT += --disable-seq
+ALSA_LIB_CONF_OPTS += --disable-seq
endif
ifneq ($(BR2_PACKAGE_ALSA_LIB_ALISP),y)
-ALSA_LIB_CONF_OPT += --disable-alisp
+ALSA_LIB_CONF_OPTS += --disable-alisp
endif
ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y)
-ALSA_LIB_CONF_OPT += --disable-old-symbols
+ALSA_LIB_CONF_OPTS += --disable-old-symbols
endif
ifeq ($(BR2_ENABLE_DEBUG),y)
-ALSA_LIB_CONF_OPT += --enable-debug
+ALSA_LIB_CONF_OPTS += --enable-debug
endif
ifeq ($(BR2_avr32),y)
@@ -58,17 +58,17 @@
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
-ALSA_LIB_CONF_OPT += \
+ALSA_LIB_CONF_OPTS += \
--with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \
--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
ALSA_LIB_DEPENDENCIES = python
else
-ALSA_LIB_CONF_OPT += --disable-python
+ALSA_LIB_CONF_OPTS += --disable-python
endif
ifeq ($(BR2_SOFT_FLOAT),y)
-ALSA_LIB_CONF_OPT += --with-softfloat
+ALSA_LIB_CONF_OPTS += --with-softfloat
endif
ifeq ($(BR2_bfin),y)
diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk
--- a/package/alsa-utils/alsa-utils.mk
+++ b/package/alsa-utils/alsa-utils.mk
@@ -16,12 +16,12 @@
ALSA_UTILS_CONF_ENV = \
ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
-ALSA_UTILS_CONF_OPT = \
+ALSA_UTILS_CONF_OPTS = \
--disable-xmlto \
--with-curses=$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncursesw,ncurses)
ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y)
-ALSA_UTILS_CONF_OPT += --disable-alsamixer --disable-alsatest
+ALSA_UTILS_CONF_OPTS += --disable-alsamixer --disable-alsatest
endif
ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACONF) += usr/sbin/alsaconf
diff --git a/package/apitrace/apitrace.mk b/package/apitrace/apitrace.mk
--- a/package/apitrace/apitrace.mk
+++ b/package/apitrace/apitrace.mk
@@ -12,6 +12,6 @@
APITRACE_DEPENDENCIES = xlib_libX11 host-python
# Gui was never tested, so we prefer to explicitly disable it
-APITRACE_CONF_OPT += -DENABLE_GUI=false
+APITRACE_CONF_OPTS += -DENABLE_GUI=false
$(eval $(cmake-package))
diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk
--- a/package/apr-util/apr-util.mk
+++ b/package/apr-util/apr-util.mk
@@ -10,7 +10,7 @@
APR_UTIL_LICENSE_FILES = LICENSE
APR_UTIL_INSTALL_STAGING = YES
APR_UTIL_DEPENDENCIES = apr sqlite neon zlib
-APR_UTIL_CONF_OPT = \
+APR_UTIL_CONF_OPTS = \
--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
APR_UTIL_CONFIG_SCRIPTS = apu-1-config
diff --git a/package/at/at.mk b/package/at/at.mk
--- a/package/at/at.mk
+++ b/package/at/at.mk
@@ -14,7 +14,7 @@
AT_LICENSE = GPLv2+, GPLv3+, ISC
AT_LICENSE_FILES = Copyright COPYING
-AT_CONF_OPT = \
+AT_CONF_OPTS = \
--with-jobdir=/var/spool/cron/atjobs \
--with-atspool=/var/spool/cron/atspool \
--with-daemon_username=root \
diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk
--- a/package/atftp/atftp.mk
+++ b/package/atftp/atftp.mk
@@ -8,25 +8,25 @@
ATFTP_SITE = http://sourceforge.net/projects/atftp/files
ATFTP_LICENSE = GPLv2+
ATFTP_LICENSE_FILES = LICENSE
-ATFTP_CONF_OPT = --disable-libwrap --disable-mtftp
+ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp
# For static we need to explicitly link against libpthread
ATFTP_LIBS = -lpthread
ATFTP_CONF_ENV = LIBS="$(ATFTP_LIBS)"
ifeq ($(BR2_PACKAGE_READLINE),y)
ATFTP_DEPENDENCIES += readline
-ATFTP_CONF_OPT += --enable-libreadline
+ATFTP_CONF_OPTS += --enable-libreadline
# For static, readline links with ncurses
ATFTP_LIBS += -lncurses
else
-ATFTP_CONF_OPT += --disable-libreadline
+ATFTP_CONF_OPTS += --disable-libreadline
endif
ifeq ($(BR2_PACKAGE_PCRE),y)
ATFTP_DEPENDENCIES += pcre
-ATFTP_CONF_OPT += --enable-libpcre
+ATFTP_CONF_OPTS += --enable-libpcre
else
-ATFTP_CONF_OPT += --disable-libpcre
+ATFTP_CONF_OPTS += --disable-libpcre
endif
$(eval $(autotools-package))
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -41,7 +41,7 @@
jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
gl_cv_c_restrict=no ac_cv_prog_F77=no
-ATK_CONF_OPT = --disable-glibtest --enable-explicit-deps=no \
+ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no \
--disable-debug
ATK_DEPENDENCIES = libglib2 host-pkgconf
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -8,7 +8,7 @@
ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
ATTR_SITE = http://download.savannah.gnu.org/releases/attr
ATTR_INSTALL_STAGING = YES
-ATTR_CONF_OPT = --enable-gettext=no
+ATTR_CONF_OPTS = --enable-gettext=no
ATTR_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
diff --git a/package/audiofile/audiofile.mk b/package/audiofile/audiofile.mk
--- a/package/audiofile/audiofile.mk
+++ b/package/audiofile/audiofile.mk
@@ -8,7 +8,7 @@
AUDIOFILE_SITE = http://audiofile.68k.org
AUDIOFILE_INSTALL_STAGING = YES
AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-AUDIOFILE_CONF_OPT = --disable-examples --disable-docs
+AUDIOFILE_CONF_OPTS = --disable-examples --disable-docs
AUDIOFILE_DEPENDENCIES = host-pkgconf
# configure is outdated and has old bugs because of it
AUDIOFILE_AUTORECONF = YES
@@ -17,9 +17,9 @@
ifeq ($(BR2_PACKAGE_FLAC),y)
AUDIOFILE_DEPENDENCIES += flac
-AUDIOFILE_CONF_OPT += --enable-flac
+AUDIOFILE_CONF_OPTS += --enable-flac
else
-AUDIOFILE_CONF_OPT += --disable-flac
+AUDIOFILE_CONF_OPTS += --disable-flac
endif
$(eval $(autotools-package))
diff --git a/package/aumix/aumix.mk b/package/aumix/aumix.mk
--- a/package/aumix/aumix.mk
+++ b/package/aumix/aumix.mk
@@ -11,7 +11,7 @@
AUMIX_LICENSE = GPLv2+
AUMIX_LICENSE_FILES = COPYING
-AUMIX_CONF_OPT = \
+AUMIX_CONF_OPTS = \
--without-gtk \
--without-gtk1 \
--without-alsa \
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -67,7 +67,7 @@
avahi_cv_sys_cxx_works=yes \
DATADIRNAME=share
-AVAHI_CONF_OPT = --localstatedir=/var \
+AVAHI_CONF_OPTS = --localstatedir=/var \
--disable-qt3 \
--disable-qt4 \
--disable-gdbm \
@@ -91,36 +91,36 @@
ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
AVAHI_DEPENDENCIES += libdaemon
else
-AVAHI_CONF_OPT += --disable-libdaemon
+AVAHI_CONF_OPTS += --disable-libdaemon
endif
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
AVAHI_DEPENDENCIES += expat
-AVAHI_CONF_OPT += --with-xml=expat
+AVAHI_CONF_OPTS += --with-xml=expat
else
-AVAHI_CONF_OPT += --with-xml=none
+AVAHI_CONF_OPTS += --with-xml=none
endif
ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y)
-AVAHI_CONF_OPT += --enable-compat-libdns_sd
+AVAHI_CONF_OPTS += --enable-compat-libdns_sd
endif
ifeq ($(BR2_PACKAGE_DBUS),y)
AVAHI_DEPENDENCIES += dbus
else
-AVAHI_CONF_OPT += --disable-dbus
+AVAHI_CONF_OPTS += --disable-dbus
endif
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
AVAHI_DEPENDENCIES += libglib2
else
-AVAHI_CONF_OPT += --disable-glib --disable-gobject
+AVAHI_CONF_OPTS += --disable-glib --disable-gobject
endif
ifeq ($(BR2_PACKAGE_LIBGLADE),y)
AVAHI_DEPENDENCIES += libglade
else
-AVAHI_CONF_OPT += --disable-gtk
+AVAHI_CONF_OPTS += --disable-gtk
endif
ifeq ($(BR2_PACKAGE_PYTHON),y)
@@ -133,9 +133,9 @@
py_cv_mod_socket_=yes
AVAHI_DEPENDENCIES += python
-AVAHI_CONF_OPT += --enable-python
+AVAHI_CONF_OPTS += --enable-python
else
-AVAHI_CONF_OPT += --disable-python
+AVAHI_CONF_OPTS += --disable-python
endif
AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
diff --git a/package/bandwidthd/bandwidthd.mk b/package/bandwidthd/bandwidthd.mk
--- a/package/bandwidthd/bandwidthd.mk
+++ b/package/bandwidthd/bandwidthd.mk
@@ -15,20 +15,20 @@
BANDWIDTHD_AUTORECONF = YES
-BANDWIDTHD_CONF_OPT += --without-x
+BANDWIDTHD_CONF_OPTS += --without-x
ifeq ($(BR2_PACKAGE_BANDWIDTHD_POSTGRESQL),y)
BANDWIDTHD_DEPENDENCIES += postgresql
-BANDWIDTHD_CONF_OPT += --with-postgresql-logging=true
+BANDWIDTHD_CONF_OPTS += --with-postgresql-logging=true
else
-BANDWIDTHD_CONF_OPT += --with-postgresql-logging=false
+BANDWIDTHD_CONF_OPTS += --with-postgresql-logging=false
endif
ifeq ($(BR2_PACKAGE_BANDWIDTHD_SQLITE3),y)
BANDWIDTHD_DEPENDENCIES += sqlite
-BANDWIDTHD_CONF_OPT += --with-sqlite-storage=true
+BANDWIDTHD_CONF_OPTS += --with-sqlite-storage=true
else
-BANDWIDTHD_CONF_OPT += --with-sqlite-storage=false
+BANDWIDTHD_CONF_OPTS += --with-sqlite-storage=false
endif
$(eval $(autotools-package))
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -7,7 +7,7 @@
BASH_VERSION = 4.3
BASH_SITE = $(BR2_GNU_MIRROR)/bash
BASH_DEPENDENCIES = ncurses readline host-bison
-BASH_CONF_OPT = --with-installed-readline
+BASH_CONF_OPTS = --with-installed-readline
BASH_LICENSE = GPLv3+
BASH_LICENSE_FILES = COPYING
@@ -25,7 +25,7 @@
# The static build needs some trickery
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-BASH_CONF_OPT += --enable-static-link --without-bash-malloc
+BASH_CONF_OPTS += --enable-static-link --without-bash-malloc
endif
# Make sure we build after busybox so that /bin/sh links to bash
diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk
--- a/package/bcusdk/bcusdk.mk
+++ b/package/bcusdk/bcusdk.mk
@@ -10,7 +10,7 @@
BCUSDK_LICENSE = GPLv2+
BCUSDK_LICENSE_FILES = COPYING
BCUSDK_INSTALL_STAGING = YES
-BCUSDK_CONF_OPT = --enable-onlyeibd --enable-ft12 --enable-pei16 \
+BCUSDK_CONF_OPTS = --enable-onlyeibd --enable-ft12 --enable-pei16 \
--enable-eibnetip --enable-eibnetipserver \
--enable-eibnetiptunnel --without-pth-test \
--with-pth=$(STAGING_DIR)/usr
diff --git a/package/beecrypt/beecrypt.mk b/package/beecrypt/beecrypt.mk
--- a/package/beecrypt/beecrypt.mk
+++ b/package/beecrypt/beecrypt.mk
@@ -17,7 +17,7 @@
BEECRYPT_CONF_ENV = \
CXXFLAGS="$(TARGET_CXXFLAGS) -fpermissive"
-BEECRYPT_CONF_OPT = \
+BEECRYPT_CONF_OPTS = \
--without-java \
--without-python \
--disable-openmp
@@ -25,7 +25,7 @@
ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)
BEECRYPT_DEPENDENCIES += icu
else
-BEECRYPT_CONF_OPT += --without-cplusplus
+BEECRYPT_CONF_OPTS += --without-cplusplus
# automake/libtool uses the C++ compiler to link libbeecrypt because of
# (the optional) cppglue.cxx. Force it to use the C compiler instead.
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -20,50 +20,50 @@
BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate
BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
BUILD_CFLAGS="$(TARGET_CFLAGS)"
-BIND_CONF_OPT = --localstatedir=/var \
+BIND_CONF_OPTS = --localstatedir=/var \
--with-randomdev=/dev/urandom \
--enable-epoll --with-libtool \
--with-gssapi=no --enable-rrl
ifeq ($(BR2_PACKAGE_LIBCAP),y)
- BIND_CONF_OPT += --enable-linux-caps
+ BIND_CONF_OPTS += --enable-linux-caps
BIND_DEPENDENCIES += libcap
else
- BIND_CONF_OPT += --disable-linux-caps
+ BIND_CONF_OPTS += --disable-linux-caps
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
- BIND_CONF_OPT += --with-libxml2=$(STAGING_DIR)/usr --enable-newstats
+ BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr --enable-newstats
BIND_DEPENDENCIES += libxml2
else
- BIND_CONF_OPT += --with-libxml2=no
+ BIND_CONF_OPTS += --with-libxml2=no
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
BIND_DEPENDENCIES += openssl
BIND_CONF_ENV += ac_cv_func_EVP_sha256=yes \
ac_cv_func_EVP_sha384=yes ac_cv_func_EVP_sha512=yes
- BIND_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \
+ BIND_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \
--with-ecdsa=yes
# GOST cipher support requires openssl extra engines
ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
- BIND_CONF_OPT += --with-gost=yes
+ BIND_CONF_OPTS += --with-gost=yes
else
- BIND_CONF_OPT += --with-gost=no
+ BIND_CONF_OPTS += --with-gost=no
endif
else
- BIND_CONF_OPT += --with-openssl=no
+ BIND_CONF_OPTS += --with-openssl=no
endif
# Used by dnssec-checkds and dnssec-coverage
ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),)
- BIND_CONF_OPT += --with-python=no
+ BIND_CONF_OPTS += --with-python=no
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
BIND_DEPENDENCIES += readline
else
- BIND_CONF_OPT += --with-readline=no
+ BIND_CONF_OPTS += --with-readline=no
endif
define BIND_TARGET_REMOVE_SERVER
diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk
--- a/package/binutils/binutils.mk
+++ b/package/binutils/binutils.mk
@@ -45,15 +45,15 @@
# When binutils sources are fetched from the binutils-gdb repository,
# they also contain the gdb sources, but gdb shouldn't be built, so we
# disable it.
-BINUTILS_DISABLE_GDB_CONF_OPT = \
+BINUTILS_DISABLE_GDB_CONF_OPTS = \
--disable-sim --disable-gdb
# We need to specify host & target to avoid breaking ARM EABI
-BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
+BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
--host=$(GNU_TARGET_NAME) \
--target=$(GNU_TARGET_NAME) \
--enable-install-libiberty \
- $(BINUTILS_DISABLE_GDB_CONF_OPT) \
+ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
$(BINUTILS_EXTRA_CONFIG_OPTIONS)
# Don't build documentation. It takes up extra space / build time,
@@ -68,11 +68,11 @@
# "host" binutils should actually be "cross"
# We just keep the convention of "host utility" for now
-HOST_BINUTILS_CONF_OPT = --disable-multilib --disable-werror \
+HOST_BINUTILS_CONF_OPTS = --disable-multilib --disable-werror \
--target=$(GNU_TARGET_NAME) \
--disable-shared --enable-static \
--with-sysroot=$(STAGING_DIR) \
- $(BINUTILS_DISABLE_GDB_CONF_OPT) \
+ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \
$(BINUTILS_EXTRA_CONFIG_OPTIONS)
# We just want libbfd and libiberty, not the full-blown binutils in staging
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -7,7 +7,7 @@
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_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+BLACKBOX_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
BLACKBOX_DEPENDENCIES = xlib_libX11
BLACKBOX_LICENSE = MIT
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -12,30 +12,30 @@
BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+
BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
-BLUEZ5_UTILS_CONF_OPT = \
+BLUEZ5_UTILS_CONF_OPTS = \
--enable-tools \
--enable-library \
--disable-cups
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-obex
+BLUEZ5_UTILS_CONF_OPTS += --enable-obex
BLUEZ5_UTILS_DEPENDENCIES += libical
else
-BLUEZ5_UTILS_CONF_OPT += --disable-obex
+BLUEZ5_UTILS_CONF_OPTS += --disable-obex
endif
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_CLIENT),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-client
+BLUEZ5_UTILS_CONF_OPTS += --enable-client
BLUEZ5_UTILS_DEPENDENCIES += readline
else
-BLUEZ5_UTILS_CONF_OPT += --disable-client
+BLUEZ5_UTILS_CONF_OPTS += --disable-client
endif
# experimental plugins
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-experimental
+BLUEZ5_UTILS_CONF_OPTS += --enable-experimental
else
-BLUEZ5_UTILS_CONF_OPT += --disable-experimental
+BLUEZ5_UTILS_CONF_OPTS += --disable-experimental
endif
# install gatttool (For some reason upstream choose not to do it by default)
@@ -48,25 +48,25 @@
# enable test
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_TEST),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-test
+BLUEZ5_UTILS_CONF_OPTS += --enable-test
else
-BLUEZ5_UTILS_CONF_OPT += --disable-test
+BLUEZ5_UTILS_CONF_OPTS += --disable-test
endif
# use udev if available
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-udev
+BLUEZ5_UTILS_CONF_OPTS += --enable-udev
BLUEZ5_UTILS_DEPENDENCIES += udev
else
-BLUEZ5_UTILS_CONF_OPT += --disable-udev
+BLUEZ5_UTILS_CONF_OPTS += --disable-udev
endif
# integrate with systemd if available
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
-BLUEZ5_UTILS_CONF_OPT += --enable-systemd
+BLUEZ5_UTILS_CONF_OPTS += --enable-systemd
BLUEZ5_UTILS_DEPENDENCIES += systemd
else
-BLUEZ5_UTILS_CONF_OPT += --disable-systemd
+BLUEZ5_UTILS_CONF_OPTS += --disable-systemd
endif
$(eval $(autotools-package))
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -9,14 +9,14 @@
BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
BLUEZ_UTILS_INSTALL_STAGING = YES
BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
-BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools
+BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
BLUEZ_UTILS_AUTORECONF = YES
BLUEZ_UTILS_LICENSE = GPLv2+ LGPLv2.1+
BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB
# BlueZ 3.x compatibility
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
-BLUEZ_UTILS_CONF_OPT += \
+BLUEZ_UTILS_CONF_OPTS += \
--enable-hidd \
--enable-pand \
--enable-sdp \
@@ -28,29 +28,29 @@
BLUEZ_UTILS_DEPENDENCIES += \
alsa-lib \
libsndfile
-BLUEZ_UTILS_CONF_OPT += \
+BLUEZ_UTILS_CONF_OPTS += \
--enable-alsa \
--enable-audio
else
-BLUEZ_UTILS_CONF_OPT += \
+BLUEZ_UTILS_CONF_OPTS += \
--disable-alsa \
--disable-audio
endif
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_GATT),y)
BLUEZ_UTILS_DEPENDENCIES += readline
-BLUEZ_UTILS_CONF_OPT += --enable-gatt
+BLUEZ_UTILS_CONF_OPTS += --enable-gatt
else
-BLUEZ_UTILS_CONF_OPT += --disable-gatt
+BLUEZ_UTILS_CONF_OPTS += --disable-gatt
endif
# USB support
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
BLUEZ_UTILS_DEPENDENCIES += libusb
-BLUEZ_UTILS_CONF_OPT += \
+BLUEZ_UTILS_CONF_OPTS += \
--enable-usb
else
-BLUEZ_UTILS_CONF_OPT += \
+BLUEZ_UTILS_CONF_OPTS += \
--disable-usb
endif
diff --git a/package/bmon/bmon.mk b/package/bmon/bmon.mk
--- a/package/bmon/bmon.mk
+++ b/package/bmon/bmon.mk
@@ -14,10 +14,10 @@
# link dynamically unless explicitly requested otherwise
ifeq ($(BR2_PREFER_STATIC_LIB),)
-BMON_CONF_OPT += --disable-static
+BMON_CONF_OPTS += --disable-static
else
# forgets to explicitly link with pthread for libnl
-BMON_CONF_OPT += LIBS=-lpthread
+BMON_CONF_OPTS += LIBS=-lpthread
endif
$(eval $(autotools-package))
diff --git a/package/bootutils/bootutils.mk b/package/bootutils/bootutils.mk
--- a/package/bootutils/bootutils.mk
+++ b/package/bootutils/bootutils.mk
@@ -6,7 +6,7 @@
BOOTUTILS_VERSION = 1.0.0
BOOTUTILS_SITE = http://downloads.sourceforge.net/project/bootutils/Stable/v$(BOOTUTILS_VERSION)
-BOOTUTILS_CONF_OPT = --prefix=/ --exec-prefix=/
+BOOTUTILS_CONF_OPTS = --prefix=/ --exec-prefix=/
BOOTUTILS_LICENSE = GPLv2+
BOOTUTILS_LICENSE_FILES = COPYING
diff --git a/package/bridge-utils/bridge-utils.mk b/package/bridge-utils/bridge-utils.mk
--- a/package/bridge-utils/bridge-utils.mk
+++ b/package/bridge-utils/bridge-utils.mk
@@ -7,7 +7,7 @@
BRIDGE_UTILS_VERSION = 1.5
BRIDGE_UTILS_SITE = http://downloads.sourceforge.net/project/bridge/bridge
BRIDGE_UTILS_AUTORECONF = YES
-BRIDGE_UTILS_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR)
+BRIDGE_UTILS_CONF_OPTS = --with-linux-headers=$(LINUX_HEADERS_DIR)
BRIDGE_UTILS_LICENSE = GPLv2+
BRIDGE_UTILS_LICENSE_FILES = COPYING
diff --git a/package/bwm-ng/bwm-ng.mk b/package/bwm-ng/bwm-ng.mk
--- a/package/bwm-ng/bwm-ng.mk
+++ b/package/bwm-ng/bwm-ng.mk
@@ -6,12 +6,12 @@
BWM_NG_VERSION = 0.6
BWM_NG_SITE = http://downloads.sourceforge.net/project/bwmng/bwmng/$(BWM_NG_VERSION)
-BWM_NG_CONF_OPT = --with-procnetdev --with-diskstats
+BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
BWM_NG_LICENSE = GPLv2
BWM_NG_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_NCURSES),y)
-BWM_NG_CONF_OPT += --with-ncurses
+BWM_NG_CONF_OPTS += --with-ncurses
BWM_NG_DEPENDENCIES += ncurses
endif
diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -42,7 +42,7 @@
CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1"
endif
-CAIRO_CONF_OPT = \
+CAIRO_CONF_OPTS = \
--enable-trace=no \
--enable-interpreter=no
@@ -52,97 +52,97 @@
# DirectFB. Break circular dependency by disabling DirectFB support in Cairo
# (which is experimental)
ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx)
- CAIRO_CONF_OPT += --enable-directfb
+ CAIRO_CONF_OPTS += --enable-directfb
CAIRO_DEPENDENCIES += directfb
else
- CAIRO_CONF_OPT += --disable-directfb
+ CAIRO_CONF_OPTS += --disable-directfb
endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)
- CAIRO_CONF_OPT += --enable-ft
+ CAIRO_CONF_OPTS += --enable-ft
CAIRO_DEPENDENCIES += freetype
else
- CAIRO_CONF_OPT += --disable-ft
+ CAIRO_CONF_OPTS += --disable-ft
endif
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
- CAIRO_CONF_OPT += --enable-gobject
+ CAIRO_CONF_OPTS += --enable-gobject
CAIRO_DEPENDENCIES += libglib2
else
- CAIRO_CONF_OPT += --disable-gobject
+ CAIRO_CONF_OPTS += --disable-gobject
endif
ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
- CAIRO_CONF_OPT += --enable-glesv2
+ CAIRO_CONF_OPTS += --enable-glesv2
CAIRO_DEPENDENCIES += libgles
else
- CAIRO_CONF_OPT += --disable-glesv2
+ CAIRO_CONF_OPTS += --disable-glesv2
endif
ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y)
- CAIRO_CONF_OPT += --enable-vg
+ CAIRO_CONF_OPTS += --enable-vg
CAIRO_DEPENDENCIES += libopenvg
else
- CAIRO_CONF_OPT += --disable-vg
+ CAIRO_CONF_OPTS += --disable-vg
endif
ifeq ($(BR2_PACKAGE_XORG7),y)
- CAIRO_CONF_OPT += --enable-xlib --enable-xcb --with-x
+ CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x
CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext
else
- CAIRO_CONF_OPT += --disable-xlib --disable-xcb --without-x
+ CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y)
- CAIRO_CONF_OPT += --enable-xlib-xrender
+ CAIRO_CONF_OPTS += --enable-xlib-xrender
CAIRO_DEPENDENCIES += xlib_libXrender
else
- CAIRO_CONF_OPT += --disable-xlib-xrender
+ CAIRO_CONF_OPTS += --disable-xlib-xrender
endif
ifeq ($(BR2_PACKAGE_CAIRO_PS),y)
- CAIRO_CONF_OPT += --enable-ps
+ CAIRO_CONF_OPTS += --enable-ps
CAIRO_DEPENDENCIES += zlib
else
- CAIRO_CONF_OPT += --disable-ps
+ CAIRO_CONF_OPTS += --disable-ps
endif
ifeq ($(BR2_PACKAGE_CAIRO_PDF),y)
- CAIRO_CONF_OPT += --enable-pdf
+ CAIRO_CONF_OPTS += --enable-pdf
CAIRO_DEPENDENCIES += zlib
else
- CAIRO_CONF_OPT += --disable-pdf
+ CAIRO_CONF_OPTS += --disable-pdf
endif
ifeq ($(BR2_PACKAGE_CAIRO_PNG),y)
- CAIRO_CONF_OPT += --enable-png
+ CAIRO_CONF_OPTS += --enable-png
CAIRO_DEPENDENCIES += libpng
else
- CAIRO_CONF_OPT += --disable-png
+ CAIRO_CONF_OPTS += --disable-png
endif
ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y)
- CAIRO_CONF_OPT += --enable-script
+ CAIRO_CONF_OPTS += --enable-script
else
- CAIRO_CONF_OPT += --disable-script
+ CAIRO_CONF_OPTS += --disable-script
endif
ifeq ($(BR2_PACKAGE_CAIRO_SVG),y)
- CAIRO_CONF_OPT += --enable-svg
+ CAIRO_CONF_OPTS += --enable-svg
else
- CAIRO_CONF_OPT += --disable-svg
+ CAIRO_CONF_OPTS += --disable-svg
endif
ifeq ($(BR2_PACKAGE_CAIRO_TEE),y)
- CAIRO_CONF_OPT += --enable-tee
+ CAIRO_CONF_OPTS += --enable-tee
else
- CAIRO_CONF_OPT += --disable-tee
+ CAIRO_CONF_OPTS += --disable-tee
endif
ifeq ($(BR2_PACKAGE_CAIRO_XML),y)
- CAIRO_CONF_OPT += --enable-xml
+ CAIRO_CONF_OPTS += --enable-xml
else
- CAIRO_CONF_OPT += --disable-xml
+ CAIRO_CONF_OPTS += --disable-xml
endif
$(eval $(autotools-package))
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -19,7 +19,7 @@
# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy
# path: tell ccache to use its internal copy of zlib, so that ccache
# has zero dependency besides the C library.
-HOST_CCACHE_CONF_OPT += ccache_cv_zlib_1_2_3=no
+HOST_CCACHE_CONF_OPTS += ccache_cv_zlib_1_2_3=no
# Patch host-ccache as follows:
# - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR
diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
--- a/package/cdrkit/cdrkit.mk
+++ b/package/cdrkit/cdrkit.mk
@@ -11,17 +11,17 @@
CDRKIT_LICENSE_FILES = COPYING
ifeq ($(BR2_ENDIAN),"BIG")
-CDRKIT_CONF_OPT += -DBITFIELDS_HTOL=1
+CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=1
else
-CDRKIT_CONF_OPT += -DBITFIELDS_HTOL=0
+CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=0
endif
## cdrkit isn't completely re-rooted by CMAKE_FIND_ROOT_PATH, so add
## some extra flags so it finds needed libs and headers.
-CDRKIT_CONF_OPT += -DCMAKE_C_FLAGS="-I$(STAGING_DIR)/usr/include"
-CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)"
-HOST_CDRKIT_CONF_OPT += -DCMAKE_C_FLAGS="-I$(HOST_DIR)/usr/include"
-HOST_CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)"
+CDRKIT_CONF_OPTS += -DCMAKE_C_FLAGS="-I$(STAGING_DIR)/usr/include"
+CDRKIT_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)"
+HOST_CDRKIT_CONF_OPTS += -DCMAKE_C_FLAGS="-I$(HOST_DIR)/usr/include"
+HOST_CDRKIT_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)"
$(eval $(cmake-package))
$(eval $(host-cmake-package))
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
--- a/package/cegui06/cegui06.mk
+++ b/package/cegui06/cegui06.mk
@@ -18,7 +18,7 @@
freetype \
pcre \
-CEGUI06_CONF_OPT = \
+CEGUI06_CONF_OPTS = \
--enable-expat \
--disable-external-tinyxml \
--disable-xerces-c \
diff --git a/package/celt051/celt051.mk b/package/celt051/celt051.mk
--- a/package/celt051/celt051.mk
+++ b/package/celt051/celt051.mk
@@ -18,7 +18,7 @@
# if target is the same kind as host (ie. same arch, same bitness,
# same endianness, so that /usr/lib contains libraries linkable by
# our cross-compiler)
-CELT051_CONF_OPT = \
+CELT051_CONF_OPTS = \
--enable-fixed-point \
--disable-fixed-point-debug \
--disable-experimental-postfilter \
diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk
--- a/package/chrony/chrony.mk
+++ b/package/chrony/chrony.mk
@@ -9,22 +9,22 @@
CHRONY_LICENSE = GPLv2
CHRONY_LICENSE_FILES = COPYING
-CHRONY_CONF_OPT = --host-system=Linux --host-machine=$(BR2_ARCH) --prefix=/usr
+CHRONY_CONF_OPTS = --host-system=Linux --host-machine=$(BR2_ARCH) --prefix=/usr
ifeq ($(BR2_PACKAGE_LIBNSS),y)
CHRONY_DEPENDENCIES += host-pkgconf libnss
else
-CHRONY_CONF_OPT += --without-nss
+CHRONY_CONF_OPTS += --without-nss
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
CHRONY_DEPENDENCIES += readline
else
-CHRONY_CONF_OPT += --disable-readline
+CHRONY_CONF_OPTS += --disable-readline
endif
ifneq ($(BR2_INET_IPV6),y)
-CHRONY_CONF_OPT += --disable-ipv6
+CHRONY_CONF_OPTS += --disable-ipv6
endif
# Ditch the doc build, needs makeinfo and we don't need them
@@ -34,7 +34,7 @@
CHRONY_POST_PATCH_HOOKS += CHRONY_DISABLE_DOCS
define CHRONY_CONFIGURE_CMDS
- cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPT)
+ cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPTS)
endef
define CHRONY_BUILD_CMDS
diff --git a/package/cifs-utils/cifs-utils.mk b/package/cifs-utils/cifs-utils.mk
--- a/package/cifs-utils/cifs-utils.mk
+++ b/package/cifs-utils/cifs-utils.mk
@@ -11,7 +11,7 @@
CIFS_UTILS_LICENSE_FILES = COPYING
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-CIFS_UTILS_CONF_OPT += --disable-pie
+CIFS_UTILS_CONF_OPTS += --disable-pie
endif
define CIFS_UTILS_NO_WERROR
diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
--- a/package/civetweb/civetweb.mk
+++ b/package/civetweb/civetweb.mk
@@ -9,7 +9,7 @@
CIVETWEB_LICENSE = MIT
CIVETWEB_LICENSE_FILES = LICENSE.md
-CIVETWEB_CONF_OPT = TARGET_OS=LINUX
+CIVETWEB_CONF_OPTS = TARGET_OS=LINUX
CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
CIVETWEB_LIBS = -lpthread -lm -ldl
CIVETWEB_SYSCONFDIR = /etc
@@ -20,11 +20,11 @@
endif
ifeq ($(BR2_INET_IPV6),y)
- CIVETWEB_CONF_OPT += WITH_IPV6=1
+ CIVETWEB_CONF_OPTS += WITH_IPV6=1
endif
ifeq ($(BR2_CIVETWEB_WITH_LUA),y)
- CIVETWEB_CONF_OPT += WITH_LUA=1
+ CIVETWEB_CONF_OPTS += WITH_LUA=1
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
@@ -37,7 +37,7 @@
define CIVETWEB_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) build \
- $(CIVETWEB_CONF_OPT) \
+ $(CIVETWEB_CONF_OPTS) \
COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)"
endef
@@ -48,7 +48,7 @@
HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \
SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \
PREFIX="$(TARGET_DIR)/usr" \
- $(CIVETWEB_CONF_OPT) \
+ $(CIVETWEB_CONF_OPTS) \
COPT='$(CIVETWEB_COPT)'
endef
diff --git a/package/clapack/clapack.mk b/package/clapack/clapack.mk
--- a/package/clapack/clapack.mk
+++ b/package/clapack/clapack.mk
@@ -14,10 +14,10 @@
CLAPACK_LICENSE_FILES = F2CLIBS/libf2c/Notice COPYING
CLAPACK_SITE = http://www.netlib.org/clapack
CLAPACK_INSTALL_STAGING = YES
-CLAPACK_CONF_OPT = -DBUILDTESTING=OFF
+CLAPACK_CONF_OPTS = -DBUILDTESTING=OFF
ifneq ($(BR2_PACKAGE_CLAPACK_ARITH_H),)
-CLAPACK_CONF_OPT += -DARITH_H=$(BR2_PACKAGE_CLAPACK_ARITH_H)
+CLAPACK_CONF_OPTS += -DARITH_H=$(BR2_PACKAGE_CLAPACK_ARITH_H)
endif
$(eval $(cmake-package))
diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
--- a/package/classpath/classpath.mk
+++ b/package/classpath/classpath.mk
@@ -6,7 +6,7 @@
CLASSPATH_VERSION = 0.98
CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
-CLASSPATH_CONF_OPT = \
+CLASSPATH_CONF_OPTS = \
--disable-examples \
--disable-plugin \
--disable-rpath \
@@ -16,7 +16,7 @@
# classpath assumes qt runs on top of X11, but we
# don't support qt4 on X11
-CLASSPATH_CONF_OPT += --disable-qt-peer
+CLASSPATH_CONF_OPTS += --disable-qt-peer
CLASSPATH_DEPENDENCIES = host-pkgconf
CLASSPATH_AUTORECONF = YES
CLASSPATH_LICENSE = GPLv2+ with exception
@@ -25,39 +25,39 @@
# Needs ALSA pcm and sequencer (midi) support
# pcm is always on for alsa-lib
ifeq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y)
-CLASSPATH_CONF_OPT += --enable-alsa
+CLASSPATH_CONF_OPTS += --enable-alsa
CLASSPATH_DEPENDENCIES += alsa-lib
else
-CLASSPATH_CONF_OPT += --disable-alsa
+CLASSPATH_CONF_OPTS += --disable-alsa
endif
ifeq ($(BR2_PACKAGE_GMP),y)
-CLASSPATH_CONF_OPT += --enable-gmp --with-gmp="$(STAGING_DIR)/usr"
+CLASSPATH_CONF_OPTS += --enable-gmp --with-gmp="$(STAGING_DIR)/usr"
CLASSPATH_DEPENDENCIES += gmp
else
-CLASSPATH_CONF_OPT += --disable-gmp
+CLASSPATH_CONF_OPTS += --disable-gmp
endif
ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
-CLASSPATH_CONF_OPT += --enable-gtk-peer
+CLASSPATH_CONF_OPTS += --enable-gtk-peer
CLASSPATH_DEPENDENCIES += libgtk2
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
-CLASSPATH_CONF_OPT += --enable-gstreamer-peer
+CLASSPATH_CONF_OPTS += --enable-gstreamer-peer
CLASSPATH_DEPENDENCIES += gst-plugins-base
else
-CLASSPATH_CONF_OPT += --disable-gstreamer-peer
+CLASSPATH_CONF_OPTS += --disable-gstreamer-peer
endif
else
-CLASSPATH_CONF_OPT += --disable-gtk-peer --disable-gstreamer-peer
+CLASSPATH_CONF_OPTS += --disable-gtk-peer --disable-gstreamer-peer
endif
ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT),yy)
-CLASSPATH_CONF_OPT += --enable-xmlj
+CLASSPATH_CONF_OPTS += --enable-xmlj
CLASSPATH_DEPENDENCIES += libxml2 libxslt
else
-CLASSPATH_CONF_OPT += --disable-xmlj
+CLASSPATH_CONF_OPTS += --disable-xmlj
endif
$(eval $(autotools-package))
diff --git a/package/cloog/cloog.mk b/package/cloog/cloog.mk
--- a/package/cloog/cloog.mk
+++ b/package/cloog/cloog.mk
@@ -12,6 +12,6 @@
# built for the host, we don't really care about it.
CLOOG_LIBTOOL_PATCH = NO
-HOST_CLOOG_CONF_OPT = --with-isl=system --with-polylib=no
+HOST_CLOOG_CONF_OPTS = --with-isl=system --with-polylib=no
$(eval $(host-autotools-package))
diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk
--- a/package/collectd/collectd.mk
+++ b/package/collectd/collectd.mk
@@ -23,7 +23,7 @@
COLLECTD_CONF_ENV += LIBS="-lm"
-COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
+COLLECTD_CONF_OPTS += --with-nan-emulation --with-fp-layout=nothing \
--localstatedir=/var --with-perl-bindings=no \
$(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \
$(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \
@@ -118,22 +118,22 @@
# include/library fixups
ifeq ($(BR2_PACKAGE_LIBCURL),y)
- COLLECTD_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr
+ COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr
endif
ifeq ($(BR2_PACKAGE_MYSQL),y)
- COLLECTD_CONF_OPT += --with-libmysql=$(STAGING_DIR)/usr
+ COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr
endif
ifeq ($(BR2_PACKAGE_NETSNMP),y)
- COLLECTD_CONF_OPT += --with-libnetsnmp=$(STAGING_DIR)/usr/bin/net-snmp-config
+ COLLECTD_CONF_OPTS += --with-libnetsnmp=$(STAGING_DIR)/usr/bin/net-snmp-config
endif
ifeq ($(BR2_PACKAGE_YAJL),y)
- COLLECTD_CONF_OPT += --with-yajl=$(STAGING_DIR)/usr
+ COLLECTD_CONF_OPTS += --with-yajl=$(STAGING_DIR)/usr
endif
# network can use libgcrypt
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
COLLECTD_DEPENDENCIES += libgcrypt
- COLLECTD_CONF_OPT += --with-libgcrypt=$(STAGING_DIR)/usr
+ COLLECTD_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr
endif
# released software should not break on minor warnings
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -11,7 +11,7 @@
CONNMAN_INSTALL_STAGING = YES
CONNMAN_LICENSE = GPLv2
CONNMAN_LICENSE_FILES = COPYING
-CONNMAN_CONF_OPT += --localstatedir=/var \
+CONNMAN_CONF_OPTS += --localstatedir=/var \
$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
@@ -33,7 +33,7 @@
ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y)
-CONNMAN_CONF_OPT += --enable-client
+CONNMAN_CONF_OPTS += --enable-client
CONNMAN_DEPENDENCIES += readline
define CONNMAN_INSTALL_CM
@@ -42,7 +42,7 @@
CONNMAN_POST_INSTALL_TARGET_HOOKS += CONNMAN_INSTALL_CM
else
-CONNMAN_CONF_OPT += --disable-client
+CONNMAN_CONF_OPTS += --disable-client
endif
$(eval $(autotools-package))
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -61,7 +61,7 @@
utils_cv_localtime_cache=no \
PERL=missing
-COREUTILS_CONF_OPT = --disable-rpath
+COREUTILS_CONF_OPTS = --disable-rpath
define COREUTILS_POST_INSTALL
# some things go in root rather than usr
diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk
--- a/package/cppcms/cppcms.mk
+++ b/package/cppcms/cppcms.mk
@@ -14,13 +14,13 @@
CPPCMS_DEPENDENCIES = zlib pcre libgcrypt
ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y)
-CPPCMS_CONF_OPT += -DDISABLE_ICONV=ON
+CPPCMS_CONF_OPTS += -DDISABLE_ICONV=ON
CPPCMS_DEPENDENCIES += icu
endif
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
# posix backend needs monetary.h which isn't available on uClibc
-CPPCMS_CONF_OPT += -DDISABLE_POSIX_LOCALE=on
+CPPCMS_CONF_OPTS += -DDISABLE_POSIX_LOCALE=on
endif
# We copy cppcms_tmpl_cc from staging to host because this file can be
diff --git a/package/cppdb/cppdb.mk b/package/cppdb/cppdb.mk
--- a/package/cppdb/cppdb.mk
+++ b/package/cppdb/cppdb.mk
@@ -14,7 +14,7 @@
ifeq ($(BR2_PACKAGE_MYSQL),y)
CPPDB_DEPENDENCIES += mysql
-CPPDB_CONF_OPT += -DMYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql
+CPPDB_CONF_OPTS += -DMYSQL_LIB=$(STAGING_DIR)/usr/lib/mysql
endif
$(eval $(cmake-package))
diff --git a/package/ctorrent/ctorrent.mk b/package/ctorrent/ctorrent.mk
--- a/package/ctorrent/ctorrent.mk
+++ b/package/ctorrent/ctorrent.mk
@@ -10,10 +10,10 @@
CTORRENT_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-CTORRENT_CONF_OPT += --with-ssl=yes
+CTORRENT_CONF_OPTS += --with-ssl=yes
CTORRENT_DEPENDENCIES += openssl
else
-CTORRENT_CONF_OPT += --with-ssl=no
+CTORRENT_CONF_OPTS += --with-ssl=no
endif
$(eval $(autotools-package))
diff --git a/package/cups/cups.mk b/package/cups/cups.mk
--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -12,7 +12,7 @@
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_OPT = --without-perl \
+CUPS_CONF_OPTS = --without-perl \
--without-java \
--without-php \
--disable-gnutls \
@@ -27,10 +27,10 @@
$(if $(BR2_PACKAGE_TIFF),tiff)
ifeq ($(BR2_PACKAGE_DBUS),y)
- CUPS_CONF_OPT += --enable-dbus
+ CUPS_CONF_OPTS += --enable-dbus
CUPS_DEPENDENCIES += dbus
else
- CUPS_CONF_OPT += --disable-dbus
+ CUPS_CONF_OPTS += --disable-dbus
endif
ifeq ($(BR2_PACKAGE_XORG7),y)
@@ -38,16 +38,16 @@
endif
ifeq ($(BR2_PACKAGE_PYTHON),y)
- CUPS_CONF_OPT += --with-python
+ CUPS_CONF_OPTS += --with-python
CUPS_DEPENDENCIES += python
else
- CUPS_CONF_OPT += --without-python
+ CUPS_CONF_OPTS += --without-python
endif
ifeq ($(BR2_PACKAGE_CUPS_PDFTOPS),y)
- CUPS_CONF_OPT += --enable-pdftops
+ CUPS_CONF_OPTS += --enable-pdftops
else
- CUPS_CONF_OPT += --disable-pdftops
+ CUPS_CONF_OPTS += --disable-pdftops
endif
# standard autoreconf fails with autoheader failures
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -22,7 +22,7 @@
CVS_CONFIGURE_ARGS += --with-external-zlib
endif
-CVS_CONF_OPT = $(CVS_CONFIGURE_ARGS)
+CVS_CONF_OPTS = $(CVS_CONFIGURE_ARGS)
define CVS_BZIP_UNPACK
$(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
diff --git a/package/cwiid/cwiid.mk b/package/cwiid/cwiid.mk
--- a/package/cwiid/cwiid.mk
+++ b/package/cwiid/cwiid.mk
@@ -18,13 +18,13 @@
# Disable python support. This disables the 2 following things:
# - wminput Python plugin support
# - cwiid Python module
-CWIID_CONF_OPT = --without-python --disable-ldconfig
+CWIID_CONF_OPTS = --without-python --disable-ldconfig
ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y)
CWIID_DEPENDENCIES += libgtk2 libglib2
-CWIID_CONF_OPT += --enable-wmgui
+CWIID_CONF_OPTS += --enable-wmgui
else
-CWIID_CONF_OPT += --disable-wmgui
+CWIID_CONF_OPTS += --disable-wmgui
endif
$(eval $(autotools-package))
diff --git a/package/dbus-cpp/dbus-cpp.mk b/package/dbus-cpp/dbus-cpp.mk
--- a/package/dbus-cpp/dbus-cpp.mk
+++ b/package/dbus-cpp/dbus-cpp.mk
@@ -11,26 +11,26 @@
# expat is required for the tools irrespective of dbus xml backend
DBUS_CPP_DEPENDENCIES = host-dbus-cpp host-pkgconf dbus expat
HOST_DBUS_CPP_DEPENDENCIES = host-pkgconf host-dbus host-expat
-DBUS_CPP_CONF_OPT = --disable-examples --disable-tests --disable-doxygen-docs \
+DBUS_CPP_CONF_OPTS = --disable-examples --disable-tests --disable-doxygen-docs \
--with-build-libdbus-cxx=$(HOST_DBUS_CPP_BUILDDIR)
-HOST_DBUS_CPP_CONF_OPT = --disable-examples --disable-tests \
+HOST_DBUS_CPP_CONF_OPTS = --disable-examples --disable-tests \
--disable-doxygen-docs --disable-ecore --disable-glib
DBUS_CPP_AUTORECONF = YES
DBUS_CPP_LICENSE = LGPLv2.1+
DBUS_CPP_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBECORE),y)
- DBUS_CPP_CONF_OPT += --enable-ecore
+ DBUS_CPP_CONF_OPTS += --enable-ecore
DBUS_CPP_DEPENDENCIES += libecore
else
- DBUS_CPP_CONF_OPT += --disable-ecore
+ DBUS_CPP_CONF_OPTS += --disable-ecore
endif
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
- DBUS_CPP_CONF_OPT += --enable-glib
+ DBUS_CPP_CONF_OPTS += --enable-glib
DBUS_CPP_DEPENDENCIES += libglib2
else
- DBUS_CPP_CONF_OPT += --disable-glib
+ DBUS_CPP_CONF_OPTS += --disable-glib
endif
$(eval $(autotools-package))
diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk
--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -14,7 +14,7 @@
ac_cv_func_posix_getpwnam_r=yes \
have_abstract_sockets=yes
-DBUS_GLIB_CONF_OPT = --localstatedir=/var \
+DBUS_GLIB_CONF_OPTS = --localstatedir=/var \
--disable-tests \
--disable-xml-docs \
--with-introspect-xml=$(DBUS_HOST_INTROSPECT) \
@@ -27,7 +27,7 @@
HOST_DBUS_GLIB_DEPENDENCIES = host-dbus host-expat host-libglib2
-HOST_DBUS_GLIB_CONF_OPT = \
+HOST_DBUS_GLIB_CONF_OPTS = \
--disable-tests \
--disable-xml-docs \
--disable-bash-completion \
diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -18,7 +18,7 @@
am_cv_python_pyexecdir=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
am_cv_python_includes=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-DBUS_PYTHON_CONF_OPT = --disable-html-docs --disable-api-docs
+DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs
DBUS_PYTHON_DEPENDENCIES = dbus-glib python host-python
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -17,7 +17,7 @@
DBUS_DEPENDENCIES = host-pkgconf expat
DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
-DBUS_CONF_OPT = --with-dbus-user=dbus \
+DBUS_CONF_OPTS = --with-dbus-user=dbus \
--disable-tests \
--disable-asserts \
--enable-abstract-sockets \
@@ -35,28 +35,28 @@
endef
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-DBUS_CONF_OPT += LIBS='-pthread'
+DBUS_CONF_OPTS += LIBS='-pthread'
endif
ifeq ($(BR2_microblaze),y)
# microblaze toolchain doesn't provide inotify_rm_* but does have sys/inotify.h
-DBUS_CONF_OPT += --disable-inotify
+DBUS_CONF_OPTS += --disable-inotify
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
-DBUS_CONF_OPT += --with-x
+DBUS_CONF_OPTS += --with-x
DBUS_DEPENDENCIES += xlib_libX11
else
-DBUS_CONF_OPT += --without-x
+DBUS_CONF_OPTS += --without-x
endif
ifeq ($(BR2_INIT_SYSTEMD),y)
-DBUS_CONF_OPT += \
+DBUS_CONF_OPTS += \
--enable-systemd \
--with-systemdsystemunitdir=/lib/systemd/system
DBUS_DEPENDENCIES += systemd
else
-DBUS_CONF_OPT += --disable-systemd
+DBUS_CONF_OPTS += --disable-systemd
endif
# fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink)
@@ -86,7 +86,7 @@
endef
HOST_DBUS_DEPENDENCIES = host-pkgconf host-expat
-HOST_DBUS_CONF_OPT = \
+HOST_DBUS_CONF_OPTS = \
--with-dbus-user=dbus \
--disable-tests \
--disable-asserts \
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -13,7 +13,7 @@
CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
-D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' \
ac_cv_file__dev_random=yes
-DHCP_CONF_OPT = \
+DHCP_CONF_OPTS = \
--localstatedir=/var/lib/dhcp \
--with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
--with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
@@ -27,11 +27,11 @@
--with-relay6-pid-file=/var/run/dhcrelay6.pid
ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
- DHCP_CONF_OPT += --enable-delayed-ack
+ DHCP_CONF_OPTS += --enable-delayed-ack
endif
ifneq ($(BR2_INET_IPV6),y)
- DHCP_CONF_OPT += --disable-dhcpv6
+ DHCP_CONF_OPTS += --disable-dhcpv6
endif
ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -7,7 +7,7 @@
DIALOG_VERSION = 1.2-20140219
DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz
DIALOG_SITE = ftp://invisible-island.net/dialog
-DIALOG_CONF_OPT = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
+DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
--disable-rpath-hack
DIALOG_DEPENDENCIES = host-pkgconf ncurses
DIALOG_LICENSE = LGPLv2.1
@@ -17,6 +17,6 @@
DIALOG_DEPENDENCIES += libiconv
endif
-DIALOG_CONF_OPT += NCURSES_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
+DIALOG_CONF_OPTS += NCURSES_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
$(eval $(autotools-package))
diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk
--- a/package/dillo/dillo.mk
+++ b/package/dillo/dillo.mk
@@ -18,31 +18,31 @@
DILLO_CONF_ENV = ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config
ifeq ($(BR2_PACKAGE_OPENSSL),y)
- DILLO_CONF_OPT += --enable-ssl
+ DILLO_CONF_OPTS += --enable-ssl
DILLO_DEPENDENCIES += openssl
else
- DILLO_CONF_OPT += --disable-ssl
+ DILLO_CONF_OPTS += --disable-ssl
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
- DILLO_CONF_OPT += --enable-png
+ DILLO_CONF_OPTS += --enable-png
DILLO_DEPENDENCIES += libpng
DILLO_CONF_ENV += PNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config
else
- DILLO_CONF_OPT += --disable-png
+ DILLO_CONF_OPTS += --disable-png
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
- DILLO_CONF_OPT += --enable-jpeg
+ DILLO_CONF_OPTS += --enable-jpeg
DILLO_DEPENDENCIES += libjpeg
else
- DILLO_CONF_OPT += --disable-jpeg
+ DILLO_CONF_OPTS += --disable-jpeg
endif
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
- DILLO_CONF_OPT += --enable-threaded-dns
+ DILLO_CONF_OPTS += --enable-threaded-dns
else
- DILLO_CONF_OPT += --disable-threaded-dns
+ DILLO_CONF_OPTS += --disable-threaded-dns
endif
$(eval $(autotools-package))
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -13,7 +13,7 @@
DIRECTFB_INSTALL_STAGING = YES
DIRECTFB_AUTORECONF = YES
-DIRECTFB_CONF_OPT = \
+DIRECTFB_CONF_OPTS = \
--localstatedir=/var \
--disable-explicit-deps \
--enable-zlib \
@@ -28,7 +28,7 @@
--without-tools
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-DIRECTFB_CONF_OPT += --disable-dynload
+DIRECTFB_CONF_OPTS += --disable-dynload
endif
DIRECTFB_CONFIG_SCRIPTS = directfb-config
@@ -36,28 +36,28 @@
DIRECTFB_DEPENDENCIES = freetype zlib
ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y)
-DIRECTFB_CONF_OPT += --enable-multi --enable-fusion
+DIRECTFB_CONF_OPTS += --enable-multi --enable-fusion
DIRECTFB_DEPENDENCIES += linux-fusion
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG),y)
-DIRECTFB_CONF_OPT += --enable-debug
+DIRECTFB_CONF_OPTS += --enable-debug
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_TRACE),y)
-DIRECTFB_CONF_OPT += --enable-trace
+DIRECTFB_CONF_OPTS += --enable-trace
endif
ifeq ($(BR2_PACKAGE_XSERVER),y)
-DIRECTFB_CONF_OPT += --enable-x11
+DIRECTFB_CONF_OPTS += --enable-x11
else
-DIRECTFB_CONF_OPT += --disable-x11
+DIRECTFB_CONF_OPTS += --disable-x11
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_UNIQUE),y)
-DIRECTFB_CONF_OPT += --enable-unique
+DIRECTFB_CONF_OPTS += --enable-unique
else
-DIRECTFB_CONF_OPT += --disable-unique
+DIRECTFB_CONF_OPTS += --disable-unique
endif
DIRECTFB_GFX = \
@@ -71,9 +71,9 @@
$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
ifeq ($(strip $(DIRECTFB_GFX)),)
-DIRECTFB_CONF_OPT += --with-gfxdrivers=none
+DIRECTFB_CONF_OPTS += --with-gfxdrivers=none
else
-DIRECTFB_CONF_OPT += \
+DIRECTFB_CONF_OPTS += \
--with-gfxdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
endif
@@ -89,62 +89,62 @@
endif
ifeq ($(strip $(DIRECTFB_INPUT)),)
-DIRECTFB_CONF_OPT += --with-inputdrivers=none
+DIRECTFB_CONF_OPTS += --with-inputdrivers=none
else
-DIRECTFB_CONF_OPT += \
+DIRECTFB_CONF_OPTS += \
--with-inputdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_GIF),y)
-DIRECTFB_CONF_OPT += --enable-gif
+DIRECTFB_CONF_OPTS += --enable-gif
else
-DIRECTFB_CONF_OPT += --disable-gif
+DIRECTFB_CONF_OPTS += --disable-gif
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_PNG),y)
-DIRECTFB_CONF_OPT += --enable-png
+DIRECTFB_CONF_OPTS += --enable-png
DIRECTFB_DEPENDENCIES += libpng
DIRECTFB_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config
else
-DIRECTFB_CONF_OPT += --disable-png
+DIRECTFB_CONF_OPTS += --disable-png
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_JPEG),y)
-DIRECTFB_CONF_OPT += --enable-jpeg
+DIRECTFB_CONF_OPTS += --enable-jpeg
DIRECTFB_DEPENDENCIES += jpeg
else
-DIRECTFB_CONF_OPT += --disable-jpeg
+DIRECTFB_CONF_OPTS += --disable-jpeg
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_SVG),y)
-DIRECTFB_CONF_OPT += --enable-svg
+DIRECTFB_CONF_OPTS += --enable-svg
# needs some help to find cairo includes
DIRECTFB_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/cairo"
DIRECTFB_DEPENDENCIES += libsvg-cairo
else
-DIRECTFB_CONF_OPT += --disable-svg
+DIRECTFB_CONF_OPTS += --disable-svg
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_IMLIB2),y)
-DIRECTFB_CONF_OPT += --enable-imlib2
+DIRECTFB_CONF_OPTS += --enable-imlib2
DIRECTFB_DEPENDENCIES += imlib2
DIRECTFB_CONF_ENV += ac_cv_path_IMLIB2_CONFIG=$(STAGING_DIR)/usr/bin/imlib2-config
else
-DIRECTFB_CONF_OPT += --disable-imlib2
+DIRECTFB_CONF_OPTS += --disable-imlib2
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_DITHER_RGB16),y)
-DIRECTFB_CONF_OPT += --with-dither-rgb16=advanced
+DIRECTFB_CONF_OPTS += --with-dither-rgb16=advanced
else
-DIRECTFB_CONF_OPT += --with-dither-rgb16=none
+DIRECTFB_CONF_OPTS += --with-dither-rgb16=none
endif
ifeq ($(BR2_PACKAGE_DIRECTFB_TESTS),y)
-DIRECTFB_CONF_OPT += --with-tests
+DIRECTFB_CONF_OPTS += --with-tests
endif
HOST_DIRECTFB_DEPENDENCIES = host-pkgconf host-libpng
-HOST_DIRECTFB_CONF_OPT = \
+HOST_DIRECTFB_CONF_OPTS = \
--disable-debug \
--disable-multi \
--enable-png \
diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
--- a/package/distcc/distcc.mk
+++ b/package/distcc/distcc.mk
@@ -7,7 +7,7 @@
DISTCC_VERSION = 2.18.3
DISTCC_SOURCE = distcc-$(DISTCC_VERSION).tar.bz2
DISTCC_SITE = http://distcc.googlecode.com/files
-DISTCC_CONF_OPT = --with-included-popt --without-gtk --without-gnome
+DISTCC_CONF_OPTS = --with-included-popt --without-gtk --without-gnome
DISTCC_LICENSE = GPLv2+
DISTCC_LICENSE_FILES = COPYING
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -13,18 +13,18 @@
DMALLOC_LICENSE_FILES = dmalloc.h.1
DMALLOC_INSTALL_STAGING = YES
-DMALLOC_CONF_OPT = --enable-shlib
+DMALLOC_CONF_OPTS = --enable-shlib
ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
-DMALLOC_CONF_OPT += --enable-cxx
+DMALLOC_CONF_OPTS += --enable-cxx
else
-DMALLOC_CONF_OPT += --disable-cxx
+DMALLOC_CONF_OPTS += --disable-cxx
endif
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-DMALLOC_CONF_OPT += --enable-threads
+DMALLOC_CONF_OPTS += --enable-threads
else
-DMALLOC_CONF_OPT += --disable-threads
+DMALLOC_CONF_OPTS += --disable-threads
endif
define DMALLOC_POST_PATCH
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -66,18 +66,18 @@
ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL
-DROPBEAR_CONF_OPT += --disable-zlib
+DROPBEAR_CONF_OPTS += --disable-zlib
else
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
DROPBEAR_DEPENDENCIES += zlib
endif
ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y)
-DROPBEAR_CONF_OPT += --disable-wtmp
+DROPBEAR_CONF_OPTS += --disable-wtmp
endif
ifneq ($(BR2_PACKAGE_DROPBEAR_LASTLOG),y)
-DROPBEAR_CONF_OPT += --disable-lastlog
+DROPBEAR_CONF_OPTS += --disable-lastlog
endif
define DROPBEAR_INSTALL_TARGET_CMDS
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -11,7 +11,7 @@
E2FSPROGS_INSTALL_STAGING = YES
E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs
-E2FSPROGS_CONF_OPT = \
+E2FSPROGS_CONF_OPTS = \
$(if $(BR2_PREFER_STATIC_LIB),,--enable-elf-shlibs) \
$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
--- a/package/ecryptfs-utils/ecryptfs-utils.mk
+++ b/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -11,7 +11,7 @@
ECRYPTFS_UTILS_LICENSE_FILES = COPYING
ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool
-ECRYPTFS_UTILS_CONF_OPT = --disable-pywrap --disable-pam
+ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam
#Needed for build system to find pk11func.h and libnss3.so
ECRYPTFS_UTILS_CONF_ENV = \
@@ -19,10 +19,10 @@
NSS_LIBS="-lnss3"
ifeq ($(BR2_PACKAGE_OPENSSL),y)
- ECRYPTFS_UTILS_CONF_OPT += --enable-openssl
+ ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl
ECRYPTFS_UTILS_DEPENDENCIES += openssl
else
- ECRYPTFS_UTILS_CONF_OPT += --disable-openssl
+ ECRYPTFS_UTILS_CONF_OPTS += --disable-openssl
endif
$(eval $(autotools-package))
diff --git a/package/ed/ed.mk b/package/ed/ed.mk
--- a/package/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -6,7 +6,7 @@
ED_VERSION = 1.9
ED_SITE = $(BR2_GNU_MIRROR)/ed
-ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+ED_CONF_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)"
ED_LICENSE = GPLv3+
ED_LICENSE_FILES = COPYING
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -15,7 +15,7 @@
LIBECORE_DEPENDENCIES = host-pkgconf libeina
HOST_LIBECORE_DEPENDENCIES = host-pkgconf host-libeina host-libevas
-HOST_LIBECORE_CONF_OPT += \
+HOST_LIBECORE_CONF_OPTS += \
--enable-ecore-evas \
--disable-simple-x11 \
--disable-ecore-directfb \
@@ -24,7 +24,7 @@
--disable-ecore-imf-xim
# default options
-LIBECORE_CONF_OPT = --disable-simple-x11
+LIBECORE_CONF_OPTS = --disable-simple-x11
ifeq ($(BR2_PACKAGE_TSLIB),y)
LIBECORE_DEPENDENCIES += tslib
@@ -36,16 +36,16 @@
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBECORE_DEPENDENCIES += openssl
-LIBECORE_CONF_OPT += --enable-openssl
+LIBECORE_CONF_OPTS += --enable-openssl
else
-LIBECORE_CONF_OPT += --disable-openssl
+LIBECORE_CONF_OPTS += --disable-openssl
endif
ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
LIBECORE_DEPENDENCIES += gnutls libgcrypt
-LIBECORE_CONF_OPT += --enable-gnutls --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+LIBECORE_CONF_OPTS += --enable-gnutls --with-libgcrypt-prefix=$(STAGING_DIR)/usr
else
-LIBECORE_CONF_OPT += --disable-gnutls
+LIBECORE_CONF_OPTS += --disable-gnutls
endif
ifeq ($(BR2_PACKAGE_LIBCURL),y)
@@ -54,34 +54,34 @@
# libecore
ifeq ($(BR2_PACKAGE_LIBECORE_DIRECTFB),y)
-LIBECORE_CONF_OPT += --enable-ecore-directfb
+LIBECORE_CONF_OPTS += --enable-ecore-directfb
LIBECORE_DEPENDENCIES += directfb
else
-LIBECORE_CONF_OPT += --disable-ecore-directfb
+LIBECORE_CONF_OPTS += --disable-ecore-directfb
endif
ifeq ($(BR2_PACKAGE_LIBECORE_FB),y)
-LIBECORE_CONF_OPT += --enable-ecore-fb
+LIBECORE_CONF_OPTS += --enable-ecore-fb
else
-LIBECORE_CONF_OPT += --disable-ecore-fb
+LIBECORE_CONF_OPTS += --disable-ecore-fb
endif
ifeq ($(BR2_PACKAGE_LIBECORE_SDL),y)
-LIBECORE_CONF_OPT += --enable-ecore-sdl
+LIBECORE_CONF_OPTS += --enable-ecore-sdl
LIBECORE_DEPENDENCIES += sdl
else
-LIBECORE_CONF_OPT += --disable-ecore-sdl
+LIBECORE_CONF_OPTS += --disable-ecore-sdl
endif
ifeq ($(BR2_PACKAGE_LIBECORE_X),y)
-LIBECORE_CONF_OPT += --enable-ecore-x
+LIBECORE_CONF_OPTS += --enable-ecore-x
LIBECORE_DEPENDENCIES += xlib_libXext xlib_libX11
else
-LIBECORE_CONF_OPT += --disable-ecore-x --disable-ecore-imf-xim
+LIBECORE_CONF_OPTS += --disable-ecore-x --disable-ecore-imf-xim
endif
ifeq ($(BR2_PACKAGE_LIBECORE_X_XCB),y)
-LIBECORE_CONF_OPT += --enable-ecore-x-xcb
+LIBECORE_CONF_OPTS += --enable-ecore-x-xcb
LIBECORE_DEPENDENCIES += libxcb xlib_libX11 xcb-util pixman
# src/util/makekeys is executed at build time to generate
@@ -96,15 +96,15 @@
LIBECORE_POST_EXTRACT_HOOKS += LIBECORE_BUILD_MAKEKEYS_FOR_HOST
else
-LIBECORE_CONF_OPT += --disable-ecore-x-xcb
+LIBECORE_CONF_OPTS += --disable-ecore-x-xcb
endif
# libecore-evas
ifeq ($(BR2_PACKAGE_LIBECORE_EVAS),y)
-LIBECORE_CONF_OPT += --enable-ecore-evas
+LIBECORE_CONF_OPTS += --enable-ecore-evas
LIBECORE_DEPENDENCIES += libevas
else
-LIBECORE_CONF_OPT += --disable-ecore-evas
+LIBECORE_CONF_OPTS += --disable-ecore-evas
endif
$(eval $(autotools-package))
diff --git a/package/efl/libedbus/libedbus.mk b/package/efl/libedbus/libedbus.mk
--- a/package/efl/libedbus/libedbus.mk
+++ b/package/efl/libedbus/libedbus.mk
@@ -15,23 +15,23 @@
LIBEDBUS_DEPENDENCIES = host-pkgconf dbus libeina libecore
ifeq ($(BR2_PACKAGE_LIBEDBUS_BLUEZ),y)
-LIBEDBUS_CONF_OPT += --enable-ebluez
+LIBEDBUS_CONF_OPTS += --enable-ebluez
LIBEDBUS_DEPENDENCIES += bluez_utils
else
-LIBEDBUS_CONF_OPT += --disable-ebluez
+LIBEDBUS_CONF_OPTS += --disable-ebluez
endif
ifeq ($(BR2_PACKAGE_LIBEDBUS_CONNMAN),y)
-LIBEDBUS_CONF_OPT += --enable-econnman0_7x
+LIBEDBUS_CONF_OPTS += --enable-econnman0_7x
LIBEDBUS_DEPENDENCIES += connman
else
-LIBEDBUS_CONF_OPT += --disable-econnman0_7x
+LIBEDBUS_CONF_OPTS += --disable-econnman0_7x
endif
ifeq ($(BR2_PACKAGE_LIBEDBUS_NOTIFY),y)
-LIBEDBUS_CONF_OPT += --enable-enotify --disable-edbus-notify-test
+LIBEDBUS_CONF_OPTS += --enable-enotify --disable-edbus-notify-test
else
-LIBEDBUS_CONF_OPT += --disable-enotify
+LIBEDBUS_CONF_OPTS += --disable-enotify
endif
$(eval $(autotools-package))
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -16,12 +16,12 @@
libembryo
ifeq ($(BR2_PACKAGE_LIBEDJE_CC),y)
-LIBEDJE_CONF_OPT += --enable-edje-cc
+LIBEDJE_CONF_OPTS += --enable-edje-cc
else
-LIBEDJE_CONF_OPT += --disable-edje-cc
+LIBEDJE_CONF_OPTS += --disable-edje-cc
endif
-HOST_LIBEDJE_CONF_OPT = --enable-edje-cc
+HOST_LIBEDJE_CONF_OPTS = --enable-edje-cc
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/efl/libeet/libeet.mk b/package/efl/libeet/libeet.mk
--- a/package/efl/libeet/libeet.mk
+++ b/package/efl/libeet/libeet.mk
@@ -18,9 +18,9 @@
ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
LIBEET_DEPENDENCIES += gnutls libgcrypt
LIBEET_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
-LIBEET_CONF_OPT += --enable-gnutls
+LIBEET_CONF_OPTS += --enable-gnutls
else
-LIBEET_CONF_OPT += --disable-gnutls
+LIBEET_CONF_OPTS += --disable-gnutls
endif
$(eval $(autotools-package))
diff --git a/package/efl/libelementary/libelementary.mk b/package/efl/libelementary/libelementary.mk
--- a/package/efl/libelementary/libelementary.mk
+++ b/package/efl/libelementary/libelementary.mk
@@ -15,16 +15,16 @@
LIBELEMENTARY_DEPENDENCIES = libeina libevas libecore libedje host-libedje \
host-libeet
-LIBELEMENTARY_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+LIBELEMENTARY_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
--with-eet-eet=$(HOST_DIR)/usr/bin/eet
# libethumb_client is only built when ethumbd is built.
# ethumbd is only built if edbus is built.
ifeq ($(BR2_PACKAGE_LIBETHUMB)$(BR2_PACKAGE_LIBEDBUS),yy)
LIBELEMENTARY_DEPENDENCIES += libethumb
-LIBELEMENTARY_CONF_OPT += --enable-ethumb
+LIBELEMENTARY_CONF_OPTS += --enable-ethumb
else
-LIBELEMENTARY_CONF_OPT += --disable-ethumb
+LIBELEMENTARY_CONF_OPTS += --disable-ethumb
endif
$(eval $(autotools-package))
diff --git a/package/efl/libethumb/libethumb.mk b/package/efl/libethumb/libethumb.mk
--- a/package/efl/libethumb/libethumb.mk
+++ b/package/efl/libethumb/libethumb.mk
@@ -14,7 +14,7 @@
LIBETHUMB_DEPENDENCIES = libeina libevas libecore libedje host-libedje
-LIBETHUMB_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
+LIBETHUMB_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
ifeq ($(BR2_PACKAGE_LIBEXIF),y)
LIBETHUMB_DEPENDENCIES += libexif
diff --git a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
--- a/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
+++ b/package/efl/libevas-generic-loaders/libevas-generic-loaders.mk
@@ -15,7 +15,7 @@
LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina zlib
# For now, we only support the SVG loader
-LIBEVAS_GENERIC_LOADERS_CONF_OPT += \
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += \
--disable-poppler \
--disable-spectre \
--disable-libraw \
@@ -23,9 +23,9 @@
ifeq ($(BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS_SVG),y)
LIBEVAS_GENERIC_LOADERS_DEPENDENCIES += librsvg cairo
-LIBEVAS_GENERIC_LOADERS_CONF_OPT += --enable-svg
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --enable-svg
else
-LIBEVAS_GENERIC_LOADERS_CONF_OPT += --disable-svg
+LIBEVAS_GENERIC_LOADERS_CONF_OPTS += --disable-svg
endif
$(eval $(autotools-package))
diff --git a/package/efl/libevas/libevas.mk b/package/efl/libevas/libevas.mk
--- a/package/efl/libevas/libevas.mk
+++ b/package/efl/libevas/libevas.mk
@@ -16,7 +16,7 @@
HOST_LIBEVAS_DEPENDENCIES = host-pkgconf host-zlib host-libeina \
host-freetype host-libpng host-libjpeg
-HOST_LIBEVAS_CONF_OPT += \
+HOST_LIBEVAS_CONF_OPTS += \
--enable-image-loader-png \
--enable-image-loader-jpeg \
--disable-image-loader-gif \
@@ -33,71 +33,71 @@
# rendering options
ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SAMPLE),y)
-LIBEVAS_CONF_OPT += --enable-scale-sample
+LIBEVAS_CONF_OPTS += --enable-scale-sample
else
-LIBEVAS_CONF_OPT += --disable-scale-sample
+LIBEVAS_CONF_OPTS += --disable-scale-sample
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_SCALE_SMOOTH),y)
-LIBEVAS_CONF_OPT += --enable-scale-smooth
+LIBEVAS_CONF_OPTS += --enable-scale-smooth
else
-LIBEVAS_CONF_OPT += --disable-scale-smooth
+LIBEVAS_CONF_OPTS += --disable-scale-smooth
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_SMALL_DITHERING),y)
-LIBEVAS_CONF_OPT += --enable-small-dither-mask
+LIBEVAS_CONF_OPTS += --enable-small-dither-mask
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_LINE_DITHERING),y)
-LIBEVAS_CONF_OPT += --enable-line-dither-mask
+LIBEVAS_CONF_OPTS += --enable-line-dither-mask
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_NO_DITHERING),y)
-LIBEVAS_CONF_OPT += --enable-no-dither-mask
+LIBEVAS_CONF_OPTS += --enable-no-dither-mask
endif
# backends
ifeq ($(BR2_PACKAGE_LIBEVAS_BUFFER),y)
-LIBEVAS_CONF_OPT += --enable-buffer
+LIBEVAS_CONF_OPTS += --enable-buffer
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_X11),y)
-LIBEVAS_CONF_OPT += --enable-software-xlib
+LIBEVAS_CONF_OPTS += --enable-software-xlib
LIBEVAS_DEPENDENCIES += xlib_libX11 xlib_libXext
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_X11_GLX),y)
-LIBEVAS_CONF_OPT += --enable-gl-xlib
+LIBEVAS_CONF_OPTS += --enable-gl-xlib
LIBEVAS_DEPENDENCIES += xproto_glproto xlib_libX11 xlib_libXrender \
xlib_libXext libeet
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_XCB),y)
-LIBEVAS_CONF_OPT += --enable-software-xcb
+LIBEVAS_CONF_OPTS += --enable-software-xcb
LIBEVAS_DEPENDENCIES += libxcb xcb-proto xcb-util pixman
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_XCB_GLX),y)
-LIBEVAS_CONF_OPT += --enable-gl-xcb
+LIBEVAS_CONF_OPTS += --enable-gl-xcb
LIBEVAS_DEPENDENCIES += libxcb xcb-proto xcb-util xproto_glproto
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_FB),y)
-LIBEVAS_CONF_OPT += --enable-fb
+LIBEVAS_CONF_OPTS += --enable-fb
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_DIRECTFB),y)
-LIBEVAS_CONF_OPT += --enable-directfb
+LIBEVAS_CONF_OPTS += --enable-directfb
LIBEVAS_DEPENDENCIES += directfb
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_SDL),y)
-LIBEVAS_CONF_OPT += --enable-software-sdl
+LIBEVAS_CONF_OPTS += --enable-software-sdl
LIBEVAS_DEPENDENCIES += sdl
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_SDL_GL),y)
-LIBEVAS_CONF_OPT += --enable-gl-sdl
+LIBEVAS_CONF_OPTS += --enable-gl-sdl
LIBEVAS_DEPENDENCIES += sdl
# configure script forgets to check for eet / fill this out
LIBEVAS_CONF_ENV += \
@@ -110,97 +110,97 @@
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_SGX),y)
-LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-sgx
+LIBEVAS_CONF_OPTS += --enable-gl-flavor-gles --enable-gles-variety-sgx
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_GLES_S3C6410),y)
-LIBEVAS_CONF_OPT += --enable-gl-flavor-gles --enable-gles-variety-s3c6410
+LIBEVAS_CONF_OPTS += --enable-gl-flavor-gles --enable-gles-variety-s3c6410
endif
# code options
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-LIBEVAS_CONF_OPT += --enable-cpu-mmx
+LIBEVAS_CONF_OPTS += --enable-cpu-mmx
else
-LIBEVAS_CONF_OPT += --disable-cpu-mmx
+LIBEVAS_CONF_OPTS += --disable-cpu-mmx
endif
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-LIBEVAS_CONF_OPT += --enable-cpu-sse
+LIBEVAS_CONF_OPTS += --enable-cpu-sse
else
-LIBEVAS_CONF_OPT += --disable-cpu-sse
+LIBEVAS_CONF_OPTS += --disable-cpu-sse
endif
ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
-LIBEVAS_CONF_OPT += --enable-cpu-sse3
+LIBEVAS_CONF_OPTS += --enable-cpu-sse3
else
-LIBEVAS_CONF_OPT += --disable-cpu-sse3
+LIBEVAS_CONF_OPTS += --disable-cpu-sse3
endif
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-LIBEVAS_CONF_OPT += --enable-cpu-altivec
+LIBEVAS_CONF_OPTS += --enable-cpu-altivec
else
-LIBEVAS_CONF_OPT += --disable-cpu-altivec
+LIBEVAS_CONF_OPTS += --disable-cpu-altivec
endif
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-LIBEVAS_CONF_OPT += --enable-cpu-neon
+LIBEVAS_CONF_OPTS += --enable-cpu-neon
else
-LIBEVAS_CONF_OPT += --disable-cpu-neon
+LIBEVAS_CONF_OPTS += --disable-cpu-neon
endif
# loaders
ifeq ($(BR2_PACKAGE_LIBEVAS_PNG),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-png
+LIBEVAS_CONF_OPTS += --enable-image-loader-png
LIBEVAS_DEPENDENCIES += libpng
else
-LIBEVAS_CONF_OPT += --disable-image-loader-png
+LIBEVAS_CONF_OPTS += --disable-image-loader-png
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_JPEG),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-jpeg
+LIBEVAS_CONF_OPTS += --enable-image-loader-jpeg
LIBEVAS_DEPENDENCIES += jpeg
else
-LIBEVAS_CONF_OPT += --disable-image-loader-jpeg
+LIBEVAS_CONF_OPTS += --disable-image-loader-jpeg
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_GIF),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-gif
+LIBEVAS_CONF_OPTS += --enable-image-loader-gif
LIBEVAS_DEPENDENCIES += libungif
else
-LIBEVAS_CONF_OPT += --disable-image-loader-gif
+LIBEVAS_CONF_OPTS += --disable-image-loader-gif
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_PMAPS),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-pmaps
+LIBEVAS_CONF_OPTS += --enable-image-loader-pmaps
else
-LIBEVAS_CONF_OPT += --disable-image-loader-pmaps
+LIBEVAS_CONF_OPTS += --disable-image-loader-pmaps
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_TIFF),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-tiff
+LIBEVAS_CONF_OPTS += --enable-image-loader-tiff
LIBEVAS_DEPENDENCIES += tiff
else
-LIBEVAS_CONF_OPT += --disable-image-loader-tiff
+LIBEVAS_CONF_OPTS += --disable-image-loader-tiff
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_XPM),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-xpm
+LIBEVAS_CONF_OPTS += --enable-image-loader-xpm
else
-LIBEVAS_CONF_OPT += --disable-image-loader-xpm
+LIBEVAS_CONF_OPTS += --disable-image-loader-xpm
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_EET),y)
-LIBEVAS_CONF_OPT += --enable-image-loader-eet
+LIBEVAS_CONF_OPTS += --enable-image-loader-eet
LIBEVAS_DEPENDENCIES += libeet
else
-LIBEVAS_CONF_OPT += --disable-image-loader-eet
+LIBEVAS_CONF_OPTS += --disable-image-loader-eet
endif
ifeq ($(BR2_PACKAGE_LIBEVAS_EET_FONT),y)
-LIBEVAS_CONF_OPT += --enable-font-loader-eet
+LIBEVAS_CONF_OPTS += --enable-font-loader-eet
LIBEVAS_DEPENDENCIES += libeet
else
-LIBEVAS_CONF_OPT += --disable-font-loader-eet
+LIBEVAS_CONF_OPTS += --disable-font-loader-eet
endif
# libevas installs the source code of examples on the target, which
diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk
--- a/package/elf2flt/elf2flt.mk
+++ b/package/elf2flt/elf2flt.mk
@@ -14,7 +14,7 @@
# It is not exactly a host variant, but more a cross variant, which is
# why we pass a special --target option.
-HOST_ELF2FLT_CONF_OPT = \
+HOST_ELF2FLT_CONF_OPTS = \
--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
--with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \
diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk
--- a/package/elfutils/elfutils.mk
+++ b/package/elfutils/elfutils.mk
@@ -12,7 +12,7 @@
# The tarball does not have a generated configure script
ELFUTILS_AUTORECONF = YES
-ELFUTILS_CONF_OPT += --disable-werror
+ELFUTILS_CONF_OPTS += --disable-werror
ELFUTILS_PATCH = \
elfutils-portability.patch \
elfutils-robustify.patch
@@ -43,29 +43,29 @@
ifeq ($(BR2_PACKAGE_ZLIB),y)
ELFUTILS_DEPENDENCIES += zlib
- ELFUTILS_CONF_OPT += --with-zlib
+ ELFUTILS_CONF_OPTS += --with-zlib
else
- ELFUTILS_CONF_OPT += --without-zlib
+ ELFUTILS_CONF_OPTS += --without-zlib
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)
ELFUTILS_DEPENDENCIES += bzip2
- ELFUTILS_CONF_OPT += --with-bzlib
+ ELFUTILS_CONF_OPTS += --with-bzlib
else
- ELFUTILS_CONF_OPT += --without-bzlib
+ ELFUTILS_CONF_OPTS += --without-bzlib
endif
ifeq ($(BR2_PACKAGE_XZ),y)
ELFUTILS_DEPENDENCIES += xz
- ELFUTILS_CONF_OPT += --with-lzma
+ ELFUTILS_CONF_OPTS += --with-lzma
else
- ELFUTILS_CONF_OPT += --without-lzma
+ ELFUTILS_CONF_OPTS += --without-lzma
endif
ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y)
- ELFUTILS_CONF_OPT += --enable-progs
+ ELFUTILS_CONF_OPTS += --enable-progs
else
- ELFUTILS_CONF_OPT += --disable-progs
+ ELFUTILS_CONF_OPTS += --disable-progs
endif
$(eval $(autotools-package))
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -24,7 +24,7 @@
host-libeet \
xcb-util-keysyms
-ENLIGHTENMENT_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+ENLIGHTENMENT_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
--disable-rpath
diff --git a/package/enscript/enscript.mk b/package/enscript/enscript.mk
--- a/package/enscript/enscript.mk
+++ b/package/enscript/enscript.mk
@@ -11,9 +11,9 @@
# Enable pthread threads if toolchain supports threads
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
- ENSCRIPT_CONF_OPT += --enable-threads=pth
+ ENSCRIPT_CONF_OPTS += --enable-threads=pth
else
- ENSCRIPT_CONF_OPT += --disable-threads
+ ENSCRIPT_CONF_OPTS += --disable-threads
endif
$(eval $(autotools-package))
diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -21,30 +21,30 @@
# for documentation.
ERLANG_CONF_ENV += erl_xcomp_sysroot=$(STAGING_DIR)
-ERLANG_CONF_OPT = --without-javac
-HOST_ERLANG_CONF_OPT = --without-javac
+ERLANG_CONF_OPTS = --without-javac
+HOST_ERLANG_CONF_OPTS = --without-javac
ifeq ($(BR2_PACKAGE_NCURSES),y)
-ERLANG_CONF_OPT += --with-termcap
+ERLANG_CONF_OPTS += --with-termcap
ERLANG_DEPENDENCIES += ncurses
else
-ERLANG_CONF_OPT += --without-termcap
+ERLANG_CONF_OPTS += --without-termcap
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-ERLANG_CONF_OPT += --with-ssl
+ERLANG_CONF_OPTS += --with-ssl
ERLANG_DEPENDENCIES += openssl
else
-ERLANG_CONF_OPT += --without-ssl
+ERLANG_CONF_OPTS += --without-ssl
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
-ERLANG_CONF_OPT += --enable-shared-zlib
+ERLANG_CONF_OPTS += --enable-shared-zlib
ERLANG_DEPENDENCIES += zlib
endif
ifeq ($(BR2_PACKAGE_ERLANG_SMP),)
-ERLANG_CONF_OPT += --disable-smp-support
+ERLANG_CONF_OPTS += --disable-smp-support
endif
# Remove source, example, gs and wx files from the target
diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk
--- a/package/eudev/eudev.mk
+++ b/package/eudev/eudev.mk
@@ -14,7 +14,7 @@
# mq_getattr is in librt
EUDEV_CONF_ENV += LIBS=-lrt
-EUDEV_CONF_OPT = \
+EUDEV_CONF_OPTS = \
--disable-manpages \
--sbindir=/sbin \
--with-rootlibdir=/lib \
@@ -28,14 +28,14 @@
EUDEV_PROVIDES = udev
ifeq ($(BR2_PACKAGE_EUDEV_RULES_GEN),y)
-EUDEV_CONF_OPT += --enable-rule_generator
+EUDEV_CONF_OPTS += --enable-rule_generator
endif
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-EUDEV_CONF_OPT += --enable-gudev
+EUDEV_CONF_OPTS += --enable-gudev
EUDEV_DEPENDENCIES += libglib2
else
-EUDEV_CONF_OPT += --disable-gudev
+EUDEV_CONF_OPTS += --disable-gudev
endif
define EUDEV_INSTALL_INIT_SYSV
diff --git a/package/evemu/evemu.mk b/package/evemu/evemu.mk
--- a/package/evemu/evemu.mk
+++ b/package/evemu/evemu.mk
@@ -19,7 +19,7 @@
EVEMU_MAKE_ENV = SYSROOT=$(STAGING_DIR)
# disable tests generation because of C++ dependency
-EVEMU_CONF_OPT += --disable-tests
+EVEMU_CONF_OPTS += --disable-tests
# Uses PKG_CHECK_MODULES() in configure.ac
EVEMU_DEPENDENCIES = host-pkgconf libevdev
@@ -29,10 +29,10 @@
# Check for target python
ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
-EVEMU_CONF_OPT += --enable-python-bindings
+EVEMU_CONF_OPTS += --enable-python-bindings
EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python)
else
-EVEMU_CONF_OPT += --disable-python-bindings
+EVEMU_CONF_OPTS += --disable-python-bindings
endif
# package source code coming from git, so it doesn't have generated
diff --git a/package/expect/expect.mk b/package/expect/expect.mk
--- a/package/expect/expect.mk
+++ b/package/expect/expect.mk
@@ -12,7 +12,7 @@
EXPECT_AUTORECONF = YES
EXPECT_DEPENDENCIES = tcl
-EXPECT_CONF_OPT = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
+EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
# Since we don't want examples installed
EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-binaries
diff --git a/package/fbdump/fbdump.mk b/package/fbdump/fbdump.mk
--- a/package/fbdump/fbdump.mk
+++ b/package/fbdump/fbdump.mk
@@ -13,9 +13,9 @@
# of the x86/x86-64 architectures, and causes build problems on some
# architectures as outw() is not always available.
ifeq ($(BR2_i386)$(BR2_x86_64),y)
-FBDUMP_CONF_OPT += --enable-vga16fb
+FBDUMP_CONF_OPTS += --enable-vga16fb
else
-FBDUMP_CONF_OPT += --disable-vga16fb
+FBDUMP_CONF_OPTS += --disable-vga16fb
endif
$(eval $(autotools-package))
diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk
--- a/package/fetchmail/fetchmail.mk
+++ b/package/fetchmail/fetchmail.mk
@@ -15,7 +15,7 @@
FETCHMAIL_CONF_ENV += LIBS="-lz"
-FETCHMAIL_CONF_OPT = \
+FETCHMAIL_CONF_OPTS = \
--with-ssl=$(STAGING_DIR)/usr
FETCHMAIL_DEPENDENCIES = \
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -16,7 +16,7 @@
FFMPEG_LICENSE_FILES += COPYING.GPLv2
endif
-FFMPEG_CONF_OPT = \
+FFMPEG_CONF_OPTS = \
--prefix=/usr \
--enable-avfilter \
--disable-version3 \
@@ -67,257 +67,257 @@
FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
ifeq ($(BR2_ENABLE_DEBUG),y)
-FFMPEG_CONF_OPT += --enable-debug
+FFMPEG_CONF_OPTS += --enable-debug
else
-FFMPEG_CONF_OPT += --disable-debug
+FFMPEG_CONF_OPTS += --disable-debug
endif
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
-FFMPEG_CONF_OPT += --enable-gpl
+FFMPEG_CONF_OPTS += --enable-gpl
else
-FFMPEG_CONF_OPT += --disable-gpl
+FFMPEG_CONF_OPTS += --disable-gpl
endif
ifeq ($(BR2_PACKAGE_FFMPEG_NONFREE),y)
-FFMPEG_CONF_OPT += --enable-nonfree
+FFMPEG_CONF_OPTS += --enable-nonfree
else
-FFMPEG_CONF_OPT += --disable-nonfree
+FFMPEG_CONF_OPTS += --disable-nonfree
endif
ifeq ($(BR2_PACKAGE_FFMPEG_FFMPEG),y)
-FFMPEG_CONF_OPT += --enable-ffmpeg
+FFMPEG_CONF_OPTS += --enable-ffmpeg
else
-FFMPEG_CONF_OPT += --disable-ffmpeg
+FFMPEG_CONF_OPTS += --disable-ffmpeg
endif
ifeq ($(BR2_PACKAGE_FFMPEG_FFPLAY),y)
FFMPEG_DEPENDENCIES += sdl
-FFMPEG_CONF_OPT += --enable-ffplay
+FFMPEG_CONF_OPTS += --enable-ffplay
FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
else
-FFMPEG_CONF_OPT += --disable-ffplay
+FFMPEG_CONF_OPTS += --disable-ffplay
endif
ifeq ($(BR2_PACKAGE_FFMPEG_FFSERVER),y)
-FFMPEG_CONF_OPT += --enable-ffserver
+FFMPEG_CONF_OPTS += --enable-ffserver
else
-FFMPEG_CONF_OPT += --disable-ffserver
+FFMPEG_CONF_OPTS += --disable-ffserver
endif
ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y)
-FFMPEG_CONF_OPT += --enable-postproc
+FFMPEG_CONF_OPTS += --enable-postproc
else
-FFMPEG_CONF_OPT += --disable-postproc
+FFMPEG_CONF_OPTS += --disable-postproc
endif
ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
-FFMPEG_CONF_OPT += --enable-swscale
+FFMPEG_CONF_OPTS += --enable-swscale
else
-FFMPEG_CONF_OPT += --disable-swscale
+FFMPEG_CONF_OPTS += --disable-swscale
endif
ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),all)
-FFMPEG_CONF_OPT += --disable-encoders \
+FFMPEG_CONF_OPTS += --disable-encoders \
$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),--enable-encoder=$(x))
endif
ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_DECODERS)),all)
-FFMPEG_CONF_OPT += --disable-decoders \
+FFMPEG_CONF_OPTS += --disable-decoders \
$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_DECODERS)),--enable-decoder=$(x))
endif
ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_MUXERS)),all)
-FFMPEG_CONF_OPT += --disable-muxers \
+FFMPEG_CONF_OPTS += --disable-muxers \
$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_MUXERS)),--enable-muxer=$(x))
endif
ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_DEMUXERS)),all)
-FFMPEG_CONF_OPT += --disable-demuxers \
+FFMPEG_CONF_OPTS += --disable-demuxers \
$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_DEMUXERS)),--enable-demuxer=$(x))
endif
ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_PARSERS)),all)
-FFMPEG_CONF_OPT += --disable-parsers \
+FFMPEG_CONF_OPTS += --disable-parsers \
$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_PARSERS)),--enable-parser=$(x))
endif
ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),all)
-FFMPEG_CONF_OPT += --disable-bsfs \
+FFMPEG_CONF_OPTS += --disable-bsfs \
$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),--enable-bsfs=$(x))
endif
ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_PROTOCOLS)),all)
-FFMPEG_CONF_OPT += --disable-protocols \
+FFMPEG_CONF_OPTS += --disable-protocols \
$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_PROTOCOLS)),--enable-protocol=$(x))
endif
ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_FILTERS)),all)
-FFMPEG_CONF_OPT += --disable-filters \
+FFMPEG_CONF_OPTS += --disable-filters \
$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_FILTERS)),--enable-filter=$(x))
endif
ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y)
-FFMPEG_CONF_OPT += --enable-indevs
+FFMPEG_CONF_OPTS += --enable-indevs
else
-FFMPEG_CONF_OPT += --disable-indevs
+FFMPEG_CONF_OPTS += --disable-indevs
endif
ifeq ($(BR2_PACKAGE_FFMPEG_OUTDEVS),y)
-FFMPEG_CONF_OPT += --enable-outdevs
+FFMPEG_CONF_OPTS += --enable-outdevs
else
-FFMPEG_CONF_OPT += --disable-outdevs
+FFMPEG_CONF_OPTS += --disable-outdevs
endif
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-FFMPEG_CONF_OPT += --enable-pthreads
+FFMPEG_CONF_OPTS += --enable-pthreads
else
-FFMPEG_CONF_OPT += --disable-pthreads
+FFMPEG_CONF_OPTS += --disable-pthreads
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
-FFMPEG_CONF_OPT += --enable-zlib
+FFMPEG_CONF_OPTS += --enable-zlib
FFMPEG_DEPENDENCIES += zlib
else
-FFMPEG_CONF_OPT += --disable-zlib
+FFMPEG_CONF_OPTS += --disable-zlib
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)
-FFMPEG_CONF_OPT += --enable-bzlib
+FFMPEG_CONF_OPTS += --enable-bzlib
FFMPEG_DEPENDENCIES += bzip2
else
-FFMPEG_CONF_OPT += --disable-bzlib
+FFMPEG_CONF_OPTS += --disable-bzlib
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
# openssl isn't license compatible with GPL
ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
-FFMPEG_CONF_OPT += --disable-openssl
+FFMPEG_CONF_OPTS += --disable-openssl
else
-FFMPEG_CONF_OPT += --enable-openssl
+FFMPEG_CONF_OPTS += --enable-openssl
FFMPEG_DEPENDENCIES += openssl
endif
else
-FFMPEG_CONF_OPT += --disable-openssl
+FFMPEG_CONF_OPTS += --disable-openssl
endif
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
FFMPEG_DEPENDENCIES += libvorbis
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
--enable-libvorbis \
--enable-muxer=ogg \
--enable-encoder=libvorbis
endif
ifeq ($(BR2_PACKAGE_LIBVA),y)
-FFMPEG_CONF_OPT += --enable-vaapi
+FFMPEG_CONF_OPTS += --enable-vaapi
FFMPEG_DEPENDENCIES += libva
else
-FFMPEG_CONF_OPT += --disable-vaapi
+FFMPEG_CONF_OPTS += --disable-vaapi
endif
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-FFMPEG_CONF_OPT += --enable-yasm
+FFMPEG_CONF_OPTS += --enable-yasm
FFMPEG_DEPENDENCIES += host-yasm
else
-FFMPEG_CONF_OPT += --disable-yasm
-FFMPEG_CONF_OPT += --disable-mmx
+FFMPEG_CONF_OPTS += --disable-yasm
+FFMPEG_CONF_OPTS += --disable-mmx
endif
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-FFMPEG_CONF_OPT += --enable-sse
+FFMPEG_CONF_OPTS += --enable-sse
else
-FFMPEG_CONF_OPT += --disable-sse
+FFMPEG_CONF_OPTS += --disable-sse
endif
ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
-FFMPEG_CONF_OPT += --enable-sse2
+FFMPEG_CONF_OPTS += --enable-sse2
else
-FFMPEG_CONF_OPT += --disable-sse2
+FFMPEG_CONF_OPTS += --disable-sse2
endif
ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
-FFMPEG_CONF_OPT += --enable-sse3
+FFMPEG_CONF_OPTS += --enable-sse3
else
-FFMPEG_CONF_OPT += --disable-sse3
+FFMPEG_CONF_OPTS += --disable-sse3
endif
ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
-FFMPEG_CONF_OPT += --enable-ssse3
+FFMPEG_CONF_OPTS += --enable-ssse3
else
-FFMPEG_CONF_OPT += --disable-ssse3
+FFMPEG_CONF_OPTS += --disable-ssse3
endif
ifeq ($(BR2_X86_CPU_HAS_SSE4),y)
-FFMPEG_CONF_OPT += --enable-sse4
+FFMPEG_CONF_OPTS += --enable-sse4
else
-FFMPEG_CONF_OPT += --disable-sse4
+FFMPEG_CONF_OPTS += --disable-sse4
endif
ifeq ($(BR2_X86_CPU_HAS_SSE42),y)
-FFMPEG_CONF_OPT += --enable-sse42
+FFMPEG_CONF_OPTS += --enable-sse42
else
-FFMPEG_CONF_OPT += --disable-sse42
+FFMPEG_CONF_OPTS += --disable-sse42
endif
# Explicitly disable everything that doesn't match for ARM
# FFMPEG "autodetects" by compiling an extended instruction via AS
# This works on compilers that aren't built for generic by default
ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
-FFMPEG_CONF_OPT += --disable-armv5te
+FFMPEG_CONF_OPTS += --disable-armv5te
endif
ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y)
-FFMPEG_CONF_OPT += --enable-armv6
+FFMPEG_CONF_OPTS += --enable-armv6
else
-FFMPEG_CONF_OPT += --disable-armv6 --disable-armv6t2
+FFMPEG_CONF_OPTS += --disable-armv6 --disable-armv6t2
endif
ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y)
-FFMPEG_CONF_OPT += --enable-vfp
+FFMPEG_CONF_OPTS += --enable-vfp
else
-FFMPEG_CONF_OPT += --disable-vfp
+FFMPEG_CONF_OPTS += --disable-vfp
endif
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-FFMPEG_CONF_OPT += --enable-neon
+FFMPEG_CONF_OPTS += --enable-neon
endif
ifeq ($(BR2_MIPS_SOFT_FLOAT),y)
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
--disable-mipsfpu
else
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
--enable-mipsfpu
endif
ifeq ($(BR2_mips_32r2),y)
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
--enable-mips32r2
else
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
--disable-mips32r2
endif
ifeq ($(BR2_mips_64r2),y)
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
--enable-mipsdspr1 \
--enable-mipsdspr2
else
-FFMPEG_CONF_OPT += \
+FFMPEG_CONF_OPTS += \
--disable-mipsdspr1 \
--disable-mipsdspr2
endif
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-FFMPEG_CONF_OPT += --enable-altivec
+FFMPEG_CONF_OPTS += --enable-altivec
else
-FFMPEG_CONF_OPT += --disable-altivec
+FFMPEG_CONF_OPTS += --disable-altivec
endif
ifeq ($(BR2_PREFER_STATIC_LIB),)
-FFMPEG_CONF_OPT += --enable-pic
+FFMPEG_CONF_OPTS += --enable-pic
else
-FFMPEG_CONF_OPT += --disable-pic
+FFMPEG_CONF_OPTS += --disable-pic
endif
-FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
+FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
# Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
define FFMPEG_CONFIGURE_CMDS
@@ -336,7 +336,7 @@
--pkg-config="$(PKG_CONFIG_HOST_BINARY)" \
$(if $(BR2_GCC_TARGET_TUNE),--cpu=$(BR2_GCC_TARGET_TUNE)) \
$(SHARED_STATIC_LIBS_OPTS) \
- $(FFMPEG_CONF_OPT) \
+ $(FFMPEG_CONF_OPTS) \
)
endef
diff --git a/package/flac/flac.mk b/package/flac/flac.mk
--- a/package/flac/flac.mk
+++ b/package/flac/flac.mk
@@ -12,23 +12,23 @@
FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
FLAC_LICENSE = Xiph BSD-like (libFLAC), GPLv2+ (tools), LGPLv2.1+ (other libraries)
FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL
-FLAC_CONF_OPT = \
+FLAC_CONF_OPTS = \
--disable-cpplibs \
--disable-xmms-plugin \
--disable-altivec
ifeq ($(BR2_PACKAGE_LIBOGG),y)
-FLAC_CONF_OPT += --with-ogg=$(STAGING_DIR)/usr
+FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr
FLAC_DEPENDENCIES += libogg
else
-FLAC_CONF_OPT += --disable-ogg
+FLAC_CONF_OPTS += --disable-ogg
endif
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
FLAC_DEPENDENCIES += host-nasm
-FLAC_CONF_OPT += --enable-sse
+FLAC_CONF_OPTS += --enable-sse
else
-FLAC_CONF_OPT += --disable-sse
+FLAC_CONF_OPTS += --disable-sse
endif
$(eval $(autotools-package))
diff --git a/package/flann/flann.mk b/package/flann/flann.mk
--- a/package/flann/flann.mk
+++ b/package/flann/flann.mk
@@ -9,7 +9,7 @@
FLANN_INSTALL_STAGING = YES
FLANN_LICENSE = BSD-3c
FLANN_LICENSE_FILES = COPYING
-FLANN_CONF_OPT = \
+FLANN_CONF_OPTS = \
-DBUILD_C_BINDINGS=ON \
-DBUILD_PYTHON_BINDINGS=OFF \
-DBUILD_MATLAB_BINDINGS=OFF \
diff --git a/package/flickcurl/flickcurl.mk b/package/flickcurl/flickcurl.mk
--- a/package/flickcurl/flickcurl.mk
+++ b/package/flickcurl/flickcurl.mk
@@ -10,7 +10,7 @@
FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html
FLICKCURL_INSTALL_STAGING = YES
FLICKCURL_CONFIG_SCRIPTS = flickcurl-config
-FLICKCURL_CONF_OPT = --without-curl-config --without-xml2-config --without-raptor
+FLICKCURL_CONF_OPTS = --without-curl-config --without-xml2-config --without-raptor
FLICKCURL_DEPENDENCIES = libcurl libxml2 host-pkgconf
ifeq ($(BR2_PACKAGE_FLICKCURL_UTILS),)
diff --git a/package/flite/flite.mk b/package/flite/flite.mk
--- a/package/flite/flite.mk
+++ b/package/flite/flite.mk
@@ -43,9 +43,9 @@
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
FLITE_DEPENDENCIES += alsa-lib
-FLITE_CONF_OPT += --with-audio=alsa
+FLITE_CONF_OPTS += --with-audio=alsa
else
-FLITE_CONF_OPT += --with-audio=oss
+FLITE_CONF_OPTS += --with-audio=oss
endif
$(eval $(autotools-package))
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -8,7 +8,7 @@
FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz
FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION)
FLTK_INSTALL_STAGING = YES
-FLTK_CONF_OPT = --enable-threads --with-x --disable-gl \
+FLTK_CONF_OPTS = --enable-threads --with-x --disable-gl \
--disable-localjpeg --disable-localpng --disable-localzlib
FLTK_DEPENDENCIES = jpeg libpng xlib_libX11 xlib_libXext xlib_libXt
FLTK_CONFIG_SCRIPTS = fltk-config
@@ -16,7 +16,7 @@
FLTK_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_CAIRO),y)
-FLTK_CONF_OPT += --enable-cairo
+FLTK_CONF_OPTS += --enable-cairo
FLTK_DEPENDENCIES += cairo
endif
@@ -24,13 +24,13 @@
FLTK_CONF_ENV += ac_cv_path_FTCONFIG=$(STAGING_DIR)/usr/bin/freetype-config
FLTK_DEPENDENCIES += xlib_libXft
else
-FLTK_CONF_OPT += --disable-xft
+FLTK_CONF_OPTS += --disable-xft
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
FLTK_DEPENDENCIES += xlib_libXinerama
else
-FLTK_CONF_OPT += --disable-xinerama
+FLTK_CONF_OPTS += --disable-xinerama
endif
$(eval $(autotools-package))
diff --git a/package/fluxbox/fluxbox.mk b/package/fluxbox/fluxbox.mk
--- a/package/fluxbox/fluxbox.mk
+++ b/package/fluxbox/fluxbox.mk
@@ -12,15 +12,15 @@
FLUXBOX_AUTORECONF = YES
-FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+FLUXBOX_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)
ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
-FLUXBOX_CONF_OPT += --enable-imlib2 --with-imlib2-prefix=$(STAGING_DIR)/usr
+FLUXBOX_CONF_OPTS += --enable-imlib2 --with-imlib2-prefix=$(STAGING_DIR)/usr
FLUXBOX_DEPENDENCIES += imlib2
else
-FLUXBOX_CONF_OPT += --disable-imlib2
+FLUXBOX_CONF_OPTS += --disable-imlib2
endif
define FLUXBOX_INSTALL_XSESSION_FILE
diff --git a/package/fontconfig/fontconfig.mk b/package/fontconfig/fontconfig.mk
--- a/package/fontconfig/fontconfig.mk
+++ b/package/fontconfig/fontconfig.mk
@@ -11,11 +11,11 @@
FONTCONFIG_LICENSE = fontconfig license
FONTCONFIG_LICENSE_FILES = COPYING
-FONTCONFIG_CONF_OPT = --with-arch=$(GNU_TARGET_NAME) \
+FONTCONFIG_CONF_OPTS = --with-arch=$(GNU_TARGET_NAME) \
--with-cache-dir=/var/cache/fontconfig \
--disable-docs
-HOST_FONTCONFIG_CONF_OPT = \
+HOST_FONTCONFIG_CONF_OPTS = \
--disable-static
$(eval $(autotools-package))
diff --git a/package/foomatic-filters/foomatic-filters.mk b/package/foomatic-filters/foomatic-filters.mk
--- a/package/foomatic-filters/foomatic-filters.mk
+++ b/package/foomatic-filters/foomatic-filters.mk
@@ -9,14 +9,14 @@
FOOMATIC_FILTERS_LICENSE = GPLv2+
FOOMATIC_FILTERS_LICENSE_FILES = COPYING
FOOMATIC_FILTERS_DEPENDENCIES = cups libusb enscript
-FOOMATIC_FILTERS_CONF_OPT = --with-file-converter=enscript
+FOOMATIC_FILTERS_CONF_OPTS = --with-file-converter=enscript
FOOMATIC_FILTERS_CONF_ENV = ac_cv_path_ENSCRIPT="/usr/bin/enscript"
ifeq ($(BR2_PACKAGE_DBUS),y)
-FOOMATIC_FILTERS_CONF_OPT += --enable-dbus
+FOOMATIC_FILTERS_CONF_OPTS += --enable-dbus
FOOMATIC_FILTERS_DEPENDENCIES += dbus
else
-FOOMATIC_FILTERS_CONF_OPT += --disable-dbus
+FOOMATIC_FILTERS_CONF_OPTS += --disable-dbus
endif
$(eval $(autotools-package))
diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk
--- a/package/freerdp/freerdp.mk
+++ b/package/freerdp/freerdp.mk
@@ -13,52 +13,52 @@
FREERDP_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_CUPS),y)
-FREERDP_CONF_OPT += -DWITH_CUPS=ON
+FREERDP_CONF_OPTS += -DWITH_CUPS=ON
FREERDP_DEPENDENCIES += cups
else
-FREERDP_CONF_OPT += -DWITH_CUPS=OFF
+FREERDP_CONF_OPTS += -DWITH_CUPS=OFF
endif
ifeq ($(BR2_PACKAGE_FFMPEG),y)
-FREERDP_CONF_OPT += -DWITH_FFMPEG=ON
+FREERDP_CONF_OPTS += -DWITH_FFMPEG=ON
FREERDP_DEPENDENCIES += ffmpeg
else
-FREERDP_CONF_OPT += -DWITH_FFMPEG=OFF
+FREERDP_CONF_OPTS += -DWITH_FFMPEG=OFF
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-FREERDP_CONF_OPT += -DWITH_ALSA=ON
+FREERDP_CONF_OPTS += -DWITH_ALSA=ON
FREERDP_DEPENDENCIES += alsa-lib
else
-FREERDP_CONF_OPT += -DWITH_ALSA=OFF
+FREERDP_CONF_OPTS += -DWITH_ALSA=OFF
endif
ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
-FREERDP_CONF_OPT += -DWITH_PULSEAUDIO=ON
+FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=ON
FREERDP_DEPENDENCIES += pulseaudio
else
-FREERDP_CONF_OPT += -DWITH_PULSEAUDIO=OFF
+FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=OFF
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
-FREERDP_CONF_OPT += -DWITH_XINERAMA=ON
+FREERDP_CONF_OPTS += -DWITH_XINERAMA=ON
FREERDP_DEPENDENCIES += xlib_libXinerama
else
-FREERDP_CONF_OPT += -DWITH_XINERAMA=OFF
+FREERDP_CONF_OPTS += -DWITH_XINERAMA=OFF
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y)
-FREERDP_CONF_OPT += -DWITH_XKBFILE=ON
+FREERDP_CONF_OPTS += -DWITH_XKBFILE=ON
FREERDP_DEPENDENCIES += xlib_libxkbfile
else
-FREERDP_CONF_OPT += -DWITH_XKBFILE=OFF
+FREERDP_CONF_OPTS += -DWITH_XKBFILE=OFF
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
-FREERDP_CONF_OPT += -DWITH_XV=ON
+FREERDP_CONF_OPTS += -DWITH_XV=ON
FREERDP_DEPENDENCIES += xlib_libXv
else
-FREERDP_CONF_OPT += -DWITH_XV=OFF
+FREERDP_CONF_OPTS += -DWITH_XV=OFF
endif
$(eval $(cmake-package))
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -15,7 +15,7 @@
FREETYPE_CONFIG_SCRIPTS = freetype-config
HOST_FREETYPE_DEPENDENCIES = host-pkgconf
-HOST_FREETYPE_CONF_OPT = --without-zlib --without-bzip2 --without-png
+HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png
# Regen required because the tarball ships with an experimental ltmain.sh
# that can't be patched by our infra.
@@ -32,25 +32,25 @@
ifeq ($(BR2_PACKAGE_ZLIB),y)
FREETYPE_DEPENDENCIES += zlib
-FREETYPE_CONF_OPT += --with-zlib
+FREETYPE_CONF_OPTS += --with-zlib
else
-FREETYPE_CONF_OPT += --without-zlib
+FREETYPE_CONF_OPTS += --without-zlib
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)
FREETYPE_DEPENDENCIES += bzip2
-FREETYPE_CONF_OPT += --with-bzip2
+FREETYPE_CONF_OPTS += --with-bzip2
else
-FREETYPE_CONF_OPT += --without-bzip2
+FREETYPE_CONF_OPTS += --without-bzip2
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
FREETYPE_DEPENDENCIES += libpng
-FREETYPE_CONF_OPT += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \
+FREETYPE_CONF_OPTS += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \
LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`"
FREETYPE_LIBPNG_LIBS = "`$(STAGING_DIR)/usr/bin/libpng-config --libs`"
else
-FREETYPE_CONF_OPT += --without-png
+FREETYPE_CONF_OPTS += --without-png
endif
# Extra fixing since includedir and libdir are expanded from configure values
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -10,10 +10,10 @@
GAMIN_INSTALL_STAGING = YES
GAMIN_LICENSE = LGPLv2+
GAMIN_LICENSE_FILES = COPYING
-GAMIN_CONF_OPT = --disable-debug
+GAMIN_CONF_OPTS = --disable-debug
# python support broken
-GAMIN_CONF_OPT += --without-python
+GAMIN_CONF_OPTS += --without-python
GAMIN_CONF_ENV = have_abstract_sockets=no
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -36,7 +36,7 @@
--prefix="$(HOST_DIR)/usr" \
--sysconfdir="$(HOST_DIR)/etc" \
--enable-static \
- $(QUIET) $(HOST_GCC_FINAL_CONF_OPT) \
+ $(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \
)
endef
@@ -48,28 +48,28 @@
GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_OBJC) += objc
GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y))
-HOST_GCC_FINAL_CONF_OPT = \
- $(HOST_GCC_COMMON_CONF_OPT) \
+HOST_GCC_FINAL_CONF_OPTS = \
+ $(HOST_GCC_COMMON_CONF_OPTS) \
--enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \
$(DISABLE_LARGEFILE) \
--with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin
# Disable shared libs like libstdc++ if we do static since it confuses linking
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-HOST_GCC_FINAL_CONF_OPT += --disable-shared
+HOST_GCC_FINAL_CONF_OPTS += --disable-shared
else
-HOST_GCC_FINAL_CONF_OPT += --enable-shared
+HOST_GCC_FINAL_CONF_OPTS += --enable-shared
endif
ifeq ($(BR2_GCC_ENABLE_OPENMP),y)
-HOST_GCC_FINAL_CONF_OPT += --enable-libgomp
+HOST_GCC_FINAL_CONF_OPTS += --enable-libgomp
else
-HOST_GCC_FINAL_CONF_OPT += --disable-libgomp
+HOST_GCC_FINAL_CONF_OPTS += --disable-libgomp
endif
# End with user-provided options, so that they can override previously
# defined options.
-HOST_GCC_FINAL_CONF_OPT += \
+HOST_GCC_FINAL_CONF_OPTS += \
$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
HOST_GCC_FINAL_CONF_ENV = \
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -36,8 +36,8 @@
HOST_GCC_INITIAL_POST_PATCH_HOOKS += HOST_GCC_INITIAL_DISABLE_LIBGMON
endif
-HOST_GCC_INITIAL_CONF_OPT = \
- $(HOST_GCC_COMMON_CONF_OPT) \
+HOST_GCC_INITIAL_CONF_OPTS = \
+ $(HOST_GCC_COMMON_CONF_OPTS) \
--enable-languages=c \
--disable-shared \
--without-headers \
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -91,7 +91,7 @@
host-mpfr \
$(if $(BR2_BINFMT_FLAT),host-elf2flt)
-HOST_GCC_COMMON_CONF_OPT = \
+HOST_GCC_COMMON_CONF_OPTS = \
--target=$(GNU_TARGET_NAME) \
--with-sysroot=$(STAGING_DIR) \
--disable-__cxa_atexit \
@@ -110,54 +110,54 @@
# Workaround until it's fixed in 4.5.4 or later
ifeq ($(ARCH),powerpc)
ifeq ($(findstring x4.5.,x$(GCC_VERSION)),x4.5.)
-HOST_GCC_COMMON_CONF_OPT += --disable-target-optspace
+HOST_GCC_COMMON_CONF_OPTS += --disable-target-optspace
endif
else
-HOST_GCC_COMMON_CONF_OPT += --enable-target-optspace
+HOST_GCC_COMMON_CONF_OPTS += --enable-target-optspace
endif
# gcc 4.6.x quadmath requires wchar
ifneq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y)
-HOST_GCC_COMMON_CONF_OPT += --disable-libquadmath
+HOST_GCC_COMMON_CONF_OPTS += --disable-libquadmath
endif
# libsanitizer requires wordexp, not in default uClibc config. Also
# doesn't build properly with musl.
ifeq ($(BR2_TOOLCHAIN_BUILDROOT_UCLIBC)$(BR2_TOOLCHAIN_BUILDROOT_MUSL),y)
-HOST_GCC_COMMON_CONF_OPT += --disable-libsanitizer
+HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer
endif
ifeq ($(BR2_GCC_ENABLE_TLS),y)
-HOST_GCC_COMMON_CONF_OPT += --enable-tls
+HOST_GCC_COMMON_CONF_OPTS += --enable-tls
else
-HOST_GCC_COMMON_CONF_OPT += --disable-tls
+HOST_GCC_COMMON_CONF_OPTS += --disable-tls
endif
ifeq ($(BR2_GCC_ENABLE_LIBMUDFLAP),y)
-HOST_GCC_COMMON_CONF_OPT += --enable-libmudflap
+HOST_GCC_COMMON_CONF_OPTS += --enable-libmudflap
else
-HOST_GCC_COMMON_CONF_OPT += --disable-libmudflap
+HOST_GCC_COMMON_CONF_OPTS += --disable-libmudflap
endif
ifeq ($(BR2_PTHREADS_NONE),y)
-HOST_GCC_COMMON_CONF_OPT += \
+HOST_GCC_COMMON_CONF_OPTS += \
--disable-threads \
--disable-libitm \
--disable-libatomic
else
-HOST_GCC_COMMON_CONF_OPT += --enable-threads
+HOST_GCC_COMMON_CONF_OPTS += --enable-threads
endif
ifeq ($(BR2_GCC_NEEDS_MPC),y)
HOST_GCC_COMMON_DEPENDENCIES += host-mpc
-HOST_GCC_COMMON_CONF_OPT += --with-mpc=$(HOST_DIR)/usr
+HOST_GCC_COMMON_CONF_OPTS += --with-mpc=$(HOST_DIR)/usr
endif
ifeq ($(BR2_GCC_ENABLE_GRAPHITE),y)
HOST_GCC_COMMON_DEPENDENCIES += host-isl host-cloog
-HOST_GCC_COMMON_CONF_OPT += --with-isl=$(HOST_DIR)/usr --with-cloog=$(HOST_DIR)/usr
+HOST_GCC_COMMON_CONF_OPTS += --with-isl=$(HOST_DIR)/usr --with-cloog=$(HOST_DIR)/usr
else
-HOST_GCC_COMMON_CONF_OPT += --without-isl --without-cloog
+HOST_GCC_COMMON_CONF_OPTS += --without-isl --without-cloog
endif
ifneq ($(BR2_arc)$(BR2_GCC_VERSION_SNAP),)
@@ -168,60 +168,60 @@
# only mips*-*-*, arm*-*-* and sparc*-*-* accept --with-float
# powerpc seems to be needing it as well
ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y)
-HOST_GCC_COMMON_CONF_OPT += --with-float=soft
+HOST_GCC_COMMON_CONF_OPTS += --with-float=soft
endif
endif
ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y)
-HOST_GCC_COMMON_CONF_OPT += --disable-decimal-float
+HOST_GCC_COMMON_CONF_OPTS += --disable-decimal-float
endif
# Determine arch/tune/abi/cpu options
ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
-HOST_GCC_COMMON_CONF_OPT += --with-arch=$(BR2_GCC_TARGET_ARCH)
+HOST_GCC_COMMON_CONF_OPTS += --with-arch=$(BR2_GCC_TARGET_ARCH)
endif
ifneq ($(call qstrip,$(BR2_GCC_TARGET_TUNE)),)
-HOST_GCC_COMMON_CONF_OPT += --with-tune=$(BR2_GCC_TARGET_TUNE)
+HOST_GCC_COMMON_CONF_OPTS += --with-tune=$(BR2_GCC_TARGET_TUNE)
endif
ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
-HOST_GCC_COMMON_CONF_OPT += --with-abi=$(BR2_GCC_TARGET_ABI)
+HOST_GCC_COMMON_CONF_OPTS += --with-abi=$(BR2_GCC_TARGET_ABI)
endif
# GCC doesn't support --with-cpu for bfin
ifeq ($(BR2_bfin),)
ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
-HOST_GCC_COMMON_CONF_OPT += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
+HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
else
-HOST_GCC_COMMON_CONF_OPT += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU))
+HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU))
endif
endif
endif
GCC_TARGET_FPU = $(call qstrip,$(BR2_GCC_TARGET_FPU))
ifneq ($(GCC_TARGET_FPU),)
-HOST_GCC_COMMON_CONF_OPT += --with-fpu=$(GCC_TARGET_FPU)
+HOST_GCC_COMMON_CONF_OPTS += --with-fpu=$(GCC_TARGET_FPU)
endif
GCC_TARGET_FLOAT_ABI = $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
ifneq ($(GCC_TARGET_FLOAT_ABI),)
-HOST_GCC_COMMON_CONF_OPT += --with-float=$(GCC_TARGET_FLOAT_ABI)
+HOST_GCC_COMMON_CONF_OPTS += --with-float=$(GCC_TARGET_FLOAT_ABI)
endif
GCC_TARGET_MODE = $(call qstrip,$(BR2_GCC_TARGET_MODE))
ifneq ($(GCC_TARGET_MODE),)
-HOST_GCC_COMMON_CONF_OPT += --with-mode=$(GCC_TARGET_MODE)
+HOST_GCC_COMMON_CONF_OPTS += --with-mode=$(GCC_TARGET_MODE)
endif
# Branding works on >= 4.3
ifneq ($(findstring x4.2.,x$(GCC_VERSION)),x4.2.)
-HOST_GCC_COMMON_CONF_OPT += \
+HOST_GCC_COMMON_CONF_OPTS += \
--with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \
--with-bugurl="http://bugs.buildroot.net/"
endif
# Enable proper double/long double for SPE ABI
ifeq ($(BR2_powerpc_SPE),y)
-HOST_GCC_COMMON_CONF_OPT += \
+HOST_GCC_COMMON_CONF_OPTS += \
--enable-e500_double \
--with-long-double-128
endif
diff --git a/package/gd/gd.mk b/package/gd/gd.mk
--- a/package/gd/gd.mk
+++ b/package/gd/gd.mk
@@ -12,35 +12,35 @@
GD_LICENSE_FILES = COPYING
GD_CONFIG_SCRIPTS = gdlib-config
-GD_CONF_OPT = --without-x --disable-rpath
+GD_CONF_OPTS = --without-x --disable-rpath
ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
GD_DEPENDENCIES += fontconfig
-GD_CONF_OPT += --with-fontconfig
+GD_CONF_OPTS += --with-fontconfig
endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)
GD_DEPENDENCIES += freetype
-GD_CONF_OPT += --with-freetype=$(STAGING_DIR)/usr
+GD_CONF_OPTS += --with-freetype=$(STAGING_DIR)/usr
else
-GD_CONF_OPT += --without-freetype
+GD_CONF_OPTS += --without-freetype
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
GD_DEPENDENCIES += jpeg
-GD_CONF_OPT += --with-jpeg
+GD_CONF_OPTS += --with-jpeg
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
GD_DEPENDENCIES += libpng
-GD_CONF_OPT += --with-png=$(STAGING_DIR)/usr
+GD_CONF_OPTS += --with-png=$(STAGING_DIR)/usr
else
-GD_CONF_OPT += --without-png
+GD_CONF_OPTS += --without-png
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y)
GD_DEPENDENCIES += xlib_libXpm
-GD_CONF_OPT += --with-xpm
+GD_CONF_OPTS += --with-xpm
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -58,7 +58,7 @@
# When gdb sources are fetched from the binutils-gdb repository, they
# also contain the binutils sources, but binutils shouldn't be built,
# so we disable it.
-GDB_DISABLE_BINUTILS_CONF_OPT = \
+GDB_DISABLE_BINUTILS_CONF_OPTS = \
--disable-binutils \
--disable-ld \
--disable-gas
@@ -74,28 +74,28 @@
bash_cv_have_mbstate_t=yes \
gdb_cv_func_sigsetjmp=yes
-GDB_CONF_OPT = \
+GDB_CONF_OPTS = \
--without-uiout \
--disable-gdbtk \
--without-x \
--disable-sim \
- $(GDB_DISABLE_BINUTILS_CONF_OPT) \
+ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \
$(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver) \
--with-curses \
--without-included-gettext \
--disable-werror
ifeq ($(BR2_PACKAGE_GDB_TUI),y)
- GDB_CONF_OPT += --enable-tui
+ GDB_CONF_OPTS += --enable-tui
else
- GDB_CONF_OPT += --disable-tui
+ GDB_CONF_OPTS += --disable-tui
endif
ifeq ($(BR2_PACKAGE_GDB_PYTHON),y)
- GDB_CONF_OPT += --with-python=$(TOPDIR)/package/gdb/gdb-python-config
+ GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config
GDB_DEPENDENCIES += python
else
- GDB_CONF_OPT += --without-python
+ GDB_CONF_OPTS += --without-python
endif
# This removes some unneeded Python scripts and XML target description
@@ -127,7 +127,7 @@
# * --disable-shared, otherwise the old 6.7 version specific to AVR32
# doesn't build because it wants to link a shared libbfd.so against
# non-PIC liberty.a.
-HOST_GDB_CONF_OPT = \
+HOST_GDB_CONF_OPTS = \
--target=$(GNU_TARGET_NAME) \
--enable-static --disable-shared \
--without-uiout \
@@ -136,20 +136,20 @@
--enable-threads \
--disable-werror \
--without-included-gettext \
- $(GDB_DISABLE_BINUTILS_CONF_OPT) \
+ $(GDB_DISABLE_BINUTILS_CONF_OPTS) \
--disable-sim
ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y)
- HOST_GDB_CONF_OPT += --enable-tui
+ HOST_GDB_CONF_OPTS += --enable-tui
else
- HOST_GDB_CONF_OPT += --disable-tui
+ HOST_GDB_CONF_OPTS += --disable-tui
endif
ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y)
- HOST_GDB_CONF_OPT += --with-python
+ HOST_GDB_CONF_OPTS += --with-python
HOST_GDB_DEPENDENCIES += host-python
else
- HOST_GDB_CONF_OPT += --without-python
+ HOST_GDB_CONF_OPTS += --without-python
endif
ifeq ($(GDB_FROM_GIT),y)
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -16,28 +16,28 @@
ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \
gio_can_sniff=no
-GDK_PIXBUF_CONF_OPT = --disable-glibtest
+GDK_PIXBUF_CONF_OPTS = --disable-glibtest
ifneq ($(BR2_PACKAGE_LIBPNG),y)
-GDK_PIXBUF_CONF_OPT += --without-libpng
+GDK_PIXBUF_CONF_OPTS += --without-libpng
else
GDK_PIXBUF_DEPENDENCIES += libpng
endif
ifneq ($(BR2_PACKAGE_JPEG),y)
-GDK_PIXBUF_CONF_OPT += --without-libjpeg
+GDK_PIXBUF_CONF_OPTS += --without-libjpeg
else
GDK_PIXBUF_DEPENDENCIES += jpeg
endif
ifneq ($(BR2_PACKAGE_TIFF),y)
-GDK_PIXBUF_CONF_OPT += --without-libtiff
+GDK_PIXBUF_CONF_OPTS += --without-libtiff
else
GDK_PIXBUF_DEPENDENCIES += tiff
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
-GDK_PIXBUF_CONF_OPT += --with-x11
+GDK_PIXBUF_CONF_OPTS += --with-x11
GDK_PIXBUF_DEPENDENCIES += xlib_libX11
endif
@@ -54,7 +54,7 @@
$(eval $(autotools-package))
-HOST_GDK_PIXBUF_CONF_OPT = \
+HOST_GDK_PIXBUF_CONF_OPTS = \
--without-libjpeg \
--without-libtiff
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -13,7 +13,7 @@
GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
HOST_GETTEXT_DEPENDENCIES = # we don't want the libiconv dependency
-GETTEXT_CONF_OPT += \
+GETTEXT_CONF_OPTS += \
--disable-libasprintf \
--disable-acl \
--disable-openmp \
@@ -24,7 +24,7 @@
--disable-relocatable \
--without-emacs
-HOST_GETTEXT_CONF_OPT = \
+HOST_GETTEXT_CONF_OPTS = \
--disable-libasprintf \
--disable-acl \
--disable-openmp \
@@ -69,7 +69,7 @@
# instead select BR2_PACKAGE_GETTEXT. Those packages need to be
# fixed before we can remove the following 3 lines... :-(
ifeq ($(BR2_ENABLE_LOCALE),)
-GETTEXT_CONF_OPT += --enable-nls
+GETTEXT_CONF_OPTS += --enable-nls
endif
# Disable interactive confirmation in host gettextize for package fixups
diff --git a/package/giblib/giblib.mk b/package/giblib/giblib.mk
--- a/package/giblib/giblib.mk
+++ b/package/giblib/giblib.mk
@@ -9,7 +9,7 @@
GIBLIB_INSTALL_STAGING = YES
GIBLIB_DEPENDENCIES = imlib2
GIBLIB_AUTORECONF = YES
-GIBLIB_CONF_OPT = --with-imlib2-prefix=$(STAGING_DIR)/usr \
+GIBLIB_CONF_OPTS = --with-imlib2-prefix=$(STAGING_DIR)/usr \
--with-imlib2-exec-prefix=$(STAGING_DIR)/usr
GIBLIB_CONFIG_SCRIPTS = giblib-config
GIBLIB_LICENSE = MIT
diff --git a/package/git/git.mk b/package/git/git.mk
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -12,45 +12,45 @@
ifeq ($(BR2_PACKAGE_OPENSSL),y)
GIT_DEPENDENCIES += openssl
- GIT_CONF_OPT += --with-openssl
+ GIT_CONF_OPTS += --with-openssl
else
- GIT_CONF_OPT += --without-openssl
+ GIT_CONF_OPTS += --without-openssl
endif
ifeq ($(BR2_PACKAGE_PERL),y)
GIT_DEPENDENCIES += perl
- GIT_CONF_OPT += --with-libpcre
+ GIT_CONF_OPTS += --with-libpcre
else
- GIT_CONF_OPT += --without-libpcre
+ GIT_CONF_OPTS += --without-libpcre
endif
ifeq ($(BR2_PACKAGE_CURL),y)
GIT_DEPENDENCIES += curl
- GIT_CONF_OPT += --with-curl
+ GIT_CONF_OPTS += --with-curl
else
- GIT_CONF_OPT += --without-curl
+ GIT_CONF_OPTS += --without-curl
endif
ifeq ($(BR2_PACKAGE_EXPAT),y)
GIT_DEPENDENCIES += expat
- GIT_CONF_OPT += --with-expat
+ GIT_CONF_OPTS += --with-expat
else
- GIT_CONF_OPT += --without-expat
+ GIT_CONF_OPTS += --without-expat
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
GIT_DEPENDENCIES += libiconv
GIT_CONF_ENV += LIBS=-liconv
- GIT_CONF_OPT += --with-iconv=/usr/lib
+ GIT_CONF_OPTS += --with-iconv=/usr/lib
else
- GIT_CONF_OPT += --without-iconv
+ GIT_CONF_OPTS += --without-iconv
endif
ifeq ($(BR2_PACKAGE_TCL),y)
GIT_DEPENDENCIES += tcl
- GIT_CONF_OPT += --with-tcltk
+ GIT_CONF_OPTS += --with-tcltk
else
- GIT_CONF_OPT += --without-tcltk
+ GIT_CONF_OPTS += --without-tcltk
endif
# assume yes for these tests, configure will bail out otherwise
diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk
--- a/package/glib-networking/glib-networking.mk
+++ b/package/glib-networking/glib-networking.mk
@@ -19,9 +19,9 @@
ifeq ($(BR2_PACKAGE_GNUTLS),y)
GLIB_NETWORKING_DEPENDENCIES += gnutls
-GLIB_NETWORKING_CONF_OPT += --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+GLIB_NETWORKING_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr
else
-GLIB_NETWORKING_CONF_OPT += --without-gnutls
+GLIB_NETWORKING_CONF_OPTS += --without-gnutls
endif
# gnutls 3.x+ doesn't use libgcrypt, it uses nettle/hogweed
diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -7,7 +7,7 @@
GMPC_VERSION = 11.8.16
GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION)
GMPC_CONF_ENV = ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
-GMPC_CONF_OPT = --disable-mmkeys --disable-unique
+GMPC_CONF_OPTS = --disable-mmkeys --disable-unique
GMPC_LICENSE = GPLv2+
GMPC_LICENSE_FILES = COPYING
GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkgconf host-vala \
diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk
--- a/package/gnupg/gnupg.mk
+++ b/package/gnupg/gnupg.mk
@@ -11,10 +11,10 @@
GNUPG_LICENSE_FILES = COPYING
GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv)
GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no
-GNUPG_CONF_OPT = --disable-rpath --enable-minimal --disable-regex
+GNUPG_CONF_OPTS = --disable-rpath --enable-minimal --disable-regex
ifeq ($(BR2_PACKAGE_BZIP2),y)
-GNUPG_CONF_OPT += --enable-bzip2
+GNUPG_CONF_OPTS += --enable-bzip2
GNUPG_DEPENDENCIES += bzip2
endif
@@ -22,19 +22,19 @@
GNUPG_CONF_ENV += ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config
GNUPG_DEPENDENCIES += libcurl
else
-GNUPG_CONF_OPT += --without-libcurl
+GNUPG_CONF_OPTS += --without-libcurl
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
GNUPG_DEPENDENCIES += readline
else
-GNUPG_CONF_OPT += --without-readline
+GNUPG_CONF_OPTS += --without-readline
endif
ifeq ($(BR2_PACKAGE_GNUPG_RSA),y)
-GNUPG_CONF_OPT += --enable-rsa
+GNUPG_CONF_OPTS += --enable-rsa
else
-GNUPG_CONF_OPT += --disable-rsa
+GNUPG_CONF_OPTS += --disable-rsa
endif
ifneq ($(BR2_PACKAGE_GNUPG_GPGV),y)
diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk
--- a/package/gnupg2/gnupg2.mk
+++ b/package/gnupg2/gnupg2.mk
@@ -11,7 +11,7 @@
GNUPG2_LICENSE_FILES = COPYING
GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libpthsem \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
-GNUPG2_CONF_OPT = \
+GNUPG2_CONF_OPTS = \
--disable-rpath --disable-regex --disable-doc \
--with-libgpg-error-prefix=$(STAGING_DIR)/usr \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
diff --git a/package/gnuplot/gnuplot.mk b/package/gnuplot/gnuplot.mk
--- a/package/gnuplot/gnuplot.mk
+++ b/package/gnuplot/gnuplot.mk
@@ -11,7 +11,7 @@
GNUPLOT_AUTORECONF = YES
-GNUPLOT_CONF_OPT = --without-x \
+GNUPLOT_CONF_OPTS = --without-x \
--disable-raise-console \
--disable-mouse \
--without-tutorial \
@@ -25,19 +25,19 @@
--without-cairo
ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
-GNUPLOT_CONF_OPT += --with-gd
+GNUPLOT_CONF_OPTS += --with-gd
GNUPLOT_DEPENDENCIES += gd
GNUPLOT_CONF_ENV += \
ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config
else
-GNUPLOT_CONF_OPT += --without-gd
+GNUPLOT_CONF_OPTS += --without-gd
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
-GNUPLOT_CONF_OPT += --with-readline=gnu
+GNUPLOT_CONF_OPTS += --with-readline=gnu
GNUPLOT_DEPENDENCIES += readline
else
-GNUPLOT_CONF_OPT += --without-readline
+GNUPLOT_CONF_OPTS += --without-readline
endif
# Remove Javascript scripts, lua scripts, PostScript files
diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -15,7 +15,7 @@
$(if $(BR2_PACKAGE_LIBIDN),libidn) \
$(if $(BR2_PACKAGE_LIBTASN1),libtasn1) \
$(if $(BR2_PACKAGE_ZLIB),zlib)
-GNUTLS_CONF_OPT = \
+GNUTLS_CONF_OPTS = \
--with-libnettle-prefix=$(STAGING_DIR)/usr \
--disable-rpath \
--disable-doc \
@@ -29,26 +29,26 @@
GNUTLS_INSTALL_STAGING = YES
# libpthread and libz autodetection poison the linkpath
-GNUTLS_CONF_OPT += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
-GNUTLS_CONF_OPT += $(if $(BR2_PACKAGE_ZLIB),--with-libz-prefix=$(STAGING_DIR)/usr)
+GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr)
+GNUTLS_CONF_OPTS += $(if $(BR2_PACKAGE_ZLIB),--with-libz-prefix=$(STAGING_DIR)/usr)
# gnutls needs libregex, but pcre can be used too
# The check isn't cross-compile friendly
GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes
-GNUTLS_CONF_OPT += --with-regex-header=pcreposix.h \
+GNUTLS_CONF_OPTS += --with-regex-header=pcreposix.h \
--with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \
--with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`"
# Consider crywrap as part of tools because it needs WCHAR, and it's so too
ifeq ($(BR2_PACKAGE_GNUTLS_TOOLS),)
- GNUTLS_CONF_OPT += --disable-crywrap
+ GNUTLS_CONF_OPTS += --disable-crywrap
endif
# libidn support for nommu must exclude the crywrap wrapper (uses fork)
-GNUTLS_CONF_OPT += $(if $(BR2_USE_MMU),,--disable-crywrap)
+GNUTLS_CONF_OPTS += $(if $(BR2_USE_MMU),,--disable-crywrap)
ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
- GNUTLS_CONF_OPT += --enable-cryptodev
+ GNUTLS_CONF_OPTS += --enable-cryptodev
GNUTLS_DEPENDENCIES += cryptodev-linux
endif
diff --git a/package/google-breakpad/google-breakpad.mk b/package/google-breakpad/google-breakpad.mk
--- a/package/google-breakpad/google-breakpad.mk
+++ b/package/google-breakpad/google-breakpad.mk
@@ -7,7 +7,7 @@
GOOGLE_BREAKPAD_VERSION = 1373
GOOGLE_BREAKPAD_SITE = http://google-breakpad.googlecode.com/svn/trunk
GOOGLE_BREAKPAD_SITE_METHOD = svn
-GOOGLE_BREAKPAD_CONF_OPT = --disable-processor --disable-tools
+GOOGLE_BREAKPAD_CONF_OPTS = --disable-processor --disable-tools
# Only a static library is installed
GOOGLE_BREAKPAD_INSTALL_TARGET = NO
GOOGLE_BREAKPAD_INSTALL_STAGING = YES
diff --git a/package/gpm/gpm.mk b/package/gpm/gpm.mk
--- a/package/gpm/gpm.mk
+++ b/package/gpm/gpm.mk
@@ -30,7 +30,7 @@
# and as it's better to have gpm support in ncurses that the contrary, we force
# gpm to not look after ncurses explicitly.
# http://invisible-island.net/ncurses/ncurses.faq.html#using_gpm_lib
-GPM_CONF_OPT = --without-curses
+GPM_CONF_OPTS = --without-curses
# configure is missing but gpm seems not compatible with our autoreconf
# mechanism so we have to do it manually instead of using GPM_AUTORECONF = YES
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -9,7 +9,7 @@
GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
GREP_LICENSE = GPLv3+
GREP_LICENSE_FILES = COPYING
-GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
+GREP_CONF_OPTS = --disable-perl-regexp --without-included-regex
GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
# link with iconv if enabled
@@ -20,7 +20,7 @@
# link with pcre if enabled
ifeq ($(BR2_PACKAGE_PCRE),y)
-GREP_CONF_OPT += --enable-perl-regexp
+GREP_CONF_OPTS += --enable-perl-regexp
GREP_DEPENDENCIES += pcre
endif
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -73,6 +73,6 @@
GST_FFMPEG_CONF_EXTRA_OPT += --enable-pic
endif
-GST_FFMPEG_CONF_OPT = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPT)"
+GST_FFMPEG_CONF_OPTS = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPT)"
$(eval $(autotools-package))
diff --git a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
--- a/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -28,9 +28,9 @@
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
GST_FSL_PLUGINS_DEPENDENCIES += xlib_libX11
-GST_FSL_PLUGINS_CONF_OPT += --enable-x11
+GST_FSL_PLUGINS_CONF_OPTS += --enable-x11
else
-GST_FSL_PLUGINS_CONF_OPT += --disable-x11
+GST_FSL_PLUGINS_CONF_OPTS += --disable-x11
endif
# Autoreconf requires an m4 directory to exist
diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
--- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
@@ -8,7 +8,7 @@
GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz
GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
-GST_PLUGINS_BAD_CONF_OPT = \
+GST_PLUGINS_BAD_CONF_OPTS = \
--disable-examples
GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer
@@ -18,564 +18,564 @@
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-adpcmdec
+GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-adpcmdec
+GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-adpcmenc
+GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-adpcmenc
+GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-aiff
+GST_PLUGINS_BAD_CONF_OPTS += --enable-aiff
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-aiff
+GST_PLUGINS_BAD_CONF_OPTS += --disable-aiff
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-asfmux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-asfmux
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-asfmux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-asfmux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-audiovisualizers
+GST_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-audiovisualizers
+GST_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-autoconvert
+GST_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-autoconvert
+GST_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-bayer
+GST_PLUGINS_BAD_CONF_OPTS += --enable-bayer
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-bayer
+GST_PLUGINS_BAD_CONF_OPTS += --disable-bayer
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin
+GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin
+GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-camerabin2
+GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-camerabin2
+GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-cdxaparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-cdxaparse
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-cdxaparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-cdxaparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-coloreffects
+GST_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-coloreffects
+GST_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-colorspace
+GST_PLUGINS_BAD_CONF_OPTS += --enable-colorspace
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-colorspace
+GST_PLUGINS_BAD_CONF_OPTS += --disable-colorspace
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dataurisrc
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dataurisrc
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dataurisrc
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dataurisrc
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dccp
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dccp
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dccp
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dccp
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-debugutils
+GST_PLUGINS_BAD_CONF_OPTS += --enable-debugutils
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-debugutils
+GST_PLUGINS_BAD_CONF_OPTS += --disable-debugutils
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-decklink
+GST_PLUGINS_BAD_CONF_OPTS += --enable-decklink
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-decklink
+GST_PLUGINS_BAD_CONF_OPTS += --disable-decklink
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dtmf
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dtmf
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dtmf
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dtmf
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dvbsuboverlay
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dvbsuboverlay
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dvdspu
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dvdspu
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-faceoverlay
+GST_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-faceoverlay
+GST_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-festival
+GST_PLUGINS_BAD_CONF_OPTS += --enable-festival
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-festival
+GST_PLUGINS_BAD_CONF_OPTS += --disable-festival
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-fieldanalysis
+GST_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-fieldanalysis
+GST_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-freeze
+GST_PLUGINS_BAD_CONF_OPTS += --enable-freeze
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-freeze
+GST_PLUGINS_BAD_CONF_OPTS += --disable-freeze
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-freeverb
+GST_PLUGINS_BAD_CONF_OPTS += --enable-freeverb
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-freeverb
+GST_PLUGINS_BAD_CONF_OPTS += --disable-freeverb
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-frei0r
+GST_PLUGINS_BAD_CONF_OPTS += --enable-frei0r
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-frei0r
+GST_PLUGINS_BAD_CONF_OPTS += --disable-frei0r
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-gaudieffects
+GST_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-gaudieffects
+GST_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-geometrictransform
+GST_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-geometrictransform
+GST_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-gsettings
+GST_PLUGINS_BAD_CONF_OPTS += --enable-gsettings
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-gsettings
+GST_PLUGINS_BAD_CONF_OPTS += --disable-gsettings
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-h264parse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-h264parse
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-h264parse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-h264parse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-hdvparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-hdvparse
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-hdvparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-hdvparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-hls
+GST_PLUGINS_BAD_CONF_OPTS += --enable-hls
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-hls
+GST_PLUGINS_BAD_CONF_OPTS += --disable-hls
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-id3tag
+GST_PLUGINS_BAD_CONF_OPTS += --enable-id3tag
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-id3tag
+GST_PLUGINS_BAD_CONF_OPTS += --disable-id3tag
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-inter
+GST_PLUGINS_BAD_CONF_OPTS += --enable-inter
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-inter
+GST_PLUGINS_BAD_CONF_OPTS += --disable-inter
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-interlace
+GST_PLUGINS_BAD_CONF_OPTS += --enable-interlace
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-interlace
+GST_PLUGINS_BAD_CONF_OPTS += --disable-interlace
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-ivfparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-ivfparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-jp2kdecimator
+GST_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-jp2kdecimator
+GST_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-jpegformat
+GST_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-jpegformat
+GST_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-legacyresample
+GST_PLUGINS_BAD_CONF_OPTS += --enable-legacyresample
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-legacyresample
+GST_PLUGINS_BAD_CONF_OPTS += --disable-legacyresample
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-librfb
+GST_PLUGINS_BAD_CONF_OPTS += --enable-librfb
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-librfb
+GST_PLUGINS_BAD_CONF_OPTS += --disable-librfb
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-linsys
+GST_PLUGINS_BAD_CONF_OPTS += --enable-linsys
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-linsys
+GST_PLUGINS_BAD_CONF_OPTS += --disable-linsys
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-liveadder
+GST_PLUGINS_BAD_CONF_OPTS += --enable-liveadder
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-liveadder
+GST_PLUGINS_BAD_CONF_OPTS += --disable-liveadder
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegdemux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegdemux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegpsmux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegpsmux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegtsdemux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegtsdemux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegtsmux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegtsmux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mpegvideoparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegvideoparse
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mpegvideoparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegvideoparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MVE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mve
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mve
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mve
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mve
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MXF),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-mxf
+GST_PLUGINS_BAD_CONF_OPTS += --enable-mxf
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-mxf
+GST_PLUGINS_BAD_CONF_OPTS += --disable-mxf
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NSF),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-nsf
+GST_PLUGINS_BAD_CONF_OPTS += --enable-nsf
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-nsf
+GST_PLUGINS_BAD_CONF_OPTS += --disable-nsf
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-nuvdemux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-nuvdemux
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-nuvdemux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-nuvdemux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-patchdetect
+GST_PLUGINS_BAD_CONF_OPTS += --enable-patchdetect
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-patchdetect
+GST_PLUGINS_BAD_CONF_OPTS += --disable-patchdetect
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-pcapparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-pcapparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-pnm
+GST_PLUGINS_BAD_CONF_OPTS += --enable-pnm
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-pnm
+GST_PLUGINS_BAD_CONF_OPTS += --disable-pnm
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-rawparse
+GST_PLUGINS_BAD_CONF_OPTS += --enable-rawparse
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-rawparse
+GST_PLUGINS_BAD_CONF_OPTS += --disable-rawparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-real
+GST_PLUGINS_BAD_CONF_OPTS += --enable-real
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-real
+GST_PLUGINS_BAD_CONF_OPTS += --disable-real
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-removesilence
+GST_PLUGINS_BAD_CONF_OPTS += --enable-removesilence
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-removesilence
+GST_PLUGINS_BAD_CONF_OPTS += --disable-removesilence
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-rtpmux
+GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpmux
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-rtpmux
+GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpmux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-rtpvp8
+GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpvp8
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-rtpvp8
+GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpvp8
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-scaletempo
+GST_PLUGINS_BAD_CONF_OPTS += --enable-scaletempo
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-scaletempo
+GST_PLUGINS_BAD_CONF_OPTS += --disable-scaletempo
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-sdi
+GST_PLUGINS_BAD_CONF_OPTS += --enable-sdi
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-sdi
+GST_PLUGINS_BAD_CONF_OPTS += --disable-sdi
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-sdp
+GST_PLUGINS_BAD_CONF_OPTS += --enable-sdp
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-sdp
+GST_PLUGINS_BAD_CONF_OPTS += --disable-sdp
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-segmentclip
+GST_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-segmentclip
+GST_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-siren
+GST_PLUGINS_BAD_CONF_OPTS += --enable-siren
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-siren
+GST_PLUGINS_BAD_CONF_OPTS += --disable-siren
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-smooth
+GST_PLUGINS_BAD_CONF_OPTS += --enable-smooth
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-smooth
+GST_PLUGINS_BAD_CONF_OPTS += --disable-smooth
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-speed
+GST_PLUGINS_BAD_CONF_OPTS += --enable-speed
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-speed
+GST_PLUGINS_BAD_CONF_OPTS += --disable-speed
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-subenc
+GST_PLUGINS_BAD_CONF_OPTS += --enable-subenc
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-subenc
+GST_PLUGINS_BAD_CONF_OPTS += --disable-subenc
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-stereo
+GST_PLUGINS_BAD_CONF_OPTS += --enable-stereo
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-stereo
+GST_PLUGINS_BAD_CONF_OPTS += --disable-stereo
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-tta
+GST_PLUGINS_BAD_CONF_OPTS += --enable-tta
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-tta
+GST_PLUGINS_BAD_CONF_OPTS += --disable-tta
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videofilters
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videofilters
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videofilters
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videofilters
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videomaxrate
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videomaxrate
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videomaxrate
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videomaxrate
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videomeasure
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videomeasure
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videomeasure
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videomeasure
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videoparsers
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videoparsers
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-videosignal
+GST_PLUGINS_BAD_CONF_OPTS += --enable-videosignal
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-videosignal
+GST_PLUGINS_BAD_CONF_OPTS += --disable-videosignal
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-vmnc
+GST_PLUGINS_BAD_CONF_OPTS += --enable-vmnc
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-vmnc
+GST_PLUGINS_BAD_CONF_OPTS += --disable-vmnc
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-y4m
+GST_PLUGINS_BAD_CONF_OPTS += --enable-y4m
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-y4m
+GST_PLUGINS_BAD_CONF_OPTS += --disable-y4m
endif
# plugins with deps
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-apexsink
+GST_PLUGINS_BAD_CONF_OPTS += --enable-apexsink
GST_PLUGINS_BAD_DEPENDENCIES += openssl
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-apexsink
+GST_PLUGINS_BAD_CONF_OPTS += --disable-apexsink
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-bz2
+GST_PLUGINS_BAD_CONF_OPTS += --enable-bz2
GST_PLUGINS_BAD_DEPENDENCIES += bzip2
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-bz2
+GST_PLUGINS_BAD_CONF_OPTS += --disable-bz2
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-cdaudio
+GST_PLUGINS_BAD_CONF_OPTS += --enable-cdaudio
GST_PLUGINS_BAD_DEPENDENCIES += libcdaudio
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-cdaudio
+GST_PLUGINS_BAD_CONF_OPTS += --disable-cdaudio
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-curl
+GST_PLUGINS_BAD_CONF_OPTS += --enable-curl
GST_PLUGINS_BAD_DEPENDENCIES += libcurl
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-curl
+GST_PLUGINS_BAD_CONF_OPTS += --disable-curl
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-directfb
+GST_PLUGINS_BAD_CONF_OPTS += --enable-directfb
GST_PLUGINS_BAD_DEPENDENCIES += directfb
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-directfb
+GST_PLUGINS_BAD_CONF_OPTS += --disable-directfb
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-dvb
+GST_PLUGINS_BAD_CONF_OPTS += --enable-dvb
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-dvb
+GST_PLUGINS_BAD_CONF_OPTS += --disable-dvb
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-faad
+GST_PLUGINS_BAD_CONF_OPTS += --enable-faad
GST_PLUGINS_BAD_DEPENDENCIES += faad2
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-faad
+GST_PLUGINS_BAD_CONF_OPTS += --disable-faad
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-fbdev
+GST_PLUGINS_BAD_CONF_OPTS += --enable-fbdev
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-fbdev
+GST_PLUGINS_BAD_CONF_OPTS += --disable-fbdev
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-libmms
+GST_PLUGINS_BAD_CONF_OPTS += --enable-libmms
GST_PLUGINS_BAD_DEPENDENCIES += libmms
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-libmms
+GST_PLUGINS_BAD_CONF_OPTS += --disable-libmms
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-musepack
+GST_PLUGINS_BAD_CONF_OPTS += --enable-musepack
GST_PLUGINS_BAD_DEPENDENCIES += musepack
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-musepack
+GST_PLUGINS_BAD_CONF_OPTS += --disable-musepack
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-neon
+GST_PLUGINS_BAD_CONF_OPTS += --enable-neon
GST_PLUGINS_BAD_DEPENDENCIES += neon
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-neon
+GST_PLUGINS_BAD_CONF_OPTS += --disable-neon
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-opus
+GST_PLUGINS_BAD_CONF_OPTS += --enable-opus
GST_PLUGINS_BAD_DEPENDENCIES += opus
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-opus
+GST_PLUGINS_BAD_CONF_OPTS += --disable-opus
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-rsvg
+GST_PLUGINS_BAD_CONF_OPTS += --enable-rsvg
GST_PLUGINS_BAD_DEPENDENCIES += librsvg
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-rsvg
+GST_PLUGINS_BAD_CONF_OPTS += --disable-rsvg
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL),y)
GST_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
-GST_PLUGINS_BAD_CONF_OPT += --enable-sdl
+GST_PLUGINS_BAD_CONF_OPTS += --enable-sdl
GST_PLUGINS_BAD_DEPENDENCIES += sdl
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-sdl
+GST_PLUGINS_BAD_CONF_OPTS += --disable-sdl
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-sndfile
+GST_PLUGINS_BAD_CONF_OPTS += --enable-sndfile
GST_PLUGINS_BAD_DEPENDENCIES += libsndfile
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-sndfile
+GST_PLUGINS_BAD_CONF_OPTS += --disable-sndfile
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-vcd
+GST_PLUGINS_BAD_CONF_OPTS += --enable-vcd
else
-GST_PLUGINS_BAD_CONF_OPT += --disable-vcd
+GST_PLUGINS_BAD_CONF_OPTS += --disable-vcd
endif
$(eval $(autotools-package))
diff --git a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
--- a/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
+++ b/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
@@ -16,7 +16,7 @@
FT2_CONFIG=/bin/false \
ac_cv_header_stdint_t="stdint.h"
-GST_PLUGINS_BASE_CONF_OPT = \
+GST_PLUGINS_BASE_CONF_OPTS = \
--disable-examples \
--disable-oggtest \
--disable-vorbistest \
@@ -26,12 +26,12 @@
ifeq ($(BR2_PACKAGE_XORG7),y)
GST_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
-GST_PLUGINS_BASE_CONF_OPT += \
+GST_PLUGINS_BASE_CONF_OPTS += \
--enable-x \
--enable-xshm \
--enable-xvideo
else
-GST_PLUGINS_BASE_CONF_OPT += \
+GST_PLUGINS_BASE_CONF_OPTS += \
--disable-x \
--disable-xshm \
--disable-xvideo
@@ -44,150 +44,150 @@
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA),y)
GST_PLUGINS_BASE_DEPENDENCIES += alsa-lib
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-alsa
+GST_PLUGINS_BASE_CONF_OPTS += --disable-alsa
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-adder
+GST_PLUGINS_BASE_CONF_OPTS += --enable-adder
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-adder
+GST_PLUGINS_BASE_CONF_OPTS += --disable-adder
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-app
+GST_PLUGINS_BASE_CONF_OPTS += --enable-app
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-app
+GST_PLUGINS_BASE_CONF_OPTS += --disable-app
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-audioconvert
+GST_PLUGINS_BASE_CONF_OPTS += --enable-audioconvert
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-audioconvert
+GST_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-audiorate
+GST_PLUGINS_BASE_CONF_OPTS += --enable-audiorate
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-audiorate
+GST_PLUGINS_BASE_CONF_OPTS += --disable-audiorate
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-audioresample
+GST_PLUGINS_BASE_CONF_OPTS += --enable-audioresample
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-audioresample
+GST_PLUGINS_BASE_CONF_OPTS += --disable-audioresample
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-audiotestsrc
+GST_PLUGINS_BASE_CONF_OPTS += --enable-audiotestsrc
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-audiotestsrc
+GST_PLUGINS_BASE_CONF_OPTS += --disable-audiotestsrc
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-encoding
+GST_PLUGINS_BASE_CONF_OPTS += --enable-encoding
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-encoding
+GST_PLUGINS_BASE_CONF_OPTS += --disable-encoding
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-ffmpegcolorspace
+GST_PLUGINS_BASE_CONF_OPTS += --enable-ffmpegcolorspace
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-ffmpegcolorspace
+GST_PLUGINS_BASE_CONF_OPTS += --disable-ffmpegcolorspace
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-gdp
+GST_PLUGINS_BASE_CONF_OPTS += --enable-gdp
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-gdp
+GST_PLUGINS_BASE_CONF_OPTS += --disable-gdp
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-playback
+GST_PLUGINS_BASE_CONF_OPTS += --enable-playback
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-playback
+GST_PLUGINS_BASE_CONF_OPTS += --disable-playback
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-subparse
+GST_PLUGINS_BASE_CONF_OPTS += --enable-subparse
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-subparse
+GST_PLUGINS_BASE_CONF_OPTS += --disable-subparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-tcp
+GST_PLUGINS_BASE_CONF_OPTS += --enable-tcp
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-tcp
+GST_PLUGINS_BASE_CONF_OPTS += --disable-tcp
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-typefind
+GST_PLUGINS_BASE_CONF_OPTS += --enable-typefind
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-typefind
+GST_PLUGINS_BASE_CONF_OPTS += --disable-typefind
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-videotestsrc
+GST_PLUGINS_BASE_CONF_OPTS += --enable-videotestsrc
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-videotestsrc
+GST_PLUGINS_BASE_CONF_OPTS += --disable-videotestsrc
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-videorate
+GST_PLUGINS_BASE_CONF_OPTS += --enable-videorate
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-videorate
+GST_PLUGINS_BASE_CONF_OPTS += --disable-videorate
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-videoscale
+GST_PLUGINS_BASE_CONF_OPTS += --enable-videoscale
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-videoscale
+GST_PLUGINS_BASE_CONF_OPTS += --disable-videoscale
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-volume
+GST_PLUGINS_BASE_CONF_OPTS += --enable-volume
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-volume
+GST_PLUGINS_BASE_CONF_OPTS += --disable-volume
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-ogg
+GST_PLUGINS_BASE_CONF_OPTS += --enable-ogg
GST_PLUGINS_BASE_DEPENDENCIES += libogg
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-ogg
+GST_PLUGINS_BASE_CONF_OPTS += --disable-ogg
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-pango
+GST_PLUGINS_BASE_CONF_OPTS += --enable-pango
GST_PLUGINS_BASE_DEPENDENCIES += pango
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-pango
+GST_PLUGINS_BASE_CONF_OPTS += --disable-pango
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-theora
+GST_PLUGINS_BASE_CONF_OPTS += --enable-theora
GST_PLUGINS_BASE_DEPENDENCIES += libtheora
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-theora
+GST_PLUGINS_BASE_CONF_OPTS += --disable-theora
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-ivorbis
+GST_PLUGINS_BASE_CONF_OPTS += --enable-ivorbis
GST_PLUGINS_BASE_DEPENDENCIES += tremor
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-ivorbis
+GST_PLUGINS_BASE_CONF_OPTS += --disable-ivorbis
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS),y)
-GST_PLUGINS_BASE_CONF_OPT += --enable-vorbis
+GST_PLUGINS_BASE_CONF_OPTS += --enable-vorbis
GST_PLUGINS_BASE_DEPENDENCIES += libvorbis
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-vorbis
+GST_PLUGINS_BASE_CONF_OPTS += --disable-vorbis
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
GST_PLUGINS_BASE_DEPENDENCIES += zlib
else
-GST_PLUGINS_BASE_CONF_OPT += --disable-zlib
+GST_PLUGINS_BASE_CONF_OPTS += --disable-zlib
endif
$(eval $(autotools-package))
diff --git a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
--- a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
+++ b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
@@ -8,7 +8,7 @@
GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz
GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
-GST_PLUGINS_GOOD_CONF_OPT = \
+GST_PLUGINS_GOOD_CONF_OPTS = \
--disable-debug \
--disable-examples \
--disable-directsound \
@@ -25,369 +25,369 @@
ifeq ($(BR2_PACKAGE_XORG7),y)
GST_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
-GST_PLUGINS_GOOD_CONF_OPT += \
+GST_PLUGINS_GOOD_CONF_OPTS += \
--enable-x \
--enable-xshm \
--enable-xvideo
else
-GST_PLUGINS_GOOD_CONF_OPT += \
+GST_PLUGINS_GOOD_CONF_OPTS += \
--disable-x \
--disable-xshm \
--disable-xvideo
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-jpeg
GST_PLUGINS_GOOD_DEPENDENCIES += jpeg
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-jpeg
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-jpeg
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PNG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-libpng
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-libpng
GST_PLUGINS_GOOD_DEPENDENCIES += libpng
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-libpng
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-libpng
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-bz2
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-bz2
GST_PLUGINS_GOOD_DEPENDENCIES += bzip2
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-bz2
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-bz2
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-zlib
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-zlib
GST_PLUGINS_GOOD_DEPENDENCIES += zlib
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-zlib
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-zlib
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-alpha
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-alpha
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-alpha
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-alpha
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-apetag
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-apetag
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-apetag
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-apetag
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-audiofx
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-audiofx
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-audiofx
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-audiofx
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-audioparsers
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-audioparsers
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-audioparsers
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-audioparsers
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-auparse
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-auparse
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-auparse
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-auparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-autodetect
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-autodetect
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-autodetect
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-autodetect
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-avi
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-avi
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-avi
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-avi
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CUTTER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-cutter
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-cutter
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-cutter
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-cutter
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-debugutils
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-debugutils
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-debugutils
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-debugutils
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-deinterlace
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-deinterlace
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-deinterlace
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-deinterlace
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EFFECTV),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-effectv
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-effectv
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-effectv
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-effectv
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-equalizer
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-equalizer
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-equalizer
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-equalizer
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-flv
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-flv
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-flv
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-flv
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-flx
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-flx
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-flx
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-flx
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-goom
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-goom
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-goom2k1
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom2k1
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-goom2k1
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom2k1
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-id3demux
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-id3demux
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-id3demux
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-id3demux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-icydemux
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-icydemux
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-icydemux
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-icydemux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-imagefreeze
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-imagefreeze
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-imagefreeze
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-imagefreeze
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-interleave
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-interleave
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-interleave
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-interleave
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-isomp4
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-isomp4
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-isomp4
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-law
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-law
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-law
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-law
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LEVEL),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-level
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-level
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-level
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-level
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-matroska
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-matroska
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-matroska
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-matroska
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-monoscope
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-monoscope
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-monoscope
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-monoscope
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-multifile
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-multifile
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-multifile
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-multifile
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-multipart
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-multipart
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-multipart
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-multipart
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-replaygain
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-replaygain
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-replaygain
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-replaygain
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-rtp
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtp
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-rtp
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtp
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-rtpmanager
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtpmanager
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-rtpmanager
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtpmanager
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-rtsp
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtsp
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-rtsp
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtsp
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-shapewipe
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-shapewipe
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-shapewipe
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-shapewipe
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-smpte
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-smpte
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-smpte
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-smpte
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-spectrum
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-spectrum
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-spectrum
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-spectrum
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-udp
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-udp
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-udp
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-udp
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-videobox
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-videobox
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-videobox
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-videobox
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-videocrop
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-videocrop
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-videocrop
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-videocrop
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-videofilter
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-videofilter
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-videofilter
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-videofilter
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-videomixer
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-videomixer
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-videomixer
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-videomixer
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVENC),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-wavenc
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavenc
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-wavenc
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavenc
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-wavparse
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavparse
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-wavparse
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_Y4M),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-y4m
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-y4m
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-y4m
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-y4m
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-gst_v4l2
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-gst_v4l2
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-gst_v4l2
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-annodex
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-annodex
GST_PLUGINS_GOOD_DEPENDENCIES += libxml2
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-annodex
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-annodex
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-cairo
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-cairo
GST_PLUGINS_GOOD_DEPENDENCIES += cairo
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-cairo
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-cairo
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-flac
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-flac
GST_PLUGINS_GOOD_DEPENDENCIES += flac
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-flac
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-flac
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-gdk_pixbuf
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-gdk_pixbuf
GST_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-gdk_pixbuf
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-gdk_pixbuf
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-oss
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-oss
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-oss4
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss4
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-oss4
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss4
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-pulse
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-pulse
GST_PLUGINS_GOOD_DEPENDENCIES += pulseaudio
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-pulse
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-pulse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-soup
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-soup
GST_PLUGINS_GOOD_DEPENDENCIES += libsoup
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-soup
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-soup
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-speex
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-speex
GST_PLUGINS_GOOD_DEPENDENCIES += speex
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-speex
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-speex
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-wavpack
+GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavpack
GST_PLUGINS_GOOD_DEPENDENCIES += wavpack
else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-wavpack
+GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavpack
endif
$(eval $(autotools-package))
diff --git a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
--- a/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -8,78 +8,78 @@
GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz
GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
-GST_PLUGINS_UGLY_CONF_OPT = \
+GST_PLUGINS_UGLY_CONF_OPTS = \
--disable-examples
GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-asfdemux
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-asfdemux
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-dvdlpcmdec
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-dvdlpcmdec
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDSUB),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-dvdsub
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-dvdsub
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_IEC958),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-iec958
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-iec958
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-iec958
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-iec958
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGAUDIOPARSE),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-mpegaudioparse
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegaudioparse
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-mpegaudioparse
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegaudioparse
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGSTREAM),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-mpegstream
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegstream
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-mpegstream
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegstream
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_REALMEDIA),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-realmedia
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-realmedia
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-synaesthesia
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-synaesthesia
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-synaesthesia
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-synaesthesia
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-lame
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-lame
GST_PLUGINS_UGLY_DEPENDENCIES += lame
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-lame
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-lame
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-mad
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-mad
GST_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-mad
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-mad
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y)
-GST_PLUGINS_UGLY_CONF_OPT += --enable-mpeg2dec
+GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec
GST_PLUGINS_UGLY_DEPENDENCIES += libmpeg2
else
-GST_PLUGINS_UGLY_CONF_OPT += --disable-mpeg2dec
+GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec
endif
$(eval $(autotools-package))
diff --git a/package/gstreamer/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer/gstreamer.mk
--- a/package/gstreamer/gstreamer/gstreamer.mk
+++ b/package/gstreamer/gstreamer/gstreamer.mk
@@ -19,7 +19,7 @@
GSTREAMER_CONF_ENV = as_cv_unaligned_access=yes
endif
-GSTREAMER_CONF_OPT = \
+GSTREAMER_CONF_OPTS = \
--disable-examples \
--disable-tests \
--disable-failing-tests \
diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk
--- a/package/gstreamer1/gst-omx/gst-omx.mk
+++ b/package/gstreamer1/gst-omx/gst-omx.mk
@@ -12,7 +12,7 @@
GST_OMX_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-GST_OMX_CONF_OPT = \
+GST_OMX_CONF_OPTS = \
--with-omx-target=rpi
GST_OMX_CONF_ENV = \
CFLAGS="$(TARGET_CFLAGS) \
@@ -22,7 +22,7 @@
endif
ifeq ($(BR2_PACKAGE_BELLAGIO),y)
-GST_OMX_CONF_OPT = \
+GST_OMX_CONF_OPTS = \
--with-omx-target=bellagio
GST_OMX_CONF_ENV = \
CFLAGS="$(TARGET_CFLAGS) \
diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk
--- a/package/gstreamer1/gst1-libav/gst1-libav.mk
+++ b/package/gstreamer1/gst1-libav/gst1-libav.mk
@@ -77,7 +77,7 @@
GST1_LIBAV_CONF_EXTRA_OPT += --disable-altivec
endif
-GST1_LIBAV_CONF_OPT = \
+GST1_LIBAV_CONF_OPTS = \
--with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPT)"
$(eval $(autotools-package))
diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -16,7 +16,7 @@
GST1_PLUGINS_BAD_AUTORECONF_OPTS = -I $(@D)/common/m4
GST1_PLUGINS_BAD_GETTEXTIZE = YES
-GST1_PLUGINS_BAD_CONF_OPT = \
+GST1_PLUGINS_BAD_CONF_OPTS = \
--disable-examples \
--disable-debug \
--disable-valgrind \
@@ -34,7 +34,7 @@
--disable-acm
# Options which require currently unpackaged libraries
-GST1_PLUGINS_BAD_CONF_OPT += \
+GST1_PLUGINS_BAD_CONF_OPTS += \
--disable-avc \
--disable-quicktime \
--disable-opensles \
@@ -88,589 +88,589 @@
ifeq ($(BR2_PACKAGE_ORC),y)
GST1_PLUGINS_BAD_DEPENDENCIES += orc
-GST1_PLUGINS_BAD_CONF_OPT += --enable-orc
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc
endif
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
GST1_PLUGINS_BAD_DEPENDENCIES += bluez_utils
-GST1_PLUGINS_BAD_CONF_OPT += --enable-bluez
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-bluez
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-bluez
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-accurip
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-accurip
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-accurip
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-accurip
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-adpcmdec
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-adpcmdec
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-adpcmenc
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-adpcmenc
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-aiff
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-aiff
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-aiff
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-aiff
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-asfmux
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-asfmux
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-asfmux
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-asfmux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-audiofxbad
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiofxbad
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-audiofxbad
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-audiomixer
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixer
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-audiomixer
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixer
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-compositor
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-compositor
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-compositor
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-compositor
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-audiovisualizers
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers
GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-audiovisualizers
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-autoconvert
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-autoconvert
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-bayer
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-bayer
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-bayer
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-bayer
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-camerabin2
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-camerabin2
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-cdxaparse
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-cdxaparse
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-cdxaparse
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-cdxaparse
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-coloreffects
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-coloreffects
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-dataurisrc
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-dataurisrc
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-dataurisrc
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-dataurisrc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-dccp
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-dccp
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-dccp
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-dccp
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-debugutils
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-debugutils
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-debugutils
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-debugutils
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-dvbsuboverlay
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-dvbsuboverlay
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-dvdspu
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-dvdspu
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-faceoverlay
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-faceoverlay
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-festival
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-festival
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-festival
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-festival
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-fieldanalysis
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-fieldanalysis
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-freeverb
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-freeverb
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-freeverb
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-freeverb
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-frei0r
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-frei0r
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-frei0r
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-frei0r
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-gaudieffects
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-gaudieffects
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-geometrictransform
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-geometrictransform
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-gdp
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-gdp
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-gdp
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-gdp
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-hdvparse
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-hdvparse
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-hdvparse
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-hdvparse
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-id3tag
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-id3tag
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-id3tag
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-id3tag
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-inter
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-inter
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-inter
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-inter
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-interlace
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-interlace
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-interlace
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-interlace
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-ivfparse
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-ivfparse
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVTC),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-ivtc
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivtc
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-ivtc
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivtc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-jp2kdecimator
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-jp2kdecimator
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-jpegformat
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-jpegformat
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-librfb
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-librfb
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-librfb
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-librfb
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIVEADDER),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-liveadder
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-liveadder
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-liveadder
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-liveadder
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-midi
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-midi
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-midi
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-midi
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegdemux
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegdemux
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegtsdemux
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux
GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegtsdemux
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegtsmux
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegtsmux
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-mpegpsmux
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux
GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-mpegpsmux
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-mve
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-mve
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-mve
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-mve
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-mxf
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-mxf
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-mxf
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-mxf
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-nuvdemux
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-nuvdemux
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-nuvdemux
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-nuvdemux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-patchdetect
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-patchdetect
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-patchdetect
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-patchdetect
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-pcapparse
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-pcapparse
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-pnm
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-pnm
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-pnm
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-pnm
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-rawparse
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-rawparse
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-rawparse
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-rawparse
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-real
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-real
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-real
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-real
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-removesilence
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-removesilence
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-removesilence
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-removesilence
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-sdi
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdi
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-sdi
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdi
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-sdp
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdp
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-sdp
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdp
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-segmentclip
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-segmentclip
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-siren
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-siren
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-siren
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-siren
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-smooth
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-smooth
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-smooth
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-smooth
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-speed
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-speed
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-speed
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-speed
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-subenc
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-subenc
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-subenc
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-subenc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-stereo
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-stereo
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-stereo
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-stereo
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-tta
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-tta
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-tta
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-tta
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-videofilters
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-videofilters
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-videofilters
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-videofilters
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-videomeasure
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-videomeasure
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-videomeasure
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-videomeasure
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-videoparsers
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-videoparsers
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-videosignal
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-videosignal
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-videosignal
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-videosignal
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-vmnc
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-vmnc
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-vmnc
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-vmnc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-y4m
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-y4m
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-y4m
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-y4m
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-yadif
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-yadif
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif
endif
# Plugins with dependencies
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-shm
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-shm
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-shm
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-shm
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-vcd
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-vcd
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-vcd
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-vcd
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-apexsink
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-apexsink
GST1_PLUGINS_BAD_DEPENDENCIES += openssl
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-apexsink
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-apexsink
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-assrender
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-assrender
GST1_PLUGINS_BAD_DEPENDENCIES += libass
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-assrender
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-assrender
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-voaacenc
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-voaacenc
GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-voaacenc
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-voaacenc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-bz2
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-bz2
GST1_PLUGINS_BAD_DEPENDENCIES += bzip2
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-bz2
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-bz2
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDAUDIO),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-cdaudio
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-cdaudio
GST1_PLUGINS_BAD_DEPENDENCIES += libcdaudio
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-cdaudio
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-cdaudio
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-curl
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-curl
GST1_PLUGINS_BAD_DEPENDENCIES += libcurl
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-curl
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-curl
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-dash
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-dash
GST1_PLUGINS_BAD_DEPENDENCIES += libxml2
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-dash
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-dash
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-decklink
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-decklink
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-decklink
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-decklink
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-webp
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-webp
GST1_PLUGINS_BAD_DEPENDENCIES += webp
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-webp
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-webp
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-directfb
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-directfb
GST1_PLUGINS_BAD_DEPENDENCIES += directfb
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-directfb
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-directfb
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-wayland
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-wayland
GST1_PLUGINS_BAD_DEPENDENCIES += wayland
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-wayland
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-wayland
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-faad
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-faad
GST1_PLUGINS_BAD_DEPENDENCIES += faad2
GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-faad
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-faad
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-fbdev
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-fbdev
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-fbdev
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-fbdev
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-libmms
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-libmms
GST1_PLUGINS_BAD_DEPENDENCIES += libmms
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-libmms
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-libmms
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-mpeg2enc
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpeg2enc
GST1_PLUGINS_BAD_DEPENDENCIES += libmpeg2
GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-mpeg2enc
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpeg2enc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPG123),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-mpg123
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpg123
GST1_PLUGINS_BAD_DEPENDENCIES += mpg123
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-mpg123
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpg123
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-musepack
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-musepack
GST1_PLUGINS_BAD_DEPENDENCIES += musepack
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-musepack
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-musepack
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-neon
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-neon
GST1_PLUGINS_BAD_DEPENDENCIES += neon
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-neon
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-neon
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-opencv
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-opencv
GST1_PLUGINS_BAD_DEPENDENCIES += opencv
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-opencv
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-opencv
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-opus
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-opus
GST1_PLUGINS_BAD_DEPENDENCIES += opus
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-opus
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-opus
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-rsvg
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-rsvg
GST1_PLUGINS_BAD_DEPENDENCIES += librsvg
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-rsvg
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-rsvg
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-eglgles
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-eglgles
GST1_PLUGINS_BAD_DEPENDENCIES += libegl libgles
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
# RPI has odd locations for several required headers.
-GST1_PLUGINS_BAD_CONF_OPT += --with-egl-window-system=rpi
+GST1_PLUGINS_BAD_CONF_OPTS += --with-egl-window-system=rpi
GST1_PLUGINS_BAD_CONF_ENV += \
CFLAGS="$(TARGET_CFLAGS) \
-I$(STAGING_DIR)/usr/include/IL \
@@ -678,36 +678,36 @@
-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux"
endif
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-eglgles
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-eglgles
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL),y)
GST1_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
-GST1_PLUGINS_BAD_CONF_OPT += --enable-sdl
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdl
GST1_PLUGINS_BAD_DEPENDENCIES += sdl
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-sdl
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdl
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-sndfile
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-sndfile
GST1_PLUGINS_BAD_DEPENDENCIES += libsndfile
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-sndfile
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-sndfile
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-dvb
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvb
GST1_PLUGINS_BAD_DEPENDENCIES += dtv-scan-tables
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-dvb
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvb
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS),y)
-GST1_PLUGINS_BAD_CONF_OPT += --enable-hls
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-hls
GST1_PLUGINS_BAD_DEPENDENCIES += gnutls
else
-GST1_PLUGINS_BAD_CONF_OPT += --disable-hls
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-hls
endif
# Add GPL license if GPL licensed plugins enabled.
diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -18,7 +18,7 @@
FT2_CONFIG=/bin/false \
ac_cv_header_stdint_t="stdint.h"
-GST1_PLUGINS_BASE_CONF_OPT = \
+GST1_PLUGINS_BASE_CONF_OPTS = \
--disable-examples \
--disable-oggtest \
--disable-vorbistest \
@@ -27,7 +27,7 @@
--disable-debug
# Options which require currently unpackaged libraries
-GST1_PLUGINS_BASE_CONF_OPT += \
+GST1_PLUGINS_BASE_CONF_OPTS += \
--disable-cdparanoia \
--disable-libvisual \
--disable-iso-codes
@@ -38,125 +38,125 @@
ifeq ($(BR2_PACKAGE_ORC),y)
GST1_PLUGINS_BASE_DEPENDENCIES += orc
-GST1_PLUGINS_BASE_CONF_OPT += --enable-orc
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-orc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-adder
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-adder
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-adder
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-adder
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-app
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-app
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-app
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-app
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-audioconvert
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-audioconvert
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-audioconvert
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-audiorate
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiorate
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-audiorate
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiorate
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-audiotestsrc
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiotestsrc
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-audiotestsrc
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiotestsrc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-encoding
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-encoding
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-encoding
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-encoding
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-videoconvert
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-videoconvert
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-videoconvert
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-videoconvert
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-gio
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-gio
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-gio
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-gio
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-playback
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-playback
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-playback
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-playback
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-audioresample
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-audioresample
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-audioresample
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioresample
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-subparse
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-subparse
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-subparse
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-subparse
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-tcp
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-tcp
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-tcp
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-tcp
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-typefind
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-typefind
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-typefind
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-typefind
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-videotestsrc
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-videotestsrc
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-videotestsrc
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-videotestsrc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-videorate
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-videorate
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-videorate
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-videorate
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-videoscale
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-videoscale
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-videoscale
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-videoscale
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-volume
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-volume
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-volume
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-volume
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
GST1_PLUGINS_BASE_DEPENDENCIES += zlib
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-zlib
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-zlib
endif
ifeq ($(BR2_PACKAGE_XORG7),y)
GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
-GST1_PLUGINS_BASE_CONF_OPT += \
+GST1_PLUGINS_BASE_CONF_OPTS += \
--enable-x \
--enable-xshm \
--enable-xvideo
else
-GST1_PLUGINS_BASE_CONF_OPT += \
+GST1_PLUGINS_BASE_CONF_OPTS += \
--disable-x \
--disable-xshm \
--disable-xvideo
@@ -165,42 +165,42 @@
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA),y)
GST1_PLUGINS_BASE_DEPENDENCIES += alsa-lib
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-alsa
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-alsa
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-ivorbis
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-ivorbis
GST1_PLUGINS_BASE_DEPENDENCIES += tremor
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-ivorbis
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-ivorbis
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-ogg
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-ogg
GST1_PLUGINS_BASE_DEPENDENCIES += libogg
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-ogg
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-ogg
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-pango
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-pango
GST1_PLUGINS_BASE_DEPENDENCIES += pango
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-pango
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-pango
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-theora
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-theora
GST1_PLUGINS_BASE_DEPENDENCIES += libtheora
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-theora
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-theora
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS),y)
-GST1_PLUGINS_BASE_CONF_OPT += --enable-vorbis
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-vorbis
GST1_PLUGINS_BASE_DEPENDENCIES += libvorbis
else
-GST1_PLUGINS_BASE_CONF_OPT += --disable-vorbis
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-vorbis
endif
$(eval $(autotools-package))
diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
@@ -10,7 +10,7 @@
GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
GST1_PLUGINS_GOOD_LICENSE = LGPLv2.1+
-GST1_PLUGINS_GOOD_CONF_OPT = \
+GST1_PLUGINS_GOOD_CONF_OPTS = \
--disable-debug \
--disable-valgrind \
--disable-examples \
@@ -27,7 +27,7 @@
# Options which require currently unpackaged libraries
-GST1_PLUGINS_GOOD_CONF_OPT += \
+GST1_PLUGINS_GOOD_CONF_OPTS += \
--disable-jack \
--disable-libdv \
--disable-dv1394 \
@@ -37,388 +37,388 @@
GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
ifeq ($(BR2_PACKAGE_ORC),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-orc
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-orc
GST1_PLUGINS_GOOD_DEPENDENCIES += orc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-alpha
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-alpha
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-alpha
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-alpha
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_APETAG),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-apetag
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-apetag
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-apetag
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-apetag
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-audiofx
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-audiofx
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-audiofx
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-audiofx
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-audioparsers
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-audioparsers
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-audioparsers
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-audioparsers
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-auparse
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-auparse
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-auparse
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-auparse
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-autodetect
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-autodetect
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-autodetect
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-autodetect
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-avi
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-avi
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-avi
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-avi
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-cutter
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-cutter
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-cutter
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-cutter
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-debugutils
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-debugutils
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-debugutils
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-debugutils
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-deinterlace
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-deinterlace
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-deinterlace
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-deinterlace
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DTMF),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-dtmf
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-dtmf
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-dtmf
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-dtmf
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-effectv
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-effectv
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-effectv
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-effectv
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-equalizer
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-equalizer
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-equalizer
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-equalizer
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-flv
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flv
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-flv
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flv
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-flx
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flx
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-flx
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flx
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-goom
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-goom
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-goom
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-goom
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-goom2k1
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-goom2k1
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-goom2k1
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-goom2k1
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-icydemux
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-icydemux
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-icydemux
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-icydemux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-id3demux
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-id3demux
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-id3demux
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-id3demux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-imagefreeze
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-imagefreeze
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-imagefreeze
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-imagefreeze
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-interleave
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-interleave
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-interleave
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-interleave
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-isomp4
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-isomp4
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-isomp4
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-law
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-law
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-law
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-law
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-level
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-level
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-level
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-level
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-matroska
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-matroska
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-matroska
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-matroska
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-monoscope
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-monoscope
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-monoscope
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-monoscope
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-multifile
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-multifile
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-multifile
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-multifile
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-multipart
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-multipart
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-multipart
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-multipart
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-replaygain
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-replaygain
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-replaygain
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-replaygain
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-rtp
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtp
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-rtp
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtp
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-rtpmanager
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtpmanager
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-rtpmanager
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtpmanager
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-rtsp
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtsp
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-rtsp
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtsp
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-shapewipe
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-shapewipe
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-shapewipe
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-shapewipe
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-smpte
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-smpte
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-smpte
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-smpte
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-spectrum
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-spectrum
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-spectrum
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-spectrum
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-udp
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-udp
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-udp
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-udp
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-videobox
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videobox
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-videobox
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videobox
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-videocrop
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videocrop
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-videocrop
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videocrop
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-videofilter
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videofilter
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-videofilter
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videofilter
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-videomixer
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videomixer
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-videomixer
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videomixer
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavenc
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavenc
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-wavenc
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavenc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavparse
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavparse
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-wavparse
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavparse
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-y4m
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-y4m
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-y4m
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-y4m
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-oss
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-oss
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-oss
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-oss
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-oss4
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-oss4
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-oss4
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-oss4
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-gst_v4l2
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-gst_v4l2
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-gst_v4l2
endif
ifeq ($(BR2_PACKAGE_XORG7),y)
GST1_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv
-GST1_PLUGINS_GOOD_CONF_OPT += \
+GST1_PLUGINS_GOOD_CONF_OPTS += \
--enable-x \
--enable-xshm \
$(if $(BR2_PACKAGE_XLIB_LIBXFIXES),xlib_libXfixes) \
$(if $(BR2_PACKAGE_XLIB_LIBXDAMAGE),xlib_libXdamage)
else
-GST1_PLUGINS_GOOD_CONF_OPT += \
+GST1_PLUGINS_GOOD_CONF_OPTS += \
--disable-x \
--disable-xshm
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-cairo
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-cairo
GST1_PLUGINS_GOOD_DEPENDENCIES += cairo
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-cairo
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-cairo
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-flac
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flac
GST1_PLUGINS_GOOD_DEPENDENCIES += flac
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-flac
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flac
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-gdk_pixbuf
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-gdk_pixbuf
GST1_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-gdk_pixbuf
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-gdk_pixbuf
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jpeg
GST1_PLUGINS_GOOD_DEPENDENCIES += jpeg
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-jpeg
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-jpeg
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-libpng
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-libpng
GST1_PLUGINS_GOOD_DEPENDENCIES += libpng
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-libpng
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-libpng
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-pulse
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-pulse
GST1_PLUGINS_GOOD_DEPENDENCIES += pulseaudio
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-pulse
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-pulse
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-soup
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-soup
GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-soup
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-soup
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-speex
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-speex
GST1_PLUGINS_GOOD_DEPENDENCIES += speex
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-speex
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-speex
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-taglib
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-taglib
GST1_PLUGINS_GOOD_DEPENDENCIES += taglib
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-taglib
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-taglib
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-vpx
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-vpx
GST1_PLUGINS_GOOD_DEPENDENCIES += libvpx
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-vpx
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-vpx
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-wavpack
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavpack
GST1_PLUGINS_GOOD_DEPENDENCIES += wavpack
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-wavpack
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavpack
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-zlib
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-zlib
GST1_PLUGINS_GOOD_DEPENDENCIES += zlib
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-zlib
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-zlib
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2),y)
-GST1_PLUGINS_GOOD_CONF_OPT += --enable-bz2
+GST1_PLUGINS_GOOD_CONF_OPTS += --enable-bz2
GST1_PLUGINS_GOOD_DEPENDENCIES += bzip2
else
-GST1_PLUGINS_GOOD_CONF_OPT += --disable-bz2
+GST1_PLUGINS_GOOD_CONF_OPTS += --disable-bz2
endif
$(eval $(autotools-package))
diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
--- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -11,12 +11,12 @@
# GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled.
GST1_PLUGINS_UGLY_LICENSE = LGPLv2.1+
-GST1_PLUGINS_UGLY_CONF_OPT = \
+GST1_PLUGINS_UGLY_CONF_OPTS = \
--disable-examples \
--disable-debug \
--disable-valgrind
-GST_PLUGINS_BAD1_CONF_OPT += \
+GST_PLUGINS_BAD1_CONF_OPTS += \
--disable-a52dec \
--disable-amrnb \
--disable-amrwb \
@@ -28,69 +28,69 @@
GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base
ifeq ($(BR2_PACKAGE_ORC),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-orc
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-orc
GST1_PLUGINS_UGLY_DEPENDENCIES += orc
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-asfdemux
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux
else
-GST1_PLUGINS_UGLY_CONF_OPT += --disable-asfdemux
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-dvdlpcmdec
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec
else
-GST1_PLUGINS_UGLY_CONF_OPT += --disable-dvdlpcmdec
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-dvdsub
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub
else
-GST1_PLUGINS_UGLY_CONF_OPT += --disable-dvdsub
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub
endif
ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGL1_PLUGIN_XINGMUX),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-xingmux
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-xingmux
else
-GST1_PLUGINS_UGLY_CONF_OPT += --disable-xingmux
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-xingmux
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-realmedia
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia
else
-GST1_PLUGINS_UGLY_CONF_OPT += --disable-realmedia
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-dvdread
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdread
GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread
GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
else
-GST1_PLUGINS_UGLY_CONF_OPT += --disable-dvdread
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdread
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-lame
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-lame
GST1_PLUGINS_UGLY_DEPENDENCIES += lame
else
-GST1_PLUGINS_UGLY_CONF_OPT += --disable-lame
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-lame
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-mad
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mad
GST1_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad
GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
else
-GST1_PLUGINS_UGLY_CONF_OPT += --disable-mad
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mad
endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y)
-GST1_PLUGINS_UGLY_CONF_OPT += --enable-mpeg2dec
+GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec
GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2
GST1_PLUGINS_ULGY_HAS_GPL_LICENSE = y
else
-GST1_PLUGINS_UGLY_CONF_OPT += --disable-mpeg2dec
+GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec
endif
# Add GPL license if GPL plugins enabled.
diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -21,7 +21,7 @@
GSTREAMER1_CONF_ENV = as_cv_unaligned_access=yes
endif
-GSTREAMER1_CONF_OPT = \
+GSTREAMER1_CONF_OPTS = \
--disable-examples \
--disable-tests \
--disable-failing-tests \
diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
--- a/package/gtest/gtest.mk
+++ b/package/gtest/gtest.mk
@@ -19,7 +19,7 @@
#
# For further details, refer to the explaination given in the README file from
# the gtest sources.
-GTEST_CONF_OPT = -DBUILD_SHARED_LIBS=OFF
+GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF
define GTEST_EXTRACT_CMDS
unzip $(DL_DIR)/$(GTEST_SOURCE) -d $(BUILD_DIR)
diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -65,7 +65,7 @@
gl_cv_c_restrict=no \
ac_cv_path_CUPS_CONFIG=no
-GTK2_ENGINES_CONF_OPT = \
+GTK2_ENGINES_CONF_OPTS = \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
diff --git a/package/gutenprint/gutenprint.mk b/package/gutenprint/gutenprint.mk
--- a/package/gutenprint/gutenprint.mk
+++ b/package/gutenprint/gutenprint.mk
@@ -25,7 +25,7 @@
GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config \
ac_cv_path_IJS_CONFIG=""
-GUTENPRINT_CONF_OPT = --disable-libgutenprintui2 \
+GUTENPRINT_CONF_OPTS = --disable-libgutenprintui2 \
--disable-samples \
--without-doc \
--without-gimp2 \
@@ -53,7 +53,7 @@
# empty string to to disable this, not just to /bin/false like elsewhere.
HOST_GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=''
-HOST_GUTENPRINT_CONF_OPT = --disable-libgutenprintui2 \
+HOST_GUTENPRINT_CONF_OPTS = --disable-libgutenprintui2 \
--disable-samples \
--without-gimp2 \
--without-doc \
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -17,7 +17,7 @@
# build system from searching the host paths.
GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
-GVFS_CONF_OPT = \
+GVFS_CONF_OPTS = \
--disable-gconf \
--disable-cdda \
--disable-obexftp \
@@ -28,23 +28,23 @@
ifeq ($(BR2_PACKAGE_AVAHI),y)
GVFS_DEPENDENCIES += avahi
-GVFS_CONF_OPT += --enable-avahi
+GVFS_CONF_OPTS += --enable-avahi
else
-GVFS_CONF_OPT += --disable-avahi
+GVFS_CONF_OPTS += --disable-avahi
endif
ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
GVFS_DEPENDENCIES += libarchive
-GVFS_CONF_OPT += --enable-archive
+GVFS_CONF_OPTS += --enable-archive
else
-GVFS_CONF_OPT += --disable-archive
+GVFS_CONF_OPTS += --disable-archive
endif
ifeq ($(BR2_PACKAGE_LIBFUSE),y)
GVFS_DEPENDENCIES += libfuse
-GVFS_CONF_OPT += --enable-fuse
+GVFS_CONF_OPTS += --enable-fuse
else
-GVFS_CONF_OPT += --disable-fuse
+GVFS_CONF_OPTS += --disable-fuse
endif
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
@@ -53,20 +53,20 @@
ifeq ($(BR2_PACKAGE_LIBSOUP),y)
GVFS_DEPENDENCIES += libsoup
-GVFS_CONF_OPT += --enable-http
+GVFS_CONF_OPTS += --enable-http
else
-GVFS_CONF_OPT += --disable-http
+GVFS_CONF_OPTS += --disable-http
endif
ifeq ($(BR2_PACKAGE_SAMBA_LIBSMBCLIENT),y)
GVFS_DEPENDENCIES += samba
-GVFS_CONF_OPT += \
+GVFS_CONF_OPTS += \
--enable-samba \
--with-samba-includes=$(STAGING_DIR)/usr/include \
--with-samba-libs=$(STAGING_DIR)/usr/lib \
ac_cv_lib_smbclient_smbc_option_get=yes
else
-GVFS_CONF_OPT += --disable-samba
+GVFS_CONF_OPTS += --disable-samba
endif
define GVFS_REMOVE_USELESS_BINARY
diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk
--- a/package/harfbuzz/harfbuzz.mk
+++ b/package/harfbuzz/harfbuzz.mk
@@ -11,7 +11,7 @@
HARFBUZZ_LICENSE_FILES = COPYING src/hb-ucdn/COPYING
HARFBUZZ_INSTALL_STAGING = YES
-HARFBUZZ_CONF_OPT = --without-coretext --without-uniscribe --without-graphite2
+HARFBUZZ_CONF_OPTS = --without-coretext --without-uniscribe --without-graphite2
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
# forgets to link test programs with -pthread breaking static link
@@ -20,30 +20,30 @@
ifeq ($(BR2_PACKAGE_CAIRO),y)
HARFBUZZ_DEPENDENCIES += cairo
- HARFBUZZ_CONF_OPT += --with-cairo=yes
+ HARFBUZZ_CONF_OPTS += --with-cairo=yes
else
- HARFBUZZ_CONF_OPT += --with-cairo=no
+ HARFBUZZ_CONF_OPTS += --with-cairo=no
endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)
HARFBUZZ_DEPENDENCIES += freetype
- HARFBUZZ_CONF_OPT += --with-freetype=yes
+ HARFBUZZ_CONF_OPTS += --with-freetype=yes
else
- HARFBUZZ_CONF_OPT += --with-freetype=no
+ HARFBUZZ_CONF_OPTS += --with-freetype=no
endif
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
HARFBUZZ_DEPENDENCIES += libglib2
- HARFBUZZ_CONF_OPT += --with-glib=yes
+ HARFBUZZ_CONF_OPTS += --with-glib=yes
else
- HARFBUZZ_CONF_OPT += --with-glib=no
+ HARFBUZZ_CONF_OPTS += --with-glib=no
endif
ifeq ($(BR2_PACKAGE_ICU),y)
HARFBUZZ_DEPENDENCIES += icu
- HARFBUZZ_CONF_OPT += --with-icu=yes
+ HARFBUZZ_CONF_OPTS += --with-icu=yes
else
- HARFBUZZ_CONF_OPT += --with-icu=no
+ HARFBUZZ_CONF_OPTS += --with-icu=no
endif
$(eval $(autotools-package))
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -15,7 +15,7 @@
HASERL_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
- HASERL_CONF_OPT += --with-lua
+ HASERL_CONF_OPTS += --with-lua
HASERL_DEPENDENCIES += lua
# liblua uses dlopen when dynamically linked
@@ -24,7 +24,7 @@
endif
else
- HASERL_CONF_OPT += --without-lua
+ HASERL_CONF_OPTS += --without-lua
endif
define HASERL_REMOVE_EXAMPLES
diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk
--- a/package/heimdal/heimdal.mk
+++ b/package/heimdal/heimdal.mk
@@ -9,7 +9,7 @@
HEIMDAL_DEPENDENCIES = host-e2fsprogs host-pkgconf
HEIMDAL_INSTALL_STAGING = YES
# static because of -fPIC issues with e2fsprogs on x86_64 host
-HOST_HEIMDAL_CONF_OPT = --with-x=no --disable-shared --enable-static
+HOST_HEIMDAL_CONF_OPTS = --with-x=no --disable-shared --enable-static
HOST_HEIMDAL_CONF_ENV = MAKEINFO=true
HEIMDAL_MAKE = $(MAKE1)
# For heimdal-0004-compile_et.patch
diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -10,13 +10,13 @@
HIAWATHA_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
-HIAWATHA_CONF_OPT += -DUSE_SYSTEM_POLARSSL=ON
+HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_POLARSSL=ON
HIAWATHA_DEPENDENCIES += polarssl
else
-HIAWATHA_CONF_OPT += -DENABLE_SSL=OFF
+HIAWATHA_CONF_OPTS += -DENABLE_SSL=OFF
endif
-HIAWATHA_CONF_OPT += \
+HIAWATHA_CONF_OPTS += \
$(if $(BR2_INET_IPV6),,-DENABLE_IPV6=OFF) \
-DENABLE_TOOLKIT=OFF \
-DENABLE_XSLT=OFF \
diff --git a/package/hplip/hplip.mk b/package/hplip/hplip.mk
--- a/package/hplip/hplip.mk
+++ b/package/hplip/hplip.mk
@@ -11,7 +11,7 @@
HPLIP_LICENSE = GPLv2 BSD-3c MIT
HPLIP_LICENSE_FILES = COPYING
-HPLIP_CONF_OPT = \
+HPLIP_CONF_OPTS = \
--disable-qt4 \
--disable-scan-build \
--disable-gui-build \
@@ -30,10 +30,10 @@
--includedir=$(STAGING_DIR)/usr/include
ifeq ($(BR2_PACKAGE_DBUS),y)
- HPLIP_CONF_OPT += --enable-dbus-build
+ HPLIP_CONF_OPTS += --enable-dbus-build
HPLIP_DEPENDENCIES += dbus
else
- HPLIP_CONF_OPT += --disable-dbus-build
+ HPLIP_CONF_OPTS += --disable-dbus-build
endif
define HPLIP_POST_INSTALL_TARGET_FIXUP
diff --git a/package/htop/htop.mk b/package/htop/htop.mk
--- a/package/htop/htop.mk
+++ b/package/htop/htop.mk
@@ -9,7 +9,7 @@
HTOP_DEPENDENCIES = ncurses
# For htop-01-native-affinity.patch
HTOP_AUTORECONF = YES
-HTOP_CONF_OPT = --disable-unicode
+HTOP_CONF_OPTS = --disable-unicode
HTOP_CONF_ENV = ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
HTOP_LICENSE = GPLv2
HTOP_LICENSE_FILES = COPYING
diff --git a/package/icu/icu.mk b/package/icu/icu.mk
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -13,9 +13,9 @@
ICU_DEPENDENCIES = host-icu
ICU_INSTALL_STAGING = YES
ICU_CONFIG_SCRIPTS = icu-config
-ICU_CONF_OPT = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
+ICU_CONF_OPTS = --with-cross-build=$(HOST_ICU_DIR)/source --disable-samples \
--disable-tests
-HOST_ICU_CONF_OPT = \
+HOST_ICU_CONF_OPTS = \
--disable-samples \
--disable-tests \
--disable-extras \
diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -12,7 +12,7 @@
# install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.*
IFPLUGD_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec
-IFPLUGD_CONF_OPT = --disable-lynx --with-initdir=/etc/init.d/
+IFPLUGD_CONF_OPTS = --disable-lynx --with-initdir=/etc/init.d/
IFPLUGD_DEPENDENCIES = libdaemon
# Prefer big ifplugd
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -13,14 +13,14 @@
IGH_ETHERCAT_DEPENDENCIES = linux
IGH_ETHERCAT_INSTALL_STAGING = YES
-IGH_ETHERCAT_CONF_OPT = \
+IGH_ETHERCAT_CONF_OPTS = \
--with-linux-dir=$(LINUX_DIR)
-IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_8139TOO),--enable-8139too,--disable-8139too)
-IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E100),--enable-e100,--disable-e100)
-IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000),--enable-e1000,--disable-e1000)
-IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e)
-IGH_ETHERCAT_CONF_OPT += $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169)
+IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_8139TOO),--enable-8139too,--disable-8139too)
+IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E100),--enable-e100,--disable-e100)
+IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000),--enable-e1000,--disable-e1000)
+IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e)
+IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169)
define IGH_ETHERCAT_BUILD_MODULES
$(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) modules
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -28,7 +28,7 @@
IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=32
endif
-IMAGEMAGICK_CONF_OPT = --program-transform-name='s,,,' \
+IMAGEMAGICK_CONF_OPTS = --program-transform-name='s,,,' \
--disable-openmp \
--without-perl \
--without-wmf \
@@ -45,78 +45,78 @@
IMAGEMAGICK_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
-IMAGEMAGICK_CONF_OPT += --with-fontconfig
+IMAGEMAGICK_CONF_OPTS += --with-fontconfig
IMAGEMAGICK_DEPENDENCIES += fontconfig
else
-IMAGEMAGICK_CONF_OPT += --without-fontconfig
+IMAGEMAGICK_CONF_OPTS += --without-fontconfig
endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)
-IMAGEMAGICK_CONF_OPT += --with-freetype
+IMAGEMAGICK_CONF_OPTS += --with-freetype
IMAGEMAGICK_CONF_ENV += \
ac_cv_path_freetype_config=$(STAGING_DIR)/usr/bin/freetype-config
IMAGEMAGICK_DEPENDENCIES += freetype
else
-IMAGEMAGICK_CONF_OPT += --without-freetype
+IMAGEMAGICK_CONF_OPTS += --without-freetype
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
-IMAGEMAGICK_CONF_OPT += --with-jpeg
+IMAGEMAGICK_CONF_OPTS += --with-jpeg
IMAGEMAGICK_DEPENDENCIES += jpeg
else
-IMAGEMAGICK_CONF_OPT += --without-jpeg
+IMAGEMAGICK_CONF_OPTS += --without-jpeg
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
-IMAGEMAGICK_CONF_OPT += --with-png
+IMAGEMAGICK_CONF_OPTS += --with-png
IMAGEMAGICK_DEPENDENCIES += libpng
else
-IMAGEMAGICK_CONF_OPT += --without-png
+IMAGEMAGICK_CONF_OPTS += --without-png
endif
ifeq ($(BR2_PACKAGE_LIBRSVG),y)
-IMAGEMAGICK_CONF_OPT += --with-rsvg
+IMAGEMAGICK_CONF_OPTS += --with-rsvg
IMAGEMAGICK_DEPENDENCIES += librsvg
else
-IMAGEMAGICK_CONF_OPT += --without-rsvg
+IMAGEMAGICK_CONF_OPTS += --without-rsvg
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
-IMAGEMAGICK_CONF_OPT += --with-xml
+IMAGEMAGICK_CONF_OPTS += --with-xml
IMAGEMAGICK_CONF_ENV += ac_cv_path_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config
IMAGEMAGICK_DEPENDENCIES += libxml2
else
-IMAGEMAGICK_CONF_OPT += --without-xml
+IMAGEMAGICK_CONF_OPTS += --without-xml
endif
ifeq ($(BR2_PACKAGE_TIFF),y)
-IMAGEMAGICK_CONF_OPT += --with-tiff
+IMAGEMAGICK_CONF_OPTS += --with-tiff
IMAGEMAGICK_DEPENDENCIES += tiff
else
-IMAGEMAGICK_CONF_OPT += --without-tiff
+IMAGEMAGICK_CONF_OPTS += --without-tiff
endif
ifeq ($(BR2_PACKAGE_FFTW),y)
# configure script misdetects these leading to build errors
IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes
-IMAGEMAGICK_CONF_OPT += --with-fftw
+IMAGEMAGICK_CONF_OPTS += --with-fftw
IMAGEMAGICK_DEPENDENCIES += fftw
else
-IMAGEMAGICK_CONF_OPT += --without-fftw
+IMAGEMAGICK_CONF_OPTS += --without-fftw
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
-IMAGEMAGICK_CONF_OPT += --with-zlib
+IMAGEMAGICK_CONF_OPTS += --with-zlib
IMAGEMAGICK_DEPENDENCIES += zlib
else
-IMAGEMAGICK_CONF_OPT += --without-zlib
+IMAGEMAGICK_CONF_OPTS += --without-zlib
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)
-IMAGEMAGICK_CONF_OPT += --with-bzlib
+IMAGEMAGICK_CONF_OPTS += --with-bzlib
IMAGEMAGICK_DEPENDENCIES += bzip2
else
-IMAGEMAGICK_CONF_OPT += --without-bzlib
+IMAGEMAGICK_CONF_OPTS += --without-bzlib
endif
$(eval $(autotools-package))
diff --git a/package/imlib2/imlib2.mk b/package/imlib2/imlib2.mk
--- a/package/imlib2/imlib2.mk
+++ b/package/imlib2/imlib2.mk
@@ -12,49 +12,49 @@
IMLIB2_INSTALL_STAGING = YES
IMLIB2_DEPENDENCIES = host-pkgconf freetype
-IMLIB2_CONF_OPT = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
+IMLIB2_CONF_OPTS = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
IMLIB2_CONFIG_SCRIPTS = imlib2-config
ifeq ($(BR2_PACKAGE_IMLIB2_X),y)
- IMLIB2_CONF_OPT += --with-x
+ IMLIB2_CONF_OPTS += --with-x
IMLIB2_DEPENDENCIES += xlib_libX11 xlib_libXext
else
- IMLIB2_CONF_OPT += --without-x
+ IMLIB2_CONF_OPTS += --without-x
endif
ifeq ($(BR2_PACKAGE_IMLIB2_JPEG),y)
- IMLIB2_CONF_OPT += --with-jpeg
+ IMLIB2_CONF_OPTS += --with-jpeg
IMLIB2_DEPENDENCIES += jpeg
else
- IMLIB2_CONF_OPT += --without-jpeg
+ IMLIB2_CONF_OPTS += --without-jpeg
endif
ifeq ($(BR2_PACKAGE_IMLIB2_PNG),y)
- IMLIB2_CONF_OPT += --with-png
+ IMLIB2_CONF_OPTS += --with-png
IMLIB2_DEPENDENCIES += libpng
else
- IMLIB2_CONF_OPT += --without-png
+ IMLIB2_CONF_OPTS += --without-png
endif
ifeq ($(BR2_PACKAGE_IMLIB2_GIF),y)
- IMLIB2_CONF_OPT += --with-gif
+ IMLIB2_CONF_OPTS += --with-gif
IMLIB2_DEPENDENCIES += libungif
else
- IMLIB2_CONF_OPT += --without-gif
+ IMLIB2_CONF_OPTS += --without-gif
endif
ifeq ($(BR2_PACKAGE_IMLIB2_TIFF),y)
- IMLIB2_CONF_OPT += --with-tiff
+ IMLIB2_CONF_OPTS += --with-tiff
IMLIB2_DEPENDENCIES += tiff
else
- IMLIB2_CONF_OPT += --without-tiff
+ IMLIB2_CONF_OPTS += --without-tiff
endif
ifeq ($(BR2_PACKAGE_IMLIB2_ID3),y)
- IMLIB2_CONF_OPT += --with-id3
+ IMLIB2_CONF_OPTS += --with-id3
IMLIB2_DEPENDENCIES += libid3tag
else
- IMLIB2_CONF_OPT += --without-id3
+ IMLIB2_CONF_OPTS += --without-id3
endif
# drop -L<dir> from linker flags
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -12,7 +12,7 @@
ac_cv_type_bool=yes \
ac_cv_sizeof_bool=1
-IPERF_CONF_OPT = \
+IPERF_CONF_OPTS = \
--disable-web100
$(eval $(autotools-package))
diff --git a/package/ipmitool/ipmitool.mk b/package/ipmitool/ipmitool.mk
--- a/package/ipmitool/ipmitool.mk
+++ b/package/ipmitool/ipmitool.mk
@@ -13,7 +13,7 @@
ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y)
IPMITOOL_DEPENDENCIES += openssl
else
-IPMITOOL_CONF_OPT += --disable-intf-lanplus
+IPMITOOL_CONF_OPTS += --disable-intf-lanplus
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -20,56 +20,56 @@
IPSEC_TOOLS_CONF_ENV += LIBS=-lz
endif
-IPSEC_TOOLS_CONF_OPT = \
+IPSEC_TOOLS_CONF_OPTS = \
--disable-hybrid \
--without-libpam \
--disable-gssapi \
--with-kernel-headers=$(STAGING_DIR)/usr/include
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
-IPSEC_TOOLS_CONF_OPT += --enable-adminport
+IPSEC_TOOLS_CONF_OPTS += --enable-adminport
else
-IPSEC_TOOLS_CONF_OPT += --disable-adminport
+IPSEC_TOOLS_CONF_OPTS += --disable-adminport
endif
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_NATT), y)
-IPSEC_TOOLS_CONF_OPT += --enable-natt
+IPSEC_TOOLS_CONF_OPTS += --enable-natt
else
-IPSEC_TOOLS_CONF_OPT += --disable-natt
+IPSEC_TOOLS_CONF_OPTS += --disable-natt
endif
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_FRAG), y)
-IPSEC_TOOLS_CONF_OPT += --enable-frag
+IPSEC_TOOLS_CONF_OPTS += --enable-frag
else
-IPSEC_TOOLS_CONF_OPT += --disable-frag
+IPSEC_TOOLS_CONF_OPTS += --disable-frag
endif
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_DPD), y)
-IPSEC_TOOLS_CONF_OPT += --enable-dpd
+IPSEC_TOOLS_CONF_OPTS += --enable-dpd
else
-IPSEC_TOOLS_CONF_OPT += --disable-dpd
+IPSEC_TOOLS_CONF_OPTS += --disable-dpd
endif
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_STATS), y)
-IPSEC_TOOLS_CONF_OPT += --enable-stats
+IPSEC_TOOLS_CONF_OPTS += --enable-stats
else
-IPSEC_TOOLS_CONF_OPT += --disable-stats
+IPSEC_TOOLS_CONF_OPTS += --disable-stats
endif
ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_READLINE), y)
-IPSEC_TOOLS_CONF_OPT += --without-readline
+IPSEC_TOOLS_CONF_OPTS += --without-readline
else
IPSEC_DEPENDENCIES += readline
endif
ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
-IPSEC_TOOLS_CONF_OPT += --enable-security-context=no
+IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no
endif
ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
-IPSEC_TOOLS_CONF_OPT += --enable-security-context=yes
+IPSEC_TOOLS_CONF_OPTS += --enable-security-context=yes
endif
ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
-IPSEC_TOOLS_CONF_OPT += --enable-security-context=kernel
+IPSEC_TOOLS_CONF_OPTS += --enable-security-context=kernel
endif
$(eval $(autotools-package))
diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -8,7 +8,7 @@
IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
IPSET_SITE = http://ipset.netfilter.org
IPSET_DEPENDENCIES = libmnl host-pkgconf
-IPSET_CONF_OPT = --with-kmod=no
+IPSET_CONF_OPTS = --with-kmod=no
IPSET_AUTORECONF = YES
IPSET_LICENSE = GPLv2
IPSET_LICENSE_FILES = COPYING
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -12,7 +12,7 @@
$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
IPTABLES_LICENSE = GPLv2
IPTABLES_LICENSE_FILES = COPYING
-IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr
+IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr
# Because of iptables-01-fix-static-link.patch
IPTABLES_AUTORECONF = YES
diff --git a/package/jamvm/jamvm.mk b/package/jamvm/jamvm.mk
--- a/package/jamvm/jamvm.mk
+++ b/package/jamvm/jamvm.mk
@@ -10,7 +10,7 @@
JAMVM_LICENSE_FILES = COPYING
JAMVM_DEPENDENCIES = zlib classpath
# int inlining seems to crash jamvm, don't build shared version of internal lib
-JAMVM_CONF_OPT = \
+JAMVM_CONF_OPTS = \
--with-classpath-install-dir=/usr \
--disable-int-inlining \
--disable-shared \
diff --git a/package/joe/joe.mk b/package/joe/joe.mk
--- a/package/joe/joe.mk
+++ b/package/joe/joe.mk
@@ -11,9 +11,9 @@
ifeq ($(BR2_PACKAGE_NCURSES),y)
JOE_DEPENDENCIES += ncurses
-JOE_CONF_OPT += --enable-curses
+JOE_CONF_OPTS += --enable-curses
else
-JOE_CONF_OPT += --disable-curses
+JOE_CONF_OPTS += --disable-curses
endif
ifneq ($(BR2_PACKAGE_JOE_FULL),y)
diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk
--- a/package/jpeg-turbo/jpeg-turbo.mk
+++ b/package/jpeg-turbo/jpeg-turbo.mk
@@ -10,14 +10,14 @@
JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like)
JPEG_TURBO_LICENSE_FILES = README README-turbo.txt
JPEG_TURBO_INSTALL_STAGING = YES
-JPEG_TURBO_CONF_OPT = --with-jpeg8
+JPEG_TURBO_CONF_OPTS = --with-jpeg8
ifeq ($(BR2_X86_CPU_HAS_MMX)$(BR2_ARM_CPU_HAS_NEON),y)
-JPEG_TURBO_CONF_OPT += --with-simd
+JPEG_TURBO_CONF_OPTS += --with-simd
# x86 simd support needs nasm
JPEG_TURBO_DEPENDENCIES += $(if $(BR2_X86_CPU_HAS_MMX),host-nasm)
else
-JPEG_TURBO_CONF_OPT += --without-simd
+JPEG_TURBO_CONF_OPTS += --without-simd
endif
define JPEG_TURBO_REMOVE_USELESS_TOOLS
diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk
--- a/package/json-c/json-c.mk
+++ b/package/json-c/json-c.mk
@@ -8,7 +8,7 @@
JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases
JSON_C_INSTALL_STAGING = YES
JSON_C_MAKE = $(MAKE1)
-JSON_C_CONF_OPT = --disable-oldname-compat
+JSON_C_CONF_OPTS = --disable-oldname-compat
JSON_C_LICENSE = MIT
JSON_C_LICENSE_FILES = COPYING
diff --git a/package/kbd/kbd.mk b/package/kbd/kbd.mk
--- a/package/kbd/kbd.mk
+++ b/package/kbd/kbd.mk
@@ -7,7 +7,7 @@
KBD_VERSION = 1.15.5
KBD_SOURCE = kbd-$(KBD_VERSION).tar.xz
KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
-KBD_CONF_OPT = --disable-vlock
+KBD_CONF_OPTS = --disable-vlock
KBD_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
KBD_LICENSE = GPLv2+
KBD_LICENSE_FILES = COPYING
diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk
--- a/package/kexec/kexec.mk
+++ b/package/kexec/kexec.mk
@@ -11,10 +11,10 @@
KEXEC_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y)
-KEXEC_CONF_OPT += --with-zlib
+KEXEC_CONF_OPTS += --with-zlib
KEXEC_DEPENDENCIES = zlib
else
-KEXEC_CONF_OPT += --without-zlib
+KEXEC_CONF_OPTS += --without-zlib
endif
define KEXEC_REMOVE_LIB_TOOLS
diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -8,7 +8,7 @@
KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz
KISMET_SITE = http://www.kismetwireless.net/code
KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl
-KISMET_CONF_OPT += --with-netlink-version=3
+KISMET_CONF_OPTS += --with-netlink-version=3
KISMET_LICENSE = GPLv2+
KISMET_LICENSE_FILES = debian/copyright
diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk
--- a/package/kmod/kmod.mk
+++ b/package/kmod/kmod.mk
@@ -17,24 +17,24 @@
# static linking not supported, see
# https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=b7016153ec8
-KMOD_CONF_OPT = --disable-static --enable-shared
+KMOD_CONF_OPTS = --disable-static --enable-shared
-KMOD_CONF_OPT += --disable-manpages
-HOST_KMOD_CONF_OPT = --disable-manpages
+KMOD_CONF_OPTS += --disable-manpages
+HOST_KMOD_CONF_OPTS = --disable-manpages
ifeq ($(BR2_PACKAGE_ZLIB),y)
KMOD_DEPENDENCIES += zlib
-KMOD_CONF_OPT += --with-zlib
+KMOD_CONF_OPTS += --with-zlib
endif
ifeq ($(BR2_PACKAGE_XZ),y)
KMOD_DEPENDENCIES += xz
-KMOD_CONF_OPT += --with-xz
+KMOD_CONF_OPTS += --with-xz
endif
ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3)
-KMOD_CONF_OPT += --enable-python
+KMOD_CONF_OPTS += --enable-python
endif
# --gc-sections triggers a bug in the current Xtensa binutils
@@ -59,7 +59,7 @@
KMOD_POST_INSTALL_TARGET_HOOKS += KMOD_INSTALL_TOOLS
else
-KMOD_CONF_OPT += --disable-tools
+KMOD_CONF_OPTS += --disable-tools
endif
# We only install depmod, since that's the only tool used for the
diff --git a/package/knock/knock.mk b/package/knock/knock.mk
--- a/package/knock/knock.mk
+++ b/package/knock/knock.mk
@@ -11,7 +11,7 @@
KNOCK_DEPENDENCIES = libpcap
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-KNOCK_CONF_OPT = LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
+KNOCK_CONF_OPTS = LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
endif
$(eval $(autotools-package))
diff --git a/package/lame/lame.mk b/package/lame/lame.mk
--- a/package/lame/lame.mk
+++ b/package/lame/lame.mk
@@ -10,13 +10,13 @@
LAME_DEPENDENCIES = host-pkgconf
LAME_INSTALL_STAGING = YES
LAME_CONF_ENV = GTK_CONFIG=/bin/false
-LAME_CONF_OPT = --enable-dynamic-frontends
+LAME_CONF_OPTS = --enable-dynamic-frontends
LAME_LICENSE = LGPLv2+
LAME_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
LAME_DEPENDENCIES += libsndfile
-LAME_CONF_OPT += --with-fileio=sndfile
+LAME_CONF_OPTS += --with-fileio=sndfile
endif
ifeq ($(BR2_PACKAGE_NCURSES),y)
diff --git a/package/lbreakout2/lbreakout2.mk b/package/lbreakout2/lbreakout2.mk
--- a/package/lbreakout2/lbreakout2.mk
+++ b/package/lbreakout2/lbreakout2.mk
@@ -21,16 +21,16 @@
ifeq ($(BR2_PACKAGE_LBREAKOUT2_AUDIO),y)
LBREAKOUT2_DEPENDENCIES += sdl_mixer
-LBREAKOUT2_CONF_OPT += --enable-audio=yes
+LBREAKOUT2_CONF_OPTS += --enable-audio=yes
else
-LBREAKOUT2_CONF_OPT += --disable-audio
+LBREAKOUT2_CONF_OPTS += --disable-audio
endif
ifeq ($(BR2_PACKAGE_LBREAKOUT2_NET),y)
LBREAKOUT2_DEPENDENCIES += sdl_net
-LBREAKOUT2_CONF_OPT += --enable-network=yes
+LBREAKOUT2_CONF_OPTS += --enable-network=yes
else
-LBREAKOUT2_CONF_OPT += --disable-network
+LBREAKOUT2_CONF_OPTS += --disable-network
endif
$(eval $(autotools-package))
diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk
--- a/package/lcdproc/lcdproc.mk
+++ b/package/lcdproc/lcdproc.mk
@@ -10,12 +10,12 @@
LCDPROC_LICENSE_FILES = COPYING
LCDPROC_MAKE = $(MAKE1)
-LCDPROC_CONF_OPT = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS) \
+LCDPROC_CONF_OPTS = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS) \
--with-ft-prefix="$(STAGING_DIR)/usr" \
--with-ft-exec-prefix="$(STAGING_DIR)/usr"
ifeq ($(BR2_PACKAGE_LCDPROC_MENUS),y)
-LCDPROC_CONF_OPT += --enable-lcdproc-menus
+LCDPROC_CONF_OPTS += --enable-lcdproc-menus
endif
LCDPROC_DEPENDENCIES = freetype ncurses zlib
diff --git a/package/lcms2/lcms2.mk b/package/lcms2/lcms2.mk
--- a/package/lcms2/lcms2.mk
+++ b/package/lcms2/lcms2.mk
@@ -9,27 +9,27 @@
LCMS2_LICENSE = MIT
LCMS2_LICENSE_FILES = COPYING
-LCMS2_CONF_OPT = \
+LCMS2_CONF_OPTS = \
ifeq ($(BR2_PACKAGE_JPEG),y)
- LCMS2_CONF_OPT += --with-jpeg
+ LCMS2_CONF_OPTS += --with-jpeg
LCMS2_DEPENDENCIES += jpeg
else
- LCMS2_CONF_OPT += --without-jpeg
+ LCMS2_CONF_OPTS += --without-jpeg
endif
ifeq ($(BR2_PACKAGE_TIFF),y)
- LCMS2_CONF_OPT += --with-tiff
+ LCMS2_CONF_OPTS += --with-tiff
LCMS2_DEPENDENCIES += tiff
else
- LCMS2_CONF_OPT += --without-tiff
+ LCMS2_CONF_OPTS += --without-tiff
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
- LCMS2_CONF_OPT += --with-zlib
+ LCMS2_CONF_OPTS += --with-zlib
LCMS2_DEPENDENCIES += zlib
else
- LCMS2_CONF_OPT += --without-zlib
+ LCMS2_CONF_OPTS += --without-zlib
endif
$(eval $(autotools-package))
diff --git a/package/lesstif/lesstif.mk b/package/lesstif/lesstif.mk
--- a/package/lesstif/lesstif.mk
+++ b/package/lesstif/lesstif.mk
@@ -13,7 +13,7 @@
freetype
LESSTIF_LICENSE = LGPLv2+
LESSTIF_LICENSE_FILES = COPYING.LIB
-LESSTIF_CONF_OPT = \
+LESSTIF_CONF_OPTS = \
--with-gnu-ld \
--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \
--enable-debug=no \
diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk
--- a/package/lftp/lftp.mk
+++ b/package/lftp/lftp.mk
@@ -12,21 +12,21 @@
LFTP_DEPENDENCIES = readline zlib host-pkgconf
ifneq ($(BR2_PREFER_STATIC_LIB),y)
-LFTP_CONF_OPT += --with-modules
+LFTP_CONF_OPTS += --with-modules
endif
ifeq ($(BR2_PACKAGE_GNUTLS),y)
LFTP_DEPENDENCIES += gnutls
-LFTP_CONF_OPT += --with-gnutls
+LFTP_CONF_OPTS += --with-gnutls
else
-LFTP_CONF_OPT += --without-gnutls
+LFTP_CONF_OPTS += --without-gnutls
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LFTP_DEPENDENCIES += openssl
-LFTP_CONF_OPT += --with-openssl
+LFTP_CONF_OPTS += --with-openssl
else
-LFTP_CONF_OPT += --without-openssl
+LFTP_CONF_OPTS += --without-openssl
endif
# Remove /usr/share/lftp
diff --git a/package/libao/libao.mk b/package/libao/libao.mk
--- a/package/libao/libao.mk
+++ b/package/libao/libao.mk
@@ -10,12 +10,12 @@
LIBAO_INSTALL_STAGING = YES
LIBAO_LICENSE = GPLv2+
LIBAO_LICENSE_FILES = COPYING
-LIBAO_CONF_OPT = --disable-esd --disable-wmm --disable-arts \
+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
-LIBAO_CONF_OPT += --enable-alsa --enable-alsa-mmap
+LIBAO_CONF_OPTS += --enable-alsa --enable-alsa-mmap
# Remove the OSS plugin if ALSA is enabled, as libao will prefer ALSA anyway
define LIBAO_REMOVE_OSS_PLUGIN
@@ -23,7 +23,7 @@
endef
LIBAO_POST_INSTALL_TARGET_HOOKS += LIBAO_REMOVE_OSS_PLUGIN
else
-LIBAO_CONF_OPT += --disable-alsa
+LIBAO_CONF_OPTS += --disable-alsa
endif
$(eval $(autotools-package))
diff --git a/package/libarchive/libarchive.mk b/package/libarchive/libarchive.mk
--- a/package/libarchive/libarchive.mk
+++ b/package/libarchive/libarchive.mk
@@ -9,81 +9,81 @@
LIBARCHIVE_INSTALL_STAGING = YES
LIBARCHIVE_LICENSE = BSD-2c, BSD-3c
LIBARCHIVE_LICENSE_FILES = COPYING
-LIBARCHIVE_CONF_OPT = --without-lzma
+LIBARCHIVE_CONF_OPTS = --without-lzma
ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y)
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LIBARCHIVE_CONF_OPT += --enable-bsdtar=static
+LIBARCHIVE_CONF_OPTS += --enable-bsdtar=static
else
-LIBARCHIVE_CONF_OPT += --enable-bsdtar=shared
+LIBARCHIVE_CONF_OPTS += --enable-bsdtar=shared
endif
else
-LIBARCHIVE_CONF_OPT += --disable-bsdtar
+LIBARCHIVE_CONF_OPTS += --disable-bsdtar
endif
ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),y)
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LIBARCHIVE_CONF_OPT += --enable-bsdcpio=static
+LIBARCHIVE_CONF_OPTS += --enable-bsdcpio=static
else
-LIBARCHIVE_CONF_OPT += --enable-bsdcpio=shared
+LIBARCHIVE_CONF_OPTS += --enable-bsdcpio=shared
endif
else
-LIBARCHIVE_CONF_OPT += --disable-bsdcpio
+LIBARCHIVE_CONF_OPTS += --disable-bsdcpio
endif
ifeq ($(BR2_PACKAGE_ACL),y)
LIBARCHIVE_DEPENDENCIES += acl
else
-LIBARCHIVE_CONF_OPT += --disable-acl
+LIBARCHIVE_CONF_OPTS += --disable-acl
endif
ifeq ($(BR2_PACKAGE_ATTR),y)
LIBARCHIVE_DEPENDENCIES += attr
else
-LIBARCHIVE_CONF_OPT += --disable-xattr
+LIBARCHIVE_CONF_OPTS += --disable-xattr
endif
ifeq ($(BR2_PACKAGE_EXPAT),y)
LIBARCHIVE_DEPENDENCIES += expat
else
-LIBARCHIVE_CONF_OPT += --without-expat
+LIBARCHIVE_CONF_OPTS += --without-expat
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
LIBARCHIVE_DEPENDENCIES += libiconv
else
-LIBARCHIVE_CONF_OPT += --without-libiconv-prefix
+LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
LIBARCHIVE_DEPENDENCIES += libxml2
LIBARCHIVE_CONF_ENV += XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
else
-LIBARCHIVE_CONF_OPT += --without-xml2
+LIBARCHIVE_CONF_OPTS += --without-xml2
endif
ifeq ($(BR2_PACKAGE_LZO),y)
LIBARCHIVE_DEPENDENCIES += lzo
else
-LIBARCHIVE_CONF_OPT += --without-lzo2
+LIBARCHIVE_CONF_OPTS += --without-lzo2
endif
ifeq ($(BR2_PACKAGE_NETTLE),y)
LIBARCHIVE_DEPENDENCIES += nettle
else
-LIBARCHIVE_CONF_OPT += --without-nettle
+LIBARCHIVE_CONF_OPTS += --without-nettle
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBARCHIVE_DEPENDENCIES += openssl
else
-LIBARCHIVE_CONF_OPT += --without-openssl
+LIBARCHIVE_CONF_OPTS += --without-openssl
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
LIBARCHIVE_DEPENDENCIES += zlib
else
-LIBARCHIVE_CONF_OPT += --without-zlib
+LIBARCHIVE_CONF_OPTS += --without-zlib
endif
$(eval $(autotools-package))
diff --git a/package/libargtable2/libargtable2.mk b/package/libargtable2/libargtable2.mk
--- a/package/libargtable2/libargtable2.mk
+++ b/package/libargtable2/libargtable2.mk
@@ -8,7 +8,7 @@
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_OPT = --disable-example \
+LIBARGTABLE2_CONF_OPTS = --disable-example \
--disable-kernel-module \
--enable-lib \
--enable-util
diff --git a/package/libass/libass.mk b/package/libass/libass.mk
--- a/package/libass/libass.mk
+++ b/package/libass/libass.mk
@@ -17,23 +17,23 @@
ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
LIBASS_DEPENDENCIES += fontconfig
-LIBASS_CONF_OPT += --enable-fontconfig
+LIBASS_CONF_OPTS += --enable-fontconfig
else
-LIBASS_CONF_OPT += --disable-fontconfig
+LIBASS_CONF_OPTS += --disable-fontconfig
endif
ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
LIBASS_DEPENDENCIES += harfbuzz
-LIBASS_CONF_OPT += --enable-harfbuzz
+LIBASS_CONF_OPTS += --enable-harfbuzz
else
-LIBASS_CONF_OPT += --disable-harfbuzz
+LIBASS_CONF_OPTS += --disable-harfbuzz
endif
ifeq ($(BR2_PACKAGE_LIBENCA),y)
LIBASS_DEPENDENCIES += libenca
-LIBASS_CONF_OPT += --enable-enca
+LIBASS_CONF_OPTS += --enable-enca
else
-LIBASS_CONF_OPT += --disable-enca
+LIBASS_CONF_OPTS += --disable-enca
endif
$(eval $(autotools-package))
diff --git a/package/libassuan/libassuan.mk b/package/libassuan/libassuan.mk
--- a/package/libassuan/libassuan.mk
+++ b/package/libassuan/libassuan.mk
@@ -11,7 +11,7 @@
LIBASSUAN_LICENSE_FILES = COPYING.LIB COPYING
LIBASSUAN_INSTALL_STAGING = YES
LIBASSUAN_DEPENDENCIES = libgpg-error
-LIBASSUAN_CONF_OPT = \
+LIBASSUAN_CONF_OPTS = \
--with-gpg-error-prefix=$(STAGING_DIR)/usr
$(eval $(autotools-package))
diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk
--- a/package/libbluray/libbluray.mk
+++ b/package/libbluray/libbluray.mk
@@ -19,13 +19,13 @@
ifeq ($(BR2_PACKAGE_FREETYPE),y)
LIBBLURAY_DEPENDENCIES += freetype
else
- LIBBLURAY_CONF_OPT += --without-freetype
+ LIBBLURAY_CONF_OPTS += --without-freetype
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
LIBBLURAY_DEPENDENCIES += libxml2
else
- LIBBLURAY_CONF_OPT += --without-libxml2
+ LIBBLURAY_CONF_OPTS += --without-libxml2
endif
$(eval $(autotools-package))
diff --git a/package/libcap-ng/libcap-ng.mk b/package/libcap-ng/libcap-ng.mk
--- a/package/libcap-ng/libcap-ng.mk
+++ b/package/libcap-ng/libcap-ng.mk
@@ -11,6 +11,6 @@
LIBCAP_NG_INSTALL_STAGING = YES
LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no
-LIBCAP_NG_CONF_OPT = --without-python
+LIBCAP_NG_CONF_OPTS = --without-python
$(eval $(autotools-package))
diff --git a/package/libcdio/libcdio.mk b/package/libcdio/libcdio.mk
--- a/package/libcdio/libcdio.mk
+++ b/package/libcdio/libcdio.mk
@@ -9,20 +9,20 @@
LIBCDIO_INSTALL_STAGING = YES
LIBCDIO_LICENSE = GPLv3+
LIBCDIO_LICENSE_FILES = COPYING
-LIBCDIO_CONF_OPT = --disable-example-progs --disable-cddb
+LIBCDIO_CONF_OPTS = --disable-example-progs --disable-cddb
ifeq ($(BR2_ENABLE_LOCALE),)
LIBCDIO_DEPENDENCIES += libiconv
endif
ifeq ($(BR2_INSTALL_LIBSTDCPP),)
-LIBCDIO_CONF_OPT += --disable-cxx
+LIBCDIO_CONF_OPTS += --disable-cxx
endif
ifeq ($(BR2_PACKAGE_NCURSES),y)
LIBCDIO_DEPENDENCIES += ncurses
else
-LIBCDIO_CONF_OPT += --without-cdda-player
+LIBCDIO_CONF_OPTS += --without-cdda-player
endif
$(eval $(autotools-package))
diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk
--- a/package/libcec/libcec.mk
+++ b/package/libcec/libcec.mk
@@ -23,12 +23,12 @@
endif
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-LIBCEC_CONF_OPT = --enable-rpi \
+LIBCEC_CONF_OPTS = --enable-rpi \
--with-rpi-include-path=$(STAGING_DIR)/usr/include
LIBCEC_DEPENDENCIES += rpi-userland
LIBCEC_CONF_ENV += LIBS="-lvcos -lvchostif"
else
-LIBCEC_CONF_OPT = --disable-rpi
+LIBCEC_CONF_OPTS = --disable-rpi
endif
$(eval $(autotools-package))
diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -12,7 +12,7 @@
LIBCGICC_INSTALL_STAGING = YES
LIBCGICC_AUTORECONF = YES
LIBCGICC_CONFIG_SCRIPTS = cgicc-config
-LIBCGICC_CONF_OPT = \
+LIBCGICC_CONF_OPTS = \
--disable-demos \
--disable-doc
diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
--- a/package/libcgroup/libcgroup.mk
+++ b/package/libcgroup/libcgroup.mk
@@ -19,16 +19,16 @@
CXXFLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" \
CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS"
-LIBCGROUP_CONF_OPT = \
+LIBCGROUP_CONF_OPTS = \
--disable-tools \
--disable-daemon \
--disable-initscript-install
ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
LIBCGROUP_DEPENDENCIES += linux-pam
- LIBCGROUP_CONF_OPT += --enable-pam
+ LIBCGROUP_CONF_OPTS += --enable-pam
else
- LIBCGROUP_CONF_OPT += --disable-pam
+ LIBCGROUP_CONF_OPTS += --disable-pam
endif
$(eval $(autotools-package))
diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -9,10 +9,10 @@
LIBCONFIG_LICENSE = LGPLv2.1+
LIBCONFIG_LICENSE_FILES = COPYING.LIB
LIBCONFIG_INSTALL_STAGING = YES
-LIBCONFIG_CONF_OPT = --disable-examples
+LIBCONFIG_CONF_OPTS = --disable-examples
ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
-LIBCONFIG_CONF_OPT += --disable-cxx
+LIBCONFIG_CONF_OPTS += --disable-cxx
endif
$(eval $(autotools-package))
diff --git a/package/libconfuse/libconfuse.mk b/package/libconfuse/libconfuse.mk
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -7,7 +7,7 @@
LIBCONFUSE_VERSION = V2_7
LIBCONFUSE_SITE = $(call github,martinh,libconfuse,$(LIBCONFUSE_VERSION))
LIBCONFUSE_INSTALL_STAGING = YES
-LIBCONFUSE_CONF_OPT = --disable-rpath
+LIBCONFUSE_CONF_OPTS = --disable-rpath
LIBCONFUSE_DEPENDENCIES = host-flex
LIBCONFUSE_LICENSE = ISC
LIBCONFUSE_LICENSE_FILES = src/confuse.c
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -21,7 +21,7 @@
# on non-MMU platforms. Moreover, this authentication method is
# probably almost never used. See
# http://curl.haxx.se/docs/manpage.html#--ntlm.
-LIBCURL_CONF_OPT = --disable-verbose --disable-manual --disable-ntlm-wb \
+LIBCURL_CONF_OPTS = --disable-verbose --disable-manual --disable-ntlm-wb \
--enable-hidden-symbols --with-random=/dev/urandom
LIBCURL_CONFIG_SCRIPTS = curl-config
@@ -33,27 +33,27 @@
# Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
# are found first.
LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
-LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \
+LIBCURL_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr \
--with-ca-path=/etc/ssl/certs
else ifeq ($(BR2_PACKAGE_GNUTLS),y)
-LIBCURL_CONF_OPT += --with-gnutls=$(STAGING_DIR)/usr
+LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr
LIBCURL_DEPENDENCIES += gnutls
else ifeq ($(BR2_PACKAGE_LIBNSS),y)
-LIBCURL_CONF_OPT += --with-nss=$(STAGING_DIR)/usr
+LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr
LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`"
LIBCURL_DEPENDENCIES += libnss
else
# polarssl support needs 1.3.x
-LIBCURL_CONF_OPT += --without-ssl --without-gnutls \
+LIBCURL_CONF_OPTS += --without-ssl --without-gnutls \
--without-polarssl --without-nss
endif
# Configure curl to support libssh2
ifeq ($(BR2_PACKAGE_LIBSSH2),y)
LIBCURL_DEPENDENCIES += libssh2
-LIBCURL_CONF_OPT += --with-libssh2
+LIBCURL_CONF_OPTS += --with-libssh2
else
-LIBCURL_CONF_OPT += --without-libssh2
+LIBCURL_CONF_OPTS += --without-libssh2
endif
define LIBCURL_FIX_DOT_PC
diff --git a/package/libdaemon/libdaemon.mk b/package/libdaemon/libdaemon.mk
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -10,7 +10,7 @@
LIBDAEMON_LICENSE_FILES = LICENSE
LIBDAEMON_INSTALL_STAGING = YES
LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no
-LIBDAEMON_CONF_OPT = --disable-lynx
+LIBDAEMON_CONF_OPTS = --disable-lynx
LIBDAEMON_DEPENDENCIES = host-pkgconf
$(eval $(autotools-package))
diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -10,13 +10,13 @@
LIBDNET_LICENSE_FILES = LICENSE
LIBDNET_INSTALL_STAGING = YES
LIBDNET_AUTORECONF = YES
-LIBDNET_CONF_OPT = \
+LIBDNET_CONF_OPTS = \
--with-gnu-ld \
--with-check=no
ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
LIBDNET_DEPENDENCIES = python
-LIBDNET_CONF_OPT += --with-python
+LIBDNET_CONF_OPTS += --with-python
LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk
--- a/package/libdrm/libdrm.mk
+++ b/package/libdrm/libdrm.mk
@@ -15,62 +15,62 @@
libpthread-stubs \
host-pkgconf
-LIBDRM_CONF_OPT = \
+LIBDRM_CONF_OPTS = \
--disable-cairo-tests \
--disable-manpages
ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y)
-LIBDRM_CONF_OPT += --enable-intel
+LIBDRM_CONF_OPTS += --enable-intel
LIBDRM_DEPENDENCIES += libatomic_ops xlib_libpciaccess
else
-LIBDRM_CONF_OPT += --disable-intel
+LIBDRM_CONF_OPTS += --disable-intel
endif
ifeq ($(BR2_PACKAGE_LIBDRM_RADEON),y)
-LIBDRM_CONF_OPT += --enable-radeon
+LIBDRM_CONF_OPTS += --enable-radeon
else
-LIBDRM_CONF_OPT += --disable-radeon
+LIBDRM_CONF_OPTS += --disable-radeon
endif
ifeq ($(BR2_PACKAGE_LIBDRM_NOUVEAU),y)
-LIBDRM_CONF_OPT += --enable-nouveau
+LIBDRM_CONF_OPTS += --enable-nouveau
else
-LIBDRM_CONF_OPT += --disable-nouveau
+LIBDRM_CONF_OPTS += --disable-nouveau
endif
ifeq ($(BR2_PACKAGE_LIBDRM_VMWGFX),y)
-LIBDRM_CONF_OPT += --enable-vmwgfx
+LIBDRM_CONF_OPTS += --enable-vmwgfx
else
-LIBDRM_CONF_OPT += --disable-vmwgfx
+LIBDRM_CONF_OPTS += --disable-vmwgfx
endif
ifeq ($(BR2_PACKAGE_LIBDRM_OMAP),y)
-LIBDRM_CONF_OPT += --enable-omap-experimental-api
+LIBDRM_CONF_OPTS += --enable-omap-experimental-api
else
-LIBDRM_CONF_OPT += --disable-omap-experimental-api
+LIBDRM_CONF_OPTS += --disable-omap-experimental-api
endif
ifeq ($(BR2_PACKAGE_LIBDRM_EXYNOS),y)
-LIBDRM_CONF_OPT += --enable-exynos-experimental-api
+LIBDRM_CONF_OPTS += --enable-exynos-experimental-api
else
-LIBDRM_CONF_OPT += --disable-exynos-experimental-api
+LIBDRM_CONF_OPTS += --disable-exynos-experimental-api
endif
ifeq ($(BR2_PACKAGE_LIBDRM_FREEDRENO),y)
-LIBDRM_CONF_OPT += --enable-freedreno-experimental-api
+LIBDRM_CONF_OPTS += --enable-freedreno-experimental-api
else
-LIBDRM_CONF_OPT += --disable-freedreno-experimental-api
+LIBDRM_CONF_OPTS += --disable-freedreno-experimental-api
endif
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-LIBDRM_CONF_OPT += --enable-udev
+LIBDRM_CONF_OPTS += --enable-udev
LIBDRM_DEPENDENCIES += udev
else
-LIBDRM_CONF_OPT += --disable-udev
+LIBDRM_CONF_OPTS += --disable-udev
endif
ifeq ($(BR2_PACKAGE_LIBDRM_INSTALL_TESTS),y)
-LIBDRM_CONF_OPT += --enable-install-test-programs
+LIBDRM_CONF_OPTS += --enable-install-test-programs
endif
$(eval $(autotools-package))
diff --git a/package/libdvdnav/libdvdnav.mk b/package/libdvdnav/libdvdnav.mk
--- a/package/libdvdnav/libdvdnav.mk
+++ b/package/libdvdnav/libdvdnav.mk
@@ -17,6 +17,6 @@
# By default libdvdnav tries to find dvdread-config in $PATH. Because
# of cross compilation, we prefer using pkg-config.
-LIBDVDNAV_CONF_OPT = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
+LIBDVDNAV_CONF_OPTS = --with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
$(eval $(autotools-package))
diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -22,12 +22,12 @@
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBEXOSIP2_DEPENDENCIES += openssl
-LIBEXOSIP2_CONF_OPT += --enable-openssl
+LIBEXOSIP2_CONF_OPTS += --enable-openssl
else
-LIBEXOSIP2_CONF_OPT += --disable-openssl
+LIBEXOSIP2_CONF_OPTS += --disable-openssl
endif
-LIBEXOSIP2_CONF_OPT += \
+LIBEXOSIP2_CONF_OPTS += \
--enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)
$(eval $(autotools-package))
diff --git a/package/libedit/libedit.mk b/package/libedit/libedit.mk
--- a/package/libedit/libedit.mk
+++ b/package/libedit/libedit.mk
@@ -15,7 +15,7 @@
LIBEDIT_AUTORECONF = YES
# Doesn't really support !wchar, but support is disabled otherwise
-LIBEDIT_CONF_OPT += --enable-widec
+LIBEDIT_CONF_OPTS += --enable-widec
# Note: libbsd required for *vis functions, but works only with a toolchain
# with __progname; otherwise, some features are disabled, as if libbsd was
diff --git a/package/libexif/libexif.mk b/package/libexif/libexif.mk
--- a/package/libexif/libexif.mk
+++ b/package/libexif/libexif.mk
@@ -8,7 +8,7 @@
LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
LIBEXIF_INSTALL_STAGING = YES
-LIBEXIF_CONF_OPT = --disable-docs
+LIBEXIF_CONF_OPTS = --disable-docs
LIBEXIF_DEPENDENCIES = host-pkgconf
LIBEXIF_LICENSE = LGPLv2.1+
LIBEXIF_LICENSE_FILES = COPYING
diff --git a/package/libftdi/libftdi.mk b/package/libftdi/libftdi.mk
--- a/package/libftdi/libftdi.mk
+++ b/package/libftdi/libftdi.mk
@@ -11,13 +11,13 @@
LIBFTDI_CONFIG_SCRIPTS = libftdi-config
LIBFTDI_AUTORECONF = YES
-LIBFDTI_CONF_OPT = --without-examples
+LIBFDTI_CONF_OPTS = --without-examples
# configure detect it automaticaly so we need to force it
ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y)
-LIBFDTI_CONF_OPT += --enable-libftdipp
+LIBFDTI_CONF_OPTS += --enable-libftdipp
else
-LIBFDTI_CONF_OPT += --disable-libftdipp
+LIBFDTI_CONF_OPTS += --disable-libftdipp
endif
$(eval $(autotools-package))
diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk
--- a/package/libfuse/libfuse.mk
+++ b/package/libfuse/libfuse.mk
@@ -11,7 +11,7 @@
LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
LIBFUSE_INSTALL_STAGING = YES
LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-LIBFUSE_CONF_OPT = \
+LIBFUSE_CONF_OPTS = \
--disable-example \
--enable-lib \
--enable-util
diff --git a/package/libgail/libgail.mk b/package/libgail/libgail.mk
--- a/package/libgail/libgail.mk
+++ b/package/libgail/libgail.mk
@@ -14,7 +14,7 @@
LIBGAIL_LICENSE_FILES = COPYING
ifneq ($(BR2_PACKAGE_XLIB_LIBX11),y)
-LIBGAIL_CONF_OPT += --disable-x
+LIBGAIL_CONF_OPTS += --disable-x
endif
LIBGAIL_DEPENDENCIES = host-pkgconf libgtk2 pango
diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk
--- a/package/libgcrypt/libgcrypt.mk
+++ b/package/libgcrypt/libgcrypt.mk
@@ -15,7 +15,7 @@
LIBGCRYPT_CONF_ENV = \
ac_cv_sys_symbol_underscore=no
-LIBGCRYPT_CONF_OPT = \
+LIBGCRYPT_CONF_OPTS = \
--disable-optimization \
--with-gpg-error-prefix=$(STAGING_DIR)/usr
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -61,7 +61,7 @@
LIBGLIB2_CONF_ENV += ac_cv_header_sys_inotify_h=no
endif
-HOST_LIBGLIB2_CONF_OPT = \
+HOST_LIBGLIB2_CONF_OPTS = \
--disable-gtk-doc \
--enable-debug=no \
--disable-dtrace \
@@ -69,9 +69,9 @@
--disable-gcov \
--disable-modular-tests
-LIBGLIB2_CONF_OPT += --disable-modular-tests
+LIBGLIB2_CONF_OPTS += --disable-modular-tests
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
- LIBGLIB2_CONF_OPT += --with-threads=none --disable-threads
+ LIBGLIB2_CONF_OPTS += --with-threads=none --disable-threads
endif
LIBGLIB2_DEPENDENCIES = host-pkgconf host-libglib2 libffi zlib $(if $(BR2_NEEDS_GETTEXT),gettext) host-gettext
@@ -83,15 +83,15 @@
endif
ifeq ($(BR2_PACKAGE_LIBICONV),y)
-LIBGLIB2_CONF_OPT += --with-libiconv=gnu
+LIBGLIB2_CONF_OPTS += --with-libiconv=gnu
LIBGLIB2_DEPENDENCIES += libiconv
endif
ifeq ($(BR2_PACKAGE_PCRE),y)
-LIBGLIB2_CONF_OPT += --with-pcre=system
+LIBGLIB2_CONF_OPTS += --with-pcre=system
LIBGLIB2_DEPENDENCIES += pcre
else
-LIBGLIB2_CONF_OPT += --with-pcre=internal
+LIBGLIB2_CONF_OPTS += --with-pcre=internal
endif
define LIBGLIB2_REMOVE_DEV_FILES
diff --git a/package/libgpgme/libgpgme.mk b/package/libgpgme/libgpgme.mk
--- a/package/libgpgme/libgpgme.mk
+++ b/package/libgpgme/libgpgme.mk
@@ -13,7 +13,7 @@
LIBGPGME_DEPENDENCIES = libassuan libgpg-error
# libgpgme, needs to know the gpg binary path on the target.
-LIBGPGME_CONF_OPT = --with-gpg=/usr/bin/gpg \
+LIBGPGME_CONF_OPTS = --with-gpg=/usr/bin/gpg \
--with-gpg-error-prefix=$(STAGING_DIR)/usr \
--with-libassuan-prefix=$(STAGING_DIR)/usr \
--disable-gpgsm-test \
diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -69,14 +69,14 @@
ac_cv_prog_F77=no \
ac_cv_path_CUPS_CONFIG=no
-LIBGTK2_CONF_OPT = --disable-glibtest \
+LIBGTK2_CONF_OPTS = --disable-glibtest \
--enable-explicit-deps=no \
--disable-debug
LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
# Xorg dependencies
-LIBGTK2_CONF_OPT += \
+LIBGTK2_CONF_OPTS += \
--with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
@@ -85,17 +85,17 @@
xlib_libXext xlib_libXrender
ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
- LIBGTK2_CONF_OPT += --enable-xinerama
+ LIBGTK2_CONF_OPTS += --enable-xinerama
LIBGTK2_DEPENDENCIES += xlib_libXinerama
else
- LIBGTK2_CONF_OPT += --disable-xinerama
+ LIBGTK2_CONF_OPTS += --disable-xinerama
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y)
- LIBGTK2_CONF_OPT += --with-xinput=yes
+ LIBGTK2_CONF_OPTS += --with-xinput=yes
LIBGTK2_DEPENDENCIES += xlib_libXi
else
- LIBGTK2_CONF_OPT += --with-xinput=no
+ LIBGTK2_CONF_OPTS += --with-xinput=no
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
@@ -121,25 +121,25 @@
ifeq ($(BR2_PACKAGE_LIBPNG),y)
LIBGTK2_DEPENDENCIES += libpng
else
-LIBGTK2_CONF_OPT += --without-libpng
+LIBGTK2_CONF_OPTS += --without-libpng
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
LIBGTK2_DEPENDENCIES += jpeg
else
-LIBGTK2_CONF_OPT += --without-libjpeg
+LIBGTK2_CONF_OPTS += --without-libjpeg
endif
ifeq ($(BR2_PACKAGE_TIFF),y)
LIBGTK2_DEPENDENCIES += tiff
else
-LIBGTK2_CONF_OPT += --without-libtiff
+LIBGTK2_CONF_OPTS += --without-libtiff
endif
ifeq ($(BR2_PACKAGE_CUPS),y)
LIBGTK2_DEPENDENCIES += cups
else
-LIBGTK2_CONF_OPT += --disable-cups
+LIBGTK2_CONF_OPTS += --disable-cups
endif
ifeq ($(BR2_PACKAGE_LIBGTK2_DEMO),)
@@ -158,7 +158,7 @@
# for the target.
HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng host-gdk-pixbuf
-HOST_LIBGTK2_CONF_OPT = \
+HOST_LIBGTK2_CONF_OPTS = \
--disable-static \
--disable-glibtest \
--without-libtiff \
diff --git a/package/libhid/libhid.mk b/package/libhid/libhid.mk
--- a/package/libhid/libhid.mk
+++ b/package/libhid/libhid.mk
@@ -14,7 +14,7 @@
# configure runs libusb-config for cflags/ldflags. Ensure it picks up
# the target version
LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH)
-LIBHID_CONF_OPT = \
+LIBHID_CONF_OPTS = \
--disable-swig \
--disable-werror \
--without-doxygen \
diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk
--- a/package/libidn/libidn.mk
+++ b/package/libidn/libidn.mk
@@ -8,7 +8,7 @@
LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
LIBIDN_INSTALL_STAGING = YES
LIBIDN_CONF_ENV = EMACS="no"
-LIBIDN_CONF_OPT = --disable-java --enable-csharp=no
+LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no
LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
LIBIDN_LICENSE = GPLv2+ GPLv3+ LGPLv3+
LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk
--- a/package/libinput/libinput.mk
+++ b/package/libinput/libinput.mk
@@ -14,6 +14,6 @@
LIBINPUT_INSTALL_STAGING = YES
# Tests need fork, so just disable them everywhere.
-LIBINPUT_CONF_OPT = --disable-tests
+LIBINPUT_CONF_OPTS = --disable-tests
$(eval $(autotools-package))
diff --git a/package/libksba/libksba.mk b/package/libksba/libksba.mk
--- a/package/libksba/libksba.mk
+++ b/package/libksba/libksba.mk
@@ -11,6 +11,6 @@
LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
LIBKSBA_INSTALL_STAGING = YES
LIBKSBA_DEPENDENCIES = libgpg-error
-LIBKSBA_CONF_OPT = --with-gpg-error-prefix=$(STAGING_DIR)/usr
+LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr
$(eval $(autotools-package))
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -13,7 +13,7 @@
# No license file included, it refers to the gnu.org website
LIBLOCKFILE_INSTALL_STAGING = YES
-LIBLOCKFILE_CONF_OPT = --mandir=/usr/share/man
+LIBLOCKFILE_CONF_OPTS = --mandir=/usr/share/man
define LIBLOCKFILE_INSTALL_STAGING_CMDS
mkdir -p $(addprefix $(STAGING_DIR)/usr/share/man/man,1 3)
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
--- a/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -7,7 +7,7 @@
LIBLOG4C_LOCALTIME_VERSION = v1.0
LIBLOG4C_LOCALTIME_SITE = $(call github,rcmadruga,log4c-localtime,$(LIBLOG4C_LOCALTIME_VERSION))
LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
-LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
+LIBLOG4C_LOCALTIME_CONF_OPTS = --disable-expattest
LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
LIBLOG4C_LOCALTIME_CONFIG_SCRIPTS = log4c-config
LIBLOG4C_LOCALTIME_LICENSE = LGPLv2.1
diff --git a/package/liblogging/liblogging.mk b/package/liblogging/liblogging.mk
--- a/package/liblogging/liblogging.mk
+++ b/package/liblogging/liblogging.mk
@@ -9,13 +9,13 @@
LIBLOGGING_LICENSE = BSD-2c
LIBLOGGING_LICENSE_FILES = COPYING
LIBLOGGING_INSTALL_STAGING = YES
-LIBLOGGING_CONF_OPT = --enable-cached-man-pages
+LIBLOGGING_CONF_OPTS = --enable-cached-man-pages
ifeq ($(BR2_INIT_SYSTEMD),y)
-LIBLOGGING_CONF_OPT += --enable-journal
+LIBLOGGING_CONF_OPTS += --enable-journal
LIBLOGGING_DEPENDENCIES += systemd
else
-LIBLOGGING_CONF_OPT += --disable-journal
+LIBLOGGING_CONF_OPTS += --disable-journal
endif
$(eval $(autotools-package))
diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk
--- a/package/libmad/libmad.mk
+++ b/package/libmad/libmad.mk
@@ -30,7 +30,7 @@
LIBMAD_POST_INSTALL_STAGING_HOOKS += LIBMAD_INSTALL_STAGING_PC
LIBMAD_POST_INSTALL_TARGET_HOOKS += LIBMAD_INSTALL_TARGET_PC
-LIBMAD_CONF_OPT = \
+LIBMAD_CONF_OPTS = \
--disable-debugging \
$(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_SPEED),--enable-speed) \
$(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_ACCURACY),--enable-accuracy) \
diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
--- a/package/libmbim/libmbim.mk
+++ b/package/libmbim/libmbim.mk
@@ -14,6 +14,6 @@
LIBMBIM_DEPENDENCIES = libglib2 udev
# we don't want -Werror
-LIBMBIM_CONF_OPT = --enable-more-warnings=no
+LIBMBIM_CONF_OPTS = --enable-more-warnings=no
$(eval $(autotools-package))
diff --git a/package/libmemcached/libmemcached.mk b/package/libmemcached/libmemcached.mk
--- a/package/libmemcached/libmemcached.mk
+++ b/package/libmemcached/libmemcached.mk
@@ -8,7 +8,7 @@
LIBMEMCACHED_VERSION = $(LIBMEMCACHED_VERSION_MAJOR).18
LIBMEMCACHED_SITE = http://launchpad.net/libmemcached/$(LIBMEMCACHED_VERSION_MAJOR)/$(LIBMEMCACHED_VERSION)/+download
LIBMEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-LIBMEMCACHED_CONF_OPT = --disable-dtrace
+LIBMEMCACHED_CONF_OPTS = --disable-dtrace
LIBMEMCACHED_INSTALL_STAGING = YES
LIBMEMCACHED_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBEVENT),libevent)
# For libmemcached-01-disable-tests.patch
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -8,21 +8,21 @@
LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
LIBMICROHTTPD_LICENSE_FILES = COPYING
LIBMICROHTTPD_INSTALL_STAGING = YES
-LIBMICROHTTPD_CONF_OPT = --disable-curl --disable-spdy
+LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-spdy
ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
LIBMICROHTTPD_LICENSE = LGPLv2.1+
LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt
-LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
+LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr
else
LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos
-LIBMICROHTTPD_CONF_OPT += --disable-https
+LIBMICROHTTPD_CONF_OPTS += --disable-https
endif
ifeq ($(BR2_avr32),y)
# no epoll_create1
-LIBMICROHTTPD_CONF_OPT += --disable-epoll
+LIBMICROHTTPD_CONF_OPTS += --disable-epoll
endif
$(eval $(autotools-package))
diff --git a/package/libmpeg2/libmpeg2.mk b/package/libmpeg2/libmpeg2.mk
--- a/package/libmpeg2/libmpeg2.mk
+++ b/package/libmpeg2/libmpeg2.mk
@@ -10,14 +10,14 @@
LIBMPEG2_LICENSE_FILES = COPYING
LIBMPEG2_INSTALL_STAGING = YES
LIBMPEG2_AUTORECONF = YES
-LIBMPEG2_CONF_OPT = --without-x --disable-directx
+LIBMPEG2_CONF_OPTS = --without-x --disable-directx
ifeq ($(BR2_PACKAGE_SDL),y)
LIBMPEG2_CONF_ENV += ac_cv_prog_SDLCONFIG=$(STAGING_DIR)/usr/bin/sdl-config
-LIBMPEG2_CONF_OPT += --enable-sdl
+LIBMPEG2_CONF_OPTS += --enable-sdl
LIBMPEG2_DEPENDENCIES += sdl
else
-LIBMPEG2_CONF_OPT += --disable-sdl
+LIBMPEG2_CONF_OPTS += --disable-sdl
endif
ifneq ($(BR2_PACKAGE_LIBMPEG2_BINS),y)
diff --git a/package/libndp/libndp.mk b/package/libndp/libndp.mk
--- a/package/libndp/libndp.mk
+++ b/package/libndp/libndp.mk
@@ -10,6 +10,6 @@
LIBNDP_LICENSE_FILES = COPYING
LIBNDP_AUTORECONF = YES
LIBNDP_INSTALL_STAGING = YES
-LIBNDP_CONF_OPT = --disable-debug
+LIBNDP_CONF_OPTS = --disable-debug
$(eval $(autotools-package))
diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk
--- a/package/libnfc/libnfc.mk
+++ b/package/libnfc/libnfc.mk
@@ -15,13 +15,13 @@
LIBNFC_DEPENDENCIES = host-pkgconf libusb libusb-compat
# N.B. The acr122 driver requires pcsc-lite.
-LIBNFC_CONF_OPT = --with-drivers=arygon,pn53x_usb
+LIBNFC_CONF_OPTS = --with-drivers=arygon,pn53x_usb
ifeq ($(BR2_PACKAGE_LIBNFC_EXAMPLES),y)
-LIBNFC_CONF_OPT += --enable-example
+LIBNFC_CONF_OPTS += --enable-example
LIBNFC_DEPENDENCIES += readline
else
-LIBNFC_CONF_OPT += --disable-example
+LIBNFC_CONF_OPTS += --disable-example
endif
$(eval $(autotools-package))
diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk
--- a/package/libnftnl/libnftnl.mk
+++ b/package/libnftnl/libnftnl.mk
@@ -13,17 +13,17 @@
LIBNFTNL_DEPENDENCIES = host-pkgconf libmnl
ifeq ($(BR2_PACKAGE_LIBNFTNL_JSON),y)
-LIBNFTNL_CONF_OPT += --with-json-parsing
+LIBNFTNL_CONF_OPTS += --with-json-parsing
LIBNFTNL_DEPENDENCIES += jansson
else
-LIBNFTNL_CONF_OPT += --without-json-parsing
+LIBNFTNL_CONF_OPTS += --without-json-parsing
endif
ifeq ($(BR2_PACKAGE_LIBNFTNL_XML),y)
-LIBNFTNL_CONF_OPT += --with-xml-parsing
+LIBNFTNL_CONF_OPTS += --with-xml-parsing
LIBNFTNL_DEPENDENCIES += mxml
else
-LIBNFTNL_CONF_OPT += --without-xml-parsing
+LIBNFTNL_CONF_OPTS += --without-xml-parsing
endif
$(eval $(autotools-package))
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -12,9 +12,9 @@
LIBNL_DEPENDENCIES = host-bison host-flex
ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
-LIBNL_CONF_OPT += --enable-cli
+LIBNL_CONF_OPTS += --enable-cli
else
-LIBNL_CONF_OPT += --disable-cli
+LIBNL_CONF_OPTS += --disable-cli
endif
$(eval $(autotools-package))
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -17,15 +17,15 @@
LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
HOST_LDFLAGS="-lc"
# NSPR mixes up --build and --host
-LIBNSPR_CONF_OPT = --host=$(GNU_HOST_NAME)
-LIBNSPR_CONF_OPT += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
-LIBNSPR_CONF_OPT += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
+LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME)
+LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
+LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
ifeq ($(BR2_arm),y)
ifeq ($(BR2_cortex_a8)$(BR2_cortex_a9),y)
-LIBNSPR_CONF_OPT += --enable-thumb2
+LIBNSPR_CONF_OPTS += --enable-thumb2
else
-LIBNSPR_CONF_OPT += --disable-thumb2
+LIBNSPR_CONF_OPTS += --disable-thumb2
endif
endif
diff --git a/package/liboauth/liboauth.mk b/package/liboauth/liboauth.mk
--- a/package/liboauth/liboauth.mk
+++ b/package/liboauth/liboauth.mk
@@ -14,7 +14,7 @@
ifeq ($(BR2_PACKAGE_LIBCURL),y)
LIBOAUTH_DEPENDENCIES += libcurl
else
-LIBOAUTH_CONF_OPT += --disable-libcurl
+LIBOAUTH_CONF_OPTS += --disable-libcurl
endif
$(eval $(autotools-package))
diff --git a/package/liboping/liboping.mk b/package/liboping/liboping.mk
--- a/package/liboping/liboping.mk
+++ b/package/liboping/liboping.mk
@@ -8,7 +8,7 @@
LIBOPING_SITE = http://verplant.org/liboping/files
LIBOPING_INSTALL_STAGING = YES
LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses)
-LIBOPING_CONF_OPT = --without-perl-bindings
+LIBOPING_CONF_OPTS = --without-perl-bindings
LIBOPING_LICENSE = LGPLv2.1+ GPLv2
LIBOPING_LICENSE_FILES = COPYING
diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk
--- a/package/libosip2/libosip2.mk
+++ b/package/libosip2/libosip2.mk
@@ -15,7 +15,7 @@
LIBOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
endif
-LIBOSIP2_CONF_OPT = \
+LIBOSIP2_CONF_OPTS = \
--enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no)
$(eval $(autotools-package))
diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -17,35 +17,35 @@
ac_cv_header_linux_wireless_h=yes \
CFLAGS="$(LIBPCAP_CFLAGS)"
LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
-LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
+LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux
LIBPCAP_CONFIG_SCRIPTS = pcap-config
# On purpose, not compatible with bluez5
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
LIBPCAP_DEPENDENCIES += bluez_utils
else
-LIBPCAP_CONF_OPT += --disable-bluetooth
+LIBPCAP_CONF_OPTS += --disable-bluetooth
endif
ifeq ($(BR2_PACKAGE_DBUS),y)
-LIBPCAP_CONF_OPT += --enable-dbus
+LIBPCAP_CONF_OPTS += --enable-dbus
LIBPCAP_DEPENDENCIES += dbus
else
-LIBPCAP_CONF_OPT += --disable-dbus
+LIBPCAP_CONF_OPTS += --disable-dbus
endif
ifeq ($(BR2_PACKAGE_LIBUSB),y)
-LIBPCAP_CONF_OPT += --enable-canusb
+LIBPCAP_CONF_OPTS += --enable-canusb
LIBPCAP_DEPENDENCIES += libusb
else
-LIBPCAP_CONF_OPT += --disable-canusb
+LIBPCAP_CONF_OPTS += --disable-canusb
endif
ifeq ($(BR2_PACKAGE_LIBNL),y)
LIBPCAP_DEPENDENCIES += libnl
LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3"
else
-LIBPCAP_CONF_OPT += --without-libnl
+LIBPCAP_CONF_OPTS += --without-libnl
endif
# microblaze needs -fPIC instead of -fpic
diff --git a/package/libphidget/libphidget.mk b/package/libphidget/libphidget.mk
--- a/package/libphidget/libphidget.mk
+++ b/package/libphidget/libphidget.mk
@@ -8,7 +8,7 @@
LIBPHIDGET_SOURCE = libphidget_$(LIBPHIDGET_VERSION).tar.gz
LIBPHIDGET_SITE = http://www.phidgets.com/downloads/libraries/
LIBPHIDGET_DEPENDENCIES = libusb
-LIBPHIDGET_CONF_OPT = --disable-ldconfig
+LIBPHIDGET_CONF_OPTS = --disable-ldconfig
LIBPHIDGET_INSTALL_STAGING = YES
LIBPHIDGET_LICENSE = LGPLv3
LIBPHIDGET_LICENSE_FILES = COPYING
diff --git a/package/libplayer/libplayer.mk b/package/libplayer/libplayer.mk
--- a/package/libplayer/libplayer.mk
+++ b/package/libplayer/libplayer.mk
@@ -21,27 +21,27 @@
--prefix=/usr \
--cross-compile \
$(SHARED_STATIC_LIBS_OPTS) \
- $(LIBPLAYER_CONF_OPT) \
+ $(LIBPLAYER_CONF_OPTS) \
)
endef
ifeq ($(BR2_PACKAGE_LIBPLAYER_MPLAYER),y)
LIBPLAYER_DEPENDENCIES += mplayer
- LIBPLAYER_CONF_OPT += --enable-mplayer
+ LIBPLAYER_CONF_OPTS += --enable-mplayer
else
- LIBPLAYER_CONF_OPT += --disable-mplayer
+ LIBPLAYER_CONF_OPTS += --disable-mplayer
endif
ifeq ($(BR2_PACKAGE_LIBPLAYER_GSTREAMER),y)
LIBPLAYER_DEPENDENCIES += gstreamer
- LIBPLAYER_CONF_OPT += --enable-gstreamer
+ LIBPLAYER_CONF_OPTS += --enable-gstreamer
else
- LIBPLAYER_CONF_OPT += --disable-gstreamer
+ LIBPLAYER_CONF_OPTS += --disable-gstreamer
endif
ifeq ($(BR2_PACKAGE_LIBPLAYER_PYTHON),y)
LIBPLAYER_DEPENDENCIES += python
- LIBPLAYER_CONF_OPT += --enable-binding-python
+ LIBPLAYER_CONF_OPTS += --enable-binding-python
endif
$(eval $(autotools-package))
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -13,7 +13,7 @@
LIBPNG_INSTALL_STAGING = YES
LIBPNG_DEPENDENCIES = host-pkgconf zlib
LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config
-LIBPNG_CONF_OPT = $(if $(BR2_ARM_CPU_HAS_NEON),--enable-arm-neon=yes,--enable-arm-neon=no)
+LIBPNG_CONF_OPTS = $(if $(BR2_ARM_CPU_HAS_NEON),--enable-arm-neon=yes,--enable-arm-neon=no)
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/libpthsem/libpthsem.mk b/package/libpthsem/libpthsem.mk
--- a/package/libpthsem/libpthsem.mk
+++ b/package/libpthsem/libpthsem.mk
@@ -15,10 +15,10 @@
LIBPTHSEM_CONFIG_SCRIPTS = pthsem-config
ifeq ($(BR2_PACKAGE_LIBPTHSEM_COMPAT),y)
-LIBPTHSEM_CONF_OPT += --enable-compat
+LIBPTHSEM_CONF_OPTS += --enable-compat
LIBPTHSEM_CONFIG_SCRIPTS += pth-config
else
-LIBPTHSEM_CONF_OPT += --disable-compat
+LIBPTHSEM_CONF_OPTS += --disable-compat
endif
$(eval $(autotools-package))
diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
--- a/package/libqmi/libqmi.mk
+++ b/package/libqmi/libqmi.mk
@@ -14,6 +14,6 @@
LIBQMI_DEPENDENCIES = libglib2
# we don't want -Werror
-LIBQMI_CONF_OPT = --enable-more-warnings=no
+LIBQMI_CONF_OPTS = --enable-more-warnings=no
$(eval $(autotools-package))
diff --git a/package/libqrencode/libqrencode.mk b/package/libqrencode/libqrencode.mk
--- a/package/libqrencode/libqrencode.mk
+++ b/package/libqrencode/libqrencode.mk
@@ -15,14 +15,14 @@
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
LIBQRENCODE_CONF_ENV += LIBS='-pthread'
else
-LIBQRENCODE_CONF_OPT += --disable-thread-safety
+LIBQRENCODE_CONF_OPTS += --disable-thread-safety
endif
ifeq ($(BR2_PACKAGE_LIBQRENCODE_TOOLS),y)
-LIBQRENCODE_CONF_OPT += --with-tools=yes
+LIBQRENCODE_CONF_OPTS += --with-tools=yes
LIBQRENCODE_DEPENDENCIES += libpng
else
-LIBQRENCODE_CONF_OPT += --with-tools=no
+LIBQRENCODE_CONF_OPTS += --with-tools=no
endif
$(eval $(autotools-package))
diff --git a/package/libraw/libraw.mk b/package/libraw/libraw.mk
--- a/package/libraw/libraw.mk
+++ b/package/libraw/libraw.mk
@@ -8,7 +8,7 @@
LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz
LIBRAW_SITE = http://www.libraw.org/data
LIBRAW_INSTALL_STAGING = YES
-LIBRAW_CONF_OPT += --disable-examples --disable-lcms \
+LIBRAW_CONF_OPTS += --disable-examples --disable-lcms \
--disable-openmp --disable-demosaic-pack-gpl2 \
--disable-demosaic-pack-gpl3
LIBRAW_LICENSE = LGPLv2.1 or CDDL 1.0 or LibRaw Software License 27032010
diff --git a/package/libroxml/libroxml.mk b/package/libroxml/libroxml.mk
--- a/package/libroxml/libroxml.mk
+++ b/package/libroxml/libroxml.mk
@@ -10,7 +10,7 @@
LIBROXML_LICENSE = LGPLv2.1+ with static link exception
LIBROXML_LICENSE_FILES = License.txt
-LIBROXML_CONF_OPT = --disable-silent-rules
+LIBROXML_CONF_OPTS = --disable-silent-rules
# libroxml forgets to compile/link with -pthread, even though it uses
# thread functions breaking static linking
diff --git a/package/librsvg/librsvg.mk b/package/librsvg/librsvg.mk
--- a/package/librsvg/librsvg.mk
+++ b/package/librsvg/librsvg.mk
@@ -8,7 +8,7 @@
LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).3
LIBRSVG_SITE = http://ftp.gnome.org/pub/GNOME/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)
LIBRSVG_INSTALL_STAGING = YES
-LIBRSVG_CONF_OPT = --disable-tools
+LIBRSVG_CONF_OPTS = --disable-tools
LIBRSVG_DEPENDENCIES = libxml2 cairo pango libglib2 gdk-pixbuf
LIBRSVG_LICENSE = LGPLv2+
LIBRSVG_LICENSE_FILES = COPYING.LIB
diff --git a/package/librtlsdr/librtlsdr.mk b/package/librtlsdr/librtlsdr.mk
--- a/package/librtlsdr/librtlsdr.mk
+++ b/package/librtlsdr/librtlsdr.mk
@@ -12,11 +12,11 @@
LIBRTLSDR_DEPENDENCIES = libusb
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-LIBRTLSDR_CONF_OPT += -DINSTALL_UDEV_RULES=ON
+LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON
endif
ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y)
-LIBRTLSDR_CONF_OPT += -DDETACH_KERNEL_DRIVER=1
+LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1
endif
$(eval $(cmake-package))
diff --git a/package/libsamplerate/libsamplerate.mk b/package/libsamplerate/libsamplerate.mk
--- a/package/libsamplerate/libsamplerate.mk
+++ b/package/libsamplerate/libsamplerate.mk
@@ -8,7 +8,7 @@
LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC
LIBSAMPLERATE_INSTALL_STAGING = YES
LIBSAMPLERATE_DEPENDENCIES = host-pkgconf
-LIBSAMPLERATE_CONF_OPT = --disable-fftw --program-transform-name=''
+LIBSAMPLERATE_CONF_OPTS = --disable-fftw --program-transform-name=''
LIBSAMPLERATE_LICENSE = Dual GPLv2+ / libsamplerate commercial use license
LIBSAMPLERATE_LICENSE_FILES = COPYING
diff --git a/package/libsecret/libsecret.mk b/package/libsecret/libsecret.mk
--- a/package/libsecret/libsecret.mk
+++ b/package/libsecret/libsecret.mk
@@ -12,14 +12,14 @@
LIBSECRET_INSTALL_STAGING = YES
LIBSECRET_DEPENDENCIES = libglib2 host-intltool
-LIBSECRET_CONF_OPT = --disable-manpages --disable-strict --disable-coverage --enable-vala=no
+LIBSECRET_CONF_OPTS = --disable-manpages --disable-strict --disable-coverage --enable-vala=no
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
LIBSECRET_DEPENDENCIES += libgcrypt
- LIBSECRET_CONF_OPT += --enable-gcrypt \
+ LIBSECRET_CONF_OPTS += --enable-gcrypt \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr
else
- LIBSECRET_CONF_OPT += --disable-gcrypt
+ LIBSECRET_CONF_OPTS += --disable-gcrypt
endif
$(eval $(autotools-package))
diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk
--- a/package/libsoc/libsoc.mk
+++ b/package/libsoc/libsoc.mk
@@ -10,6 +10,6 @@
LIBSOC_LICENSE_FILES = COPYING
LIBSOC_AUTORECONF = YES
LIBSOC_INSTALL_STAGING = YES
-LIBSOC_CONF_OPT = --disable-debug
+LIBSOC_CONF_OPTS = --disable-debug
$(eval $(autotools-package))
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -18,21 +18,21 @@
LIBSOUP_CONF_ENV += soup_cv_ipv6=no
endif
-LIBSOUP_CONF_OPT = --disable-glibtest
+LIBSOUP_CONF_OPTS = --disable-glibtest
LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \
libglib2 libxml2 sqlite host-intltool
ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y)
-LIBSOUP_CONF_OPT += --with-gnome
+LIBSOUP_CONF_OPTS += --with-gnome
else
-LIBSOUP_CONF_OPT += --without-gnome
+LIBSOUP_CONF_OPTS += --without-gnome
endif
ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
LIBSOUP_DEPENDENCIES += glib-networking
else
-LIBSOUP_CONF_OPT += --disable-tls-check
+LIBSOUP_CONF_OPTS += --disable-tls-check
endif
$(eval $(autotools-package))
diff --git a/package/libsoxr/libsoxr.mk b/package/libsoxr/libsoxr.mk
--- a/package/libsoxr/libsoxr.mk
+++ b/package/libsoxr/libsoxr.mk
@@ -10,16 +10,16 @@
LIBSOXR_LICENSE = LGPLv2.1+
LIBSOXR_LICENSE_FILES = LICENCE COPYING.LGPL
LIBSOXR_INSTALL_STAGING = YES
-LIBSOXR_CONF_OPT = -DWITH_OPENMP:BOOL=OFF -DBUILD_TESTS:BOOL=OFF
+LIBSOXR_CONF_OPTS = -DWITH_OPENMP:BOOL=OFF -DBUILD_TESTS:BOOL=OFF
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-LIBSOXR_CONF_OPT += -DBUILD_SHARED_LIBS:BOOL=OFF
+LIBSOXR_CONF_OPTS += -DBUILD_SHARED_LIBS:BOOL=OFF
endif
ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG)
-LIBSOXR_CONF_OPT += -DHAVE_WORDS_BIGENDIAN=1
+LIBSOXR_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=1
else
-LIBSOXR_CONF_OPT += -DHAVE_WORDS_BIGENDIAN=0
+LIBSOXR_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=0
endif
$(eval $(cmake-package))
diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk
--- a/package/libssh2/libssh2.mk
+++ b/package/libssh2/libssh2.mk
@@ -9,18 +9,18 @@
LIBSSH2_LICENSE = BSD
LIBSSH2_LICENSE_FILES = COPYING
LIBSSH2_INSTALL_STAGING = YES
-LIBSSH2_CONF_OPT = --disable-examples-build
+LIBSSH2_CONF_OPTS = --disable-examples-build
# libssh2 must use either libgcrypt or OpenSSL
# Only select openssl if libgcrypt is not selected
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
LIBSSH2_DEPENDENCIES += libgcrypt
-LIBSSH2_CONF_OPT += --with-libgcrypt \
+LIBSSH2_CONF_OPTS += --with-libgcrypt \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
--without-openssl
else
LIBSSH2_DEPENDENCIES += openssl
-LIBSSH2_CONF_OPT += --with-openssl \
+LIBSSH2_CONF_OPTS += --with-openssl \
--with-libssl-prefix=$(STAGING_DIR)/usr \
--without-libgcrypt
endif
@@ -28,9 +28,9 @@
# Add zlib support if enabled
ifeq ($(BR2_PACKAGE_ZLIB),y)
LIBSSH2_DEPENDENCIES += zlib
-LIBSSH2_CONF_OPT += --with-libz
+LIBSSH2_CONF_OPTS += --with-libz
else
-LIBSSH2_CONF_OPT += --without-libz
+LIBSSH2_CONF_OPTS += --without-libz
endif
$(eval $(autotools-package))
diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk
--- a/package/libstrophe/libstrophe.mk
+++ b/package/libstrophe/libstrophe.mk
@@ -22,7 +22,7 @@
# configure script assumes expat should be used.
LIBSTROPHE_DEPENDENCIES += expat
else
-LIBSTROPHE_CONF_OPT += --with-libxml2
+LIBSTROPHE_CONF_OPTS += --with-libxml2
LIBSTROPHE_DEPENDENCIES += libxml2
endif
diff --git a/package/libsvg-cairo/libsvg-cairo.mk b/package/libsvg-cairo/libsvg-cairo.mk
--- a/package/libsvg-cairo/libsvg-cairo.mk
+++ b/package/libsvg-cairo/libsvg-cairo.mk
@@ -11,6 +11,6 @@
LIBSVG_CAIRO_LICENSE = LGPLv2.1+
LIBSVG_CAIRO_LICENSE_FILES = COPYING
-LIBSVG_CAIRO_CONF_OPT = --without-x
+LIBSVG_CAIRO_CONF_OPTS = --without-x
$(eval $(autotools-package))
diff --git a/package/libsvg/libsvg.mk b/package/libsvg/libsvg.mk
--- a/package/libsvg/libsvg.mk
+++ b/package/libsvg/libsvg.mk
@@ -13,10 +13,10 @@
# libsvg needs at last a XML parser
ifeq ($(BR2_PACKAGE_EXPAT),y)
-LIBSVG_CONF_OPT += --with-expat
+LIBSVG_CONF_OPTS += --with-expat
LIBSVG_DEPENDENCIES += expat
else
-LIBSVG_CONF_OPT += --with-libxml2
+LIBSVG_CONF_OPTS += --with-libxml2
LIBSVG_DEPENDENCIES += libxml2
endif
diff --git a/package/libtheora/libtheora.mk b/package/libtheora/libtheora.mk
--- a/package/libtheora/libtheora.mk
+++ b/package/libtheora/libtheora.mk
@@ -11,7 +11,7 @@
LIBTHEORA_LICENSE = BSD-3c
LIBTHEORA_LICENSE_FILES = COPYING LICENSE
-LIBTHEORA_CONF_OPT = \
+LIBTHEORA_CONF_OPTS = \
--disable-oggtest \
--disable-vorbistest \
--disable-sdltest \
diff --git a/package/libtirpc/libtirpc.mk b/package/libtirpc/libtirpc.mk
--- a/package/libtirpc/libtirpc.mk
+++ b/package/libtirpc/libtirpc.mk
@@ -16,7 +16,7 @@
# getrpcby{number,name} are only provided if 'GQ' is defined
LIBTIRPC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DGQ"
-LIBTIRPC_CONF_OPT = --disable-gssapi
+LIBTIRPC_CONF_OPTS = --disable-gssapi
# We need host-pkgconf because the configure.ac contains a
# PKG_CHECK_MODULES macro call, and since we're autoreconfiguring this
diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk
--- a/package/libtorrent/libtorrent.mk
+++ b/package/libtorrent/libtorrent.mk
@@ -8,7 +8,7 @@
LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads
LIBTORRENT_DEPENDENCIES = host-pkgconf libsigc \
$(if $(BR2_PACKAGE_OPENSSL),openssl)
-LIBTORRENT_CONF_OPT = --enable-aligned \
+LIBTORRENT_CONF_OPTS = --enable-aligned \
$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
LIBTORRENT_INSTALL_STAGING = YES
LIBTORRENT_AUTORECONF = YES
diff --git a/package/libubox/libubox.mk b/package/libubox/libubox.mk
--- a/package/libubox/libubox.mk
+++ b/package/libubox/libubox.mk
@@ -12,10 +12,10 @@
ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy)
LIBUBOX_DEPENDENCIES += lua
-LIBUBOX_CONF_OPT += -DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
+LIBUBOX_CONF_OPTS += -DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
else
-LIBUBOX_CONF_OPT += -DBUILD_LUA:BOOL=OFF
+LIBUBOX_CONF_OPTS += -DBUILD_LUA:BOOL=OFF
endif
$(eval $(cmake-package))
diff --git a/package/libuci/libuci.mk b/package/libuci/libuci.mk
--- a/package/libuci/libuci.mk
+++ b/package/libuci/libuci.mk
@@ -12,10 +12,10 @@
ifeq ($(BR2_PACKAGE_LUA_5_1),y)
LIBUCI_DEPENDENCIES += lua
-LIBUCI_CONF_OPT += -DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
+LIBUCI_CONF_OPTS += -DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
else
-LIBUCI_CONF_OPT += -DBUILD_LUA:BOOL=OFF
+LIBUCI_CONF_OPTS += -DBUILD_LUA:BOOL=OFF
endif
$(eval $(cmake-package))
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -8,7 +8,7 @@
LIBUNGIF_SOURCE = libungif-$(LIBUNGIF_VERSION).tar.bz2
LIBUNGIF_SITE = http://downloads.sourceforge.net/project/giflib/libungif-4.x/libungif-$(LIBUNGIF_VERSION)
LIBUNGIF_INSTALL_STAGING = YES
-LIBUNGIF_CONF_OPT = --without-x
+LIBUNGIF_CONF_OPTS = --without-x
LIBUNGIF_LICENSE = MIT
LIBUNGIF_LICENSE_FILES = COPYING
diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk
--- a/package/libusb/libusb.mk
+++ b/package/libusb/libusb.mk
@@ -14,17 +14,17 @@
LIBUSB_INSTALL_STAGING = YES
# Avoid the discovery of udev for the host variant
-HOST_LIBUSB_CONF_OPT = --disable-udev
+HOST_LIBUSB_CONF_OPTS = --disable-udev
HOST_LIBUSB_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_avr32),y)
-LIBUSB_CONF_OPT += --disable-timerfd
+LIBUSB_CONF_OPTS += --disable-timerfd
endif
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
LIBUSB_DEPENDENCIES += udev
else
-LIBUSB_CONF_OPT += --disable-udev
+LIBUSB_CONF_OPTS += --disable-udev
endif
$(eval $(autotools-package))
diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -21,15 +21,15 @@
ifeq ($(BR2_PACKAGE_JPEG),y)
LIBV4L_DEPENDENCIES += jpeg
-LIBV4L_CONF_OPT += --with-jpeg
+LIBV4L_CONF_OPTS += --with-jpeg
else
-LIBV4L_CONF_OPT += --without-jpeg
+LIBV4L_CONF_OPTS += --without-jpeg
endif
ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
-LIBV4L_CONF_OPT += --enable-v4l-utils
+LIBV4L_CONF_OPTS += --enable-v4l-utils
else
-LIBV4L_CONF_OPT += --disable-v4l-utils
+LIBV4L_CONF_OPTS += --disable-v4l-utils
endif
$(eval $(autotools-package))
diff --git a/package/libva-intel-driver/libva-intel-driver.mk b/package/libva-intel-driver/libva-intel-driver.mk
--- a/package/libva-intel-driver/libva-intel-driver.mk
+++ b/package/libva-intel-driver/libva-intel-driver.mk
@@ -14,16 +14,16 @@
ifeq ($(BR2_PACKAGE_XORG7),y)
LIBVA_INTEL_DRIVER_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes
-LIBVA_INTEL_DRIVER_CONF_OPT += --enable-x11
+LIBVA_INTEL_DRIVER_CONF_OPTS += --enable-x11
else
-LIBVA_INTEL_DRIVER_CONF_OPT += --disable-x11
+LIBVA_INTEL_DRIVER_CONF_OPTS += --disable-x11
endif
ifeq ($(BR2_PACKAGE_WAYLAND),y)
LIBVA_DEPENDENCIES += wayland
-LIBVA_INTEL_DRIVER_CONF_OPT += --enable-wayland
+LIBVA_INTEL_DRIVER_CONF_OPTS += --enable-wayland
else
-LIBVA_INTEL_DRIVER_CONF_OPT += --disable-wayland
+LIBVA_INTEL_DRIVER_CONF_OPTS += --disable-wayland
endif
$(eval $(autotools-package))
diff --git a/package/libva/libva.mk b/package/libva/libva.mk
--- a/package/libva/libva.mk
+++ b/package/libva/libva.mk
@@ -14,37 +14,37 @@
LIBVA_DEPENDENCIES = host-pkgconf libdrm
# libdrm is a hard-dependency
-LIBVA_CONF_OPT = \
+LIBVA_CONF_OPTS = \
--enable-drm \
--disable-dummy-driver \
--with-drivers-path="/usr/lib/va"
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
LIBVA_DEPENDENCIES += mesa3d
-LIBVA_CONF_OPT += --enable-glx
+LIBVA_CONF_OPTS += --enable-glx
else
-LIBVA_CONF_OPT += --disable-glx
+LIBVA_CONF_OPTS += --disable-glx
endif
ifeq ($(BR2_PACKAGE_XORG7),y)
LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes
-LIBVA_CONF_OPT += --enable-x11
+LIBVA_CONF_OPTS += --enable-x11
else
-LIBVA_CONF_OPT += --disable-x11
+LIBVA_CONF_OPTS += --disable-x11
endif
ifeq ($(BR2_PACKAGE_WAYLAND),y)
LIBVA_DEPENDENCIES += wayland
-LIBVA_CONF_OPT += --enable-wayland
+LIBVA_CONF_OPTS += --enable-wayland
else
-LIBVA_CONF_OPT += --disable-wayland
+LIBVA_CONF_OPTS += --disable-wayland
endif
ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)
LIBVA_DEPENDENCIES += libegl
-LIBVA_CONF_OPT += --enable-egl
+LIBVA_CONF_OPTS += --enable-egl
else
-LIBVA_CONF_OPT += --disable-egl
+LIBVA_CONF_OPTS += --disable-egl
endif
# Autoreconf requires an m4 directory to exist
diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -13,46 +13,46 @@
LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config
# only used for examples
-LIBVNCSERVER_CONF_OPT += --with-sdl-config=/bin/false
+LIBVNCSERVER_CONF_OPTS += --with-sdl-config=/bin/false
ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-LIBVNCSERVER_CONF_OPT += --without-pthread
+LIBVNCSERVER_CONF_OPTS += --without-pthread
endif
ifneq ($(BR2_INET_IPV6),y)
-LIBVNCSERVER_CONF_OPT += --without-ipv6
+LIBVNCSERVER_CONF_OPTS += --without-ipv6
endif
# openssl supports needs pthread
ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
LIBVNCSERVER_DEPENDENCIES += openssl
else
-LIBVNCSERVER_CONF_OPT += --without-crypto --without-ssl
+LIBVNCSERVER_CONF_OPTS += --without-crypto --without-ssl
endif
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
LIBVNCSERVER_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
LIBVNCSERVER_DEPENDENCIES += libgcrypt
else
-LIBVNCSERVER_CONF_OPT += --without-gcrypt
+LIBVNCSERVER_CONF_OPTS += --without-gcrypt
endif
ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
LIBVNCSERVER_DEPENDENCIES += gnutls host-pkgconf
else
-LIBVNCSERVER_CONF_OPT += --without-gnutls
+LIBVNCSERVER_CONF_OPTS += --without-gnutls
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
LIBVNCSERVER_DEPENDENCIES += jpeg
else
-LIBVNCSERVER_CONF_OPT += --without-jpeg
+LIBVNCSERVER_CONF_OPTS += --without-jpeg
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
LIBVNCSERVER_DEPENDENCIES += zlib
else
-LIBVNCSERVER_CONF_OPT += --without-zlib
+LIBVNCSERVER_CONF_OPTS += --without-zlib
endif
$(eval $(autotools-package))
diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk
--- a/package/libvorbis/libvorbis.mk
+++ b/package/libvorbis/libvorbis.mk
@@ -8,7 +8,7 @@
LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz
LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis
LIBVORBIS_INSTALL_STAGING = YES
-LIBVORBIS_CONF_OPT = --disable-oggtest
+LIBVORBIS_CONF_OPTS = --disable-oggtest
LIBVORBIS_DEPENDENCIES = host-pkgconf libogg
LIBVORBIS_LICENSE = BSD-3c
LIBVORBIS_LICENSE_FILES = COPYING
diff --git a/package/libvpx/libvpx.mk b/package/libvpx/libvpx.mk
--- a/package/libvpx/libvpx.mk
+++ b/package/libvpx/libvpx.mk
@@ -18,7 +18,7 @@
LD="$(TARGET_CC)" \
CROSS=$(GNU_TARGET_NAME)
-LIBVPX_CONF_OPT = \
+LIBVPX_CONF_OPTS = \
--disable-examples \
--disable-docs \
--disable-unit-tests
@@ -34,7 +34,7 @@
--enable-pic \
--prefix=/usr \
$(SHARED_STATIC_LIBS_OPTS) \
- $(LIBVPX_CONF_OPT) \
+ $(LIBVPX_CONF_OPTS) \
)
endef
diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -12,12 +12,12 @@
LIBWEBSOCKETS_DEPENDENCIES = zlib
LIBWEBSOCKETS_INSTALL_STAGING = YES
-LIBWEBSOCKETS_CONF_OPT += -DWITHOUT_TESTAPPS=ON
+LIBWEBSOCKETS_CONF_OPTS += -DWITHOUT_TESTAPPS=ON
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBWEBSOCKETS_DEPENDENCIES += openssl
else
-LIBWEBSOCKETS_CONF_OPT += -DWITH_SSL=OFF
+LIBWEBSOCKETS_CONF_OPTS += -DWITH_SSL=OFF
endif
$(eval $(cmake-package))
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -16,25 +16,25 @@
LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
endif
-LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug --without-lzma
+LIBXML2_CONF_OPTS = --with-gnu-ld --without-python --without-debug --without-lzma
HOST_LIBXML2_DEPENDENCIES = host-pkgconf
-HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma --without-python
+HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma --without-python
ifeq ($(BR2_PACKAGE_ZLIB),y)
LIBXML2_DEPENDENCIES += zlib
-LIBXML2_CONF_OPT += --with-zlib
+LIBXML2_CONF_OPTS += --with-zlib
else
-LIBXML2_CONF_OPT += --without-zlib
+LIBXML2_CONF_OPTS += --without-zlib
endif
LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y)
-LIBXML2_CONF_OPT += --with-iconv
+LIBXML2_CONF_OPTS += --with-iconv
else
-LIBXML2_CONF_OPT += --without-iconv
+LIBXML2_CONF_OPTS += --without-iconv
endif
$(eval $(autotools-package))
diff --git a/package/libxmlrpc/libxmlrpc.mk b/package/libxmlrpc/libxmlrpc.mk
--- a/package/libxmlrpc/libxmlrpc.mk
+++ b/package/libxmlrpc/libxmlrpc.mk
@@ -14,7 +14,7 @@
LIBXMLRPC_CONFIG_SCRIPTS = xmlrpc-c-config
LIBXMLRPC_MAKE = $(MAKE1)
-LIBXMLRPC_CONF_OPT = \
+LIBXMLRPC_CONF_OPTS = \
$(if $(BR2_USE_WCHAR),,ac_cv_header_wchar_h=no) \
$(if $(BR2_INSTALL_LIBSTDCPP),,--disable-cplusplus) \
have_curl_config=$(STAGING_DIR)/usr/bin/curl-config \
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -10,7 +10,7 @@
LIBXSLT_LICENSE = MIT
LIBXSLT_LICENSE_FILES = COPYING
-LIBXSLT_CONF_OPT = --with-gnu-ld --without-debug \
+LIBXSLT_CONF_OPTS = --with-gnu-ld --without-debug \
--without-python --with-libxml-prefix=$(STAGING_DIR)/usr/
LIBXSLT_CONFIG_SCRIPTS = xslt-config
LIBXSLT_DEPENDENCIES = libxml2
@@ -20,10 +20,10 @@
LIBXSLT_DEPENDENCIES += libgcrypt
LIBXSLT_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
else
-LIBXSLT_CONF_OPT += --without-crypto
+LIBXSLT_CONF_OPTS += --without-crypto
endif
-HOST_LIBXSLT_CONF_OPT = --without-debug --without-python --without-crypto
+HOST_LIBXSLT_CONF_OPTS = --without-debug --without-python --without-crypto
HOST_LIBXSLT_DEPENDENCIES = host-libxml2
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -11,7 +11,7 @@
LIGHTTPD_LICENSE = BSD-3c
LIGHTTPD_LICENSE_FILES = COPYING
LIGHTTPD_DEPENDENCIES = host-pkgconf
-LIGHTTPD_CONF_OPT = \
+LIGHTTPD_CONF_OPTS = \
--libdir=/usr/lib/lighttpd \
--libexecdir=/usr/lib \
--localstatedir=/var \
@@ -19,45 +19,45 @@
ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y)
LIGHTTPD_DEPENDENCIES += openssl
-LIGHTTPD_CONF_OPT += --with-openssl
+LIGHTTPD_CONF_OPTS += --with-openssl
else
-LIGHTTPD_CONF_OPT += --without-openssl
+LIGHTTPD_CONF_OPTS += --without-openssl
endif
ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y)
LIGHTTPD_DEPENDENCIES += zlib
-LIGHTTPD_CONF_OPT += --with-zlib
+LIGHTTPD_CONF_OPTS += --with-zlib
else
-LIGHTTPD_CONF_OPT += --without-zlib
+LIGHTTPD_CONF_OPTS += --without-zlib
endif
ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y)
LIGHTTPD_DEPENDENCIES += bzip2
-LIGHTTPD_CONF_OPT += --with-bzip2
+LIGHTTPD_CONF_OPTS += --with-bzip2
else
-LIGHTTPD_CONF_OPT += --without-bzip2
+LIGHTTPD_CONF_OPTS += --without-bzip2
endif
ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y)
LIGHTTPD_CONF_ENV = PCRECONFIG=$(STAGING_DIR)/usr/bin/pcre-config
LIGHTTPD_DEPENDENCIES += pcre
-LIGHTTPD_CONF_OPT += --with-pcre
+LIGHTTPD_CONF_OPTS += --with-pcre
else
-LIGHTTPD_CONF_OPT += --without-pcre
+LIGHTTPD_CONF_OPTS += --without-pcre
endif
ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y)
LIGHTTPD_DEPENDENCIES += libxml2 sqlite
-LIGHTTPD_CONF_OPT += --with-webdav-props --with-webdav-locks
+LIGHTTPD_CONF_OPTS += --with-webdav-props --with-webdav-locks
else
-LIGHTTPD_CONF_OPT += --without-webdav-props --without-webdav-locks
+LIGHTTPD_CONF_OPTS += --without-webdav-props --without-webdav-locks
endif
ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y)
LIGHTTPD_DEPENDENCIES += lua
-LIGHTTPD_CONF_OPT += --with-lua
+LIGHTTPD_CONF_OPTS += --with-lua
else
-LIGHTTPD_CONF_OPT += --without-lua
+LIGHTTPD_CONF_OPTS += --without-lua
endif
define LIGHTTPD_INSTALL_CONFIG
diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk
--- a/package/linknx/linknx.mk
+++ b/package/linknx/linknx.mk
@@ -8,23 +8,23 @@
LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LINKNX_VERSION)
LINKNX_LICENSE = GPLv2+
LINKNX_INSTALL_STAGING = YES
-LINKNX_CONF_OPT = --without-lua --without-log4cpp --without-pth-test \
+LINKNX_CONF_OPTS = --without-lua --without-log4cpp --without-pth-test \
--with-pth=$(STAGING_DIR)/usr --disable-smtp
LINKNX_DEPENDENCIES = libpthsem
ifeq ($(BR2_PACKAGE_MYSQL),y)
-LINKNX_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config
+LINKNX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config
LINKNX_DEPENDENCIES += mysql
else
-LINKNX_CONF_OPT += --without-mysql
+LINKNX_CONF_OPTS += --without-mysql
endif
ifeq ($(BR2_PACKAGE_LIBCURL),y)
-LINKNX_CONF_OPT += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
+LINKNX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
LINKNX_DEPENDENCIES += libcurl
else
-LINKNX_CONF_OPT += --without-libcurl
+LINKNX_CONF_OPTS += --without-libcurl
endif
$(eval $(autotools-package))
diff --git a/package/links/links.mk b/package/links/links.mk
--- a/package/links/links.mk
+++ b/package/links/links.mk
@@ -11,20 +11,20 @@
LINKS_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
-LINKS_CONF_OPT += --enable-graphics
+LINKS_CONF_OPTS += --enable-graphics
LINKS_DEPENDENCIES += libpng
ifeq ($(BR2_PACKAGE_XLIB_LIBXT),y)
-LINKS_CONF_OPT += --with-x
+LINKS_CONF_OPTS += --with-x
LINKS_DEPENDENCIES += xlib_libXt
else
-LINKS_CONF_OPT += --without-x
+LINKS_CONF_OPTS += --without-x
endif
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
LINKS_CONF_ENV = ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config
-LINKS_CONF_OPT += --with-directfb
+LINKS_CONF_OPTS += --with-directfb
LINKS_DEPENDENCIES += directfb
else
-LINKS_CONF_OPT += --without-directfb
+LINKS_CONF_OPTS += --without-directfb
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
LINKS_DEPENDENCIES += jpeg
diff --git a/package/linphone/linphone.mk b/package/linphone/linphone.mk
--- a/package/linphone/linphone.mk
+++ b/package/linphone/linphone.mk
@@ -7,7 +7,7 @@
LINPHONE_VERSION_MAJOR = 3.6
LINPHONE_VERSION = $(LINPHONE_VERSION_MAJOR).1
LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/$(LINPHONE_VERSION_MAJOR).x/sources
-LINPHONE_CONF_OPT = \
+LINPHONE_CONF_OPTS = \
--enable-external-ortp \
--enable-external-mediastreamer \
--disable-strict
@@ -23,10 +23,10 @@
endif
ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy)
-LINPHONE_CONF_OPT += --enable-gtk_ui
+LINPHONE_CONF_OPTS += --enable-gtk_ui
LINPHONE_DEPENDENCIES += libgtk2
else
-LINPHONE_CONF_OPT += --disable-gtk_ui
+LINPHONE_CONF_OPTS += --disable-gtk_ui
endif
$(eval $(autotools-package))
diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
--- a/package/linux-pam/linux-pam.mk
+++ b/package/linux-pam/linux-pam.mk
@@ -8,7 +8,7 @@
LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2
LINUX_PAM_SITE = http://linux-pam.org/library
LINUX_PAM_INSTALL_STAGING = YES
-LINUX_PAM_CONF_OPT = \
+LINUX_PAM_CONF_OPTS = \
--disable-prelude \
--disable-isadir \
--disable-nis \
diff --git a/package/linux-zigbee/linux-zigbee.mk b/package/linux-zigbee/linux-zigbee.mk
--- a/package/linux-zigbee/linux-zigbee.mk
+++ b/package/linux-zigbee/linux-zigbee.mk
@@ -13,18 +13,18 @@
# We patch configure.ac/Makefile.am
LINUX_ZIGBEE_AUTORECONF = YES
-LINUX_ZIGBEE_CONF_OPT = \
+LINUX_ZIGBEE_CONF_OPTS = \
--disable-manpages \
--with-leasefile="$(call qstrip,$(BR2_PACKAGE_LINUX_ZIGBEE_LEASEFILE))"
ifeq ($(BR2_PACKAGE_LINUX_ZIGBEE_TESTS),y)
-LINUX_ZIGBEE_CONF_OPT += --with-zbtestdir='/usr/sbin/'
+LINUX_ZIGBEE_CONF_OPTS += --with-zbtestdir='/usr/sbin/'
else
-LINUX_ZIGBEE_CONF_OPT += --with-zbtestdir=''
+LINUX_ZIGBEE_CONF_OPTS += --with-zbtestdir=''
endif
ifeq ($(BR2_PACKAGE_LINUX_ZIGBEE_OLD_KERNEL_COMPAT),y)
-LINUX_ZIGBEE_CONF_OPT += --enable-kernel-compat
+LINUX_ZIGBEE_CONF_OPTS += --enable-kernel-compat
endif
$(eval $(autotools-package))
diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
--- a/package/localedef/localedef.mk
+++ b/package/localedef/localedef.mk
@@ -8,7 +8,7 @@
LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src
-HOST_LOCALEDEF_CONF_OPT += \
+HOST_LOCALEDEF_CONF_OPTS += \
--prefix=/usr \
--with-glibc=./eglibc
diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk
--- a/package/log4cxx/log4cxx.mk
+++ b/package/log4cxx/log4cxx.mk
@@ -11,7 +11,7 @@
LOG4CXX_LICENSE = Apache-2.0
LOG4CXX_LICENSE_FILES = LICENSE
-LOG4CXX_CONF_OPT = \
+LOG4CXX_CONF_OPTS = \
--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \
--with-apr-util=$(STAGING_DIR)/usr/bin/apu-1-config
diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk
--- a/package/lrzsz/lrzsz.mk
+++ b/package/lrzsz/lrzsz.mk
@@ -6,7 +6,7 @@
LRZSZ_VERSION = 0.12.20
LRZSZ_SITE = http://www.ohse.de/uwe/releases
-LRZSZ_CONF_OPT = --disable-timesync
+LRZSZ_CONF_OPTS = --disable-timesync
LRZSZ_LICENSE = GPLv2+
LRZSZ_LICENSE_FILES = COPYING
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -7,7 +7,7 @@
LTRACE_VERSION = 0896ce554f80afdcba81d9754f6104f863dea803
LTRACE_SITE = git://anonscm.debian.org/collab-maint/ltrace.git
LTRACE_DEPENDENCIES = elfutils
-LTRACE_CONF_OPT = --disable-werror
+LTRACE_CONF_OPTS = --disable-werror
LTRACE_LICENSE = GPLv2
LTRACE_LICENSE_FILES = COPYING
LTRACE_AUTORECONF = YES
@@ -21,10 +21,10 @@
# We don't normally do so for uClibc and we can't know if it's external
ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),)
-LTRACE_CONF_OPT += --with-libunwind=yes
+LTRACE_CONF_OPTS += --with-libunwind=yes
LTRACE_DEPENDENCIES += libunwind
else
-LTRACE_CONF_OPT += --with-libunwind=no
+LTRACE_CONF_OPTS += --with-libunwind=no
endif
endif
diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk
--- a/package/ltris/ltris.mk
+++ b/package/ltris/ltris.mk
@@ -16,9 +16,9 @@
ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y)
LTRIS_DEPENDENCIES += sdl_mixer
-LTRIS_CONF_OPT += --enable-audio=yes
+LTRIS_CONF_OPTS += --enable-audio=yes
else
-LTRIS_CONF_OPT += --disable-audio
+LTRIS_CONF_OPTS += --disable-audio
endif
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -9,7 +9,7 @@
LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/*
LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
-LTTNG_TOOLS_CONF_OPT += --with-xml-prefix=$(STAGING_DIR)/usr
+LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr
# The host-lttng-babeltrace technically isn't a required build
# dependency. However, having the babeltrace utilities built for the
@@ -20,10 +20,10 @@
LTTNG_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y)
-LTTNG_TOOLS_CONF_OPT += --enable-lttng-ust
+LTTNG_TOOLS_CONF_OPTS += --enable-lttng-ust
LTTNG_TOOLS_DEPENDENCIES += lttng-libust
else
-LTTNG_TOOLS_CONF_OPT += --disable-lttng-ust
+LTTNG_TOOLS_CONF_OPTS += --disable-lttng-ust
endif
$(eval $(autotools-package))
diff --git a/package/lua-ev/lua-ev.mk b/package/lua-ev/lua-ev.mk
--- a/package/lua-ev/lua-ev.mk
+++ b/package/lua-ev/lua-ev.mk
@@ -9,6 +9,6 @@
LUA_EV_DEPENDENCIES = luainterpreter libev
LUA_EV_LICENSE = MIT
LUA_EV_LICENSE_FILES = README
-LUA_EV_CONF_OPT = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)"
+LUA_EV_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)"
$(eval $(cmake-package))
diff --git a/package/luaposix/luaposix.mk b/package/luaposix/luaposix.mk
--- a/package/luaposix/luaposix.mk
+++ b/package/luaposix/luaposix.mk
@@ -10,7 +10,7 @@
LUAPOSIX_LICENSE = MIT
LUAPOSIX_LICENSE_FILES = COPYING
LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
-LUAPOSIX_CONF_OPT = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
+LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
ifeq ($(BR2_PACKAGE_NCURSES),y)
LUAPOSIX_DEPENDENCIES += ncurses
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -14,17 +14,17 @@
LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks
LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
-HOST_LUAROCKS_CONF_OPT = \
+HOST_LUAROCKS_CONF_OPTS = \
--prefix=$(HOST_DIR)/usr \
--sysconfdir=$(LUAROCKS_CONFIG_DIR) \
--with-lua=$(HOST_DIR)/usr
ifeq ($(BR2_PACKAGE_LUAJIT),y)
-HOST_LUAROCKS_CONF_OPT += --lua-suffix=jit
+HOST_LUAROCKS_CONF_OPTS += --lua-suffix=jit
endif
define HOST_LUAROCKS_CONFIGURE_CMDS
- cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPT)
+ cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS)
endef
define HOST_LUAROCKS_INSTALL_CMDS
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -13,7 +13,7 @@
# Make sure that binaries and libraries are installed with write
# permissions for the owner.
-LVM2_CONF_OPT += \
+LVM2_CONF_OPTS += \
--enable-write_install \
--enable-pkgconfig \
--enable-cmdlib \
@@ -28,7 +28,7 @@
else
# v2.02.44: disable readline usage, or binaries are linked against provider
# of "tgetent" (=> ncurses) even if it's not used..
-LVM2_CONF_OPT += --disable-readline
+LVM2_CONF_OPTS += --disable-readline
endif
ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
@@ -38,9 +38,9 @@
endif
ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y)
-LVM2_CONF_OPT += --enable-applib
+LVM2_CONF_OPTS += --enable-applib
else
-LVM2_CONF_OPT += --disable-applib
+LVM2_CONF_OPTS += --disable-applib
endif
$(eval $(autotools-package))
diff --git a/package/lxc/lxc.mk b/package/lxc/lxc.mk
--- a/package/lxc/lxc.mk
+++ b/package/lxc/lxc.mk
@@ -11,7 +11,7 @@
LXC_DEPENDENCIES = libcap host-pkgconf
# configure not shipped
LXC_AUTORECONF = YES
-LXC_CONF_OPT = --disable-apparmor --with-distro=buildroot \
+LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
--disable-lua --disable-python \
$(if $(BR2_PACKAGE_BASH),,--disable-bash)
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -7,7 +7,7 @@
LZMA_VERSION = 4.32.7
LZMA_SOURCE = lzma-$(LZMA_VERSION).tar.xz
LZMA_SITE = http://tukaani.org/lzma
-LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
+LZMA_CONF_OPTS = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
$(eval $(host-autotools-package))
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -15,7 +15,7 @@
M4_CONF_ENV += gt_cv_c_wchar_t=no gl_cv_absolute_wchar_h=__fpending.h
endif
-HOST_M4_CONF_OPT = --disable-static
+HOST_M4_CONF_OPTS = --disable-static
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/madplay/madplay.mk b/package/madplay/madplay.mk
--- a/package/madplay/madplay.mk
+++ b/package/madplay/madplay.mk
@@ -14,7 +14,7 @@
# Check if ALSA is built, then we should configure after alsa-lib so
# ./configure can find alsa-lib.
ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)
-MADPLAY_CONF_OPT += --with-alsa
+MADPLAY_CONF_OPTS += --with-alsa
MADPLAY_DEPENDENCIES += alsa-lib
endif
diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk
--- a/package/matchbox/matchbox-common/matchbox-common.mk
+++ b/package/matchbox/matchbox-common/matchbox-common.mk
@@ -13,7 +13,7 @@
MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y)
- MATCHBOX_COMMON_CONF_OPT += --enable-pda-folders
+ MATCHBOX_COMMON_CONF_OPTS += --enable-pda-folders
endif
################################################################################
diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
--- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk
+++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk
@@ -11,7 +11,7 @@
MATCHBOX_DESKTOP_LICENSE = GPLv2+
MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib
-MATCHBOX_DESKTOP_CONF_OPT = --enable-expat
+MATCHBOX_DESKTOP_CONF_OPTS = --enable-expat
# The bundled configure script does not properly replace LIBADD_DL, so
# we force an autoreconf even if we don't have any patches touching
@@ -21,10 +21,10 @@
################################################################################
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
- MATCHBOX_DESKTOP_CONF_OPT += --enable-startup-notification
+ MATCHBOX_DESKTOP_CONF_OPTS += --enable-startup-notification
MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification
else
- MATCHBOX_DESKTOP_CONF_OPT += --disable-startup-notification
+ MATCHBOX_DESKTOP_CONF_OPTS += --disable-startup-notification
endif
################################################################################
diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
--- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
+++ b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk
@@ -11,7 +11,7 @@
MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING
MATCHBOX_FAKEKEY_INSTALL_STAGING = YES
MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
-MATCHBOX_FAKEKEY_CONF_OPT = --enable-expat
+MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
--- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
+++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk
@@ -23,7 +23,7 @@
################################################################################
ifeq ($(BR2_PACKAGE_CAIRO),y)
- MATCHBOX_KEYBOARD_CONF_OPT += --enable-cairo
+ MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo
MATCHBOX_KEYBOARD_DEPENDENCIES += cairo
else
MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft
diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk
--- a/package/matchbox/matchbox-lib/matchbox-lib.mk
+++ b/package/matchbox/matchbox-lib/matchbox-lib.mk
@@ -11,7 +11,7 @@
MATCHBOX_LIB_LICENSE_FILES = COPYING
MATCHBOX_LIB_INSTALL_STAGING = YES
MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
-MATCHBOX_LIB_CONF_OPT = --enable-expat --disable-doxygen-docs
+MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs
MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
define MATCHBOX_LIB_POST_INSTALL_FIXES
@@ -29,31 +29,31 @@
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
- MATCHBOX_LIB_CONF_OPT += --enable-jpeg
+ MATCHBOX_LIB_CONF_OPTS += --enable-jpeg
MATCHBOX_LIB_DEPENDENCIES += jpeg
else
- MATCHBOX_LIB_CONF_OPT += --disable-jpeg
+ MATCHBOX_LIB_CONF_OPTS += --disable-jpeg
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
- MATCHBOX_LIB_CONF_OPT += --enable-png
+ MATCHBOX_LIB_CONF_OPTS += --enable-png
MATCHBOX_LIB_DEPENDENCIES += libpng
else
- MATCHBOX_LIB_CONF_OPT += --disable-png
+ MATCHBOX_LIB_CONF_OPTS += --disable-png
endif
ifeq ($(BR2_PACKAGE_PANGO)$(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyy)
- MATCHBOX_LIB_CONF_OPT += --enable-pango
+ MATCHBOX_LIB_CONF_OPTS += --enable-pango
MATCHBOX_LIB_DEPENDENCIES += pango
else
- MATCHBOX_LIB_CONF_OPT += --disable-pango
+ MATCHBOX_LIB_CONF_OPTS += --disable-pango
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
- MATCHBOX_LIB_CONF_OPT += --enable-xft
+ MATCHBOX_LIB_CONF_OPTS += --enable-xft
MATCHBOX_LIB_DEPENDENCIES += xlib_libXft
else
- MATCHBOX_LIB_CONF_OPT += --disable-xft
+ MATCHBOX_LIB_CONF_OPTS += --disable-xft
endif
################################################################################
diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -11,15 +11,15 @@
MATCHBOX_PANEL_LICENSE = GPLv2+
MATCHBOX_PANEL_LICENSE_FILES = COPYING
MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
-MATCHBOX_PANEL_CONF_OPT = --enable-expat
+MATCHBOX_PANEL_CONF_OPTS = --enable-expat
################################################################################
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
- MATCHBOX_PANEL_CONF_OPT += --enable-startup-notification
+ MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification
MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor
else
- MATCHBOX_PANEL_CONF_OPT += --disable-startup-notification
+ MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
endif
################################################################################
diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
--- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -10,7 +10,7 @@
MATCHBOX_STARTUP_MONITOR_LICENSE = GPLv2+
MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING
MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification
-MATCHBOX_STARTUP_MONITOR_CONF_OPT =
+MATCHBOX_STARTUP_MONITOR_CONF_OPTS =
################################################################################
diff --git a/package/matchbox/matchbox-wm/matchbox-wm.mk b/package/matchbox/matchbox-wm/matchbox-wm.mk
--- a/package/matchbox/matchbox-wm/matchbox-wm.mk
+++ b/package/matchbox/matchbox-wm/matchbox-wm.mk
@@ -11,7 +11,7 @@
MATCHBOX_WM_LICENSE_FILES = COPYING
MATCHBOX_WM_DEPENDENCIES = matchbox-lib
-MATCHBOX_WM_CONF_OPT = --enable-expat
+MATCHBOX_WM_CONF_OPTS = --enable-expat
# Workaround bug in configure script
MATCHBOX_WM_CONF_ENV = expat=yes
@@ -20,7 +20,7 @@
ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)
ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)
- MATCHBOX_WM_CONF_OPT += --enable-composite
+ MATCHBOX_WM_CONF_OPTS += --enable-composite
MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite
MATCHBOX_WM_DEPENDENCIES += xlib_libXpm
endif
@@ -34,10 +34,10 @@
endif
ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
- MATCHBOX_WM_CONF_OPT += --enable-startup-notification
+ MATCHBOX_WM_CONF_OPTS += --enable-startup-notification
MATCHBOX_WM_DEPENDENCIES += startup-notification
else
- MATCHBOX_WM_CONF_OPT += --disable-startup-notification
+ MATCHBOX_WM_CONF_OPTS += --disable-startup-notification
endif
################################################################################
diff --git a/package/mcrypt/mcrypt.mk b/package/mcrypt/mcrypt.mk
--- a/package/mcrypt/mcrypt.mk
+++ b/package/mcrypt/mcrypt.mk
@@ -10,7 +10,7 @@
$(if $(BR2_PACKAGE_ZLIB),zlib) \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-MCRYPT_CONF_OPT = --with-libmcrypt-prefix=$(STAGING_DIR)/usr
+MCRYPT_CONF_OPTS = --with-libmcrypt-prefix=$(STAGING_DIR)/usr
MCRYPT_LICENSE = GPLv3
MCRYPT_LICENSE_FILES = COPYING
diff --git a/package/media-ctl/media-ctl.mk b/package/media-ctl/media-ctl.mk
--- a/package/media-ctl/media-ctl.mk
+++ b/package/media-ctl/media-ctl.mk
@@ -11,7 +11,7 @@
MEDIA_CTL_LICENSE_FILES = COPYING.LIB
MEDIA_CTL_AUTORECONF = YES
-MEDIA_CTL_CONF_OPT = --with-kernel-headers=$(STAGING_DIR)/usr/include
+MEDIA_CTL_CONF_OPTS = --with-kernel-headers=$(STAGING_DIR)/usr/include
MEDIA_CTL_DEPENDENCIES = host-pkgconf
$(eval $(autotools-package))
diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk
--- a/package/mediastreamer/mediastreamer.mk
+++ b/package/mediastreamer/mediastreamer.mk
@@ -9,80 +9,80 @@
MEDIASTREAMER_INSTALL_STAGING = YES
MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext
# tests fail linking on some architectures, so disable them
-MEDIASTREAMER_CONF_OPT = --disable-tests --disable-glx --disable-strict
+MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict
MEDIASTREAMER_LICENSE = GPLv2+
MEDIASTREAMER_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy)
-MEDIASTREAMER_CONF_OPT += --enable-alsa
+MEDIASTREAMER_CONF_OPTS += --enable-alsa
MEDIASTREAMER_DEPENDENCIES += alsa-lib
else
-MEDIASTREAMER_CONF_OPT += --disable-alsa
+MEDIASTREAMER_CONF_OPTS += --disable-alsa
endif
# portaudio backend needs speex as well
ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEX),yy)
-MEDIASTREAMER_CONF_OPT += --enable-portaudio
+MEDIASTREAMER_CONF_OPTS += --enable-portaudio
MEDIASTREAMER_DEPENDENCIES += portaudio speex
else
-MEDIASTREAMER_CONF_OPT += --disable-portaudio
+MEDIASTREAMER_CONF_OPTS += --disable-portaudio
endif
ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
-MEDIASTREAMER_CONF_OPT += --enable-pulseaudio
+MEDIASTREAMER_CONF_OPTS += --enable-pulseaudio
MEDIASTREAMER_DEPENDENCIES += pulseaudio
else
-MEDIASTREAMER_CONF_OPT += --disable-pulseaudio
+MEDIASTREAMER_CONF_OPTS += --disable-pulseaudio
endif
ifeq ($(BR2_PACKAGE_SPEEX),y)
-MEDIASTREAMER_CONF_OPT += --enable-speex
+MEDIASTREAMER_CONF_OPTS += --enable-speex
MEDIASTREAMER_DEPENDENCIES += speex
else
-MEDIASTREAMER_CONF_OPT += --disable-speex
+MEDIASTREAMER_CONF_OPTS += --disable-speex
endif
ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
-MEDIASTREAMER_CONF_OPT += --enable-ffmpeg
+MEDIASTREAMER_CONF_OPTS += --enable-ffmpeg
MEDIASTREAMER_DEPENDENCIES += ffmpeg
else
-MEDIASTREAMER_CONF_OPT += --disable-ffmpeg
+MEDIASTREAMER_CONF_OPTS += --disable-ffmpeg
endif
ifeq ($(BR2_PACKAGE_SDL),y)
-MEDIASTREAMER_CONF_OPT += --enable-sdl
+MEDIASTREAMER_CONF_OPTS += --enable-sdl
MEDIASTREAMER_DEPENDENCIES += sdl
else
-MEDIASTREAMER_CONF_OPT += --disable-sdl
+MEDIASTREAMER_CONF_OPTS += --disable-sdl
endif
# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support
# is only used for SDL output)
ifeq ($(BR2_PACKAGE_SDL_X11),y)
-MEDIASTREAMER_CONF_OPT += --enable-x11
+MEDIASTREAMER_CONF_OPTS += --enable-x11
else
-MEDIASTREAMER_CONF_OPT += --disable-x11
+MEDIASTREAMER_CONF_OPTS += --disable-x11
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
-MEDIASTREAMER_CONF_OPT += --enable-xv
+MEDIASTREAMER_CONF_OPTS += --enable-xv
MEDIASTREAMER_DEPENDENCIES += xlib_libXv
else
-MEDIASTREAMER_CONF_OPT += --disable-xv
+MEDIASTREAMER_CONF_OPTS += --disable-xv
endif
ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
-MEDIASTREAMER_CONF_OPT += --enable-theora
+MEDIASTREAMER_CONF_OPTS += --enable-theora
MEDIASTREAMER_DEPENDENCIES += libtheora
else
-MEDIASTREAMER_CONF_OPT += --disable-theora
+MEDIASTREAMER_CONF_OPTS += --disable-theora
endif
ifeq ($(BR2_PACKAGE_LIBV4L),y)
-MEDIASTREAMER_CONF_OPT += --enable-libv4l1 --enable-libv4l2
+MEDIASTREAMER_CONF_OPTS += --enable-libv4l1 --enable-libv4l2
MEDIASTREAMER_DEPENDENCIES += libv4l
else
-MEDIASTREAMER_CONF_OPT += --disable-libv4l1 --disable-libv4l2
+MEDIASTREAMER_CONF_OPTS += --disable-libv4l1 --disable-libv4l2
endif
$(eval $(autotools-package))
diff --git a/package/memcached/memcached.mk b/package/memcached/memcached.mk
--- a/package/memcached/memcached.mk
+++ b/package/memcached/memcached.mk
@@ -8,7 +8,7 @@
MEMCACHED_SITE = http://www.memcached.org/files
MEMCACHED_DEPENDENCIES = libevent
MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-MEMCACHED_CONF_OPT = --disable-coverage --disable-docs
+MEMCACHED_CONF_OPTS = --disable-coverage --disable-docs
MEMCACHED_LICENSE = BSD-3c
MEMCACHED_LICENSE_FILES = COPYING
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -34,22 +34,22 @@
xlib_libXdamage \
xlib_libXfixes \
libxcb
-MESA3D_CONF_OPT += --enable-glx
+MESA3D_CONF_OPTS += --enable-glx
# quote from mesa3d configure "Building xa requires at least one non swrast gallium driver."
ifneq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU)$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA),)
-MESA3D_CONF_OPT += --enable-xa
+MESA3D_CONF_OPTS += --enable-xa
else
-MESA3D_CONF_OPT += --disable-xa
+MESA3D_CONF_OPTS += --disable-xa
endif
else
-MESA3D_CONF_OPT += \
+MESA3D_CONF_OPTS += \
--disable-glx \
--disable-xa
endif
ifeq ($(BR2_PREFER_STATIC_LIB),)
# fix for "configure: error: Cannot use static libraries for DRI drivers"
-MESA3D_CONF_OPT += --disable-static
+MESA3D_CONF_OPTS += --disable-static
endif
# Drivers
@@ -65,29 +65,29 @@
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
ifeq ($(MESA3D_GALLIUM_DRIVERS-y),)
-MESA3D_CONF_OPT += \
+MESA3D_CONF_OPTS += \
--without-gallium-drivers
else
-MESA3D_CONF_OPT += \
+MESA3D_CONF_OPTS += \
--enable-shared-glapi \
--with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y))
endif
ifeq ($(MESA3D_DRI_DRIVERS-y),)
-MESA3D_CONF_OPT += \
+MESA3D_CONF_OPTS += \
--without-dri-drivers
else
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto
-MESA3D_CONF_OPT += --enable-dri3
+MESA3D_CONF_OPTS += --enable-dri3
else
-MESA3D_CONF_OPT += --disable-dri3
+MESA3D_CONF_OPTS += --disable-dri3
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y)
MESA3D_DEPENDENCIES += xlib_libXxf86vm
endif
MESA3D_PROVIDES += libgl
-MESA3D_CONF_OPT += \
+MESA3D_CONF_OPTS += \
--enable-dri \
--enable-shared-glapi \
--with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y))
@@ -98,7 +98,7 @@
# Always enable OpenGL:
# - it is needed for GLES (mesa3d's ./configure is a bit weird)
# - but if no DRI driver is enabled, then libgl is not built
-MESA3D_CONF_OPT += --enable-opengl
+MESA3D_CONF_OPTS += --enable-opengl
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
MESA3D_PROVIDES += libegl
@@ -112,20 +112,20 @@
ifeq ($(BR2_PACKAGE_XORG7),y)
MESA3D_EGL_PLATFORMS += x11
endif
-MESA3D_CONF_OPT += \
+MESA3D_CONF_OPTS += \
--enable-gbm \
--enable-egl \
--with-egl-platforms=$(subst $(space),$(comma),$(MESA3D_EGL_PLATFORMS))
else
-MESA3D_CONF_OPT += \
+MESA3D_CONF_OPTS += \
--disable-egl
endif
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y)
MESA3D_PROVIDES += libgles
-MESA3D_CONF_OPT += --enable-gles1 --enable-gles2
+MESA3D_CONF_OPTS += --enable-gles1 --enable-gles2
else
-MESA3D_CONF_OPT += --disable-gles1 --disable-gles2
+MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2
endif
$(eval $(autotools-package))
diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk
--- a/package/metacity/metacity.mk
+++ b/package/metacity/metacity.mk
@@ -12,7 +12,7 @@
METACITY_LICENSE = GPLv2+
METACITY_LICENSE_FILES = COPYING
-METACITY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+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
diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk
--- a/package/minidlna/minidlna.mk
+++ b/package/minidlna/minidlna.mk
@@ -20,7 +20,7 @@
MINIDLNA_CONF_ENV = \
LIBS='-lavformat -lavcodec -lavutil -logg -lz -lpthread -lm'
else
-MINIDLNA_CONF_OPT = \
+MINIDLNA_CONF_OPTS = \
--disable-static
endif
diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk
--- a/package/modem-manager/modem-manager.mk
+++ b/package/modem-manager/modem-manager.mk
@@ -14,16 +14,16 @@
ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
MODEM_MANAGER_DEPENDENCIES += libqmi
- MODEM_MANAGER_CONF_OPT += --with-qmi
+ MODEM_MANAGER_CONF_OPTS += --with-qmi
else
- MODEM_MANAGER_CONF_OPT += --without-qmi
+ MODEM_MANAGER_CONF_OPTS += --without-qmi
endif
ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y)
MODEM_MANAGER_DEPENDENCIES += libmbim
- MODEM_MANAGER_CONF_OPT += --with-mbim
+ MODEM_MANAGER_CONF_OPTS += --with-mbim
else
- MODEM_MANAGER_CONF_OPT += --without-mbim
+ MODEM_MANAGER_CONF_OPTS += --without-mbim
endif
$(eval $(autotools-package))
diff --git a/package/monit/monit.mk b/package/monit/monit.mk
--- a/package/monit/monit.mk
+++ b/package/monit/monit.mk
@@ -22,20 +22,20 @@
libmonit_cv_setjmp_available=yes \
libmonit_cv_vsnprintf_c99_conformant=yes
-MONIT_CONF_OPT += \
+MONIT_CONF_OPTS += \
--without-pam
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MONIT_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr
+MONIT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
MONIT_DEPENDENCIES += openssl
else
-MONIT_CONF_OPT += --without-ssl
+MONIT_CONF_OPTS += --without-ssl
endif
ifeq ($(BR2_LARGEFILE),y)
-MONIT_CONF_OPT += --with-largefiles
+MONIT_CONF_OPTS += --with-largefiles
else
-MONIT_CONF_OPT += --without-largefiles
+MONIT_CONF_OPTS += --without-largefiles
endif
$(eval $(autotools-package))
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -16,163 +16,163 @@
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
MPD_DEPENDENCIES += avahi
else
-MPD_CONF_OPT += --with-zeroconf=no
+MPD_CONF_OPTS += --with-zeroconf=no
endif
ifeq ($(BR2_PACKAGE_MPD_ALSA),y)
MPD_DEPENDENCIES += alsa-lib
-MPD_CONF_OPT += --enable-alsa
+MPD_CONF_OPTS += --enable-alsa
else
-MPD_CONF_OPT += --disable-alsa
+MPD_CONF_OPTS += --disable-alsa
endif
ifeq ($(BR2_PACKAGE_MPD_AO),y)
MPD_DEPENDENCIES += libao
-MPD_CONF_OPT += --enable-ao
+MPD_CONF_OPTS += --enable-ao
else
-MPD_CONF_OPT += --disable-ao
+MPD_CONF_OPTS += --disable-ao
endif
ifeq ($(BR2_PACKAGE_MPD_AUDIOFILE),y)
MPD_DEPENDENCIES += audiofile
-MPD_CONF_OPT += --enable-audiofile
+MPD_CONF_OPTS += --enable-audiofile
else
-MPD_CONF_OPT += --disable-audiofile
+MPD_CONF_OPTS += --disable-audiofile
endif
ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y)
MPD_DEPENDENCIES += pulseaudio
-MPD_CONF_OPT += --enable-pulse
+MPD_CONF_OPTS += --enable-pulse
else
-MPD_CONF_OPT += --disable-pulse
+MPD_CONF_OPTS += --disable-pulse
endif
ifeq ($(BR2_PACKAGE_MPD_BZIP2),y)
MPD_DEPENDENCIES += bzip2
-MPD_CONF_OPT += --enable-bzip2
+MPD_CONF_OPTS += --enable-bzip2
else
-MPD_CONF_OPT += --disable-bzip2
+MPD_CONF_OPTS += --disable-bzip2
endif
ifeq ($(BR2_PACKAGE_MPD_FAAD2),y)
MPD_DEPENDENCIES += faad2
-MPD_CONF_OPT += --enable-aac
+MPD_CONF_OPTS += --enable-aac
else
-MPD_CONF_OPT += --disable-aac
+MPD_CONF_OPTS += --disable-aac
endif
ifeq ($(BR2_PACKAGE_MPD_FLAC),y)
MPD_DEPENDENCIES += flac
-MPD_CONF_OPT += --enable-flac
+MPD_CONF_OPTS += --enable-flac
else
-MPD_CONF_OPT += --disable-flac
+MPD_CONF_OPTS += --disable-flac
endif
ifeq ($(BR2_PACKAGE_MPD_CURL),y)
MPD_DEPENDENCIES += libcurl
-MPD_CONF_OPT += --enable-curl
+MPD_CONF_OPTS += --enable-curl
else
-MPD_CONF_OPT += --disable-curl
+MPD_CONF_OPTS += --disable-curl
endif
ifeq ($(BR2_PACKAGE_MPD_LAME),y)
MPD_DEPENDENCIES += lame
-MPD_CONF_OPT += --enable-lame-encoder
+MPD_CONF_OPTS += --enable-lame-encoder
else
-MPD_CONF_OPT += --disable-lame-encoder
+MPD_CONF_OPTS += --disable-lame-encoder
endif
ifeq ($(BR2_PACKAGE_MPD_LIBSAMPLERATE),y)
MPD_DEPENDENCIES += libsamplerate
-MPD_CONF_OPT += --enable-lsr
+MPD_CONF_OPTS += --enable-lsr
else
-MPD_CONF_OPT += --disable-lsr
+MPD_CONF_OPTS += --disable-lsr
endif
ifeq ($(BR2_PACKAGE_MPD_LIBSNDFILE),y)
MPD_DEPENDENCIES += libsndfile
-MPD_CONF_OPT += --enable-sndfile
+MPD_CONF_OPTS += --enable-sndfile
else
-MPD_CONF_OPT += --disable-sndfile
+MPD_CONF_OPTS += --disable-sndfile
endif
ifeq ($(BR2_PACKAGE_MPD_OPUS),y)
MPD_DEPENDENCIES += opus libogg
-MPD_CONF_OPT += --enable-opus
+MPD_CONF_OPTS += --enable-opus
else
-MPD_CONF_OPT += --disable-opus
+MPD_CONF_OPTS += --disable-opus
endif
ifeq ($(BR2_PACKAGE_MPD_VORBIS),y)
MPD_DEPENDENCIES += libvorbis
-MPD_CONF_OPT += --enable-vorbis --enable-vorbis-encoder
+MPD_CONF_OPTS += --enable-vorbis --enable-vorbis-encoder
else
-MPD_CONF_OPT += --disable-vorbis --disable-vorbis-encoder
+MPD_CONF_OPTS += --disable-vorbis --disable-vorbis-encoder
endif
ifeq ($(BR2_PACKAGE_MPD_MAD),y)
MPD_DEPENDENCIES += libid3tag libmad
-MPD_CONF_OPT += --enable-mad
+MPD_CONF_OPTS += --enable-mad
else
-MPD_CONF_OPT += --disable-mad
+MPD_CONF_OPTS += --disable-mad
endif
ifeq ($(BR2_PACKAGE_MPD_MPG123),y)
MPD_DEPENDENCIES += libid3tag mpg123
-MPD_CONF_OPT += --enable-mpg123
+MPD_CONF_OPTS += --enable-mpg123
else
-MPD_CONF_OPT += --disable-mpg123
+MPD_CONF_OPTS += --disable-mpg123
endif
ifeq ($(BR2_PACKAGE_MPD_MUSEPACK),y)
MPD_DEPENDENCIES += musepack
-MPD_CONF_OPT += --enable-mpc
+MPD_CONF_OPTS += --enable-mpc
else
-MPD_CONF_OPT += --disable-mpc
+MPD_CONF_OPTS += --disable-mpc
endif
ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y)
MPD_DEPENDENCIES += yajl
-MPD_CONF_OPT += --enable-soundcloud
+MPD_CONF_OPTS += --enable-soundcloud
else
-MPD_CONF_OPT += --disable-soundcloud
+MPD_CONF_OPTS += --disable-soundcloud
endif
ifeq ($(BR2_PACKAGE_MPD_SQLITE),y)
MPD_DEPENDENCIES += sqlite
-MPD_CONF_OPT += --enable-sqlite
+MPD_CONF_OPTS += --enable-sqlite
else
-MPD_CONF_OPT += --disable-sqlite
+MPD_CONF_OPTS += --disable-sqlite
endif
ifneq ($(BR2_PACKAGE_MPD_TCP),y)
-MPD_CONF_OPT += --disable-tcp
+MPD_CONF_OPTS += --disable-tcp
endif
ifeq ($(BR2_PACKAGE_MPD_TREMOR),y)
MPD_DEPENDENCIES += tremor
-MPD_CONF_OPT += --with-tremor
+MPD_CONF_OPTS += --with-tremor
endif
ifeq ($(BR2_PACKAGE_MPD_TWOLAME),y)
MPD_DEPENDENCIES += twolame
-MPD_CONF_OPT += --enable-twolame-encoder
+MPD_CONF_OPTS += --enable-twolame-encoder
else
-MPD_CONF_OPT += --disable-twolame-encoder
+MPD_CONF_OPTS += --disable-twolame-encoder
endif
ifeq ($(BR2_PACKAGE_MPD_WAVPACK),y)
MPD_DEPENDENCIES += wavpack
-MPD_CONF_OPT += --enable-wavpack
+MPD_CONF_OPTS += --enable-wavpack
else
-MPD_CONF_OPT += --disable-wavpack
+MPD_CONF_OPTS += --disable-wavpack
endif
ifeq ($(BR2_PACKAGE_MPD_FFMPEG),y)
MPD_DEPENDENCIES += ffmpeg
-MPD_CONF_OPT += --enable-ffmpeg
+MPD_CONF_OPTS += --enable-ffmpeg
else
-MPD_CONF_OPT += --disable-ffmpeg
+MPD_CONF_OPTS += --disable-ffmpeg
endif
define MPD_INSTALL_EXTRA_FILES
diff --git a/package/mpdecimal/mpdecimal.mk b/package/mpdecimal/mpdecimal.mk
--- a/package/mpdecimal/mpdecimal.mk
+++ b/package/mpdecimal/mpdecimal.mk
@@ -9,7 +9,7 @@
MPDECIMAL_INSTALL_STAGING = YES
MPDECIMAL_LICENSE = BSD-2c
MPDECIMAL_LICENSE_FILES = LICENSE.txt
-MPDECIMAL_CONF_OPT = LD="$(TARGET_CC)"
+MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)"
# On i386, by default, mpdecimal tries to uses <fenv.h> which is not
# available in musl/glibc. So in this case, we tell mpdecimal to use
diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
--- a/package/mpg123/mpg123.mk
+++ b/package/mpg123/mpg123.mk
@@ -7,7 +7,7 @@
MPG123_VERSION = 1.20.1
MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
-MPG123_CONF_OPT = --disable-lfs-alias
+MPG123_CONF_OPTS = --disable-lfs-alias
MPG123_INSTALL_STAGING = YES
MPG123_LICENSE = LGPLv2.1
MPG123_LICENSE_FILES = COPYING
@@ -43,34 +43,34 @@
MPG123_CPU = x86-64
endif
-MPG123_CONF_OPT += --with-cpu=$(MPG123_CPU)
+MPG123_CONF_OPTS += --with-cpu=$(MPG123_CPU)
MPG123_AUDIO = dummy oss
ifeq ($(BR2_PACKAGE_PORTAUDIO),y)
MPG123_AUDIO += portaudio
-MPG123_CONF_OPT += --with-default-audio=portaudio
+MPG123_CONF_OPTS += --with-default-audio=portaudio
MPG123_DEPENDENCIES += portaudio
endif
ifeq ($(BR2_PACKAGE_SDL),y)
MPG123_AUDIO += sdl
-MPG123_CONF_OPT += --with-default-audio=sdl
+MPG123_CONF_OPTS += --with-default-audio=sdl
MPG123_DEPENDENCIES += sdl
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
MPG123_AUDIO += alsa
-MPG123_CONF_OPT += --with-default-audio=alsa
+MPG123_CONF_OPTS += --with-default-audio=alsa
MPG123_DEPENDENCIES += alsa-lib
endif
-MPG123_CONF_OPT += --with-audio=$(shell echo $(MPG123_AUDIO) | tr ' ' ,)
+MPG123_CONF_OPTS += --with-audio=$(shell echo $(MPG123_AUDIO) | tr ' ' ,)
ifeq ($(BR2_PACKAGE_LIBTOOL),y)
MPG123_DEPENDENCIES += libtool
# .la files gets stripped , so directly load .so files rather than .la
-MPG123_CONF_OPT += --with-modules --with-module-suffix=.so
+MPG123_CONF_OPTS += --with-modules --with-module-suffix=.so
endif
$(eval $(autotools-package))
diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk
--- a/package/msmtp/msmtp.mk
+++ b/package/msmtp/msmtp.mk
@@ -13,20 +13,20 @@
MSMTP_DEPENDENCIES += host-pkgconf
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MSMTP_CONF_OPT += --with-ssl=openssl
+MSMTP_CONF_OPTS += --with-ssl=openssl
MSMTP_DEPENDENCIES += openssl
ifeq ($(BR2_PREFER_STATIC_LIB),y)
# openssl uses zlib, so we need to explicitly link with it when static
MSMTP_CONF_ENV += LIBS=-lz
endif
else ifeq ($(BR2_PACKAGE_GNUTLS),y)
-MSMTP_CONF_OPT += --with-ssl=gnutls
+MSMTP_CONF_OPTS += --with-ssl=gnutls
MSMTP_DEPENDENCIES += gnutls
else
-MSMTP_CONF_OPT += --with-ssl=no
+MSMTP_CONF_OPTS += --with-ssl=no
endif
-MSMTP_CONF_OPT += \
+MSMTP_CONF_OPTS += \
--without-libidn \
--without-libgsasl \
--without-gnome-keyring
diff --git a/package/mtools/mtools.mk b/package/mtools/mtools.mk
--- a/package/mtools/mtools.mk
+++ b/package/mtools/mtools.mk
@@ -10,7 +10,7 @@
MTOOLS_LICENSE = GPLv3+
MTOOLS_LICENSE_FILES = COPYING
MTOOLS_CONF_ENV = ac_cv_func_setpgrp_void=yes
-MTOOLS_CONF_OPT = --without-x
+MTOOLS_CONF_OPTS = --without-x
# link with iconv if enabled
ifeq ($(BR2_PACKAGE_LIBICONV),y)
diff --git a/package/mtr/mtr.mk b/package/mtr/mtr.mk
--- a/package/mtr/mtr.mk
+++ b/package/mtr/mtr.mk
@@ -6,7 +6,7 @@
MTR_VERSION = 0.85
MTR_SITE = ftp://ftp.bitwizard.nl/mtr
-MTR_CONF_OPT = --without-gtk --without-glib
+MTR_CONF_OPTS = --without-gtk --without-glib
MTR_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_NCURSES),ncurses)
MTR_LICENSE = GPLv2
MTR_LICENSE_FILES = COPYING
diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk
--- a/package/mutt/mutt.mk
+++ b/package/mutt/mutt.mk
@@ -9,36 +9,36 @@
MUTT_LICENSE = GPLv2+
MUTT_LICENSE_FILES = GPL
MUTT_DEPENDENCIES = ncurses
-MUTT_CONF_OPT = --disable-smtp
+MUTT_CONF_OPTS = --disable-smtp
MUTT_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_LIBICONV),y)
MUTT_DEPENDENCIES += libiconv
-MUTT_CONF_OPT += --enable-iconv
+MUTT_CONF_OPTS += --enable-iconv
endif
ifeq ($(BR2_PACKAGE_MUTT_IMAP),y)
-MUTT_CONF_OPT += --enable-imap
+MUTT_CONF_OPTS += --enable-imap
else
-MUTT_CONF_OPT += --disable-imap
+MUTT_CONF_OPTS += --disable-imap
endif
ifeq ($(BR2_PACKAGE_MUTT_POP3),y)
-MUTT_CONF_OPT += --enable-pop
+MUTT_CONF_OPTS += --enable-pop
else
-MUTT_CONF_OPT += --disable-pop
+MUTT_CONF_OPTS += --disable-pop
endif
# SSL support is only used by imap or pop3 module
ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),)
ifeq ($(BR2_PACKAGE_OPENSSL),y)
MUTT_DEPENDENCIES += openssl
-MUTT_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr
+MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
else
-MUTT_CONF_OPT += --without-ssl
+MUTT_CONF_OPTS += --without-ssl
endif
else
-MUTT_CONF_OPT += --without-ssl
+MUTT_CONF_OPTS += --without-ssl
endif
$(eval $(autotools-package))
diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk
--- a/package/mysql/mysql.mk
+++ b/package/mysql/mysql.mk
@@ -23,7 +23,7 @@
ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \
mysql_cv_new_rl_interface=yes
-MYSQL_CONF_OPT = \
+MYSQL_CONF_OPTS = \
--without-ndb-binlog \
--without-docs \
--without-man \
@@ -45,11 +45,11 @@
MYSQL_DEPENDENCIES += host-mysql host-bison
HOST_MYSQL_DEPENDENCIES = host-zlib
-HOST_MYSQL_CONF_OPT = \
+HOST_MYSQL_CONF_OPTS = \
--with-embedded-server \
--disable-mysql-maintainer-mode
-MYSQL_CONF_OPT += \
+MYSQL_CONF_OPTS += \
--localstatedir=/var/mysql \
--with-atomic-ops=up \
--with-embedded-server \
@@ -69,9 +69,9 @@
# Debugging is only available for the server, so no need for
# this if-block outside of the server if-block
ifeq ($(BR2_ENABLE_DEBUG),y)
-MYSQL_CONF_OPT += --with-debug=full
+MYSQL_CONF_OPTS += --with-debug=full
else
-MYSQL_CONF_OPT += --without-debug
+MYSQL_CONF_OPTS += --without-debug
endif
define HOST_MYSQL_BUILD_CMDS
@@ -104,7 +104,7 @@
endef
else
-MYSQL_CONF_OPT += \
+MYSQL_CONF_OPTS += \
--without-server
endif
diff --git a/package/nano/nano.mk b/package/nano/nano.mk
--- a/package/nano/nano.mk
+++ b/package/nano/nano.mk
@@ -9,7 +9,7 @@
NANO_SITE = http://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR)
NANO_LICENSE = GPLv3+
NANO_LICENSE_FILES = COPYING
-NANO_CONF_OPT = --without-slang
+NANO_CONF_OPTS = --without-slang
NANO_DEPENDENCIES = ncurses
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
@@ -26,7 +26,7 @@
endif
ifeq ($(BR2_PACKAGE_NANO_TINY),y)
- NANO_CONF_OPT += --enable-tiny
+ NANO_CONF_OPTS += --enable-tiny
define NANO_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano
endef
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -7,7 +7,7 @@
NBD_VERSION = 3.8
NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz
NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
-NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
+NBD_CONF_OPTS = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
NBD_DEPENDENCIES = libglib2
NBD_LICENSE = GPLv2
NBD_LICENSE_FILES = COPYING
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -14,7 +14,7 @@
NCURSES_LICENSE_FILES = README
NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)5-config
-NCURSES_CONF_OPT = \
+NCURSES_CONF_OPTS = \
$(if $(BR2_PREFER_STATIC_LIB),--without-shared,--with-shared) \
--without-cxx \
--without-cxx-binding \
@@ -37,7 +37,7 @@
endif
ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
-NCURSES_CONF_OPT += --enable-widec
+NCURSES_CONF_OPTS += --enable-widec
NCURSES_LIB_SUFFIX = w
ifeq ($(BR2_PREFER_STATIC_LIB),y)
@@ -77,7 +77,7 @@
NCURSES_LIBS-$(BR2_PACKAGE_NCURSES_TARGET_FORM) += libform
ifneq ($(BR2_ENABLE_DEBUG),y)
-NCURSES_CONF_OPT += --without-debug
+NCURSES_CONF_OPTS += --without-debug
endif
# ncurses breaks with parallel build, but takes quite a while to
@@ -140,7 +140,7 @@
$(MAKE) -C $(@D)/progs tic
endef
-HOST_NCURSES_CONF_OPT = \
+HOST_NCURSES_CONF_OPTS = \
--with-shared --without-gpm \
--without-manpages \
--without-cxx \
diff --git a/package/ndisc6/ndisc6.mk b/package/ndisc6/ndisc6.mk
--- a/package/ndisc6/ndisc6.mk
+++ b/package/ndisc6/ndisc6.mk
@@ -8,7 +8,7 @@
NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2
NDISC6_SITE = http://www.remlab.net/files/ndisc6
NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
-NDISC6_CONF_OPT = --localstatedir=/var --disable-rpath --disable-suid-install
+NDISC6_CONF_OPTS = --localstatedir=/var --disable-rpath --disable-suid-install
NDISC6_LICENSE = GPLv2 or GPLv3
NDISC6_LICENSE_FILES = COPYING
diff --git a/package/ne10/ne10.mk b/package/ne10/ne10.mk
--- a/package/ne10/ne10.mk
+++ b/package/ne10/ne10.mk
@@ -9,10 +9,10 @@
NE10_LICENSE = BSD-3c or Apache-2.0
NE10_LICENSE_FILES = doc/LICENSE
-NE10_CONF_OPT = -DGNULINUX_PLATFORM=ON
+NE10_CONF_OPTS = -DGNULINUX_PLATFORM=ON
ifeq ($(BR2_PREFER_STATIC_LIB),)
-NE10_CONF_OPT += \
+NE10_CONF_OPTS += \
-DNE10_BUILD_SHARED=ON
endif
diff --git a/package/neard/neard.mk b/package/neard/neard.mk
--- a/package/neard/neard.mk
+++ b/package/neard/neard.mk
@@ -12,10 +12,10 @@
NEARD_AUTORECONF = YES
NEARD_DEPENDENCIES = host-pkgconf dbus libglib2 libnl
-NEARD_CONF_OPT = --disable-traces
+NEARD_CONF_OPTS = --disable-traces
ifeq ($(BR2_PACKAGE_NEARD_TOOLS),y)
- NEARD_CONF_OPT += --enable-tools
+ NEARD_CONF_OPTS += --enable-tools
endif
define NEARD_INSTALL_INIT_SYSV
diff --git a/package/neon/neon.mk b/package/neon/neon.mk
--- a/package/neon/neon.mk
+++ b/package/neon/neon.mk
@@ -9,42 +9,42 @@
NEON_LICENSE = LGPLv2+ (library), GPLv2+ (manual and tests)
NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README
NEON_INSTALL_STAGING = YES
-NEON_CONF_OPT = --without-gssapi --disable-rpath
+NEON_CONF_OPTS = --without-gssapi --disable-rpath
NEON_CONFIG_SCRIPTS = neon-config
NEON_DEPENDENCIES = host-pkgconf
ifeq ($(BR2_PACKAGE_NEON_ZLIB),y)
-NEON_CONF_OPT += --with-zlib=$(STAGING_DIR)
+NEON_CONF_OPTS += --with-zlib=$(STAGING_DIR)
NEON_DEPENDENCIES += zlib
else
-NEON_CONF_OPT += --without-zlib
+NEON_CONF_OPTS += --without-zlib
endif
ifeq ($(BR2_PACKAGE_NEON_SSL),y)
-NEON_CONF_OPT += --with-ssl
+NEON_CONF_OPTS += --with-ssl
NEON_DEPENDENCIES += openssl
else
-NEON_CONF_OPT += --without-ssl
+NEON_CONF_OPTS += --without-ssl
endif
ifeq ($(BR2_PACKAGE_NEON_EXPAT),y)
-NEON_CONF_OPT += --with-expat=$(STAGING_DIR)/usr/lib/libexpat.la
+NEON_CONF_OPTS += --with-expat=$(STAGING_DIR)/usr/lib/libexpat.la
NEON_DEPENDENCIES += expat
else
-NEON_CONF_OPT += --with-expat=no
+NEON_CONF_OPTS += --with-expat=no
endif
ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y)
-NEON_CONF_OPT += --with-libxml2=yes
+NEON_CONF_OPTS += --with-libxml2=yes
NEON_CONF_ENV += ac_cv_prog_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config
NEON_DEPENDENCIES += libxml2
else
-NEON_CONF_OPT += --with-libxml2=no
+NEON_CONF_OPTS += --with-libxml2=no
endif
ifeq ($(BR2_PACKAGE_NEON_EXPAT)$(BR2_PACKAGE_NEON_LIBXML2),)
# webdav needs xml support
-NEON_CONF_OPT += --disable-webdav
+NEON_CONF_OPTS += --disable-webdav
endif
$(eval $(autotools-package))
diff --git a/package/netatalk/netatalk.mk b/package/netatalk/netatalk.mk
--- a/package/netatalk/netatalk.mk
+++ b/package/netatalk/netatalk.mk
@@ -17,7 +17,7 @@
# Don't run ldconfig!
NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \
ac_cv_path_NETA_LDCONFIG=""
-NETATALK_CONF_OPT += --with-cnid-cdb-backend \
+NETATALK_CONF_OPTS += --with-cnid-cdb-backend \
--with-bdb=$(STAGING_DIR)/usr \
--with-ssl-dir=$(STAGING_DIR)/usr \
--with-libgcrypt-dir=$(STAGING_DIR)/usr \
@@ -32,22 +32,22 @@
ifeq ($(BR2_PACKAGE_ACL),y)
NETATALK_DEPENDENCIES += acl
else
- NETATALK_CONF_OPT += --with-acls=no
+ NETATALK_CONF_OPTS += --with-acls=no
endif
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
NETATALK_DEPENDENCIES += avahi
- NETATALK_CONF_OPT += --enable-zeroconf=$(STAGING_DIR)/usr
+ NETATALK_CONF_OPTS += --enable-zeroconf=$(STAGING_DIR)/usr
else
- NETATALK_CONF_OPT += --disable-zeroconf
+ NETATALK_CONF_OPTS += --disable-zeroconf
endif
ifeq ($(BR2_PACKAGE_CUPS),y)
NETATALK_DEPENDENCIES += cups
NETATALK_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config
- NETATALK_CONF_OPT += --enable-cups
+ NETATALK_CONF_OPTS += --enable-cups
else
- NETATALK_CONF_OPT += --disable-cups
+ NETATALK_CONF_OPTS += --disable-cups
endif
define NETATALK_INSTALL_EXTRA_FILES
diff --git a/package/netperf/netperf.mk b/package/netperf/netperf.mk
--- a/package/netperf/netperf.mk
+++ b/package/netperf/netperf.mk
@@ -7,7 +7,7 @@
NETPERF_VERSION = 2.6.0
NETPERF_SITE = ftp://ftp.netperf.org/netperf
NETPERF_CONF_ENV = ac_cv_func_setpgrp_void=set
-NETPERF_CONF_OPT = --enable-demo=yes
+NETPERF_CONF_OPTS = --enable-demo=yes
NETPERF_LICENSE = netperf license
NETPERF_LICENSE_FILES = COPYING
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -11,7 +11,7 @@
NETSNMP_LICENSE_FILES = COPYING
NETSNMP_INSTALL_STAGING = YES
NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=yes
-NETSNMP_CONF_OPT = --with-persistent-directory=/var/lib/snmp \
+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 \
@@ -32,31 +32,31 @@
NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX
ifeq ($(BR2_ENDIAN),"BIG")
- NETSNMP_CONF_OPT += --with-endianness=big
+ NETSNMP_CONF_OPTS += --with-endianness=big
else
- NETSNMP_CONF_OPT += --with-endianness=little
+ NETSNMP_CONF_OPTS += --with-endianness=little
endif
# OpenSSL
ifeq ($(BR2_PACKAGE_OPENSSL),y)
NETSNMP_DEPENDENCIES += openssl
- NETSNMP_CONF_OPT += \
+ NETSNMP_CONF_OPTS += \
--with-openssl=$(STAGING_DIR)/usr/include/openssl
ifeq ($(BR2_PREFER_STATIC_LIB),y)
# openssl uses zlib, so we need to explicitly link with it when static
NETSNMP_CONF_ENV += LIBS=-lz
endif
else
- NETSNMP_CONF_OPT += --without-openssl
+ NETSNMP_CONF_OPTS += --without-openssl
endif
ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y)
- NETSNMP_CONF_OPT += --disable-mib-loading
- NETSNMP_CONF_OPT += --disable-mibs
+ NETSNMP_CONF_OPTS += --disable-mib-loading
+ NETSNMP_CONF_OPTS += --disable-mibs
endif
ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING),y)
- NETSNMP_CONF_OPT += --disable-debugging
+ NETSNMP_CONF_OPTS += --disable-debugging
endif
# Remove IPv6 MIBs if there's no IPv6
diff --git a/package/nettle/nettle.mk b/package/nettle/nettle.mk
--- a/package/nettle/nettle.mk
+++ b/package/nettle/nettle.mk
@@ -12,18 +12,18 @@
NETTLE_LICENSE_FILES = COPYING.LIB
# don't include openssl support for (unused) examples as it has problems
# with static linking
-NETTLE_CONF_OPT = --disable-openssl
+NETTLE_CONF_OPTS = --disable-openssl
# ARM assembly requires v6+ ISA
ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_arm926t)$(BR2_fa526)$(BR2_strongarm)$(BR2_xscale)$(BR2_iwmmxt),y)
-NETTLE_CONF_OPT += --disable-assembler
+NETTLE_CONF_OPTS += --disable-assembler
endif
# ARM NEON, requires binutils 2.21+
ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_TOOLCHAIN_BUILDROOT)$(BR2_BINUTILS_VERSION_2_20_1),yy)
-NETTLE_CONF_OPT += --enable-arm-neon
+NETTLE_CONF_OPTS += --enable-arm-neon
else
-NETTLE_CONF_OPT += --disable-arm-neon
+NETTLE_CONF_OPTS += --disable-arm-neon
endif
define NETTLE_DITCH_DEBUGGING_CFLAGS
diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk
--- a/package/network-manager/network-manager.mk
+++ b/package/network-manager/network-manager.mk
@@ -23,7 +23,7 @@
ac_cv_file__etc_SuSE_release=no
-NETWORK_MANAGER_CONF_OPT = \
+NETWORK_MANAGER_CONF_OPTS = \
--mandir=$(STAGING_DIR)/usr/man/ \
--disable-tests \
--disable-qt \
@@ -38,36 +38,36 @@
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
NETWORK_MANAGER_DEPENDENCIES += newt
- NETWORK_MANAGER_CONF_OPT += --with-nmtui=yes
+ NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes
else
- NETWORK_MANAGER_CONF_OPT += --with-nmtui=no
+ NETWORK_MANAGER_CONF_OPTS += --with-nmtui=no
endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y)
NETWORK_MANAGER_DEPENDENCIES += pppd
- NETWORK_MANAGER_CONF_OPT += --enable-ppp
+ NETWORK_MANAGER_CONF_OPTS += --enable-ppp
else
- NETWORK_MANAGER_CONF_OPT += --disable-ppp
+ NETWORK_MANAGER_CONF_OPTS += --disable-ppp
endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y)
NETWORK_MANAGER_DEPENDENCIES += modem-manager
- NETWORK_MANAGER_CONF_OPT += --with-modem-manager-1
+ NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1
else
- NETWORK_MANAGER_CONF_OPT += --without-modem-manager-1
+ NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1
endif
ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
-NETWORK_MANAGER_CONF_OPT += --with-dhclient=/usr/sbin/dhclient
+NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/usr/sbin/dhclient
endif
ifeq ($(BR2_PACKAGE_DHCPCD),y)
-NETWORK_MANAGER_CONF_OPT += --with-dhcpcd=/usr/sbin/dhcpcd
+NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/usr/sbin/dhcpcd
endif
# uClibc by default doesn't have backtrace support, so don't use it
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
-NETWORK_MANAGER_CONF_OPT += --disable-crashtrace
+NETWORK_MANAGER_CONF_OPTS += --disable-crashtrace
endif
define NETWORK_MANAGER_INSTALL_INIT_SYSV
diff --git a/package/newt/newt.mk b/package/newt/newt.mk
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -9,7 +9,7 @@
NEWT_INSTALL_STAGING = YES
NEWT_DEPENDENCIES = popt slang \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-NEWT_CONF_OPT = --without-python --without-tcl
+NEWT_CONF_OPTS = --without-python --without-tcl
NEWT_MAKE = $(MAKE1)
NEWT_LICENSE = GPLv2
NEWT_LICENSE_FILES = COPYING
diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk
--- a/package/nfs-utils/nfs-utils.mk
+++ b/package/nfs-utils/nfs-utils.mk
@@ -14,7 +14,7 @@
NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no
-NFS_UTILS_CONF_OPT = \
+NFS_UTILS_CONF_OPTS = \
--disable-nfsv4 \
--disable-nfsv41 \
--disable-gss \
@@ -28,10 +28,10 @@
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
-NFS_UTILS_CONF_OPT += --enable-tirpc --with-tirpcinclude=$(STAGING_DIR)/usr/include/tirpc/
+NFS_UTILS_CONF_OPTS += --enable-tirpc --with-tirpcinclude=$(STAGING_DIR)/usr/include/tirpc/
NFS_UTILS_DEPENDENCIES += libtirpc
else
-NFS_UTILS_CONF_OPT += --disable-tirpc
+NFS_UTILS_CONF_OPTS += --disable-tirpc
endif
define NFS_UTILS_INSTALL_FIXUP
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -17,7 +17,7 @@
endif
NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)"
-NGREP_CONF_OPT = \
+NGREP_CONF_OPTS = \
--with-pcap-includes=$(STAGING_DIR)/usr/include \
--enable-pcre \
--with-pcre=$(STAGING_DIR)/usr \
diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
--- a/package/nmap/nmap.mk
+++ b/package/nmap/nmap.mk
@@ -8,24 +8,24 @@
NMAP_SITE = http://nmap.org/dist
NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2
NMAP_DEPENDENCIES = libpcap pcre
-NMAP_CONF_OPT = --without-liblua --without-zenmap \
+NMAP_CONF_OPTS = --without-liblua --without-zenmap \
--with-libdnet=included --with-liblinear=included \
--with-libpcre="$(STAGING_DIR)/usr" --without-ncat
NMAP_LICENSE = GPLv2
NMAP_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-NMAP_CONF_OPT += --with-openssl="$(STAGING_DIR)/usr"
+NMAP_CONF_OPTS += --with-openssl="$(STAGING_DIR)/usr"
NMAP_DEPENDENCIES += openssl
else
-NMAP_CONF_OPT += --without-openssl
+NMAP_CONF_OPTS += --without-openssl
endif
# ndiff only works with python2.x
ifeq ($(BR2_PACKAGE_PYTHON),y)
NMAP_DEPENDENCIES += python
else
-NMAP_CONF_OPT += --without-ndiff
+NMAP_CONF_OPTS += --without-ndiff
endif
$(eval $(autotools-package))
diff --git a/package/nss-mdns/nss-mdns.mk b/package/nss-mdns/nss-mdns.mk
--- a/package/nss-mdns/nss-mdns.mk
+++ b/package/nss-mdns/nss-mdns.mk
@@ -6,7 +6,7 @@
NSS_MDNS_VERSION = 0.10
NSS_MDNS_SITE = http://0pointer.de/lennart/projects/nss-mdns
-NSS_MDNS_CONF_OPT = --localstatedir=/var
+NSS_MDNS_CONF_OPTS = --localstatedir=/var
NSS_MDNS_LICENSE = LGPLv2.1+
NSS_MDNS_LICENSE_FILES = LICENSE
diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk
--- a/package/ntfs-3g/ntfs-3g.mk
+++ b/package/ntfs-3g/ntfs-3g.mk
@@ -7,14 +7,14 @@
NTFS_3G_VERSION = 2014.2.15
NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
NTFS_3G_SITE = http://tuxera.com/opensource
-NTFS_3G_CONF_OPT = --disable-ldconfig
+NTFS_3G_CONF_OPTS = --disable-ldconfig
NTFS_3G_INSTALL_STAGING = YES
NTFS_3G_DEPENDENCIES = host-pkgconf
NTFS_3G_LICENSE = GPLv2+ LGPLv2+
NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB
ifeq ($(BR2_PACKAGE_LIBFUSE),y)
- NTFS_3G_CONF_OPT += --with-fuse=external
+ NTFS_3G_CONF_OPTS += --with-fuse=external
NTFS_3G_DEPENDENCIES += libfuse
endif
@@ -24,12 +24,12 @@
ifeq ($(BR2_PACKAGE_NTFS_3G_ENCRYPTED),y)
NTFS_3G_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
- NTFS_3G_CONF_OPT += --enable-crypto
+ NTFS_3G_CONF_OPTS += --enable-crypto
NTFS_3G_DEPENDENCIES += gnutls libgcrypt
endif
ifneq ($(BR2_PACKAGE_NTFS_3G_NTFSPROGS),y)
- NTFS_3G_CONF_OPT += --disable-ntfsprogs
+ NTFS_3G_CONF_OPTS += --disable-ntfsprogs
endif
$(eval $(autotools-package))
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -15,23 +15,23 @@
NTP_CONF_ENV += isc_cv_have_in6addr_any=no
endif
-NTP_CONF_OPT = --with-shared \
+NTP_CONF_OPTS = --with-shared \
--program-transform-name=s,,, \
--disable-tickadj
ifeq ($(BR2_PACKAGE_OPENSSL),y)
- NTP_CONF_OPT += --with-crypto
+ NTP_CONF_OPTS += --with-crypto
NTP_DEPENDENCIES += openssl
else
- NTP_CONF_OPT += --without-crypto
+ NTP_CONF_OPTS += --without-crypto
endif
ifeq ($(BR2_PACKAGE_NTP_NTPSNMPD),y)
- NTP_CONF_OPT += \
+ NTP_CONF_OPTS += \
--with-net-snmp-config=$(STAGING_DIR)/usr/bin/net-snmp-config
NTP_DEPENDENCIES += netsnmp
else
- NTP_CONF_OPT += --without-ntpsnmpd
+ NTP_CONF_OPTS += --without-ntpsnmpd
endif
define NTP_PATCH_FIXUPS
diff --git a/package/nut/nut.mk b/package/nut/nut.mk
--- a/package/nut/nut.mk
+++ b/package/nut/nut.mk
@@ -16,7 +16,7 @@
# Put the PID files in a read-write place (/var/run is a tmpfs)
# since the default location (/var/state/ups) maybe readonly.
-NUT_CONF_OPT = \
+NUT_CONF_OPTS = \
--with-altpidpath=/var/run/upsd \
--without-hal
@@ -30,60 +30,60 @@
endif
ifeq ($(call qstrip,$(BR2_PACKAGE_NUT_DRIVERS)),)
-NUT_CONF_OPT += --with-drivers=all
+NUT_CONF_OPTS += --with-drivers=all
else
-NUT_CONF_OPT += --with-drivers=$(BR2_PACKAGE_NUT_DRIVERS)
+NUT_CONF_OPTS += --with-drivers=$(BR2_PACKAGE_NUT_DRIVERS)
endif
ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS),yy)
NUT_DEPENDENCIES += avahi dbus
-NUT_CONF_OPT += --with-avahi
+NUT_CONF_OPTS += --with-avahi
else
-NUT_CONF_OPT += --without-avahi
+NUT_CONF_OPTS += --without-avahi
endif
# gd with support for png is required for the CGI
ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
NUT_DEPENDENCIES += gd libpng
-NUT_CONF_OPT += --with-cgi
+NUT_CONF_OPTS += --with-cgi
else
-NUT_CONF_OPT += --without-cgi
+NUT_CONF_OPTS += --without-cgi
endif
# libltdl (libtool) is needed for nut-scanner
ifeq ($(BR2_PACKAGE_LIBTOOL),y)
NUT_DEPENDENCIES += libtool
-NUT_CONF_OPT += --with-libltdl
+NUT_CONF_OPTS += --with-libltdl
else
-NUT_CONF_OPT += --without-libltdl
+NUT_CONF_OPTS += --without-libltdl
endif
ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
NUT_DEPENDENCIES += libusb-compat
-NUT_CONF_OPT += --with-usb
+NUT_CONF_OPTS += --with-usb
else
-NUT_CONF_OPT += --without-usb
+NUT_CONF_OPTS += --without-usb
endif
ifeq ($(BR2_PACKAGE_NEON_EXPAT)$(BR2_PACKAGE_NEON_LIBXML2),y)
NUT_DEPENDENCIES += neon
-NUT_CONF_OPT += --with-neon
+NUT_CONF_OPTS += --with-neon
else
-NUT_CONF_OPT += --without-neon
+NUT_CONF_OPTS += --without-neon
endif
ifeq ($(BR2_PACKAGE_NETSNMP),y)
NUT_DEPENDENCIES += netsnmp
-NUT_CONF_OPT += --with-snmp
+NUT_CONF_OPTS += --with-snmp
else
-NUT_CONF_OPT += --without-snmp
+NUT_CONF_OPTS += --without-snmp
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
NUT_DEPENDENCIES += openssl
-NUT_CONF_OPT += --with-ssl
+NUT_CONF_OPTS += --with-ssl
else
-NUT_CONF_OPT += --without-ssl
+NUT_CONF_OPTS += --without-ssl
endif
$(eval $(autotools-package))
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -16,7 +16,7 @@
libcap-ng \
mobile-broadband-provider-info
-OFONO_CONF_OPT = --disable-test
+OFONO_CONF_OPTS = --disable-test
# N.B. Qualcomm QMI modem support requires O_CLOEXEC; so
# make sure that it is defined.
@@ -27,17 +27,17 @@
endef
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
- OFONO_CONF_OPT += --enable-udev
+ OFONO_CONF_OPTS += --enable-udev
OFONO_DEPENDENCIES += udev
else
- OFONO_CONF_OPT += --disable-udev
+ OFONO_CONF_OPTS += --disable-udev
endif
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
- OFONO_CONF_OPT += --enable-bluetooth
+ OFONO_CONF_OPTS += --enable-bluetooth
OFONO_DEPENDENCIES += bluez_utils
else
- OFONO_CONF_OPT += --disable-bluetooth
+ OFONO_CONF_OPTS += --disable-bluetooth
endif
$(eval $(autotools-package))
diff --git a/package/ola/ola.mk b/package/ola/ola.mk
--- a/package/ola/ola.mk
+++ b/package/ola/ola.mk
@@ -17,7 +17,7 @@
# util-linux provides uuid lib
OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex
-OLA_CONF_OPT = \
+OLA_CONF_OPTS = \
ac_cv_have_pymod_google_protobuf=yes \
--disable-gcov \
--disable-tcmalloc \
@@ -33,119 +33,119 @@
## OLA Bindings and Interface selections
ifeq ($(BR2_PACKAGE_OLA_WEB),y)
-OLA_CONF_OPT += --enable-http
+OLA_CONF_OPTS += --enable-http
OLA_DEPENDENCIES += libmicrohttpd
else
-OLA_CONF_OPT += --disable-http
+OLA_CONF_OPTS += --disable-http
endif
ifeq ($(BR2_PACKAGE_OLA_SLP),y)
-OLA_CONF_OPT += --enable-slp
+OLA_CONF_OPTS += --enable-slp
else
-OLA_CONF_OPT += --disable-slp
+OLA_CONF_OPTS += --disable-slp
endif
ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y)
-OLA_CONF_OPT += --enable-python-libs
+OLA_CONF_OPTS += --enable-python-libs
OLA_DEPENDENCIES += python python-protobuf
else
-OLA_CONF_OPT += --disable-python-libs
+OLA_CONF_OPTS += --disable-python-libs
endif
## OLA Examples and Tests
ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y)
-OLA_CONF_OPT += --enable-examples
+OLA_CONF_OPTS += --enable-examples
OLA_DEPENDENCIES += ncurses
else
-OLA_CONF_OPT += --disable-examples
+OLA_CONF_OPTS += --disable-examples
endif
ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y)
-OLA_CONF_OPT += --enable-rdm-tests
+OLA_CONF_OPTS += --enable-rdm-tests
else
-OLA_CONF_OPT += --disable-rdm-tests
+OLA_CONF_OPTS += --disable-rdm-tests
endif
## OLA Plugin selections
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y)
-OLA_CONF_OPT += --enable-e131
+OLA_CONF_OPTS += --enable-e131
else
-OLA_CONF_OPT += --disable-e131
+OLA_CONF_OPTS += --disable-e131
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y)
-OLA_CONF_OPT += --enable-artnet
+OLA_CONF_OPTS += --enable-artnet
else
-OLA_CONF_OPT += --disable-artnet
+OLA_CONF_OPTS += --disable-artnet
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y)
-OLA_CONF_OPT += --enable-opendmx
+OLA_CONF_OPTS += --enable-opendmx
else
-OLA_CONF_OPT += --disable-opendmx
+OLA_CONF_OPTS += --disable-opendmx
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y)
-OLA_CONF_OPT += --enable-dummy
+OLA_CONF_OPTS += --enable-dummy
else
-OLA_CONF_OPT += --disable-dummy
+OLA_CONF_OPTS += --disable-dummy
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y)
-OLA_CONF_OPT += --enable-espnet
+OLA_CONF_OPTS += --enable-espnet
else
-OLA_CONF_OPT += --disable-espnet
+OLA_CONF_OPTS += --disable-espnet
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y)
-OLA_CONF_OPT += --enable-kinet
+OLA_CONF_OPTS += --enable-kinet
else
-OLA_CONF_OPT += --disable-kinet
+OLA_CONF_OPTS += --disable-kinet
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y)
-OLA_CONF_OPT += --enable-osc
+OLA_CONF_OPTS += --enable-osc
OLA_DEPENDENCIES += liblo
else
-OLA_CONF_OPT += --disable-osc
+OLA_CONF_OPTS += --disable-osc
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y)
-OLA_CONF_OPT += --enable-milinst
+OLA_CONF_OPTS += --enable-milinst
else
-OLA_CONF_OPT += --disable-milinst
+OLA_CONF_OPTS += --disable-milinst
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y)
-OLA_CONF_OPT += --enable-pathport
+OLA_CONF_OPTS += --enable-pathport
else
-OLA_CONF_OPT += --disable-pathport
+OLA_CONF_OPTS += --disable-pathport
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y)
-OLA_CONF_OPT += --enable-sandnet
+OLA_CONF_OPTS += --enable-sandnet
else
-OLA_CONF_OPT += --disable-sandnet
+OLA_CONF_OPTS += --disable-sandnet
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y)
-OLA_CONF_OPT += --enable-shownet
+OLA_CONF_OPTS += --enable-shownet
else
-OLA_CONF_OPT += --disable-shownet
+OLA_CONF_OPTS += --disable-shownet
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y)
-OLA_CONF_OPT += --enable-stageprofi --enable-libusb
+OLA_CONF_OPTS += --enable-stageprofi --enable-libusb
else
-OLA_CONF_OPT += --disable-stageprofi
+OLA_CONF_OPTS += --disable-stageprofi
endif
ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y)
-OLA_CONF_OPT += --enable-usbpro --enable-libusb
+OLA_CONF_OPTS += --enable-usbpro --enable-libusb
else
-OLA_CONF_OPT += --disable-usbpro
+OLA_CONF_OPTS += --disable-usbpro
endif
$(eval $(autotools-package))
diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
--- a/package/omniorb/omniorb.mk
+++ b/package/omniorb/omniorb.mk
@@ -15,8 +15,8 @@
OMNIORB_INSTALL_TARGET = YES
# omniorb is not python3 friendly, so force the python interpreter
-OMNIORB_CONF_OPT = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
-HOST_OMNIORB_CONF_OPT = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
+OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
+HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
# Defaulting long double support to a safe option for the
# mix of embedded targets, this could later be automated
@@ -25,8 +25,8 @@
# need to match because of the code generation done by the
# host tools during the target compile (ie headers generated
# on host are used in target build).
-OMNIORB_CONF_OPT += --disable-longdouble
-HOST_OMNIORB_CONF_OPT += --disable-longdouble
+OMNIORB_CONF_OPTS += --disable-longdouble
+HOST_OMNIORB_CONF_OPTS += --disable-longdouble
# The EmbeddedSystem define (set below in OMNIORB_ADJUST_TOOLDIR)
# enables building of just the lib and disables building of
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -11,7 +11,7 @@
OPENCV_LICENSE_FILES = doc/license.txt
# OpenCV component options
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DBUILD_WITH_DEBUG_INFO=OFF \
-DBUILD_DOCS=OFF \
-DBUILD_EXAMPLES=OFF \
@@ -19,7 +19,7 @@
-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF)
# OpenCV build options
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DBUILD_WITH_STATIC_CRT=OFF \
-DENABLE_FAST_MATH=ON \
-DENABLE_NOISY_WARNINGS=OFF \
@@ -29,19 +29,19 @@
-DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON
# OpenCV link options
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_USE_RELATIVE_PATHS=OFF
# OpenCV packaging options:
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DBUILD_PACKAGE=OFF \
-DENABLE_SOLUTION_FOLDERS=OFF \
-DINSTALL_CREATE_DISTRIB=OFF
# OpenCV module selection
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DBUILD_opencv_androidcamera=OFF \
-DBUILD_opencv_apps=OFF \
-DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \
@@ -72,7 +72,7 @@
#
# * PowerPC support is turned off since its only effect is altering CFLAGS,
# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DENABLE_POWERPC=OFF \
-DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
-DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
@@ -82,36 +82,36 @@
-DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
# Cuda stuff
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DWITH_CUBLAS=OFF \
-DWITH_CUDA=OFF \
-DWITH_CUFFT=OFF
# NVidia stuff
-OPENCV_CONF_OPT += -DWITH_NVCUVID=OFF
+OPENCV_CONF_OPTS += -DWITH_NVCUVID=OFF
# AMD stuff
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DWITH_OPENCLAMDFFT=OFF \
-DWITH_OPENCLAMDBLAS=OFF
# Intel stuff
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DWITH_INTELPERC=OFF \
-DWITH_IPP=OFF \
-DWITH_TBB=OFF
# Smartek stuff
-OPENCV_CONF_OPT += -DWITH_GIGEAPI=OFF
+OPENCV_CONF_OPTS += -DWITH_GIGEAPI=OFF
# Prosilica stuff
-OPENCV_CONF_OPT += -DWITH_PVAPI=OFF
+OPENCV_CONF_OPTS += -DWITH_PVAPI=OFF
# Ximea stuff
-OPENCV_CONF_OPT += -DWITH_XIMEA=OFF
+OPENCV_CONF_OPTS += -DWITH_XIMEA=OFF
# Non-Linux support (Android options) must remain OFF:
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DWITH_ANDROID_CAMERA=OFF \
-DBUILD_ANDROID_CAMERA_WRAPPER=OFF \
-DBUILD_ANDROID_EXAMPLES=OFF \
@@ -120,13 +120,13 @@
-DBUILD_JAVA_SUPPORT=OFF
# Non-Linux support (Mac OSX options) must remain OFF:
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DWITH_AVFOUNDATION=OFF \
-DWITH_CARBON=OFF \
-DWITH_QUICKTIME=OFF
# Non-Linux support (Windows options) must remain OFF:
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DWITH_VFW=OFF \
-DWITH_WIN32UI=OFF \
-DWITH_CSTRIPES=OFF \
@@ -135,7 +135,7 @@
-DWITH_VIDEOINPUT=OFF
# Software/3rd-party support options.
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DBUILD_JASPER=OFF \
-DBUILD_JPEG=OFF \
-DBUILD_OPENEXR=OFF \
@@ -149,7 +149,7 @@
# Disabled features (mostly because they are not available in Buildroot), but
# - eigen: OpenCV does not use it, not take any benefit from it.
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DWITH_1394=OFF \
-DWITH_EIGEN=OFF \
-DWITH_IMAGEIO=OFF \
@@ -164,68 +164,68 @@
OPENCV_DEPENDENCIES += zlib
ifeq ($(BR2_PACKAGE_OPENCV_WITH_FFMPEG),y)
-OPENCV_CONF_OPT += -DWITH_FFMPEG=ON
+OPENCV_CONF_OPTS += -DWITH_FFMPEG=ON
OPENCV_DEPENDENCIES += ffmpeg bzip2
else
-OPENCV_CONF_OPT += -DWITH_FFMPEG=OFF
+OPENCV_CONF_OPTS += -DWITH_FFMPEG=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER),y)
-OPENCV_CONF_OPT += -DWITH_GSTREAMER=ON
+OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON
OPENCV_DEPENDENCIES += gstreamer gst-plugins-base
else
-OPENCV_CONF_OPT += -DWITH_GSTREAMER=OFF
+OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y)
-OPENCV_CONF_OPT += -DWITH_GTK=ON
+OPENCV_CONF_OPTS += -DWITH_GTK=ON
OPENCV_DEPENDENCIES += libgtk2
else
-OPENCV_CONF_OPT += -DWITH_GTK=OFF
+OPENCV_CONF_OPTS += -DWITH_GTK=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y)
-OPENCV_CONF_OPT += -DWITH_JASPER=ON
+OPENCV_CONF_OPTS += -DWITH_JASPER=ON
OPENCV_DEPENDENCIES += jasper
else
-OPENCV_CONF_OPT += -DWITH_JASPER=OFF
+OPENCV_CONF_OPTS += -DWITH_JASPER=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_JPEG),y)
-OPENCV_CONF_OPT += -DWITH_JPEG=ON
+OPENCV_CONF_OPTS += -DWITH_JPEG=ON
OPENCV_DEPENDENCIES += jpeg
else
-OPENCV_CONF_OPT += -DWITH_JPEG=OFF
+OPENCV_CONF_OPTS += -DWITH_JPEG=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_PNG),y)
-OPENCV_CONF_OPT += -DWITH_PNG=ON
+OPENCV_CONF_OPTS += -DWITH_PNG=ON
OPENCV_DEPENDENCIES += libpng
else
-OPENCV_CONF_OPT += -DWITH_PNG=OFF
+OPENCV_CONF_OPTS += -DWITH_PNG=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y)
-OPENCV_CONF_OPT += -DWITH_QT=4
+OPENCV_CONF_OPTS += -DWITH_QT=4
OPENCV_DEPENDENCIES += qt
else
-OPENCV_CONF_OPT += -DWITH_QT=OFF
+OPENCV_CONF_OPTS += -DWITH_QT=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y)
-OPENCV_CONF_OPT += -DWITH_TIFF=ON
+OPENCV_CONF_OPTS += -DWITH_TIFF=ON
OPENCV_DEPENDENCIES += tiff
else
-OPENCV_CONF_OPT += -DWITH_TIFF=OFF
+OPENCV_CONF_OPTS += -DWITH_TIFF=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV_WITH_V4L),y)
-OPENCV_CONF_OPT += \
+OPENCV_CONF_OPTS += \
-DWITH_V4L=ON \
-DWITH_LIBV4L=$(if $(BR2_PACKAGE_LIBV4L),ON,OFF)
OPENCV_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBV4L),libv4l)
else
-OPENCV_CONF_OPT += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF
+OPENCV_CONF_OPTS += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF
endif
# Installation hooks:
diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk
--- a/package/openntpd/openntpd.mk
+++ b/package/openntpd/openntpd.mk
@@ -6,7 +6,7 @@
OPENNTPD_VERSION = 3.9p1
OPENNTPD_SITE = ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD
-OPENNTPD_CONF_OPT = --with-builtin-arc4random --disable-strip
+OPENNTPD_CONF_OPTS = --with-builtin-arc4random --disable-strip
OPENNTPD_LICENSE = MIT-like, BSD-2c, BSD-3c
OPENNTPD_LICENSE_FILES = LICENCE
diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk
--- a/package/openobex/openobex.mk
+++ b/package/openobex/openobex.mk
@@ -15,7 +15,7 @@
OPENOBEX_AUTORECONF = YES
OPENOBEX_INSTALL_STAGING = YES
-OPENOBEX_CONF_OPT += \
+OPENOBEX_CONF_OPTS += \
$(if $(BR2_ENABLE_DEBUG),--enable-debug) \
$(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
$(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
@@ -23,16 +23,16 @@
ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
OPENOBEX_DEPENDENCIES += bluez_utils
-OPENOBEX_CONF_OPT += --with-bluez=$(STAGING_DIR)
+OPENOBEX_CONF_OPTS += --with-bluez=$(STAGING_DIR)
else
-OPENOBEX_CONF_OPT += --disable-bluetooth
+OPENOBEX_CONF_OPTS += --disable-bluetooth
endif
ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
OPENOBEX_DEPENDENCIES += libusb
-OPENOBEX_CONF_OPT += --with-usb=$(STAGING_DIR)
+OPENOBEX_CONF_OPTS += --with-usb=$(STAGING_DIR)
else
-OPENOBEX_CONF_OPT += --disable-usb
+OPENOBEX_CONF_OPTS += --disable-usb
endif
$(eval $(autotools-package))
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -11,7 +11,7 @@
OPENOCD_LICENSE_FILES = COPYING
OPENOCD_AUTORECONF = YES
-OPENOCD_CONF_OPT = \
+OPENOCD_CONF_OPTS = \
--oldincludedir=$(STAGING_DIR)/usr/include \
--includedir=$(STAGING_DIR)/usr/include \
--disable-doxygen-html \
@@ -21,21 +21,21 @@
# Adapters
ifeq ($(BR2_PACKAGE_OPENOCD_FT2XXX),y)
-OPENOCD_CONF_OPT += --enable-ft2232_libftdi
+OPENOCD_CONF_OPTS += --enable-ft2232_libftdi
OPENOCD_DEPENDENCIES += libftdi
endif
ifeq ($(BR2_PACKAGE_OPENOCD_JLINK),y)
-OPENOCD_CONF_OPT += --enable-jlink
+OPENOCD_CONF_OPTS += --enable-jlink
endif
ifeq ($(BR2_PACKAGE_OPENOCD_VSLLINK),y)
-OPENOCD_CONF_OPT += --enable-vsllink
+OPENOCD_CONF_OPTS += --enable-vsllink
endif
HOST_OPENOCD_DEPENDENCIES = host-libusb-compat host-libftdi
-HOST_OPENOCD_CONF_OPT = \
+HOST_OPENOCD_CONF_OPTS = \
--disable-doxygen-html \
--enable-dummy \
--enable-ft2232_libftdi \
diff --git a/package/openpowerlink/openpowerlink.mk b/package/openpowerlink/openpowerlink.mk
--- a/package/openpowerlink/openpowerlink.mk
+++ b/package/openpowerlink/openpowerlink.mk
@@ -19,17 +19,17 @@
OPENPOWERLINK_ARCH = x86_64
endif
-OPENPOWERLINK_CONF_OPT = -DCMAKE_SYSTEM_PROCESSOR=$(OPENPOWERLINK_ARCH)
+OPENPOWERLINK_CONF_OPTS = -DCMAKE_SYSTEM_PROCESSOR=$(OPENPOWERLINK_ARCH)
# There is no shared lib in openpowerlink,
# so force static lib to build libpowerlink.a
-OPENPOWERLINK_CONF_OPT += -DBUILD_SHARED_LIBS=OFF
+OPENPOWERLINK_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF
-OPENPOWERLINK_CONF_OPT += -DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL))
+OPENPOWERLINK_CONF_OPTS += -DCFG_DEBUG_LVL=$(call qstrip,$(BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL))
ifeq ($(BR2_PACKAGE_OPENPOWERLINK_LIBPCAP),y)
# use the user space stack (libpcap)
-OPENPOWERLINK_CONF_OPT += -DCFG_KERNEL_STACK=OFF
+OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_STACK=OFF
OPENPOWERLINK_DEPENDENCIES = libpcap
define OPENPOWERLINK_REMOVE_LIB
rm $(TARGET_DIR)/usr/lib/libpowerlink.a
@@ -37,51 +37,51 @@
OPENPOWERLINK_POST_INSTALL_TARGET_HOOKS += OPENPOWERLINK_REMOVE_LIB
else
# use the kernel stack
-OPENPOWERLINK_CONF_OPT += -DCFG_KERNEL_STACK=ON \
+OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_STACK=ON \
-DCFG_KERNEL_DIR=$(LINUX_DIR) \
-DCMAKE_SYSTEM_VERSION=$(LINUX_VERSION)
OPENPOWERLINK_DEPENDENCIES = linux
endif
ifeq ($(BR2_PACKAGE_OPENPOWERLINK_82573),y)
-OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=82573
+OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_EDRV=82573
else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_8255x),y)
-OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=8255x
+OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_EDRV=8255x
else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_I210),y)
-OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=I210
+OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_EDRV=I210
else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_RTL8139),y)
-OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_EDRV=8139
+OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_EDRV=8139
endif
ifeq ($(BR2_PACKAGE_OPENPOWERLINK_MN),y)
-OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_MN=ON
+OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_MN=ON
else
-OPENPOWERLINK_CONF_OPT += -DCFG_POWERLINK_MN=OFF
+OPENPOWERLINK_CONF_OPTS += -DCFG_POWERLINK_MN=OFF
endif
ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_MN_CONSOLE),y)
-OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_MN_CONSOLE=ON
+OPENPOWERLINK_CONF_OPTS += -DCFG_X86_DEMO_MN_CONSOLE=ON
else
-OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_MN_CONSOLE=OFF
+OPENPOWERLINK_CONF_OPTS += -DCFG_X86_DEMO_MN_CONSOLE=OFF
endif
ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_MN_QT),y)
-OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_MN_QT=ON
+OPENPOWERLINK_CONF_OPTS += -DCFG_X86_DEMO_MN_QT=ON
OPENPOWERLINK_DEPENDENCIES += qt
else
-OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_MN_QT=OFF
+OPENPOWERLINK_CONF_OPTS += -DCFG_X86_DEMO_MN_QT=OFF
endif
ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_CN_CONSOLE),y)
-OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_CN_CONSOLE=ON
+OPENPOWERLINK_CONF_OPTS += -DCFG_X86_DEMO_CN_CONSOLE=ON
else
-OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_CN_CONSOLE=OFF
+OPENPOWERLINK_CONF_OPTS += -DCFG_X86_DEMO_CN_CONSOLE=OFF
endif
ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_LINUX_KERNEL),y)
-OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_LINUX_KERNEL=ON
+OPENPOWERLINK_CONF_OPTS += -DCFG_X86_DEMO_LINUX_KERNEL=ON
else
-OPENPOWERLINK_CONF_OPT += -DCFG_X86_DEMO_LINUX_KERNEL=OFF
+OPENPOWERLINK_CONF_OPTS += -DCFG_X86_DEMO_LINUX_KERNEL=OFF
endif
$(eval $(cmake-package))
diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk
--- a/package/openssh/openssh.mk
+++ b/package/openssh/openssh.mk
@@ -9,19 +9,19 @@
OPENSSH_LICENSE = BSD-3c BSD-2c Public Domain
OPENSSH_LICENSE_FILES = LICENCE
OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
-OPENSSH_CONF_OPT = --disable-lastlog --disable-utmp \
+OPENSSH_CONF_OPTS = --disable-lastlog --disable-utmp \
--disable-utmpx --disable-wtmp --disable-wtmpx --disable-strip
# uClibc toolchain for ARC doesn't support PIE at the moment
ifeq ($(BR2_arc),y)
-OPENSSH_CONF_OPT += --without-pie
+OPENSSH_CONF_OPTS += --without-pie
endif
OPENSSH_DEPENDENCIES = zlib openssl
ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
OPENSSH_DEPENDENCIES += linux-pam
-OPENSSH_CONF_OPT += --with-pam
+OPENSSH_CONF_OPTS += --with-pam
endif
define OPENSSH_INSTALL_INIT_SYSTEMD
diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk
--- a/package/openvmtools/openvmtools.mk
+++ b/package/openvmtools/openvmtools.mk
@@ -12,7 +12,7 @@
# Autoreconf needed because package is distributed without a configure script
# See http://sourceforge.net/p/open-vm-tools/mailman/message/32550385/
OPENVMTOOLS_AUTORECONF = YES
-OPENVMTOOLS_CONF_OPT = --without-icu --without-x --without-gtk2 --without-gtkmm --without-kernel-modules
+OPENVMTOOLS_CONF_OPTS = --without-icu --without-x --without-gtk2 --without-gtkmm --without-kernel-modules
OPENVMTOOLS_DEPENDENCIES = libglib2
# When libfuse is available, openvmtools can build vmblock-fuse, so
@@ -23,28 +23,28 @@
ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PROCPS),y)
OPENVMTOOLS_CONF_ENV += CUSTOM_PROCPS_NAME=procps
-OPENVMTOOLS_CONF_OPT += --with-procps
+OPENVMTOOLS_CONF_OPTS += --with-procps
OPENVMTOOLS_DEPENDENCIES += procps-ng
else
-OPENVMTOOLS_CONF_OPT += --without-procps
+OPENVMTOOLS_CONF_OPTS += --without-procps
endif
ifeq ($(BR2_PACKAGE_OPENVMTOOLS_DNET),y)
# Needed because if it is defined configure will
# use a different method to check for dnet
OPENVMTOOLS_CONF_ENV += CUSTOM_DNET_CPPFLAGS=" "
-OPENVMTOOLS_CONF_OPT += --with-dnet
+OPENVMTOOLS_CONF_OPTS += --with-dnet
OPENVMTOOLS_DEPENDENCIES += libdnet
else
-OPENVMTOOLS_CONF_OPT += --without-dnet
+OPENVMTOOLS_CONF_OPTS += --without-dnet
endif
ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PAM),y)
-OPENVMTOOLS_CONF_OPT += --with-pam
+OPENVMTOOLS_CONF_OPTS += --with-pam
OPENVMTOOLS_MAKE_OPTS += CFLAGS+="-Wno-unused-local-typedefs"
OPENVMTOOLS_DEPENDENCIES += linux-pam
else
-OPENVMTOOLS_CONF_OPT += --without-pam
+OPENVMTOOLS_CONF_OPTS += --without-pam
endif
# symlink needed by lib/system/systemLinux.c (or will cry in /var/log/messages)
diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -10,14 +10,14 @@
OPENVPN_DEPENDENCIES = host-pkgconf
OPENVPN_LICENSE = GPLv2
OPENVPN_LICENSE_FILES = COPYRIGHT.GPL
-OPENVPN_CONF_OPT = --disable-plugin-auth-pam --enable-iproute2 \
+OPENVPN_CONF_OPTS = --disable-plugin-auth-pam --enable-iproute2 \
$(if $(BR2_PREFER_STATIC_LIB),--disable-plugins)
OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
NETSTAT=/bin/netstat \
ROUTE=/sbin/route
ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y)
-OPENVPN_CONF_OPT += --enable-small --disable-plugins \
+OPENVPN_CONF_OPTS += --enable-small --disable-plugins \
--disable-debug --disable-eurephia
endif
@@ -34,16 +34,16 @@
ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
OPENVPN_DEPENDENCIES += lzo
else
- OPENVPN_CONF_OPT += --disable-lzo
+ OPENVPN_CONF_OPTS += --disable-lzo
endif
ifeq ($(BR2_PACKAGE_OPENVPN_CRYPTO_OPENSSL),y)
- OPENVPN_CONF_OPT += --with-crypto-library=openssl
+ OPENVPN_CONF_OPTS += --with-crypto-library=openssl
OPENVPN_DEPENDENCIES += openssl
endif
ifeq ($(BR2_PACKAGE_OPENVPN_CRYPTO_POLARSSL),y)
- OPENVPN_CONF_OPT += --with-crypto-library=polarssl
+ OPENVPN_CONF_OPTS += --with-crypto-library=polarssl
OPENVPN_DEPENDENCIES += polarssl
endif
diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
--- a/package/opkg/opkg.mk
+++ b/package/opkg/opkg.mk
@@ -12,7 +12,7 @@
OPKG_LICENSE = GPLv2+
OPKG_LICENSE_FILES = COPYING
OPKG_INSTALL_STAGING = YES
-OPKG_CONF_OPT = --disable-curl
+OPKG_CONF_OPTS = --disable-curl
OPKG_AUTORECONF = YES
# Ensure directory for lockfile exists
@@ -21,11 +21,11 @@
endef
ifeq ($(BR2_PACKAGE_OPKG_GPG_SIGN),y)
-OPKG_CONF_OPT += --enable-gpg
+OPKG_CONF_OPTS += --enable-gpg
OPKG_CONF_ENV = ac_cv_path_GPGME_CONFIG=$(STAGING_DIR)/usr/bin/gpgme-config
OPKG_DEPENDENCIES += libgpgme
else
-OPKG_CONF_OPT += --disable-gpg
+OPKG_CONF_OPTS += --disable-gpg
endif
OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR
diff --git a/package/oprofile/oprofile.mk b/package/oprofile/oprofile.mk
--- a/package/oprofile/oprofile.mk
+++ b/package/oprofile/oprofile.mk
@@ -8,7 +8,7 @@
OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
OPROFILE_LICENSE = GPLv2+
OPROFILE_LICENSE_FILES = COPYING
-OPROFILE_CONF_OPT = \
+OPROFILE_CONF_OPTS = \
--localstatedir=/var \
--disable-account-check \
--enable-gui=no \
diff --git a/package/opus-tools/opus-tools.mk b/package/opus-tools/opus-tools.mk
--- a/package/opus-tools/opus-tools.mk
+++ b/package/opus-tools/opus-tools.mk
@@ -8,7 +8,7 @@
OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus
OPUS_TOOLS_LICENSE = BSD-2c
OPUS_TOOLS_LICENSE_FILES = COPYING
-OPUS_TOOLS_CONF_OPT = --disable-oggtest --disable-opustest
+OPUS_TOOLS_CONF_OPTS = --disable-oggtest --disable-opustest
OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf
ifeq ($(BR2_PACKAGE_LIBPCAP),y)
@@ -16,15 +16,15 @@
endif
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-OPUS_TOOLS_CONF_OPT += --enable-sse
+OPUS_TOOLS_CONF_OPTS += --enable-sse
else
-OPUS_TOOLS_CONF_OPT += --disable-sse
+OPUS_TOOLS_CONF_OPTS += --disable-sse
endif
ifeq ($(BR2_PACKAGE_FLAC),y)
OPUS_TOOLS_DEPENDENCIES += flac
else
-OPUS_TOOLS_CONF_OPT += --without-flac
+OPUS_TOOLS_CONF_OPTS += --without-flac
endif
$(eval $(autotools-package))
diff --git a/package/opus/opus.mk b/package/opus/opus.mk
--- a/package/opus/opus.mk
+++ b/package/opus/opus.mk
@@ -9,11 +9,11 @@
OPUS_LICENSE = BSD-3c
OPUS_LICENSE_FILES = COPYING
OPUS_INSTALL_STAGING = YES
-OPUS_CONF_OPT = --disable-doc
+OPUS_CONF_OPTS = --disable-doc
OPUS_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y)
-OPUS_CONF_OPT += --enable-fixed-point
+OPUS_CONF_OPTS += --enable-fixed-point
endif
$(eval $(autotools-package))
diff --git a/package/ortp/ortp.mk b/package/ortp/ortp.mk
--- a/package/ortp/ortp.mk
+++ b/package/ortp/ortp.mk
@@ -6,7 +6,7 @@
ORTP_VERSION = 0.22.0
ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
-ORTP_CONF_OPT = --disable-strict
+ORTP_CONF_OPTS = --disable-strict
ORTP_INSTALL_STAGING = YES
ORTP_LICENSE = LGPLv2.1+
ORTP_LICENSE_FILES = COPYING
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -8,7 +8,7 @@
P11_KIT_SITE = http://p11-glue.freedesktop.org/releases
P11_KIT_DEPENDENCIES = host-pkgconf libffi libtasn1
P11_KIT_INSTALL_STAGING = YES
-P11_KIT_CONF_OPT = --disable-static
+P11_KIT_CONF_OPTS = --disable-static
P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
ac_cv_have_decl___progname=no
P11_KIT_LICENSE = BSD-3c
diff --git a/package/pango/pango.mk b/package/pango/pango.mk
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -40,7 +40,7 @@
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
-PANGO_CONF_OPT = --enable-explicit-deps=no \
+PANGO_CONF_OPTS = --enable-explicit-deps=no \
--disable-debug \
--disable-gtk-doc-html
@@ -53,14 +53,14 @@
freetype
ifeq ($(BR2_PACKAGE_XORG7),y)
- PANGO_CONF_OPT += --x-includes=$(STAGING_DIR)/usr/include/X11 \
+ PANGO_CONF_OPTS += --x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
PANGO_DEPENDENCIES += xlib_libX11
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy)
PANGO_DEPENDENCIES += xlib_libXft xlib_libXrender
- PANGO_CONF_OPT += --with-xft
+ PANGO_CONF_OPTS += --with-xft
endif
define PANGO_INSTALL_INITSCRIPT
diff --git a/package/parted/parted.mk b/package/parted/parted.mk
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -17,24 +17,24 @@
ifeq ($(BR2_PACKAGE_READLINE),y)
PARTED_DEPENDENCIES += readline
-PARTED_CONF_OPT += --with-readline
+PARTED_CONF_OPTS += --with-readline
else
-PARTED_CONF_OPT += --without-readline
+PARTED_CONF_OPTS += --without-readline
endif
ifeq ($(BR2_PACKAGE_LVM2),y)
PARTED_DEPENDENCIES += lvm2
-PARTED_CONF_OPT += --enable-device-mapper
+PARTED_CONF_OPTS += --enable-device-mapper
else
-PARTED_CONF_OPT += --disable-device-mapper
+PARTED_CONF_OPTS += --disable-device-mapper
endif
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-PARTED_CONF_OPT += --disable-dynamic-loading
+PARTED_CONF_OPTS += --disable-dynamic-loading
endif
HOST_PARTED_DEPENDENCIES = host-util-linux
-HOST_PARTED_CONF_OPT += \
+HOST_PARTED_CONF_OPTS += \
--without-readline \
--disable-device-mapper \
diff --git a/package/pcmanfm/pcmanfm.mk b/package/pcmanfm/pcmanfm.mk
--- a/package/pcmanfm/pcmanfm.mk
+++ b/package/pcmanfm/pcmanfm.mk
@@ -6,7 +6,7 @@
PCMANFM_VERSION = 0.3.5.9
PCMANFM_SITE = http://downloads.sourceforge.net/project/pcmanfm/pcmanfm-legacy%20%28Old%200.5%20series%29/PCManFM%20$(PCMANFM_VERSION)
-PCMANFM_CONF_OPT = --disable-hal
+PCMANFM_CONF_OPTS = --disable-hal
PCMANFM_DEPENDENCIES = host-pkgconf libgtk2 gamin startup-notification xlib_libX11
PCMANFM_AUTORECONF = YES
PCMANFM_LICENSE = GPLv2+
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -13,13 +13,13 @@
ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
# pcre will use the host g++ if a cross version isn't available
-PCRE_CONF_OPT = --disable-cpp
+PCRE_CONF_OPTS = --disable-cpp
endif
-PCRE_CONF_OPT += --enable-pcre8
-PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_16),--enable-pcre16,--disable-pcre16)
-PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_32),--enable-pcre32,--disable-pcre32)
-PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_UTF),--enable-utf,--disable-utf)
-PCRE_CONF_OPT += $(if $(BR2_PACKAGE_PCRE_UCP),--enable-unicode-properties,--disable-unicode-properties)
+PCRE_CONF_OPTS += --enable-pcre8
+PCRE_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE_16),--enable-pcre16,--disable-pcre16)
+PCRE_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE_32),--enable-pcre32,--disable-pcre32)
+PCRE_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE_UTF),--enable-utf,--disable-utf)
+PCRE_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE_UCP),--enable-unicode-properties,--disable-unicode-properties)
$(eval $(autotools-package))
diff --git a/package/pcsc-lite/pcsc-lite.mk b/package/pcsc-lite/pcsc-lite.mk
--- a/package/pcsc-lite/pcsc-lite.mk
+++ b/package/pcsc-lite/pcsc-lite.mk
@@ -18,23 +18,23 @@
# - libudev has a priority over libusb
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-PCSC_LITE_CONF_OPT += --enable-libudev --disable-libusb
+PCSC_LITE_CONF_OPTS += --enable-libudev --disable-libusb
PCSC_LITE_DEPENDENCIES += udev
else
ifeq ($(BR2_PACKAGE_LIBUSB),y)
-PCSC_LITE_CONF_OPT += --enable-libusb --disable-libudev
+PCSC_LITE_CONF_OPTS += --enable-libusb --disable-libudev
PCSC_LITE_DEPENDENCIES += libusb
else
-PCSC_LITE_CONF_OPT += --disable-libusb --disable-libudev
+PCSC_LITE_CONF_OPTS += --disable-libusb --disable-libudev
endif
endif
ifeq ($(PACKAGE_PCSC_LITE_DEBUGATR),y)
-PCSC_LITE_CONF_OPT += --enable-debugatr
+PCSC_LITE_CONF_OPTS += --enable-debugatr
endif
ifeq ($(PACKAGE_PCSC_LITE_EMBEDDED),y)
-PCSC_LITE_CONF_OPT += --enable-embedded
+PCSC_LITE_CONF_OPTS += --enable-embedded
endif
$(eval $(autotools-package))
diff --git a/package/perl-gd/perl-gd.mk b/package/perl-gd/perl-gd.mk
--- a/package/perl-gd/perl-gd.mk
+++ b/package/perl-gd/perl-gd.mk
@@ -11,7 +11,7 @@
PERL_GD_LICENSE = Artistic-2.0 or GPLv1+
PERL_GD_LICENSE_FILES = LICENSE
-PERL_GD_CONF_OPT = \
+PERL_GD_CONF_OPTS = \
-options=FT,PNG \
-lib_gd_path=$(STAGING_DIR)/usr \
-lib_ft_path=$(STAGING_DIR)/usr \
diff --git a/package/perl-xml-libxml/perl-xml-libxml.mk b/package/perl-xml-libxml/perl-xml-libxml.mk
--- a/package/perl-xml-libxml/perl-xml-libxml.mk
+++ b/package/perl-xml-libxml/perl-xml-libxml.mk
@@ -11,7 +11,7 @@
PERL_XML_LIBXML_LICENSE = Artistic or GPLv1+
PERL_XML_LIBXML_LICENSE_FILES = LICENSE
-PERL_XML_LIBXML_CONF_OPT = \
+PERL_XML_LIBXML_CONF_OPTS = \
LIBS="-L $(STAGING_DIR)/usr/lib" \
INC="-I $(STAGING_DIR)/usr/include/libxml2" \
NO_THREADS
diff --git a/package/perl-xml-parser/perl-xml-parser.mk b/package/perl-xml-parser/perl-xml-parser.mk
--- a/package/perl-xml-parser/perl-xml-parser.mk
+++ b/package/perl-xml-parser/perl-xml-parser.mk
@@ -10,7 +10,7 @@
PERL_XML_PARSER_DEPENDENCIES = expat
PERL_XML_PARSER_LICENSE = Artistic or GPLv1+
-HOST_PERL_XML_PARSER_CONF_OPT = \
+HOST_PERL_XML_PARSER_CONF_OPTS = \
EXPATLIBPATH=$(HOST_DIR)/usr/lib \
EXPATINCPATH=$(HOST_DIR)/usr/include
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -51,7 +51,7 @@
# We have to override LD, because an external multilib toolchain ld is not
# wrapped to provide the required sysroot options. We also can't use ccache
# because the configure script doesn't support it.
-PERL_CONF_OPT = \
+PERL_CONF_OPTS = \
--target=$(GNU_TARGET_NAME) \
--target-tools-prefix=$(TARGET_CROSS) \
--prefix=/usr \
@@ -66,24 +66,24 @@
-Dperladmin=root
ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
- PERL_CONF_OPT += -Dusedevel
+ PERL_CONF_OPTS += -Dusedevel
endif
ifeq ($(BR2_PREFER_STATIC_LIB),y)
- PERL_CONF_OPT += --all-static --no-dynaloader
+ PERL_CONF_OPTS += --all-static --no-dynaloader
endif
ifneq ($(BR2_LARGEFILE),y)
- PERL_CONF_OPT += -Uuselargefiles
+ PERL_CONF_OPTS += -Uuselargefiles
endif
PERL_MODULES = $(call qstrip,$(BR2_PACKAGE_PERL_MODULES))
ifneq ($(PERL_MODULES),)
-PERL_CONF_OPT += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES))
+PERL_CONF_OPTS += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES))
endif
define PERL_CONFIGURE_CMDS
- (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_CONF_OPT))
+ (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_CONF_OPTS))
$(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
endef
diff --git a/package/php-geoip/php-geoip.mk b/package/php-geoip/php-geoip.mk
--- a/package/php-geoip/php-geoip.mk
+++ b/package/php-geoip/php-geoip.mk
@@ -8,7 +8,7 @@
PHP_GEOIP_SOURCE = geoip-$(PHP_GEOIP_VERSION).tgz
# pecl.php.net returns html with db connect failed
PHP_GEOIP_SITE = http://sources.buildroot.net
-PHP_GEOIP_CONF_OPT = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
+PHP_GEOIP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--with-geoip=$(STAGING_DIR)/usr
# phpize does the autoconf magic
PHP_GEOIP_DEPENDENCIES = geoip php host-autoconf
diff --git a/package/php-gnupg/php-gnupg.mk b/package/php-gnupg/php-gnupg.mk
--- a/package/php-gnupg/php-gnupg.mk
+++ b/package/php-gnupg/php-gnupg.mk
@@ -10,7 +10,7 @@
PHP_GNUPG_SITE = http://sources.buildroot.net
# phpize does the autoconf magic
PHP_GNUPG_DEPENDENCIES = php libgpgme host-autoconf host-pkgconf
-PHP_GNUPG_CONF_OPT = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
+PHP_GNUPG_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--with-gnupg=$(STAGING_DIR)/usr/include --with-gpg=/usr/bin/gpg
PHP_GNUPG_LICENSE = BSD-2c
PHP_GNUPG_LICENSE_FILES = LICENSE
diff --git a/package/php-imagick/php-imagick.mk b/package/php-imagick/php-imagick.mk
--- a/package/php-imagick/php-imagick.mk
+++ b/package/php-imagick/php-imagick.mk
@@ -8,7 +8,7 @@
PHP_IMAGICK_SOURCE = imagick-$(PHP_IMAGICK_VERSION).tgz
# pecl.php.net returns html with db connect failed
PHP_IMAGICK_SITE = http://sources.buildroot.net
-PHP_IMAGICK_CONF_OPT = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
+PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--with-imagick=$(STAGING_DIR)/usr
# phpize does the autoconf magic
PHP_IMAGICK_DEPENDENCIES = imagemagick php host-autoconf
diff --git a/package/php-memcached/php-memcached.mk b/package/php-memcached/php-memcached.mk
--- a/package/php-memcached/php-memcached.mk
+++ b/package/php-memcached/php-memcached.mk
@@ -8,7 +8,7 @@
PHP_MEMCACHED_SOURCE = memcached-$(PHP_MEMCACHED_VERSION).tgz
# pecl.php.net returns html with db connect failed
PHP_MEMCACHED_SITE = http://sources.buildroot.net
-PHP_MEMCACHED_CONF_OPT = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
+PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--disable-memcached-sasl \
--with-libmemcached-dir=$(STAGING_DIR)/usr \
--with-zlib-dir=$(STAGING_DIR)/usr
diff --git a/package/php-ssh2/php-ssh2.mk b/package/php-ssh2/php-ssh2.mk
--- a/package/php-ssh2/php-ssh2.mk
+++ b/package/php-ssh2/php-ssh2.mk
@@ -8,7 +8,7 @@
PHP_SSH2_SOURCE = ssh2-$(PHP_SSH2_VERSION).tgz
# pecl.php.net returns html with db connect failed
PHP_SSH2_SITE = http://sources.buildroot.net
-PHP_SSH2_CONF_OPT = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
+PHP_SSH2_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--with-ssh2=$(STAGING_DIR)/usr
# phpize does the autoconf magic
PHP_SSH2_DEPENDENCIES = libssh2 php host-autoconf
diff --git a/package/php-yaml/php-yaml.mk b/package/php-yaml/php-yaml.mk
--- a/package/php-yaml/php-yaml.mk
+++ b/package/php-yaml/php-yaml.mk
@@ -8,7 +8,7 @@
PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz
# pecl.php.net returns html with db connect failed
PHP_YAML_SITE = http://sources.buildroot.net
-PHP_YAML_CONF_OPT = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
+PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
--with-yaml=$(STAGING_DIR)/usr
# phpize does the autoconf magic
PHP_YAML_DEPENDENCIES = libyaml php host-autoconf
diff --git a/package/php-zmq/php-zmq.mk b/package/php-zmq/php-zmq.mk
--- a/package/php-zmq/php-zmq.mk
+++ b/package/php-zmq/php-zmq.mk
@@ -10,7 +10,7 @@
PHP_ZMQ_SITE = http://sources.buildroot.net
# phpize does the autoconf magic
PHP_ZMQ_DEPENDENCIES = php zeromq host-autoconf host-pkgconf
-PHP_ZMQ_CONF_OPT = --with-php-config=$(STAGING_DIR)/usr/bin/php-config
+PHP_ZMQ_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config
PHP_ZMQ_LICENSE = BSD-3c
PHP_ZMQ_LICENSE_FILES = LICENSE
diff --git a/package/php/php.mk b/package/php/php.mk
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -13,7 +13,7 @@
PHP_DEPENDENCIES = host-pkgconf
PHP_LICENSE = PHP
PHP_LICENSE_FILES = LICENSE
-PHP_CONF_OPT = --mandir=/usr/share/man \
+PHP_CONF_OPTS = --mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-all \
--without-pear \
@@ -46,12 +46,12 @@
endif
endif
-PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
-PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
-PHP_CONF_OPT += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)
+PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
+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_OPT += $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \
+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) \
@@ -79,48 +79,48 @@
$(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar)
ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y)
- PHP_CONF_OPT += --with-openssl=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += openssl
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
PHP_CONF_ENV += php_cv_libxml_build_works=yes
- PHP_CONF_OPT += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr
+ PHP_CONF_OPTS += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr
PHP_DEPENDENCIES += libxml2
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_WDDX),y)
- PHP_CONF_OPT += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += expat
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y)
- PHP_CONF_OPT += --with-xmlrpc \
+ PHP_CONF_OPTS += --with-xmlrpc \
$(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr)
PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
endif
ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),)
- PHP_CONF_OPT += --with-zlib=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += zlib
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
- PHP_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-gettext=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext)
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_ICONV),y)
ifeq ($(BR2_PACKAGE_LIBICONV),y)
- PHP_CONF_OPT += --with-iconv=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-iconv=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += libiconv
else
- PHP_CONF_OPT += --with-iconv
+ PHP_CONF_OPTS += --with-iconv
endif
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y)
- PHP_CONF_OPT += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += icu
# The intl module is implemented in C++, but PHP fails to use
# g++ as the compiler for the final link. As a workaround,
@@ -129,30 +129,30 @@
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
- PHP_CONF_OPT += --with-gmp=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-gmp=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += gmp
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
- PHP_CONF_OPT += --with-readline=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-readline=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += readline
endif
### Native MySQL extensions
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQL),y)
- PHP_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += mysql
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y)
- PHP_CONF_OPT += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config
+ PHP_CONF_OPTS += --with-mysqli=$(STAGING_DIR)/usr/bin/mysql_config
PHP_DEPENDENCIES += mysql
endif
### PDO
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y)
- PHP_CONF_OPT += --enable-pdo
+ PHP_CONF_OPTS += --enable-pdo
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y)
- PHP_CONF_OPT += --with-pdo-sqlite=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-pdo-sqlite=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += sqlite
PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION
ifneq ($(BR2_LARGEFILE),y)
@@ -160,56 +160,56 @@
endif
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y)
- PHP_CONF_OPT += --with-pdo-mysql=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-pdo-mysql=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += mysql
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL),y)
- PHP_CONF_OPT += --with-pdo-pgsql=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-pdo-pgsql=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += postgresql
endif
endif
### Use external PCRE if it's available
ifeq ($(BR2_PACKAGE_PCRE),y)
- PHP_CONF_OPT += --with-pcre-regex=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += pcre
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y)
- PHP_CONF_OPT += --with-curl=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-curl=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += libcurl
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_XSL),y)
- PHP_CONF_OPT += --with-xsl=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-xsl=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += libxslt
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_BZIP2),y)
- PHP_CONF_OPT += --with-bz2=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-bz2=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += bzip2
endif
### DBA
ifeq ($(BR2_PACKAGE_PHP_EXT_DBA),y)
- PHP_CONF_OPT += --enable-dba
+ PHP_CONF_OPTS += --enable-dba
ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_CDB),y)
- PHP_CONF_OPT += --without-cdb
+ PHP_CONF_OPTS += --without-cdb
endif
ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_FLAT),y)
- PHP_CONF_OPT += --without-flatfile
+ PHP_CONF_OPTS += --without-flatfile
endif
ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_INI),y)
- PHP_CONF_OPT += --without-inifile
+ PHP_CONF_OPTS += --without-inifile
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_DBA_DB4),y)
- PHP_CONF_OPT += --with-db4=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-db4=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += berkeleydb
endif
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_SNMP),y)
- PHP_CONF_OPT += --with-snmp=$(STAGING_DIR)/usr
+ PHP_CONF_OPTS += --with-snmp=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += netsnmp
endif
diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
--- a/package/pinentry/pinentry.mk
+++ b/package/pinentry/pinentry.mk
@@ -10,42 +10,42 @@
PINENTRY_LICENSE = GPLv2+
PINENTRY_LICENSE_FILES = COPYING
PINENTRY_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-PINENTRY_CONF_OPT = --disable-pinentry-gtk # gtk1
-PINENTRY_CONF_OPT += --disable-pinentry-qt # qt3
-PINENTRY_CONF_OPT += --without-libcap # requires PAM
+PINENTRY_CONF_OPTS = --disable-pinentry-gtk # gtk1
+PINENTRY_CONF_OPTS += --disable-pinentry-qt # qt3
+PINENTRY_CONF_OPTS += --without-libcap # requires PAM
# build with X if available
ifeq ($(BR2_PACKAGE_XORG7),y)
-PINENTRY_CONF_OPT += --with-x
+PINENTRY_CONF_OPTS += --with-x
else
-PINENTRY_CONF_OPT += --without-x
+PINENTRY_CONF_OPTS += --without-x
endif
# pinentry-ncurses backend
ifeq ($(BR2_PACKAGE_PINENTRY_NCURSES),y)
-PINENTRY_CONF_OPT += --enable-ncurses
+PINENTRY_CONF_OPTS += --enable-ncurses
PINENTRY_DEPENDENCIES += ncurses
else
-PINENTRY_CONF_OPT += --disable-ncurses
+PINENTRY_CONF_OPTS += --disable-ncurses
endif
# pinentry-gtk2 backend
ifeq ($(BR2_PACKAGE_PINENTRY_GTK2),y)
-PINENTRY_CONF_OPT += --enable-pinentry-gtk2
+PINENTRY_CONF_OPTS += --enable-pinentry-gtk2
PINENTRY_DEPENDENCIES += libgtk2
else
-PINENTRY_CONF_OPT += --disable-pinentry-gtk2
+PINENTRY_CONF_OPTS += --disable-pinentry-gtk2
endif
# pinentry-qt4 backend
ifeq ($(BR2_PACKAGE_PINENTRY_QT4),y)
# -pthread needs to be passed for certain toolchains
# http://autobuild.buildroot.net/results/6be/6be109ccedec603a67cebdb31b55865dcce0e128/
-PINENTRY_CONF_OPT += LIBS=-pthread
-PINENTRY_CONF_OPT += --enable-pinentry-qt4
+PINENTRY_CONF_OPTS += LIBS=-pthread
+PINENTRY_CONF_OPTS += --enable-pinentry-qt4
PINENTRY_DEPENDENCIES += qt
else
-PINENTRY_CONF_OPT += --disable-pinentry-qt4
+PINENTRY_CONF_OPTS += --disable-pinentry-qt4
endif
$(eval $(autotools-package))
diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk
--- a/package/pixman/pixman.mk
+++ b/package/pixman/pixman.mk
@@ -14,12 +14,12 @@
PIXMAN_AUTORECONF = YES
# don't build gtk based demos
-PIXMAN_CONF_OPT = --disable-gtk
+PIXMAN_CONF_OPTS = --disable-gtk
# disable iwmmxt support for CPU's that don't have
# this feature
ifneq ($(BR2_iwmmxt),y)
-PIXMAN_CONF_OPT += --disable-arm-iwmmxt
+PIXMAN_CONF_OPTS += --disable-arm-iwmmxt
endif
$(eval $(autotools-package))
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -104,7 +104,7 @@
endif
$(2)_CONF_ENV ?=
-$(2)_CONF_OPT ?=
+$(2)_CONF_OPTS ?=
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
$(2)_INSTALL_OPTS ?= install
@@ -146,7 +146,7 @@
$$(DISABLE_LARGEFILE) \
$$(DISABLE_IPV6) \
$$(SHARED_STATIC_LIBS_OPTS) \
- $$(QUIET) $$($$(PKG)_CONF_OPT) \
+ $$(QUIET) $$($$(PKG)_CONF_OPTS) \
)
endef
else
@@ -173,7 +173,7 @@
--with-xmlto=no \
--with-fop=no \
--disable-dependency-tracking \
- $$(QUIET) $$($$(PKG)_CONF_OPT) \
+ $$(QUIET) $$($$(PKG)_CONF_OPTS) \
)
endef
endif
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -37,7 +37,7 @@
define inner-cmake-package
$(2)_CONF_ENV ?=
-$(2)_CONF_OPT ?=
+$(2)_CONF_OPTS ?=
$(2)_MAKE ?= $$(MAKE)
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
@@ -69,7 +69,7 @@
-DBUILD_TESTING=OFF \
-DBUILD_SHARED_LIBS=$$(if $$(BR2_PREFER_STATIC_LIB),OFF,ON) \
-DUSE_CCACHE=$$(if $$(BR2_CCACHE),ON,OFF) \
- $$($$(PKG)_CONF_OPT) \
+ $$($$(PKG)_CONF_OPTS) \
)
endef
else
@@ -88,7 +88,7 @@
-DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)/usr" \
-DUSE_CCACHE=$$(if $$(BR2_CCACHE),ON,OFF) \
-DBUILD_TESTING=OFF \
- $$($$(PKG)_CONF_OPT) \
+ $$($$(PKG)_CONF_OPTS) \
)
endef
endif
diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
--- a/package/pkg-perl.mk
+++ b/package/pkg-perl.mk
@@ -69,7 +69,7 @@
--install_path script=/usr/bin \
--install_path bindoc=/usr/share/man/man1 \
--install_path libdoc=/usr/share/man/man3 \
- $$($(2)_CONF_OPT); \
+ $$($(2)_CONF_OPTS); \
else \
$$($(2)_CONF_ENV) \
PERL_MM_USE_DEFAULT=1 \
@@ -91,7 +91,7 @@
INSTALLVENDORSCRIPT=/usr/bin \
INSTALLVENDORMAN1DIR=/usr/share/man/man1 \
INSTALLVENDORMAN3DIR=/usr/share/man/man3 \
- $$($(2)_CONF_OPT); \
+ $$($(2)_CONF_OPTS); \
fi
endef
else
@@ -104,7 +104,7 @@
perl Build.PL \
--install_base $$(HOST_DIR)/usr \
--installdirs vendor \
- $$($(2)_CONF_OPT); \
+ $$($(2)_CONF_OPTS); \
else \
$$($(2)_CONF_ENV) \
PERL_MM_USE_DEFAULT=1 \
@@ -112,7 +112,7 @@
perl Makefile.PL \
INSTALL_BASE=$$(HOST_DIR)/usr \
INSTALLDIRS=vendor \
- $$($(2)_CONF_OPT); \
+ $$($(2)_CONF_OPTS); \
fi
endef
endif
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -31,12 +31,12 @@
$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
ifeq ($(LIBC),uclibc)
-POCO_CONF_OPT += --no-fpenvironment --no-wstring
+POCO_CONF_OPTS += --no-fpenvironment --no-wstring
endif
# architectures missing some FE_* in their fenv.h
ifeq ($(BR2_sh4a)$(BR2_nios2),y)
-POCO_CONF_OPT += --no-fpenvironment
+POCO_CONF_OPTS += --no-fpenvironment
endif
define POCO_CONFIGURE_CMDS
@@ -44,7 +44,7 @@
--config=Linux-CrossEnv \
--prefix=/usr \
--omit="$(POCO_OMIT)" \
- $(POCO_CONF_OPT) \
+ $(POCO_CONF_OPTS) \
--unbundled \
--no-tests \
--no-samples)
diff --git a/package/polarssl/polarssl.mk b/package/polarssl/polarssl.mk
--- a/package/polarssl/polarssl.mk
+++ b/package/polarssl/polarssl.mk
@@ -7,7 +7,7 @@
POLARSSL_SITE = https://polarssl.org/code/releases
POLARSSL_VERSION = 1.2.11
POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
-POLARSSL_CONF_OPT = \
+POLARSSL_CONF_OPTS = \
-DBUILD_TESTS=OFF \
-DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_POLARSSL_PROGRAMS),ON,OFF)
diff --git a/package/polkit/polkit.mk b/package/polkit/polkit.mk
--- a/package/polkit/polkit.mk
+++ b/package/polkit/polkit.mk
@@ -14,7 +14,7 @@
POLKIT_DEPENDENCIES = libglib2 host-intltool expat
# We could also support --with-authfw=pam
-POLKIT_CONF_OPT = \
+POLKIT_CONF_OPTS = \
--with-authfw=shadow \
--with-os-type=unknown \
--disable-man-pages \
diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk
--- a/package/poppler/poppler.mk
+++ b/package/poppler/poppler.mk
@@ -10,55 +10,55 @@
POPPLER_DEPENDENCIES = fontconfig
POPPLER_LICENSE = GPLv2+
POPPLER_LICENSE_FILES = COPYING
-POPPLER_CONF_OPT = --with-font-configuration=fontconfig
+POPPLER_CONF_OPTS = --with-font-configuration=fontconfig
ifeq ($(BR2_PACKAGE_LCMS2),y)
- POPPLER_CONF_OPT += --enable-cms=lcms2
+ POPPLER_CONF_OPTS += --enable-cms=lcms2
POPPLER_DEPENDENCIES += lcms2
else
- POPPLER_CONF_OPT += --enable-cms=none
+ POPPLER_CONF_OPTS += --enable-cms=none
endif
ifeq ($(BR2_PACKAGE_TIFF),y)
- POPPLER_CONF_OPT += --enable-libtiff
+ POPPLER_CONF_OPTS += --enable-libtiff
POPPLER_DEPENDENCIES += tiff
else
- POPPLER_CONF_OPT += --disable-libtiff
+ POPPLER_CONF_OPTS += --disable-libtiff
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
- POPPLER_CONF_OPT += --enable-libjpeg
+ POPPLER_CONF_OPTS += --enable-libjpeg
POPPLER_DEPENDENCIES += jpeg
else
- POPPLER_CONF_OPT += --disable-libjpeg
+ POPPLER_CONF_OPTS += --disable-libjpeg
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
- POPPLER_CONF_OPT += --enable-libpng
+ POPPLER_CONF_OPTS += --enable-libpng
POPPLER_DEPENDENCIES += libpng
else
- POPPLER_CONF_OPT += --disable-libpng
+ POPPLER_CONF_OPTS += --disable-libpng
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
- POPPLER_CONF_OPT += --enable-zlib
+ POPPLER_CONF_OPTS += --enable-zlib
POPPLER_DEPENDENCIES += zlib
else
- POPPLER_CONF_OPT += --disable-zlib
+ POPPLER_CONF_OPTS += --disable-zlib
endif
ifeq ($(BR2_PACKAGE_POPPLER_LIBCURL),y)
- POPPLER_CONF_OPT += --enable-libcurl
+ POPPLER_CONF_OPTS += --enable-libcurl
POPPLER_DEPENDENCIES += libcurl
else
- POPPLER_CONF_OPT += --disable-libcurl
+ POPPLER_CONF_OPTS += --disable-libcurl
endif
ifeq ($(BR2_PACKAGE_XORG7),y)
- POPPLER_CONF_OPT += --with-x
+ POPPLER_CONF_OPTS += --with-x
POPPLER_DEPENDENCIES += xlib_libX11 xlib_libXext
else
- POPPLER_CONF_OPT += --without-x
+ POPPLER_CONF_OPTS += --without-x
endif
$(eval $(autotools-package))
diff --git a/package/popt/popt.mk b/package/popt/popt.mk
--- a/package/popt/popt.mk
+++ b/package/popt/popt.mk
@@ -17,7 +17,7 @@
ifeq ($(BR2_PACKAGE_LIBICONV),y)
POPT_CONF_ENV += am_cv_lib_iconv=yes
-POPT_CONF_OPT += --with-libiconv-prefix=$(STAGING_DIR)/usr
+POPT_CONF_OPTS += --with-libiconv-prefix=$(STAGING_DIR)/usr
endif
$(eval $(autotools-package))
diff --git a/package/portaudio/portaudio.mk b/package/portaudio/portaudio.mk
--- a/package/portaudio/portaudio.mk
+++ b/package/portaudio/portaudio.mk
@@ -15,7 +15,7 @@
PORTAUDIO_DEPENDENCIES = \
$(if $(BR2_PACKAGE_PORTAUDIO_WITH_ALSA),alsa-lib)
-PORTAUDIO_CONF_OPT = \
+PORTAUDIO_CONF_OPTS = \
$(if $(BR2_PACKAGE_PORTAUDIO_ALSA),--with-alsa,--without-alsa) \
$(if $(BR2_PACKAGE_PORTAUDIO_OSS),--with-oss,--without-oss) \
$(if $(BR2_PACKAGE_PORTAUDIO_CXX),--enable-cxx,--disable-cxx)
diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk
--- a/package/postgresql/postgresql.mk
+++ b/package/postgresql/postgresql.mk
@@ -14,28 +14,28 @@
POSTGRESQL_CONFIG_SCRIPTS = pg_config
ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
- POSTGRESQL_CONF_OPT += --disable-thread-safety
+ POSTGRESQL_CONF_OPTS += --disable-thread-safety
endif
ifeq ($(BR2_microblazeel)$(BR2_microblazebe)$(BR2_nios2),y)
- POSTGRESQL_CONF_OPT += --disable-spinlocks
+ POSTGRESQL_CONF_OPTS += --disable-spinlocks
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
POSTGRESQL_DEPENDENCIES += readline
else
- POSTGRESQL_CONF_OPT += --without-readline
+ POSTGRESQL_CONF_OPTS += --without-readline
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
POSTGRESQL_DEPENDENCIES += zlib
else
- POSTGRESQL_CONF_OPT += --without-zlib
+ POSTGRESQL_CONF_OPTS += --without-zlib
endif
ifeq ($(BR2_PACKAGE_TZDATA),y)
POSTGRESQL_DEPENDENCIES += tzdata
- POSTGRESQL_CONF_OPT += --with-system-tzdata=/usr/share/zoneinfo
+ POSTGRESQL_CONF_OPTS += --with-system-tzdata=/usr/share/zoneinfo
else
POSTGRESQL_DEPENDENCIES += host-zic
POSTGRESQL_CONF_ENV += ZIC=$$(ZIC)
@@ -43,7 +43,7 @@
ifeq ($(BR2_PACKAGE_OPENSSL),y)
POSTGRESQL_DEPENDENCIES += openssl
- POSTGRESQL_CONF_OPT += --with-openssl
+ POSTGRESQL_CONF_OPTS += --with-openssl
endif
define POSTGRESQL_USERS
diff --git a/package/powerpc-utils/powerpc-utils.mk b/package/powerpc-utils/powerpc-utils.mk
--- a/package/powerpc-utils/powerpc-utils.mk
+++ b/package/powerpc-utils/powerpc-utils.mk
@@ -11,6 +11,6 @@
POWERPC_UTILS_LICENSE = Common Public License Version 1.0
POWERPC_UTILS_LICENSE_FILES = COPYRIGHT
-POWERPC_UTILS_CONF_OPT = --without-librtas
+POWERPC_UTILS_CONF_OPTS = --without-librtas
$(eval $(autotools-package))
diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk
--- a/package/prboom/prboom.mk
+++ b/package/prboom/prboom.mk
@@ -15,7 +15,7 @@
PRBOOM_DEPENDENCIES += libpng
endif
-PRBOOM_CONF_OPT = \
+PRBOOM_CONF_OPTS = \
--oldincludedir=$(STAGING_DIR)/usr/include \
--with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk
--- a/package/procps-ng/procps-ng.mk
+++ b/package/procps-ng/procps-ng.mk
@@ -21,11 +21,11 @@
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
PROCPS_NG_DEPENDENCIES += gettext
-PROCPS_NG_CONF_OPT += LIBS=-lintl
+PROCPS_NG_CONF_OPTS += LIBS=-lintl
endif
# We need this to make procps-ng binaries installed in $(TARGET_DIR)/usr
# instead of $(TARGET_DIR)/usr/usr
-PROCPS_NG_CONF_OPT += --exec-prefix=
+PROCPS_NG_CONF_OPTS += --exec-prefix=
$(eval $(autotools-package))
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -13,7 +13,7 @@
PROFTPD_CONF_ENV = ac_cv_func_setpgrp_void=yes \
ac_cv_func_setgrent_void=yes
-PROFTPD_CONF_OPT = --localstatedir=/var/run \
+PROFTPD_CONF_OPTS = --localstatedir=/var/run \
--disable-static \
--disable-curses \
--disable-ncurses \
@@ -23,7 +23,7 @@
--with-gnu-ld
ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
-PROFTPD_CONF_OPT += --with-modules=mod_rewrite
+PROFTPD_CONF_OPTS += --with-modules=mod_rewrite
endif
ifeq ($(BR2_LARGEFILE),y)
diff --git a/package/protobuf-c/protobuf-c.mk b/package/protobuf-c/protobuf-c.mk
--- a/package/protobuf-c/protobuf-c.mk
+++ b/package/protobuf-c/protobuf-c.mk
@@ -9,7 +9,7 @@
PROTOBUF_C_DEPENDENCIES = host-protobuf-c
HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf
PROTOBUF_C_MAKE = $(MAKE1)
-PROTOBUF_C_CONF_OPT = --disable-protoc
+PROTOBUF_C_CONF_OPTS = --disable-protoc
PROTOBUF_C_INSTALL_STAGING = YES
PROTOBUF_C_LICENSE = BSD-2c
PROTOBUF_C_LICENSE_FILES = LICENSE
diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk
--- a/package/protobuf/protobuf.mk
+++ b/package/protobuf/protobuf.mk
@@ -11,7 +11,7 @@
# N.B. Need to use host protoc during cross compilation.
PROTOBUF_DEPENDENCIES = host-protobuf
-PROTOBUF_CONF_OPT = --with-protoc=$(HOST_DIR)/usr/bin/protoc
+PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/usr/bin/protoc
PROTOBUF_INSTALL_STAGING = YES
diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk
--- a/package/psmisc/psmisc.mk
+++ b/package/psmisc/psmisc.mk
@@ -12,7 +12,7 @@
ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
# Don't force -fstack-protector when SSP is not available in toolchain
-PSMISC_CONF_OPT = --disable-harden-flags
+PSMISC_CONF_OPTS = --disable-harden-flags
endif
# build after busybox, we prefer fat versions while we're at it
diff --git a/package/ptpd2/ptpd2.mk b/package/ptpd2/ptpd2.mk
--- a/package/ptpd2/ptpd2.mk
+++ b/package/ptpd2/ptpd2.mk
@@ -14,14 +14,14 @@
PTPD2_LICENSE_FILES = COPYRIGHT
ifeq ($(BR2_PREFER_STATIC_LIB),y)
- PTPD2_CONF_OPT += LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
+ PTPD2_CONF_OPTS += LIBS="$(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)"
endif
ifeq ($(BR2_PACKAGE_NETSNMP),y)
PTPD2_CONF_ENV += ac_cv_path_PATH_NET_SNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
PTPD2_DEPENDENCIES += netsnmp
else
- PTPD2_CONF_OPT += --disable-snmp
+ PTPD2_CONF_OPTS += --disable-snmp
endif
define PTPD2_INSTALL_INIT_SYSV
diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk
--- a/package/pulseaudio/pulseaudio.mk
+++ b/package/pulseaudio/pulseaudio.mk
@@ -10,7 +10,7 @@
PULSEAUDIO_INSTALL_STAGING = YES
PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file)
PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL
-PULSEAUDIO_CONF_OPT = \
+PULSEAUDIO_CONF_OPTS = \
--localstatedir=/var \
--disable-default-build-tests \
--disable-legacy-runtime-dir \
@@ -36,16 +36,16 @@
ifeq ($(BR2_PACKAGE_ORC),y)
PULSEAUDIO_DEPENDENCIES += orc
PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/usr/bin/orcc
-PULSEAUDIO_CONF_OPT += --enable-orc
+PULSEAUDIO_CONF_OPTS += --enable-orc
else
-PULSEAUDIO_CONF_OPT += --disable-orc
+PULSEAUDIO_CONF_OPTS += --disable-orc
endif
ifeq ($(BR2_PACKAGE_LIBCAP),y)
PULSEAUDIO_DEPENDENCIES += libcap
-PULSEAUDIO_CONF_OPT += --with-caps
+PULSEAUDIO_CONF_OPTS += --with-caps
else
-PULSEAUDIO_CONF_OPT += --without-caps
+PULSEAUDIO_CONF_OPTS += --without-caps
endif
ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
@@ -71,14 +71,14 @@
endif
ifeq ($(PULSEAUDIO_USE_NEON),y)
-PULSEAUDIO_CONF_OPT += --enable-neon-opt=yes
+PULSEAUDIO_CONF_OPTS += --enable-neon-opt=yes
else
-PULSEAUDIO_CONF_OPT += --enable-neon-opt=no
+PULSEAUDIO_CONF_OPTS += --enable-neon-opt=no
endif
# pulseaudio alsa backend needs pcm/mixer apis
ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
-PULSEAUDIO_CONF_OPT += --disable-alsa
+PULSEAUDIO_CONF_OPTS += --disable-alsa
endif
ifeq ($(BR2_PACKAGE_LIBXCB)$(BR2_PACKAGE_XLIB_LIBSM)$(BR2_PACKAGE_XLIB_LIBXTST),yyy)
@@ -97,7 +97,7 @@
endif
else
-PULSEAUDIO_CONF_OPT += --disable-x11
+PULSEAUDIO_CONF_OPTS += --disable-x11
endif
define PULSEAUDIO_REMOVE_VALA
diff --git a/package/python/python.mk b/package/python/python.mk
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -16,7 +16,7 @@
# also installed in $(HOST_DIR), as it is needed when cross-compiling
# third-party Python modules.
-HOST_PYTHON_CONF_OPT += \
+HOST_PYTHON_CONF_OPTS += \
--enable-static \
--without-cxx-main \
--disable-sqlite3 \
@@ -61,57 +61,57 @@
ifeq ($(BR2_PACKAGE_PYTHON_CURSES),y)
PYTHON_DEPENDENCIES += ncurses
else
-PYTHON_CONF_OPT += --disable-curses
+PYTHON_CONF_OPTS += --disable-curses
endif
ifeq ($(BR2_PACKAGE_PYTHON_PYEXPAT),y)
PYTHON_DEPENDENCIES += expat
-PYTHON_CONF_OPT += --with-expat=system
+PYTHON_CONF_OPTS += --with-expat=system
else
-PYTHON_CONF_OPT += --with-expat=none
+PYTHON_CONF_OPTS += --with-expat=none
endif
ifeq ($(BR2_PACKAGE_PYTHON_BSDDB),y)
PYTHON_DEPENDENCIES += berkeleydb
else
-PYTHON_CONF_OPT += --disable-bsddb
+PYTHON_CONF_OPTS += --disable-bsddb
endif
ifeq ($(BR2_PACKAGE_PYTHON_SQLITE),y)
PYTHON_DEPENDENCIES += sqlite
else
-PYTHON_CONF_OPT += --disable-sqlite3
+PYTHON_CONF_OPTS += --disable-sqlite3
endif
ifeq ($(BR2_PACKAGE_PYTHON_SSL),y)
PYTHON_DEPENDENCIES += openssl
else
-PYTHON_CONF_OPT += --disable-ssl
+PYTHON_CONF_OPTS += --disable-ssl
endif
ifneq ($(BR2_PACKAGE_PYTHON_CODECSCJK),y)
-PYTHON_CONF_OPT += --disable-codecs-cjk
+PYTHON_CONF_OPTS += --disable-codecs-cjk
endif
ifneq ($(BR2_PACKAGE_PYTHON_UNICODEDATA),y)
-PYTHON_CONF_OPT += --disable-unicodedata
+PYTHON_CONF_OPTS += --disable-unicodedata
endif
# Default is UCS2 w/o a conf opt
ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y)
-PYTHON_CONF_OPT += --enable-unicode=ucs4
+PYTHON_CONF_OPTS += --enable-unicode=ucs4
endif
ifeq ($(BR2_PACKAGE_PYTHON_BZIP2),y)
PYTHON_DEPENDENCIES += bzip2
else
-PYTHON_CONF_OPT += --disable-bz2
+PYTHON_CONF_OPTS += --disable-bz2
endif
ifeq ($(BR2_PACKAGE_PYTHON_ZLIB),y)
PYTHON_DEPENDENCIES += zlib
else
-PYTHON_CONF_OPT += --disable-zlib
+PYTHON_CONF_OPTS += --disable-zlib
endif
ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
@@ -124,7 +124,7 @@
ac_cv_file__dev_ptc=yes \
ac_cv_working_tzset=yes
-PYTHON_CONF_OPT += \
+PYTHON_CONF_OPTS += \
--without-cxx-main \
--without-doc-strings \
--with-system-ffi \
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -17,7 +17,7 @@
# installed in $(HOST_DIR), as it is needed when cross-compiling
# third-party Python modules.
-HOST_PYTHON3_CONF_OPT += \
+HOST_PYTHON3_CONF_OPTS += \
--without-ensurepip \
--without-cxx-main \
--disable-sqlite3 \
@@ -50,35 +50,35 @@
ifeq ($(BR2_PACKAGE_PYTHON3_CURSES),y)
PYTHON3_DEPENDENCIES += ncurses
else
-PYTHON3_CONF_OPT += --disable-curses
+PYTHON3_CONF_OPTS += --disable-curses
endif
ifeq ($(BR2_PACKAGE_PYTHON3_DECIMAL),y)
PYTHON3_DEPENDENCIES += mpdecimal
-PYTHON3_CONF_OPT += --with-libmpdec=system
+PYTHON3_CONF_OPTS += --with-libmpdec=system
else
-PYTHON3_CONF_OPT += --with-libmpdec=none
+PYTHON3_CONF_OPTS += --with-libmpdec=none
endif
ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y)
PYTHON3_DEPENDENCIES += expat
-PYTHON3_CONF_OPT += --with-expat=system
+PYTHON3_CONF_OPTS += --with-expat=system
else
-PYTHON3_CONF_OPT += --with-expat=none
+PYTHON3_CONF_OPTS += --with-expat=none
endif
ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y)
-PYTHON3_CONF_OPT += --enable-old-stdlib-cache
+PYTHON3_CONF_OPTS += --enable-old-stdlib-cache
endif
ifeq ($(BR2_PACKAGE_PYTHON3_PY_ONLY),y)
-PYTHON3_CONF_OPT += --disable-pyc-build
+PYTHON3_CONF_OPTS += --disable-pyc-build
endif
ifeq ($(BR2_PACKAGE_PYTHON3_SQLITE),y)
PYTHON3_DEPENDENCIES += sqlite
else
-PYTHON3_CONF_OPT += --disable-sqlite3
+PYTHON3_CONF_OPTS += --disable-sqlite3
endif
ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y)
@@ -86,11 +86,11 @@
endif
ifneq ($(BR2_PACKAGE_PYTHON3_CODECSCJK),y)
-PYTHON3_CONF_OPT += --disable-codecs-cjk
+PYTHON3_CONF_OPTS += --disable-codecs-cjk
endif
ifneq ($(BR2_PACKAGE_PYTHON3_UNICODEDATA),y)
-PYTHON3_CONF_OPT += --disable-unicodedata
+PYTHON3_CONF_OPTS += --disable-unicodedata
endif
ifeq ($(BR2_PACKAGE_PYTHON3_BZIP2),y)
@@ -107,7 +107,7 @@
ac_cv_file__dev_ptc=yes \
ac_cv_working_tzset=yes
-PYTHON3_CONF_OPT += \
+PYTHON3_CONF_OPTS += \
--without-ensurepip \
--without-cxx-main \
--with-system-ffi \
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -10,24 +10,24 @@
QUAGGA_DEPENDENCIES = host-gawk
QUAGGA_LICENSE = GPLv2+
QUAGGA_LICENSE_FILES = COPYING
-QUAGGA_CONF_OPT = --program-transform-name='' --enable-netlink
+QUAGGA_CONF_OPTS = --program-transform-name='' --enable-netlink
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_ZEBRA),--enable-zebra,--disable-zebra)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BABELD),--enable-babeld,--disable-babeld)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BGPD),--enable-bgpd,--disable-bgpd)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_RIPD),--enable-ripd,--disable-ripd)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_RIPNGD),--enable-ripngd,--disable-ripngd)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OSPFD),--enable-ospfd,--disable-ospfd)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OSPF6D),--enable-ospf6d,--disable-ospf6d)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),--enable-watchquagga,--disable-watchquagga)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-isisd)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--disable-tcp-zebra)
-QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--disable-opaque-lsa)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ZEBRA),--enable-zebra,--disable-zebra)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BABELD),--enable-babeld,--disable-babeld)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGPD),--enable-bgpd,--disable-bgpd)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_RIPD),--enable-ripd,--disable-ripd)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_RIPNGD),--enable-ripngd,--disable-ripngd)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_OSPFD),--enable-ospfd,--disable-ospfd)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_OSPF6D),--enable-ospf6d,--disable-ospf6d)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),--enable-watchquagga,--disable-watchquagga)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-isisd)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--disable-tcp-zebra)
+QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--disable-opaque-lsa)
ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config
-QUAGGA_CONF_OPT += --enable-snmp=agentx
+QUAGGA_CONF_OPTS += --enable-snmp=agentx
QUAGGA_DEPENDENCIES += netsnmp
endif
diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk
--- a/package/rdesktop/rdesktop.mk
+++ b/package/rdesktop/rdesktop.mk
@@ -10,14 +10,14 @@
$(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \
$(if $(BR2_PACKAGE_LIBAO),libao) \
$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate)
-RDESKTOP_CONF_OPT = --with-openssl=$(STAGING_DIR)/usr --disable-credssp
+RDESKTOP_CONF_OPTS = --with-openssl=$(STAGING_DIR)/usr --disable-credssp
RDESKTOP_LICENSE = GPLv3+
RDESKTOP_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_PCSC_LITE),y)
RDESKTOP_DEPENDENCIES += pcsc-lite
else
-RDESKTOP_CONF_OPT += --disable-smartcard
+RDESKTOP_CONF_OPTS += --disable-smartcard
endif
$(eval $(autotools-package))
diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -12,7 +12,7 @@
RP_PPPOE_SUBDIR = src
RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
-RP_PPPOE_CONF_OPT = --disable-debugging
+RP_PPPOE_CONF_OPTS = --disable-debugging
RP_PPPOE_CONF_ENV = \
rpppoe_cv_pack_bitfields=normal \
PPPD_H=$(PPPD_DIR)/pppd/pppd.h
diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk
--- a/package/rpcbind/rpcbind.mk
+++ b/package/rpcbind/rpcbind.mk
@@ -14,7 +14,7 @@
RPCBIND_CONF_ENV += \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
RPCBIND_DEPENDENCIES += libtirpc
-RPCBIND_CONF_OPT += --with-rpcuser=root
+RPCBIND_CONF_OPTS += --with-rpcuser=root
define RPCBIND_INSTALL_INIT_SYSV
[ -f $(TARGET_DIR)/etc/init.d/S30rpcbind ] || \
diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
--- a/package/rpi-userland/rpi-userland.mk
+++ b/package/rpi-userland/rpi-userland.mk
@@ -9,7 +9,7 @@
RPI_USERLAND_LICENSE = BSD-3c
RPI_USERLAND_LICENSE_FILES = LICENCE
RPI_USERLAND_INSTALL_STAGING = YES
-RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
+RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr
RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg
diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -14,7 +14,7 @@
RPM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon -DHAVE_MUTEX_THREAD_ONLY" \
ac_cv_va_copy=yes
-RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
+RPM_CONF_OPTS = --disable-build-versionscript --disable-rpath \
--without-selinux \
--without-python --without-perl \
--with-openssl=external \
@@ -24,24 +24,24 @@
ifeq ($(BR2_PACKAGE_PCRE),y)
RPM_DEPENDENCIES += pcre
-RPM_CONF_OPT += --with-pcre=external
+RPM_CONF_OPTS += --with-pcre=external
else
-RPM_CONF_OPT += --with-pcre=no
+RPM_CONF_OPTS += --with-pcre=no
endif
ifeq ($(BR2_PACKAGE_FILE),y)
RPM_DEPENDENCIES += file
-RPM_CONF_OPT += --with-file=external
+RPM_CONF_OPTS += --with-file=external
else
-RPM_CONF_OPT += --with-file=no
+RPM_CONF_OPTS += --with-file=no
endif
ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y)
-RPM_CONF_OPT += --with-xz
+RPM_CONF_OPTS += --with-xz
endif
ifeq ($(BR2_PACKAGE_RPM_BZIP2_PAYLOADS),y)
-RPM_CONF_OPT += --with-bzip2
+RPM_CONF_OPTS += --with-bzip2
RPM_DEPENDENCIES += bzip2
endif
diff --git a/package/rrdtool/rrdtool.mk b/package/rrdtool/rrdtool.mk
--- a/package/rrdtool/rrdtool.mk
+++ b/package/rrdtool/rrdtool.mk
@@ -14,7 +14,7 @@
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_OPT = --disable-perl --disable-python --disable-ruby \
+RRDTOOL_CONF_OPTS = --disable-perl --disable-python --disable-ruby \
--disable-tcl --program-transform-name='' \
$(if $(BR2_TOOLCHAIN_HAS_THREADS),,--disable-pthread)
RRDTOOL_MAKE = $(MAKE1)
diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -9,7 +9,7 @@
RSYNC_LICENSE = GPLv3+
RSYNC_LICENSE_FILES = COPYING
RSYNC_DEPENDENCIES = zlib popt
-RSYNC_CONF_OPT = \
+RSYNC_CONF_OPTS = \
$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) \
--with-included-zlib=no \
--with-included-popt=no
@@ -17,7 +17,7 @@
ifeq ($(BR2_PACKAGE_ACL),y)
RSYNC_DEPENDENCIES += acl
else
- RSYNC_CONF_OPT += --disable-acl-support
+ RSYNC_CONF_OPTS += --disable-acl-support
endif
$(eval $(autotools-package))
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -11,7 +11,7 @@
RSYSLOG_DEPENDENCIES = zlib libestr liblogging json-c util-linux host-pkgconf
RSYSLOG_AUTORECONF = YES
-RSYSLOG_CONF_OPT = --disable-testbench \
+RSYSLOG_CONF_OPTS = --disable-testbench \
--enable-cached-man-pages
# Build after BusyBox
@@ -26,9 +26,9 @@
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
RSYSLOG_DEPENDENCIES += libgcrypt
RSYSLOG_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
- RSYSLOG_CONF_OPT += --enable-libgcrypt=yes
+ RSYSLOG_CONF_OPTS += --enable-libgcrypt=yes
else
- RSYSLOG_CONF_OPT += --enable-libgcrypt=no
+ RSYSLOG_CONF_OPTS += --enable-libgcrypt=no
endif
define RSYSLOG_INSTALL_INIT_SYSV
diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
--- a/package/rtai/rtai.mk
+++ b/package/rtai/rtai.mk
@@ -18,7 +18,7 @@
RTAI_DEPENDENCIES = linux
-RTAI_CONF_OPT = \
+RTAI_CONF_OPTS = \
--includedir=/usr/include/rtai \
--with-linux-dir=$(LINUX_DIR) \
--disable-leds \
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -12,8 +12,8 @@
HOST_RUBY_DEPENDENCIES = host-pkgconf
RUBY_MAKE_ENV = $(TARGET_MAKE_ENV)
RUBY_MAKE = $(MAKE1)
-RUBY_CONF_OPT = --disable-install-doc --disable-rpath
-HOST_RUBY_CONF_OPT = --disable-install-doc \
+RUBY_CONF_OPTS = --disable-install-doc --disable-rpath
+HOST_RUBY_CONF_OPTS = --disable-install-doc \
--with-out-ext=curses,openssl,readline \
--without-gmp
RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others
@@ -56,9 +56,9 @@
endif
ifeq ($(BR2_PACKAGE_GMP),y)
RUBY_DEPENDENCIES += gmp
- RUBY_CONF_OPT += --with-gmp
+ RUBY_CONF_OPTS += --with-gmp
else
- RUBY_CONF_OPT += --without-gmp
+ RUBY_CONF_OPTS += --without-gmp
endif
# Remove rubygems and friends, as they need extensions that aren't
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -31,7 +31,7 @@
libreplace_cv_HAVE_IPV6=$(if $(BR2_INET_IPV6),yes,no) \
$(if $(BR2_PACKAGE_SAMBA_AVAHI),AVAHI_LIBS=-pthread)
-SAMBA_CONF_OPT = \
+SAMBA_CONF_OPTS = \
--localstatedir=/var \
--with-piddir=/var/run \
--with-lockdir=/var/lock \
@@ -148,13 +148,13 @@
# --with-libiconv="" is to avoid detecting host libiconv and build failure
ifeq ($(BR2_PACKAGE_SAMBA_LIBICONV),y)
SAMBA_DEPENDENCIES += libiconv
-SAMBA_CONF_OPT += --with-libiconv=$(STAGING_DIR)
+SAMBA_CONF_OPTS += --with-libiconv=$(STAGING_DIR)
else
-SAMBA_CONF_OPT += --with-libiconv=""
+SAMBA_CONF_OPTS += --with-libiconv=""
endif
# Compiled debug messages by level
-SAMBA_CONF_OPT += CFLAGS="$(TARGET_CFLAGS) -DMAX_DEBUG_LEVEL=$(BR2_PACKAGE_SAMBA_MAX_DEBUGLEVEL)"
+SAMBA_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -DMAX_DEBUG_LEVEL=$(BR2_PACKAGE_SAMBA_MAX_DEBUGLEVEL)"
ifeq ($(BR2_PACKAGE_SAMBA_SWAT),y)
SAMBA_POST_INSTALL_TARGET_HOOKS += SAMBA_REMOVE_SWAT_DOCUMENTATION
diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -14,59 +14,59 @@
$(if $(BR2_PACKAGE_READLINE),readline)
ifeq ($(BR2_PACKAGE_ACL),y)
- SAMBA4_CONF_OPT += --with-acl-support
+ SAMBA4_CONF_OPTS += --with-acl-support
SAMBA4_DEPENDENCIES += acl
else
- SAMBA4_CONF_OPT += --without-acl-support
+ SAMBA4_CONF_OPTS += --without-acl-support
endif
ifeq ($(BR2_PACKAGE_CUPS),y)
SAMBA4_CONF_ENV += CUPS_CONFIG="$(STAGING_DIR)/usr/bin/cups-config"
- SAMBA4_CONF_OPT += --enable-cups
+ SAMBA4_CONF_OPTS += --enable-cups
SAMBA4_DEPENDENCIES += cups
else
- SAMBA4_CONF_OPT += --disable-cups
+ SAMBA4_CONF_OPTS += --disable-cups
endif
ifeq ($(BR2_PACKAGE_LIBAIO),y)
- SAMBA4_CONF_OPT += --with-aio-support
+ SAMBA4_CONF_OPTS += --with-aio-support
SAMBA4_DEPENDENCIES += libaio
else
- SAMBA4_CONF_OPT += --without-aio-support
+ SAMBA4_CONF_OPTS += --without-aio-support
endif
ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_AVAHI_DAEMON),yy)
- SAMBA4_CONF_OPT += --enable-avahi
+ SAMBA4_CONF_OPTS += --enable-avahi
SAMBA4_DEPENDENCIES += avahi
else
- SAMBA4_CONF_OPT += --disable-avahi
+ SAMBA4_CONF_OPTS += --disable-avahi
endif
ifeq ($(BR2_PACKAGE_GAMIN),y)
- SAMBA4_CONF_OPT += --with-fam
+ SAMBA4_CONF_OPTS += --with-fam
SAMBA4_DEPENDENCIES += gamin
else
- SAMBA4_CONF_OPT += --without-fam
+ SAMBA4_CONF_OPTS += --without-fam
endif
ifeq ($(BR2_PACKAGE_GETTEXT),y)
- SAMBA4_CONF_OPT += --with-gettext=$(STAGING_DIR)/usr
+ SAMBA4_CONF_OPTS += --with-gettext=$(STAGING_DIR)/usr
SAMBA4_DEPENDENCIES += gettext
else
- SAMBA4_CONF_OPT += --without-gettext
+ SAMBA4_CONF_OPTS += --without-gettext
endif
ifeq ($(BR2_PACKAGE_GNUTLS),y)
- SAMBA4_CONF_OPT += --enable-gnutls
+ SAMBA4_CONF_OPTS += --enable-gnutls
SAMBA4_DEPENDENCIES += gnutls
else
- SAMBA4_CONF_OPT += --disable-gnutls
+ SAMBA4_CONF_OPTS += --disable-gnutls
endif
ifeq ($(BR2_PACKAGE_NCURSES_TARGET_FORM)$(BR2_PACKAGE_NCURSES_TARGET_MENU)$(BR2_PACKAGE_NCURSES_TARGET_PANEL),yyy)
SAMBA4_DEPENDENCIES += ncurses
else
- SAMBA4_CONF_OPT += --without-regedit
+ SAMBA4_CONF_OPTS += --without-regedit
endif
define SAMBA4_CONFIGURE_CMDS
@@ -97,7 +97,7 @@
--without-cluster-support \
--without-ads \
--bundled-libraries='!asn1_compile,!compile_et' \
- $(SAMBA4_CONF_OPT) \
+ $(SAMBA4_CONF_OPTS) \
)
endef
diff --git a/package/sane-backends/sane-backends.mk b/package/sane-backends/sane-backends.mk
--- a/package/sane-backends/sane-backends.mk
+++ b/package/sane-backends/sane-backends.mk
@@ -12,9 +12,9 @@
ifeq ($(BR2_PACKAGE_LIBUSB),y)
SANE_BACKENDS_DEPENDENCIES += libusb
-SANE_BACKENDS_CONF_OPT += --enable-libusb_1_0
+SANE_BACKENDS_CONF_OPTS += --enable-libusb_1_0
else
-SANE_BACKENDS_CONF_OPT += --disable-libusb
+SANE_BACKENDS_CONF_OPTS += --disable-libusb
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
@@ -31,13 +31,13 @@
ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBGLIB2),yyy)
SANE_BACKENDS_DEPENDENCIES += avahi
-SANE_BACKENDS_CONF_OPT += --enable-avahi
+SANE_BACKENDS_CONF_OPTS += --enable-avahi
endif
ifeq ($(BR2_PACKAGE_NETSNMP),y)
SANE_BACKENDS_DEPENDENCIES += netsnmp
else
-SANE_BACKENDS_CONF_OPT += --without-snmp
+SANE_BACKENDS_CONF_OPTS += --without-snmp
endif
define SANE_BACKENDS_DISABLE_DOCS
diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -13,103 +13,103 @@
SCONESERVER_AUTORECONF = YES
SCONESERVER_DEPENDENCIES += pcre
-SCONESERVER_CONF_OPT += --with-ip --with-local
+SCONESERVER_CONF_OPTS += --with-ip --with-local
# Sconeserver configure script fails to find the libxml2 headers.
ifeq ($(BR2_PACKAGE_LIBXML2),y)
- SCONESERVER_CONF_OPT += \
+ SCONESERVER_CONF_OPTS += \
--with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config"
endif
ifeq ($(BR2_INET_IPV6),y)
- SCONESERVER_CONF_OPT += --with-ip6
+ SCONESERVER_CONF_OPTS += --with-ip6
else
- SCONESERVER_CONF_OPT += --without-ip6
+ SCONESERVER_CONF_OPTS += --without-ip6
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
SCONESERVER_DEPENDENCIES += openssl
- SCONESERVER_CONF_OPT += --with-ssl
+ SCONESERVER_CONF_OPTS += --with-ssl
else
- SCONESERVER_CONF_OPT += --without-ssl
+ SCONESERVER_CONF_OPTS += --without-ssl
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_EXAMPLES),y)
- SCONESERVER_CONF_OPT += --with-examples
+ SCONESERVER_CONF_OPTS += --with-examples
else
- SCONESERVER_CONF_OPT += --without-examples
+ SCONESERVER_CONF_OPTS += --without-examples
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE),y)
SCONESERVER_DEPENDENCIES += libxml2
- SCONESERVER_CONF_OPT += --with-sconesite
+ SCONESERVER_CONF_OPTS += --with-sconesite
else
- SCONESERVER_CONF_OPT += --without-sconesite
+ SCONESERVER_CONF_OPTS += --without-sconesite
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y)
SCONESERVER_DEPENDENCIES += imagemagick host-pkgconf
- SCONESERVER_CONF_OPT += \
+ SCONESERVER_CONF_OPTS += \
--with-sconesite-image \
--with-Magick++-config="$(STAGING_DIR)/usr/bin/Magick++-config"
else
- SCONESERVER_CONF_OPT += --without-sconesite-image
+ SCONESERVER_CONF_OPTS += --without-sconesite-image
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
SCONESERVER_DEPENDENCIES += mysql
- SCONESERVER_CONF_OPT += --with-mysql \
+ SCONESERVER_CONF_OPTS += --with-mysql \
--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"
else
- SCONESERVER_CONF_OPT += --without-mysql
+ SCONESERVER_CONF_OPTS += --without-mysql
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_BLUETOOTH),y)
SCONESERVER_DEPENDENCIES += bluez_utils
- SCONESERVER_CONF_OPT += --with-bluetooth
+ SCONESERVER_CONF_OPTS += --with-bluetooth
else
- SCONESERVER_CONF_OPT += --without-bluetooth
+ SCONESERVER_CONF_OPTS += --without-bluetooth
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_RSS),y)
SCONESERVER_DEPENDENCIES += libxml2
- SCONESERVER_CONF_OPT += --with-rss
+ SCONESERVER_CONF_OPTS += --with-rss
else
- SCONESERVER_CONF_OPT += --without-rss
+ SCONESERVER_CONF_OPTS += --without-rss
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_LOCATION),y)
SCONESERVER_DEPENDENCIES += gpsd
- SCONESERVER_CONF_OPT += --with-location
+ SCONESERVER_CONF_OPTS += --with-location
else
- SCONESERVER_CONF_OPT += --without-location
+ SCONESERVER_CONF_OPTS += --without-location
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_LETTUCE),y)
- SCONESERVER_CONF_OPT += --with-lettuce
+ SCONESERVER_CONF_OPTS += --with-lettuce
else
- SCONESERVER_CONF_OPT += --without-lettuce
+ SCONESERVER_CONF_OPTS += --without-lettuce
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_MATHS),y)
SCONESERVER_DEPENDENCIES += mpfr
- SCONESERVER_CONF_OPT += --with-maths
+ SCONESERVER_CONF_OPTS += --with-maths
else
- SCONESERVER_CONF_OPT += --without-maths
+ SCONESERVER_CONF_OPTS += --without-maths
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_TESTBUILDER),y)
- SCONESERVER_CONF_OPT += --with-testbuilder
+ SCONESERVER_CONF_OPTS += --with-testbuilder
else
- SCONESERVER_CONF_OPT += --without-testbuilder
+ SCONESERVER_CONF_OPTS += --without-testbuilder
endif
ifeq ($(BR2_PACKAGE_SCONESERVER_UI),y)
SCONESERVER_DEPENDENCIES += xlib_libX11
- SCONESERVER_CONF_OPT += --with-ui
+ SCONESERVER_CONF_OPTS += --with-ui
else
- SCONESERVER_CONF_OPT += --without-ui
+ SCONESERVER_CONF_OPTS += --without-ui
endif
$(eval $(autotools-package))
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -24,37 +24,37 @@
HOST_SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
-SDL_CONF_OPT += --enable-video-fbcon=yes
+SDL_CONF_OPTS += --enable-video-fbcon=yes
else
-SDL_CONF_OPT += --enable-video-fbcon=no
+SDL_CONF_OPTS += --enable-video-fbcon=no
endif
ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y)
SDL_DEPENDENCIES += directfb
-SDL_CONF_OPT += --enable-video-directfb=yes
+SDL_CONF_OPTS += --enable-video-directfb=yes
SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config
else
-SDL_CONF_OPT = --enable-video-directfb=no
+SDL_CONF_OPTS = --enable-video-directfb=no
endif
ifeq ($(BR2_PACKAGE_SDL_QTOPIA),y)
-SDL_CONF_OPT += --enable-video-qtopia=yes
+SDL_CONF_OPTS += --enable-video-qtopia=yes
SDL_DEPENDENCIES += qt
else
-SDL_CONF_OPT += --enable-video-qtopia=no
+SDL_CONF_OPTS += --enable-video-qtopia=no
endif
ifeq ($(BR2_PACKAGE_SDL_X11),y)
-SDL_CONF_OPT += --enable-video-x11=yes
+SDL_CONF_OPTS += --enable-video-x11=yes
SDL_DEPENDENCIES += xlib_libX11 xlib_libXext \
$(if $(BR2_PACKAGE_XLIB_LIBXRENDER), xlib_libXrender) \
$(if $(BR2_PACKAGE_XLIB_LIBXRANDR), xlib_libXrandr)
else
-SDL_CONF_OPT += --enable-video-x11=no
+SDL_CONF_OPTS += --enable-video-x11=no
endif
ifneq ($(BR2_USE_MMU),y)
-SDL_CONF_OPT += --enable-dga=no
+SDL_CONF_OPTS += --enable-dga=no
endif
ifeq ($(BR2_PACKAGE_TSLIB),y)
@@ -69,13 +69,13 @@
SDL_DEPENDENCIES += mesa3d
endif
-SDL_CONF_OPT += --enable-pulseaudio=no \
+SDL_CONF_OPTS += --enable-pulseaudio=no \
--disable-arts \
--disable-esd \
--disable-nasm \
--disable-video-ps3
-HOST_SDL_CONF_OPT += --enable-pulseaudio=no \
+HOST_SDL_CONF_OPTS += --enable-pulseaudio=no \
--enable-video-x11=no \
--disable-arts \
--disable-esd \
diff --git a/package/sdl_gfx/sdl_gfx.mk b/package/sdl_gfx/sdl_gfx.mk
--- a/package/sdl_gfx/sdl_gfx.mk
+++ b/package/sdl_gfx/sdl_gfx.mk
@@ -12,7 +12,7 @@
SDL_GFX_LICENSE_FILES = COPYING LICENSE
SDL_GFX_INSTALL_STAGING = YES
SDL_GFX_DEPENDENCIES = sdl
-SDL_GFX_CONF_OPT = \
+SDL_GFX_CONF_OPTS = \
--with-sdl-prefix=$(STAGING_DIR)/usr \
--disable-sdltest \
--enable-static
@@ -20,9 +20,9 @@
# Even though x86_64 processors support MMX, the MMX-specific assembly
# code in sdl_gfx is IA32 specific, and does not build for x86_64.
ifeq ($(BR2_i386)$(BR2_X86_CPU_HAS_MMX),yy)
-SDL_GFX_CONF_OPT += --enable-mmx
+SDL_GFX_CONF_OPTS += --enable-mmx
else
-SDL_GFX_CONF_OPT += --disable-mmx
+SDL_GFX_CONF_OPTS += --disable-mmx
endif
$(eval $(autotools-package))
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -11,7 +11,7 @@
SDL_IMAGE_LICENSE = zlib
SDL_IMAGE_LICENSE_FILES = COPYING
-SDL_IMAGE_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
+SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
--disable-sdltest \
--disable-static \
@@ -35,7 +35,7 @@
$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff) \
$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
-HOST_SDL_IMAGE_CONF_OPT = --with-sdl-prefix=$(HOST_DIR)/usr \
+HOST_SDL_IMAGE_CONF_OPTS = --with-sdl-prefix=$(HOST_DIR)/usr \
--with-sdl-exec-prefix=$(HOST_DIR)/usr \
--disable-sdltest \
--disable-static \
diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk
--- a/package/sdl_mixer/sdl_mixer.mk
+++ b/package/sdl_mixer/sdl_mixer.mk
@@ -12,7 +12,7 @@
SDL_MIXER_INSTALL_STAGING = YES
SDL_MIXER_DEPENDENCIES = sdl
-SDL_MIXER_CONF_OPT = \
+SDL_MIXER_CONF_OPTS = \
--without-x \
--with-sdl-prefix=$(STAGING_DIR)/usr \
--disable-music-midi \
@@ -21,17 +21,17 @@
--disable-music-flac # configure script fails when cross compiling
ifeq ($(BR2_PACKAGE_LIBMAD),y)
-SDL_MIXER_CONF_OPT += --enable-music-mp3-mad-gpl
+SDL_MIXER_CONF_OPTS += --enable-music-mp3-mad-gpl
SDL_MIXER_DEPENDENCIES += libmad
else
-SDL_MIXER_CONF_OPT += --disable-music-mp3-mad-gpl
+SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl
endif
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
-SDL_MIXER_CONF_OPT += --enable-music-ogg
+SDL_MIXER_CONF_OPTS += --enable-music-ogg
SDL_MIXER_DEPENDENCIES += libvorbis
else
-SDL_MIXER_CONF_OPT += --disable-music-ogg
+SDL_MIXER_CONF_OPTS += --disable-music-ogg
endif
$(eval $(autotools-package))
diff --git a/package/sdl_net/sdl_net.mk b/package/sdl_net/sdl_net.mk
--- a/package/sdl_net/sdl_net.mk
+++ b/package/sdl_net/sdl_net.mk
@@ -10,7 +10,7 @@
SDL_NET_LICENSE = zlib
SDL_NET_LICENSE_FILES = COPYING
-SDL_NET_CONF_OPT = --localstatedir=/var \
+SDL_NET_CONF_OPTS = --localstatedir=/var \
--with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -29,16 +29,16 @@
SDL_SOUND_DEPENDENCIES += speex
endif
-SDL_SOUND_CONF_OPT = \
+SDL_SOUND_CONF_OPTS = \
--with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
--disable-sdltest \
--enable-static
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-SDL_SOUND_CONF_OPT += --enable-mmx
+SDL_SOUND_CONF_OPTS += --enable-mmx
else
-SDL_SOUND_CONF_OPT += --disable-mmx
+SDL_SOUND_CONF_OPTS += --disable-mmx
endif
define SDL_SOUND_REMOVE_PLAYSOUND
diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
--- a/package/sdl_ttf/sdl_ttf.mk
+++ b/package/sdl_ttf/sdl_ttf.mk
@@ -12,7 +12,7 @@
SDL_TTF_INSTALL_STAGING = YES
SDL_TTF_DEPENDENCIES = sdl freetype
-SDL_TTF_CONF_OPT = --without-x \
+SDL_TTF_CONF_OPTS = --without-x \
--with-freetype-prefix=$(STAGING_DIR)/usr \
--with-sdl-prefix=$(STAGING_DIR)/usr
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -9,7 +9,7 @@
SED_LICENSE = GPLv3
SED_LICENSE_FILES = COPYING
-SED_CONF_OPT = --bindir=/usr/bin \
+SED_CONF_OPTS = --bindir=/usr/bin \
--libdir=/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk
--- a/package/shared-mime-info/shared-mime-info.mk
+++ b/package/shared-mime-info/shared-mime-info.mk
@@ -10,14 +10,14 @@
SHARED_MIME_INFO_INSTALL_STAGING = YES
SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
SHARED_MIME_INFO_DEPENDENCIES = host-pkgconf host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
-SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
+SHARED_MIME_INFO_CONF_OPTS = --disable-update-mimedb
SHARED_MIME_INFO_MAKE = $(MAKE1)
SHARED_MIME_INFO_LICENSE = GPLv2
SHARED_MIME_INFO_LICENSE_FILES = COPYING
HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkgconf host-intltool
-HOST_SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
+HOST_SHARED_MIME_INFO_CONF_OPTS = --disable-update-mimedb
HOST_SHARED_MIME_INFO_MAKE = $(MAKE1)
define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
diff --git a/package/sispmctl/sispmctl.mk b/package/sispmctl/sispmctl.mk
--- a/package/sispmctl/sispmctl.mk
+++ b/package/sispmctl/sispmctl.mk
@@ -11,6 +11,6 @@
SISPMCTL_DEPENDENCIES = libusb-compat
SISPMCTL_CONF_ENV = HAVELIBUSB=$(STAGING_DIR)/usr/bin/libusb-config
-SISPMCTL_CONF_OPT = --enable-webless
+SISPMCTL_CONF_OPTS = --enable-webless
$(eval $(autotools-package))
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -13,32 +13,32 @@
# Absolute path hell, sigh...
ifeq ($(BR2_PACKAGE_LIBPNG),y)
- SLANG_CONF_OPT += --with-png=$(STAGING_DIR)/usr
+ SLANG_CONF_OPTS += --with-png=$(STAGING_DIR)/usr
SLANG_DEPENDENCIES += libpng
else
- SLANG_CONF_OPT += --with-png=no
+ SLANG_CONF_OPTS += --with-png=no
endif
ifeq ($(BR2_PACKAGE_PCRE),y)
- SLANG_CONF_OPT += --with-pcre=$(STAGING_DIR)/usr
+ SLANG_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr
SLANG_DEPENDENCIES += pcre
else
- SLANG_CONF_OPT += --with-pcre=no
+ SLANG_CONF_OPTS += --with-pcre=no
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
- SLANG_CONF_OPT += --with-z=$(STAGING_DIR)/usr
+ SLANG_CONF_OPTS += --with-z=$(STAGING_DIR)/usr
SLANG_DEPENDENCIES += zlib
else
- SLANG_CONF_OPT += --with-z=no
+ SLANG_CONF_OPTS += --with-z=no
endif
ifeq ($(BR2_PACKAGE_NCURSES),y)
SLANG_DEPENDENCIES += ncurses
else
- SLANG_CONF_OPT += ac_cv_path_nc5config=no
+ SLANG_CONF_OPTS += ac_cv_path_nc5config=no
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
- SLANG_CONF_OPT += --with-readline=gnu
+ SLANG_CONF_OPTS += --with-readline=gnu
SLANG_DEPENDENCIES += readline
endif
diff --git a/package/smcroute/smcroute.mk b/package/smcroute/smcroute.mk
--- a/package/smcroute/smcroute.mk
+++ b/package/smcroute/smcroute.mk
@@ -9,7 +9,7 @@
SMCROUTE_LICENSE = GPLv2+
SMCROUTE_LICENSE_FILES = COPYING
-SMCROUTE_CONF_OPT = ac_cv_func_setpgrp_void=yes
+SMCROUTE_CONF_OPTS = ac_cv_func_setpgrp_void=yes
#BUG:The package Makefile uses CC?= even though the package is autotools based
SMCROUTE_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk
--- a/package/snmppp/snmppp.mk
+++ b/package/snmppp/snmppp.mk
@@ -11,15 +11,15 @@
SNMPPP_INSTALL_STAGING = YES
# no configure script in tarball
SNMPPP_AUTORECONF = YES
-SNMPPP_CONF_OPT = $(if $(BR2_PACKAGE_SNMPPP_LOGGING),--enable-logging,--disable-logging)
+SNMPPP_CONF_OPTS = $(if $(BR2_PACKAGE_SNMPPP_LOGGING),--enable-logging,--disable-logging)
SNMPPP_LICENSE = SNMP++
SNMPPP_LICENSE_FILES = src/v3.cpp
ifeq ($(BR2_PACKAGE_SNMPPP_SNMPV3),y)
- SNMPPP_CONF_OPT += --enable-snmpv3
+ SNMPPP_CONF_OPTS += --enable-snmpv3
SNMPPP_DEPENDENCIES += openssl
else
- SNMPPP_CONF_OPT += --disable-snmpv3
+ SNMPPP_CONF_OPTS += --disable-snmpv3
endif
$(eval $(autotools-package))
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -24,13 +24,13 @@
ifeq ($(BR2_PACKAGE_OPENSSL),y)
SOCAT_DEPENDENCIES += openssl
else
- SOCAT_CONF_OPT += --disable-openssl
+ SOCAT_CONF_OPTS += --disable-openssl
endif
ifeq ($(BR2_PACKAGE_READLINE),y)
SOCAT_DEPENDENCIES += readline
else
- SOCAT_CONF_OPT += --disable-readline
+ SOCAT_CONF_OPTS += --disable-readline
endif
define SOCAT_RUN_AUTOCONF
diff --git a/package/socketcand/socketcand.mk b/package/socketcand/socketcand.mk
--- a/package/socketcand/socketcand.mk
+++ b/package/socketcand/socketcand.mk
@@ -13,7 +13,7 @@
ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
SOCKETCAND_DEPENDENCIES = libconfig
else
-SOCKETCAND_CONF_OPT = --without-config
+SOCKETCAND_CONF_OPTS = --without-config
endif
$(eval $(autotools-package))
diff --git a/package/sox/sox.mk b/package/sox/sox.mk
--- a/package/sox/sox.mk
+++ b/package/sox/sox.mk
@@ -7,92 +7,92 @@
SOX_VERSION = 14.4.1
SOX_SITE = http://downloads.sourceforge.net/project/sox/sox/$(SOX_VERSION)
SOX_DEPENDENCIES = host-pkgconf
-SOX_CONF_OPT = --with-distro="Buildroot" --without-ffmpeg --disable-gomp
+SOX_CONF_OPTS = --with-distro="Buildroot" --without-ffmpeg --disable-gomp
SOX_LICENSE = GPLv2+ (sox binary), LGPLv2.1+ (libraries)
SOX_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL
ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y)
SOX_DEPENDENCIES += alsa-lib
else
-SOX_CONF_OPT += --without-alsa
+SOX_CONF_OPTS += --without-alsa
endif
ifeq ($(BR2_PACKAGE_FILE),y)
SOX_DEPENDENCIES += file
else
-SOX_CONF_OPT += --without-magic
+SOX_CONF_OPTS += --without-magic
endif
ifeq ($(BR2_PACKAGE_FLAC),y)
SOX_DEPENDENCIES += flac
else
-SOX_CONF_OPT += --without-flac
+SOX_CONF_OPTS += --without-flac
endif
ifeq ($(BR2_PACKAGE_LAME),y)
SOX_DEPENDENCIES += lame
else
-SOX_CONF_OPT += --without-lame
+SOX_CONF_OPTS += --without-lame
endif
ifeq ($(BR2_PACKAGE_LIBAO),y)
SOX_DEPENDENCIES += libao
else
-SOX_CONF_OPT += --without-ao
+SOX_CONF_OPTS += --without-ao
endif
ifeq ($(BR2_PACKAGE_LIBID3TAG),y)
SOX_DEPENDENCIES += libid3tag
else
-SOX_CONF_OPT += --without-id3tag
+SOX_CONF_OPTS += --without-id3tag
endif
ifeq ($(BR2_PACKAGE_LIBMAD),y)
SOX_DEPENDENCIES += libmad
else
-SOX_CONF_OPT += --without-mad
+SOX_CONF_OPTS += --without-mad
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
SOX_DEPENDENCIES += libpng
else
-SOX_CONF_OPT += --without-png
+SOX_CONF_OPTS += --without-png
endif
ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
SOX_DEPENDENCIES += libsndfile
else
-SOX_CONF_OPT += --without-sndfile
+SOX_CONF_OPTS += --without-sndfile
endif
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
SOX_DEPENDENCIES += libvorbis
else
-SOX_CONF_OPT += --without-oggvorbis
+SOX_CONF_OPTS += --without-oggvorbis
endif
ifeq ($(BR2_PACKAGE_OPENCORE_AMR),y)
SOX_DEPENDENCIES += opencore-amr
else
-SOX_CONF_OPT += --without-amrwb --without-amrnb
+SOX_CONF_OPTS += --without-amrwb --without-amrnb
endif
ifeq ($(BR2_PACKAGE_PULSEAUDIO),y)
SOX_DEPENDENCIES += pulseaudio
else
-SOX_CONF_OPT += --without-pulseaudio
+SOX_CONF_OPTS += --without-pulseaudio
endif
ifeq ($(BR2_PACKAGE_TWOLAME),y)
SOX_DEPENDENCIES += twolame
else
-SOX_CONF_OPT += --without-twolame
+SOX_CONF_OPTS += --without-twolame
endif
ifeq ($(BR2_PACKAGE_WAVPACK),y)
SOX_DEPENDENCIES += wavpack
else
-SOX_CONF_OPT += --without-wavpack
+SOX_CONF_OPTS += --without-wavpack
endif
$(eval $(autotools-package))
diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk
--- a/package/spawn-fcgi/spawn-fcgi.mk
+++ b/package/spawn-fcgi/spawn-fcgi.mk
@@ -11,7 +11,7 @@
SPAWN_FCGI_LICENSE_FILES = COPYING
ifneq ($(BR2_INET_IPV6),y)
-SPAWN_FCGI_CONF_OPT = --disable-ipv6
+SPAWN_FCGI_CONF_OPTS = --disable-ipv6
endif
$(eval $(autotools-package))
diff --git a/package/speex/speex.mk b/package/speex/speex.mk
--- a/package/speex/speex.mk
+++ b/package/speex/speex.mk
@@ -11,16 +11,16 @@
SPEEX_INSTALL_STAGING = YES
SPEEX_DEPENDENCIES = libogg
-SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \
+SPEEX_CONF_OPTS = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \
--with-ogg-includes=$(STAGING_DIR)/usr/include \
--enable-fixed-point
ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y)
- SPEEX_CONF_OPT += --enable-arm4-asm
+ SPEEX_CONF_OPTS += --enable-arm4-asm
endif
ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y)
- SPEEX_CONF_OPT += --enable-arm5e-asm
+ SPEEX_CONF_OPTS += --enable-arm5e-asm
endif
define SPEEX_LIBTOOL_FIXUP
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -21,7 +21,7 @@
# We disable everything for now, because the dependency tree can become
# quite deep if we try to enable some features, and I have not tested that.
-SPICE_CONF_OPT = \
+SPICE_CONF_OPTS = \
--disable-opengl \
--disable-smartcard \
--disable-automated-tests \
@@ -30,24 +30,24 @@
SPICE_DEPENDENCIES += host-pkgconf
ifeq ($(BR2_PACKAGE_SPICE_CLIENT),y)
-SPICE_CONF_OPT += --enable-client
+SPICE_CONF_OPTS += --enable-client
SPICE_DEPENDENCIES += xlib_libXfixes xlib_libXrandr
else
-SPICE_CONF_OPT += --disable-client
+SPICE_CONF_OPTS += --disable-client
endif
ifeq ($(BR2_PACKAGE_SPICE_GUI),y)
-SPICE_CONF_OPT += --enable-gui
+SPICE_CONF_OPTS += --enable-gui
SPICE_DEPENDENCIES += cegui06
else
-SPICE_CONF_OPT += --disable-gui
+SPICE_CONF_OPTS += --disable-gui
endif
ifeq ($(BR2_PACKAGE_SPICE_TUNNEL),y)
-SPICE_CONF_OPT += --enable-tunnel
+SPICE_CONF_OPTS += --enable-tunnel
SPICE_DEPENDENCIES += slirp
else
-SPICE_CONF_OPT += --disable-tunnel
+SPICE_CONF_OPTS += --disable-tunnel
endif
SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
@@ -75,6 +75,6 @@
# Note that NOEXECSTACK on a kernel with address space randomization
# is generally sufficient to prevent most buffer overflow exploits
# without increasing code size.
-SPICE_CONF_OPT += gl_cv_warn__fstack_protector_all=no
+SPICE_CONF_OPTS += gl_cv_warn__fstack_protector_all=no
$(eval $(autotools-package))
diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk
--- a/package/sqlcipher/sqlcipher.mk
+++ b/package/sqlcipher/sqlcipher.mk
@@ -14,7 +14,7 @@
LDFLAGS="$(TARGET_LDFLAGS) $(SQLCIPHER_LDFLAGS)" \
TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
-SQLCIPHER_CONF_OPT = \
+SQLCIPHER_CONF_OPTS = \
--enable-threadsafe \
--localstatedir=/var
@@ -34,9 +34,9 @@
ifeq ($(BR2_PACKAGE_SQLCIPHER_READLINE),y)
SQLCIPHER_DEPENDENCIES += ncurses readline
-SQLCIPHER_CONF_OPT += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
+SQLCIPHER_CONF_OPTS += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
else
-SQLCIPHER_CONF_OPT += --disable-readline
+SQLCIPHER_CONF_OPTS += --disable-readline
endif
$(eval $(autotools-package))
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -39,24 +39,24 @@
SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)"
-SQLITE_CONF_OPT = \
+SQLITE_CONF_OPTS = \
--localstatedir=/var
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-SQLITE_CONF_OPT += --enable-dynamic-extensions=no
+SQLITE_CONF_OPTS += --enable-dynamic-extensions=no
endif
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-SQLITE_CONF_OPT += --enable-threadsafe
+SQLITE_CONF_OPTS += --enable-threadsafe
else
-SQLITE_CONF_OPT += --disable-threadsafe
+SQLITE_CONF_OPTS += --disable-threadsafe
endif
ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
SQLITE_DEPENDENCIES += ncurses readline
-SQLITE_CONF_OPT += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
+SQLITE_CONF_OPTS += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
else
-SQLITE_CONF_OPT += --disable-readline
+SQLITE_CONF_OPTS += --disable-readline
endif
$(eval $(autotools-package))
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -17,7 +17,7 @@
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_OPT = --enable-async-io=8 --enable-linux-netfilter \
+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 \
@@ -34,7 +34,7 @@
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
- SQUID_CONF_OPT += --enable-ssl
+ SQUID_CONF_OPTS += --enable-ssl
SQUID_DEPENDENCIES += openssl
endif
diff --git a/package/startup-notification/startup-notification.mk b/package/startup-notification/startup-notification.mk
--- a/package/startup-notification/startup-notification.mk
+++ b/package/startup-notification/startup-notification.mk
@@ -9,7 +9,7 @@
STARTUP_NOTIFICATION_INSTALL_STAGING = YES
STARTUP_NOTIFICATION_DEPENDENCIES = xlib_libX11
STARTUP_NOTIFICATION_CONF_ENV = lf_cv_sane_realloc=yes
-STARTUP_NOTIFICATION_CONF_OPT = --with-x \
+STARTUP_NOTIFICATION_CONF_OPTS = --with-x \
--x-includes="$(STAGING_DIR)/usr/include/X11" \
--x-libraries="$(STAGING_DIR)/usr/lib"
STARTUP_NOTIFICATION_LICENSE = LGPLv2
diff --git a/package/stress/stress.mk b/package/stress/stress.mk
--- a/package/stress/stress.mk
+++ b/package/stress/stress.mk
@@ -19,7 +19,7 @@
# --disable-static explicitly to get stress linked dynamically.
#
# Also, disable documentation by undefining makeinfo
-STRESS_CONF_OPT = \
+STRESS_CONF_OPTS = \
$(if $(BR2_PREFER_STATIC_LIB),,--disable-static) \
MAKEINFO=:
diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -10,7 +10,7 @@
STRONGSWAN_LICENSE = GPLv2+
STRONGSWAN_LICENSE_FILES = COPYING LICENSE
STRONGSWAN_DEPENDENCIES = host-pkgconf
-STRONGSWAN_CONF_OPT += \
+STRONGSWAN_CONF_OPTS += \
--without-lib-prefix \
--enable-pkcs11=yes \
--enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
@@ -32,7 +32,7 @@
--enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no)
ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y)
-STRONGSWAN_CONF_OPT += \
+STRONGSWAN_CONF_OPTS += \
--enable-eap-sim \
--enable-eap-sim-file \
--enable-eap-aka \
diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk
--- a/package/stunnel/stunnel.mk
+++ b/package/stunnel/stunnel.mk
@@ -7,7 +7,7 @@
STUNNEL_VERSION = 5.03
STUNNEL_SITE = http://ftp.nluug.nl/pub/networking/stunnel/archive/5.x
STUNNEL_DEPENDENCIES = openssl
-STUNNEL_CONF_OPT = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork
+STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork
STUNNEL_LICENSE = GPLv2+
STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL
diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk
--- a/package/subversion/subversion.mk
+++ b/package/subversion/subversion.mk
@@ -10,7 +10,7 @@
SUBVERSION_LICENSE_FILES = LICENSE
SUBVERSION_DEPENDENCIES = apr apr-util expat neon zlib
-SUBVERSION_CONF_OPT = \
+SUBVERSION_CONF_OPTS = \
--with-expat=$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/lib: \
--with-apr=$(STAGING_DIR)/usr \
--with-apr-util=$(STAGING_DIR)/usr \
diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk
--- a/package/sudo/sudo.mk
+++ b/package/sudo/sudo.mk
@@ -10,7 +10,7 @@
SUDO_LICENSE_FILES = doc/LICENSE
# Ships a non-release libtool that isn't patch-friendly
SUDO_AUTORECONF = YES
-SUDO_CONF_OPT = \
+SUDO_CONF_OPTS = \
--without-lecture \
--without-sendmail \
--without-umask \
diff --git a/package/swig/swig.mk b/package/swig/swig.mk
--- a/package/swig/swig.mk
+++ b/package/swig/swig.mk
@@ -8,7 +8,7 @@
SWIG_VERSION = $(SWIG_MAJOR).12
SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
SWIG_DEPENDENCIES = host-bison
-HOST_SWIG_CONF_OPT = \
+HOST_SWIG_CONF_OPTS = \
--without-pcre \
--disable-ccache \
--without-octave
diff --git a/package/sylpheed/sylpheed.mk b/package/sylpheed/sylpheed.mk
--- a/package/sylpheed/sylpheed.mk
+++ b/package/sylpheed/sylpheed.mk
@@ -10,7 +10,7 @@
SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
SYLPHEED_LICENSE = GPLv2+ (executables), LGPLv2.1+ (library, attachment plugin)
SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB
-SYLPHEED_CONF_OPT = --disable-gtkspell --disable-gpgme
+SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme
SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
# Remove the -I$(includedir) from the Makefiles
@@ -25,9 +25,9 @@
ifeq ($(BR2_PACKAGE_OPENSSL),y)
SYLPHEED_DEPENDENCIES += openssl
-SYLPHEED_CONF_OPT += --enable-ssl
+SYLPHEED_CONF_OPTS += --enable-ssl
else
-SYLPHEED_CONF_OPT += --disable-ssl
+SYLPHEED_CONF_OPTS += --disable-ssl
endif
$(eval $(autotools-package))
diff --git a/package/synergy/synergy.mk b/package/synergy/synergy.mk
--- a/package/synergy/synergy.mk
+++ b/package/synergy/synergy.mk
@@ -7,7 +7,7 @@
SYNERGY_VERSION = 1.3.1
SYNERGY_SITE = http://downloads.sourceforge.net/project/synergy2/Sources/$(SYNERGY_VERSION)
SYNERGY_AUTORECONF = YES
-SYNERGY_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \
+SYNERGY_CONF_OPTS = --x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
SYNERGY_DEPENDENCIES = xlib_libXtst \
$(if $(BR2_PACKAGE_XLIB_LIBXINERAMA),xlib_libXinerama)
diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
--- a/package/sysstat/sysstat.mk
+++ b/package/sysstat/sysstat.mk
@@ -7,7 +7,7 @@
SYSSTAT_VERSION = 11.0.1
SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz
SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard
-SYSSTAT_CONF_OPT = --disable-man-group --disable-sensors
+SYSSTAT_CONF_OPTS = --disable-man-group --disable-sensors
SYSSTAT_DEPENDENCIES = host-gettext
SYSSTAT_LICENSE = GPLv2+
SYSSTAT_LICENSE_FILES = COPYING
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -26,7 +26,7 @@
SYSTEMD_DEPENDENCIES += busybox
endif
-SYSTEMD_CONF_OPT += \
+SYSTEMD_CONF_OPTS += \
--with-rootprefix= \
--with-rootlibdir=/lib \
--localstatedir=/var \
@@ -57,42 +57,42 @@
ac_cv_path_KMOD=/usr/bin/kmod
ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
-SYSTEMD_CONF_OPT += --enable-compat-libs
+SYSTEMD_CONF_OPTS += --enable-compat-libs
else
-SYSTEMD_CONF_OPT += --disable-compat-libs
+SYSTEMD_CONF_OPTS += --disable-compat-libs
endif
ifeq ($(BR2_PACKAGE_ACL),y)
-SYSTEMD_CONF_OPT += --enable-acl
+SYSTEMD_CONF_OPTS += --enable-acl
SYSTEMD_DEPENDENCIES += acl
else
-SYSTEMD_CONF_OPT += --disable-acl
+SYSTEMD_CONF_OPTS += --disable-acl
endif
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-SYSTEMD_CONF_OPT += --enable-gudev
+SYSTEMD_CONF_OPTS += --enable-gudev
SYSTEMD_DEPENDENCIES += libglib2
else
-SYSTEMD_CONF_OPT += --disable-gudev
+SYSTEMD_CONF_OPTS += --disable-gudev
endif
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
-SYSTEMD_CONF_OPT += --enable-seccomp
+SYSTEMD_CONF_OPTS += --enable-seccomp
SYSTEMD_DEPENDENCIES += libseccomp
else
-SYSTEMD_CONF_OPT += --disable-seccomp
+SYSTEMD_CONF_OPTS += --disable-seccomp
endif
ifeq ($(BR2_PACKAGE_SYSTEMD_ALL_EXTRAS),y)
SYSTEMD_DEPENDENCIES += \
xz \
libgcrypt
-SYSTEMD_CONF_OPT += \
+SYSTEMD_CONF_OPTS += \
--enable-xz \
--enable-gcrypt \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr
else
-SYSTEMD_CONF_OPT += \
+SYSTEMD_CONF_OPTS += \
--disable-xz \
--disable-gcrypt
endif
@@ -100,17 +100,17 @@
ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y)
SYSTEMD_DEPENDENCIES += libmicrohttpd
else
-SYSTEMD_CONF_OPT += --disable-microhttpd
+SYSTEMD_CONF_OPTS += --disable-microhttpd
endif
ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y)
-SYSTEMD_CONF_OPT += --enable-networkd
+SYSTEMD_CONF_OPTS += --enable-networkd
define SYSTEMD_INSTALL_RESOLVCONF_HOOK
ln -sf ../run/systemd/resolve/resolv.conf \
$(TARGET_DIR)/etc/resolv.conf
endef
else
-SYSTEMD_CONF_OPT += --disable-networkd
+SYSTEMD_CONF_OPTS += --disable-networkd
define SYSTEMD_INSTALL_SERVICE_NETWORK
$(INSTALL) -D -m 644 package/systemd/network.service \
$(TARGET_DIR)/etc/systemd/system/network.service
@@ -121,20 +121,20 @@
endif
ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y)
-SYSTEMD_CONF_OPT += --enable-timesyncd
+SYSTEMD_CONF_OPTS += --enable-timesyncd
define SYSTEMD_INSTALL_SERVICE_TIMESYNC
mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants
ln -sf ../../../../lib/systemd/system/systemd-timesyncd.service \
$(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
endef
else
-SYSTEMD_CONF_OPT += --disable-timesyncd
+SYSTEMD_CONF_OPTS += --disable-timesyncd
endif
ifeq ($(BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT),y)
-SYSTEMD_CONF_OPT += --enable-smack
+SYSTEMD_CONF_OPTS += --enable-smack
else
-SYSTEMD_CONF_OPT += --disable-smack
+SYSTEMD_CONF_OPTS += --disable-smack
endif
# mq_getattr needs -lrt
diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk
--- a/package/taglib/taglib.mk
+++ b/package/taglib/taglib.mk
@@ -15,11 +15,11 @@
endif
ifeq ($(BR2_PACKAGE_TAGLIB_ASF),y)
-TAGLIB_CONF_OPT += -DWITH_ASF=ON
+TAGLIB_CONF_OPTS += -DWITH_ASF=ON
endif
ifeq ($(BR2_PACKAGE_TAGLIB_MP4),y)
-TAGLIB_CONF_OPT += -DWITH_MP4=ON
+TAGLIB_CONF_OPTS += -DWITH_MP4=ON
endif
define TAGLIB_REMOVE_DEVFILE
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -18,13 +18,13 @@
# in the sqlite package (which gets removed if sqlite not
# configured). Don't need to worry about conditionally including
# it in the configure options
-TCL_CONF_OPT = \
+TCL_CONF_OPTS = \
--disable-symbols \
--disable-langinfo \
--disable-framework \
--with-system-sqlite
-HOST_TCL_CONF_OPT = \
+HOST_TCL_CONF_OPTS = \
--disable-symbols \
--disable-langinfo \
--disable-framework
diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk
--- a/package/tcpdump/tcpdump.mk
+++ b/package/tcpdump/tcpdump.mk
@@ -9,7 +9,7 @@
TCPDUMP_LICENSE = BSD-3c
TCPDUMP_LICENSE_FILES = LICENSE
TCPDUMP_CONF_ENV = ac_cv_linux_vers=2 td_cv_buggygetaddrinfo=no
-TCPDUMP_CONF_OPT = --without-crypto \
+TCPDUMP_CONF_OPTS = --without-crypto \
$(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb)
TCPDUMP_DEPENDENCIES = zlib libpcap
diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -12,7 +12,7 @@
tr_cv_libpcap_version=">= 0.7.0" \
ac_cv_have_bpf=no \
$(call AUTOCONF_AC_CHECK_FILE_VAL,$(STAGING_DIR)/usr/include/pcap-netmap.c)=no
-TCPREPLAY_CONF_OPT = --with-libpcap=$(STAGING_DIR)/usr
+TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr
TCPREPLAY_DEPENDENCIES = libpcap
# libpcap may depend on symbols in other libs
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -7,10 +7,10 @@
TFTPD_VERSION = 5.2
TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
-TFTPD_CONF_OPT = --without-tcpwrappers
+TFTPD_CONF_OPTS = --without-tcpwrappers
ifneq ($(BR2_INET_IPV6),y)
-TFTPD_CONF_OPT += --without-ipv6
+TFTPD_CONF_OPTS += --without-ipv6
endif
define TFTPD_INSTALL_TARGET_CMDS
diff --git a/package/thrift/thrift.mk b/package/thrift/thrift.mk
--- a/package/thrift/thrift.mk
+++ b/package/thrift/thrift.mk
@@ -10,9 +10,9 @@
THRIFT_INSTALL_STAGING = YES
HOST_THRIFT_DEPENDENCIES = host-boost host-libevent host-openssl host-pkgconf \
host-zlib host-bison host-flex
-THRIFT_CONF_OPT = --with-sysroot=$(STAGING_DIR) --with-tests=no \
+THRIFT_CONF_OPTS = --with-sysroot=$(STAGING_DIR) --with-tests=no \
--with-boost=$(STAGING_DIR)
-HOST_THRIFT_CONF_OPT = --with-sysroot=$(HOST_DIR) --with-tests=no
+HOST_THRIFT_CONF_OPTS = --with-sysroot=$(HOST_DIR) --with-tests=no
THRIFT_AUTORECONF = YES
THRIFT_LICENSE = Apache-2.0
THRIFT_LICENSE_FILES = LICENSE
@@ -25,17 +25,17 @@
# Language selection
# The generator (host tool) works with all of them regardless
# This is just for the libraries / bindings
-THRIFT_LANG_CONF_OPT += --without-csharp --without-java --without-erlang \
+THRIFT_LANG_CONF_OPTS += --without-csharp --without-java --without-erlang \
--without-python --without-perl --without-php --without-php_extension \
--without-ruby --without-haskell --without-go --without-d --without-qt4
-HOST_THRIFT_CONF_OPT += $(THRIFT_LANG_CONF_OPT) --without-c_glib
-THRIFT_CONF_OPT += $(THRIFT_LANG_CONF_OPT)
+HOST_THRIFT_CONF_OPTS += $(THRIFT_LANG_CONF_OPTS) --without-c_glib
+THRIFT_CONF_OPTS += $(THRIFT_LANG_CONF_OPTS)
# C bindings
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
THRIFT_DEPENDENCIES += libglib2
else
-THRIFT_CONF_OPT += --without-c_glib
+THRIFT_CONF_OPTS += --without-c_glib
endif
# De-hardcode THRIFT for cross compiling
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -9,7 +9,7 @@
TIFF_LICENSE = tiff license
TIFF_LICENSE_FILES = COPYRIGHT
TIFF_INSTALL_STAGING = YES
-TIFF_CONF_OPT = \
+TIFF_CONF_OPTS = \
--disable-cxx \
--without-x \
@@ -24,55 +24,55 @@
endif
ifneq ($(BR2_PACKAGE_TIFF_CCITT),y)
- TIFF_CONF_OPT += --disable-ccitt
+ TIFF_CONF_OPTS += --disable-ccitt
endif
ifneq ($(BR2_PACKAGE_TIFF_PACKBITS),y)
- TIFF_CONF_OPT += --disable-packbits
+ TIFF_CONF_OPTS += --disable-packbits
endif
ifneq ($(BR2_PACKAGE_TIFF_LZW),y)
- TIFF_CONF_OPT += --disable-lzw
+ TIFF_CONF_OPTS += --disable-lzw
endif
ifneq ($(BR2_PACKAGE_TIFF_THUNDER),y)
- TIFF_CONF_OPT += --disable-thunder
+ TIFF_CONF_OPTS += --disable-thunder
endif
ifneq ($(BR2_PACKAGE_TIFF_NEXT),y)
- TIFF_CONF_OPT += --disable-next
+ TIFF_CONF_OPTS += --disable-next
endif
ifneq ($(BR2_PACKAGE_TIFF_LOGLUV),y)
- TIFF_CONF_OPT += --disable-logluv
+ TIFF_CONF_OPTS += --disable-logluv
endif
ifneq ($(BR2_PACKAGE_TIFF_MDI),y)
- TIFF_CONF_OPT += --disable-mdi
+ TIFF_CONF_OPTS += --disable-mdi
endif
ifneq ($(BR2_PACKAGE_TIFF_ZLIB),y)
- TIFF_CONF_OPT += --disable-zlib
+ TIFF_CONF_OPTS += --disable-zlib
else
TIFF_DEPENDENCIES += zlib
endif
ifneq ($(BR2_PACKAGE_TIFF_PIXARLOG),y)
- TIFF_CONF_OPT += --disable-pixarlog
+ TIFF_CONF_OPTS += --disable-pixarlog
endif
ifneq ($(BR2_PACKAGE_TIFF_JPEG),y)
- TIFF_CONF_OPT += --disable-jpeg
+ TIFF_CONF_OPTS += --disable-jpeg
else
TIFF_DEPENDENCIES += jpeg
endif
ifneq ($(BR2_PACKAGE_TIFF_OLD_JPEG),y)
- TIFF_CONF_OPT += --disable-old-jpeg
+ TIFF_CONF_OPTS += --disable-old-jpeg
endif
ifneq ($(BR2_PACKAGE_TIFF_JBIG),y)
- TIFF_CONF_OPT += --disable-jbig
+ TIFF_CONF_OPTS += --disable-jbig
endif
define TIFF_INSTALL_TARGET_CMDS
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -12,10 +12,10 @@
TN5250_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_OPENSSL),y)
- TN5250_CONF_OPT += --with-ssl-dir=$(STAGING_DIR)/usr
+ TN5250_CONF_OPTS += --with-ssl-dir=$(STAGING_DIR)/usr
TN5250_DEPENDENCIES += openssl
else
- TN5250_CONF_OPT += --without-ssl
+ TN5250_CONF_OPTS += --without-ssl
endif
define TN5250_INSTALL_FIXES
diff --git a/package/torsmo/torsmo.mk b/package/torsmo/torsmo.mk
--- a/package/torsmo/torsmo.mk
+++ b/package/torsmo/torsmo.mk
@@ -11,7 +11,7 @@
# help2man doesn't work when cross compiling
TORSMO_CONF_ENV = ac_cv_path_HELP2MAN=''
-TORSMO_CONF_OPT = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries="-I$(STAGING_DIR)/usr/lib" --with-x
+TORSMO_CONF_OPTS = --x-includes="-I$(STAGING_DIR)/usr/include/X11" --x-libraries="-I$(STAGING_DIR)/usr/lib" --with-x
TORSMO_DEPENDENCIES = xlib_libX11 xlib_libXext
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -15,26 +15,26 @@
openssl \
zlib
TRANSMISSION_AUTORECONF = YES
-TRANSMISSION_CONF_OPT = \
+TRANSMISSION_CONF_OPTS = \
--disable-libnotify \
--enable-lightweight
TRANSMISSION_LICENSE = GPLv2 or GPLv3 with OpenSSL exception
TRANSMISSION_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_TRANSMISSION_UTP),y)
- TRANSMISSION_CONF_OPT += --enable-utp
+ TRANSMISSION_CONF_OPTS += --enable-utp
else
- TRANSMISSION_CONF_OPT += --disable-utp
+ TRANSMISSION_CONF_OPTS += --disable-utp
endif
ifeq ($(BR2_PACKAGE_TRANSMISSION_CLI),y)
- TRANSMISSION_CONF_OPT += --enable-cli
+ TRANSMISSION_CONF_OPTS += --enable-cli
else
- TRANSMISSION_CONF_OPT += --disable-cli
+ TRANSMISSION_CONF_OPTS += --disable-cli
endif
ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y)
- TRANSMISSION_CONF_OPT += --enable-daemon
+ TRANSMISSION_CONF_OPTS += --enable-daemon
define TRANSMISSION_INSTALL_INIT_SYSV
[ -f $(TARGET_DIR)/etc/init.d/S92transmission ] || \
@@ -43,20 +43,20 @@
endef
else
- TRANSMISSION_CONF_OPT += --disable-daemon
+ TRANSMISSION_CONF_OPTS += --disable-daemon
endif
ifeq ($(BR2_PACKAGE_TRANSMISSION_REMOTE),y)
- TRANSMISSION_CONF_OPT += --enable-remote
+ TRANSMISSION_CONF_OPTS += --enable-remote
else
- TRANSMISSION_CONF_OPT += --disable-remote
+ TRANSMISSION_CONF_OPTS += --disable-remote
endif
ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y)
- TRANSMISSION_CONF_OPT += --enable-gtk
+ TRANSMISSION_CONF_OPTS += --enable-gtk
TRANSMISSION_DEPENDENCIES += libgtk2
else
- TRANSMISSION_CONF_OPT += --disable-gtk
+ TRANSMISSION_CONF_OPTS += --disable-gtk
endif
$(eval $(autotools-package))
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -20,10 +20,10 @@
lvm2 \
libatasmart
-UDISKS_CONF_OPT = --disable-remote-access --disable-man-pages
+UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y)
-UDISKS_CONF_OPT += --enable-lvm2
+UDISKS_CONF_OPTS += --enable-lvm2
endif
$(eval $(autotools-package))
diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk
--- a/package/ulogd/ulogd.mk
+++ b/package/ulogd/ulogd.mk
@@ -7,7 +7,7 @@
ULOGD_VERSION = 2.0.4
ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2
ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files
-ULOGD_CONF_OPT = --with-dbi=no --with-pgsql=no
+ULOGD_CONF_OPTS = --with-dbi=no --with-pgsql=no
ULOGD_AUTORECONF = YES
ULOGD_DEPENDENCIES = host-pkgconf \
libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
@@ -18,16 +18,16 @@
# DB backends need threads
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
ifeq ($(BR2_PACKAGE_MYSQL),y)
- ULOGD_CONF_OPT += --with-mysql=$(STAGING_DIR)/usr
+ ULOGD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr
ULOGD_DEPENDENCIES += mysql
else
- ULOGD_CONF_OPT += --with-mysql=no
+ ULOGD_CONF_OPTS += --with-mysql=no
endif
ifeq ($(BR2_PACKAGE_SQLITE),y)
ULOGD_DEPENDENCIES += sqlite
endif
else
- ULOGD_CONF_OPT += --with-mysql=no --without-sqlite
+ ULOGD_CONF_OPTS += --with-mysql=no --without-sqlite
endif
$(eval $(autotools-package))
diff --git a/package/urg/urg.mk b/package/urg/urg.mk
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -14,10 +14,10 @@
ifeq ($(BR2_PACKAGE_SDL)$(BR2_PACKAGE_SDL_NET),yy)
URG_DEPENDENCIES += sdl sdl_net
-URG_CONF_OPT += --with-sdl-prefix=$(STAGING_DIR)/usr \
+URG_CONF_OPTS += --with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr
else
-URG_CONF_OPT = --without-sdl
+URG_CONF_OPTS = --without-sdl
URG_CONF_ENV += ac_cv_path_SDL_CONFIG=""
endif
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -15,7 +15,7 @@
ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)
USBUTILS_DEPENDENCIES += zlib
else
- USBUTILS_CONF_OPT = --disable-zlib
+ USBUTILS_CONF_OPTS = --disable-zlib
endif
# Build after busybox since it's got a lightweight lsusb
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -18,7 +18,7 @@
UTIL_LINUX_INSTALL_STAGING = YES
UTIL_LINUX_DEPENDENCIES = host-pkgconf
UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
-UTIL_LINUX_CONF_OPT += \
+UTIL_LINUX_CONF_OPTS += \
--disable-rpath \
--disable-makeinstall-chown \
--disable-bash-completion \
@@ -28,7 +28,7 @@
HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
# We also don't want the host-python dependency
-HOST_UTIL_LINUX_CONF_OPT = --without-python
+HOST_UTIL_LINUX_CONF_OPTS = --without-python
# If both util-linux and busybox are selected, make certain util-linux
# wins the fight over who gets to have their utils actually installed
@@ -39,7 +39,7 @@
ifeq ($(BR2_PACKAGE_NCURSES),y)
UTIL_LINUX_DEPENDENCIES += ncurses
else
-UTIL_LINUX_CONF_OPT += --without-ncurses
+UTIL_LINUX_CONF_OPTS += --without-ncurses
endif
ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
@@ -58,7 +58,7 @@
UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam)
# Disable/Enable utilities
-UTIL_LINUX_CONF_OPT += \
+UTIL_LINUX_CONF_OPTS += \
$(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \
$(if $(BR2_PACKAGE_UTIL_LINUX_ARCH),--enable-arch,--disable-arch) \
$(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \
@@ -92,7 +92,7 @@
# In the host version of util-linux, we so far only require libuuid,
# and none of the util-linux utilities, so we disable all of them.
-HOST_UTIL_LINUX_CONF_OPT += \
+HOST_UTIL_LINUX_CONF_OPTS += \
--enable-libuuid \
--disable-libblkid --disable-libmount \
--disable-all-programs --without-ncurses
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -9,7 +9,7 @@
VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
VALGRIND_LICENSE = GPLv2 GFDLv1.2
VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
-VALGRIND_CONF_OPT = --disable-tls
+VALGRIND_CONF_OPTS = --disable-tls
VALGRIND_AUTORECONF = YES
# On ARM, Valgrind only supports ARMv7, and uses the arch part of the
@@ -18,7 +18,7 @@
# ARMv7. The valgrind package is guaranteed, through Config.in, to
# only be selected on Cortex A8 and Cortex A9 platforms.
ifeq ($(BR2_cortex_a8)$(BR2_cortex_a9),y)
-VALGRIND_CONF_OPT += \
+VALGRIND_CONF_OPTS += \
--host=$(patsubst arm-%,armv7-%,$(GNU_TARGET_NAME))
endif
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@@ -25,7 +25,7 @@
#
# Note: disabled features can be added with corresponding dependencies
# in future commits.
-VDE2_CONF_OPT = --disable-experimental \
+VDE2_CONF_OPTS = --disable-experimental \
--disable-cryptcab \
--disable-pcap \
--disable-python \
diff --git a/package/vim/vim.mk b/package/vim/vim.mk
--- a/package/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -20,7 +20,7 @@
ac_cv_sizeof_int=4 \
ac_cv_small_wchar_t=no
# GUI/X11 headers leak from the host so forcibly disable them
-VIM_CONF_OPT = --with-tlib=ncurses --enable-gui=no --without-x
+VIM_CONF_OPTS = --with-tlib=ncurses --enable-gui=no --without-x
VIM_LICENSE = Charityware
VIM_LICENSE_FILES = README.txt
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -23,7 +23,7 @@
endef
VLC_POST_PATCH_HOOKS += VLC_OVERRIDE_PKG_M4
-VLC_CONF_OPT += \
+VLC_CONF_OPTS += \
--disable-a52 \
--disable-shout \
--disable-twolame \
@@ -46,188 +46,188 @@
# Building static and shared doesn't work, so force static off.
ifeq ($(BR2_PREFER_STATIC_LIB),)
-VLC_CONF_OPT += --disable-static
+VLC_CONF_OPTS += --disable-static
endif
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-VCL_CONF_OPT += --enable-altivec
+VCL_CONF_OPTS += --enable-altivec
else
-VLC_CONF_OPT += --disable-altivec
+VLC_CONF_OPTS += --disable-altivec
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
-VLC_CONF_OPT += --enable-alsa
+VLC_CONF_OPTS += --enable-alsa
VLC_DEPENDENCIES += alsa-lib
else
-VLC_CONF_OPT += --disable-alsa
+VLC_CONF_OPTS += --disable-alsa
endif
# bonjour support needs avahi-client, which needs avahi-daemon and dbus
ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy)
-VLC_CONF_OPT += --enable-bonjour
+VLC_CONF_OPTS += --enable-bonjour
VLC_DEPENDENCIES += avahi dbus
else
-VLC_CONF_OPT += --disable-bonjour
+VLC_CONF_OPTS += --disable-bonjour
endif
ifeq ($(BR2_PACKAGE_DBUS),y)
-VLC_CONF_OPT += --enable-dbus
+VLC_CONF_OPTS += --enable-dbus
VLC_DEPENDENCIES += dbus
else
-VLC_CONF_OPT += --disable-dbus
+VLC_CONF_OPTS += --disable-dbus
endif
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
-VLC_CONF_OPT += --enable-directfb
+VLC_CONF_OPTS += --enable-directfb
VLC_DEPENDENCIES += directfb
else
-VLC_CONF_OPT += --disable-directfb
+VLC_CONF_OPTS += --disable-directfb
endif
ifeq ($(BR2_PACKAGE_FAAD2),y)
-VLC_CONF_OPT += --enable-faad
+VLC_CONF_OPTS += --enable-faad
VLC_DEPENDENCIES += faad2
else
-VLC_CONF_OPT += --disable-faad
+VLC_CONF_OPTS += --disable-faad
endif
ifeq ($(BR2_PACKAGE_FFMPEG),y)
-VLC_CONF_OPT += --enable-avcodec
+VLC_CONF_OPTS += --enable-avcodec
VLC_DEPENDENCIES += ffmpeg
else
-VLC_CONF_OPT += --disable-avcodec
+VLC_CONF_OPTS += --disable-avcodec
endif
ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y)
-VLC_CONF_OPT += --enable-postproc
+VLC_CONF_OPTS += --enable-postproc
else
-VLC_CONF_OPT += --disable-postproc
+VLC_CONF_OPTS += --disable-postproc
endif
ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
-VLC_CONF_OPT += --enable-swscale
+VLC_CONF_OPTS += --enable-swscale
else
-VLC_CONF_OPT += --disable-swscale
+VLC_CONF_OPTS += --disable-swscale
endif
ifeq ($(BR2_PACKAGE_FLAC),y)
-VLC_CONF_OPT += --enable-flac
+VLC_CONF_OPTS += --enable-flac
VLC_DEPENDENCIES += flac
else
-VLC_CONF_OPT += --disable-flac
+VLC_CONF_OPTS += --disable-flac
endif
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
-VLC_CONF_OPT += --enable-glx
+VLC_CONF_OPTS += --enable-glx
VLC_DEPENDENCIES += libgl
else
-VLC_CONF_OPT += --disable-glx
+VLC_CONF_OPTS += --disable-glx
endif
ifeq ($(BR2_PACKAGE_OPUS),y)
-VLC_CONF_OPT += --enable-opus
+VLC_CONF_OPTS += --enable-opus
VLC_DEPENDENCIES += libvorbis opus
else
-VLC_CONF_OPT += --disable-opus
+VLC_CONF_OPTS += --disable-opus
endif
ifeq ($(BR2_PACKAGE_LIBASS),y)
-VLC_CONF_OPT += --enable-libass
+VLC_CONF_OPTS += --enable-libass
VLC_DEPENDENCIES += libass
else
-VLC_CONF_OPT += --disable-libass
+VLC_CONF_OPTS += --disable-libass
endif
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
-VLC_CONF_OPT += --enable-libgcrypt
+VLC_CONF_OPTS += --enable-libgcrypt
VLC_DEPENDENCIES += libgcrypt
VLC_CONF_ENV += \
GCRYPT_CONFIG="$(STAGING_DIR)/usr/bin/libgcrypt-config"
else
-VLC_CONF_OPT += --disable-libgcrypt
+VLC_CONF_OPTS += --disable-libgcrypt
endif
ifeq ($(BR2_PACKAGE_LIBMAD),y)
-VLC_CONF_OPT += --enable-mad
+VLC_CONF_OPTS += --enable-mad
VLC_DEPENDENCIES += libmad
else
-VLC_CONF_OPT += --disable-mad
+VLC_CONF_OPTS += --disable-mad
endif
ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
-VLC_CONF_OPT += --enable-mod
+VLC_CONF_OPTS += --enable-mod
VLC_DEPENDENCIES += libmodplug
else
-VLC_CONF_OPT += --disable-mod
+VLC_CONF_OPTS += --disable-mod
endif
ifeq ($(BR2_PACKAGE_LIBMPEG2),y)
-VLC_CONF_OPT += --enable-libmpeg2
+VLC_CONF_OPTS += --enable-libmpeg2
VLC_DEPENDENCIES += libmpeg2
else
-VLC_CONF_OPT += --disable-libmpeg2
+VLC_CONF_OPTS += --disable-libmpeg2
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
-VLC_CONF_OPT += --enable-png
+VLC_CONF_OPTS += --enable-png
VLC_DEPENDENCIES += libpng
else
-VLC_CONF_OPT += --disable-png
+VLC_CONF_OPTS += --disable-png
endif
ifeq ($(BR2_PACKAGE_LIBRSVG),y)
-VLC_CONF_OPT += --enable-svg
+VLC_CONF_OPTS += --enable-svg
VLC_DEPENDENCIES += librsvg
else
-VLC_CONF_OPT += --disable-svg
+VLC_CONF_OPTS += --disable-svg
endif
ifeq ($(BR2_PACKAGE_LIBTHEORA),y)
-VLC_CONF_OPT += --enable-theora
+VLC_CONF_OPTS += --enable-theora
VLC_DEPENDENCIES += libtheora
else
-VLC_CONF_OPT += --disable-theora
+VLC_CONF_OPTS += --disable-theora
endif
ifeq ($(BR2_PACKAGE_LIBUPNP),y)
-VLC_CONF_OPT += --enable-upnp
+VLC_CONF_OPTS += --enable-upnp
VLC_DEPENDENCIES += libupnp
else
-VLC_CONF_OPT += --disable-upnp
+VLC_CONF_OPTS += --disable-upnp
endif
ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
-VLC_CONF_OPT += --enable-vorbis
+VLC_CONF_OPTS += --enable-vorbis
VLC_DEPENDENCIES += libvorbis
else
-VLC_CONF_OPT += --disable-vorbis
+VLC_CONF_OPTS += --disable-vorbis
endif
ifeq ($(BR2_PACKAGE_LIBV4L),y)
-VLC_CONF_OPT += --enable-v4l2
+VLC_CONF_OPTS += --enable-v4l2
VLC_DEPENDENCIES += libv4l
else
-VLC_CONF_OPT += --disable-v4l2
+VLC_CONF_OPTS += --disable-v4l2
endif
ifeq ($(BR2_PACKAGE_LIBXCB),y)
-VLC_CONF_OPT += --enable-xcb
+VLC_CONF_OPTS += --enable-xcb
VLC_DEPENDENCIES += libxcb
else
-VLC_CONF_OPT += --disable-xcb
+VLC_CONF_OPTS += --disable-xcb
endif
ifeq ($(BR2_PACKAGE_LIBXML2),y)
-VLC_CONF_OPT += --enable-libxml2
+VLC_CONF_OPTS += --enable-libxml2
VLC_DEPENDENCIES += libxml2
else
-VLC_CONF_OPT += --disable-libxml2
+VLC_CONF_OPTS += --disable-libxml2
endif
# live555 installs a static library only, and vlc tries to link it into a
# shared library - which doesn't work. So only enable live555 if static.
ifeq ($(BR2_PACKAGE_LIVE555)$(BR2_PREFER_STATIC_LIB),yy)
-VLC_CONF_OPT += --enable-live555
+VLC_CONF_OPTS += --enable-live555
VLC_DEPENDENCIES += live555
VLC_CONF_ENV += \
LIVE555_CFLAGS="\
@@ -239,63 +239,63 @@
" \
LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia"
else
-VLC_CONF_OPT += --disable-live555
+VLC_CONF_OPTS += --disable-live555
endif
ifeq ($(BR2_PACKAGE_LUA),y)
-VLC_CONF_OPT += --enable-lua
+VLC_CONF_OPTS += --enable-lua
VLC_DEPENDENCIES += lua host-lua
else
-VLC_CONF_OPT += --disable-lua
+VLC_CONF_OPTS += --disable-lua
endif
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-VLC_CONF_OPT += --enable-qt
+VLC_CONF_OPTS += --enable-qt
VLC_DEPENDENCIES += qt
else
-VLC_CONF_OPT += --disable-qt
+VLC_CONF_OPTS += --disable-qt
endif
ifeq ($(BR2_PACKAGE_SDL_X11),y)
-VLC_CONF_OPT += --enable-sdl
+VLC_CONF_OPTS += --enable-sdl
VLC_DEPENDENCIES += sdl
else
-VLC_CONF_OPT += --disable-sdl
+VLC_CONF_OPTS += --disable-sdl
endif
ifeq ($(BR2_PACKAGE_SDL_IMAGE),y)
-VLC_CONF_OPT += --enable-sdl-image
+VLC_CONF_OPTS += --enable-sdl-image
VLC_DEPENDENCIES += sdl_image
else
-VLC_CONF_OPT += --disable-sdl-image
+VLC_CONF_OPTS += --disable-sdl-image
endif
ifeq ($(BR2_PACKAGE_SPEEX),y)
-VLC_CONF_OPT += --enable-speex
+VLC_CONF_OPTS += --enable-speex
VLC_DEPENDENCIES += speex
else
-VLC_CONF_OPT += --disable-speex
+VLC_CONF_OPTS += --disable-speex
endif
ifeq ($(BR2_PACKAGE_TREMOR),y)
-VLC_CONF_OPT += --enable-tremor
+VLC_CONF_OPTS += --enable-tremor
VLC_DEPENDENCIES += tremor
else
-VLC_CONF_OPT += --disable-tremor
+VLC_CONF_OPTS += --disable-tremor
endif
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-VLC_CONF_OPT += --enable-udev
+VLC_CONF_OPTS += --enable-udev
VLC_DEPENDENCIES += udev
else
-VLC_CONF_OPT += --disable-udev
+VLC_CONF_OPTS += --disable-udev
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
-VLC_CONF_OPT += --with-x
+VLC_CONF_OPTS += --with-x
VLC_DEPENDENCIES += xlib_libX11
else
-VLC_CONF_OPT += --without-x
+VLC_CONF_OPTS += --without-x
endif
$(eval $(autotools-package))
diff --git a/package/vo-aacenc/vo-aacenc.mk b/package/vo-aacenc/vo-aacenc.mk
--- a/package/vo-aacenc/vo-aacenc.mk
+++ b/package/vo-aacenc/vo-aacenc.mk
@@ -20,16 +20,16 @@
VO_AACENC_CFLAGS += -marm
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-VO_AACENC_CONF_OPT += --enable-armv7neon
+VO_AACENC_CONF_OPTS += --enable-armv7neon
# mfpu=neon needed to assemble neon code
VO_AACENC_CFLAGS += -mfpu=neon
else
-VO_AACENC_CONF_OPT += --disable-armv7neon
+VO_AACENC_CONF_OPTS += --disable-armv7neon
ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),)
-VO_AACENC_CONF_OPT += --enable-armv5e
+VO_AACENC_CONF_OPTS += --enable-armv5e
else
-VO_AACENC_CONF_OPT += --disable-armv5e
+VO_AACENC_CONF_OPTS += --disable-armv5e
endif
endif # !neon
diff --git a/package/vorbis-tools/vorbis-tools.mk b/package/vorbis-tools/vorbis-tools.mk
--- a/package/vorbis-tools/vorbis-tools.mk
+++ b/package/vorbis-tools/vorbis-tools.mk
@@ -9,7 +9,7 @@
VORBIS_TOOLS_LICENSE = GPLv2
VORBIS_TOOLS_LICENSE_FILES = COPYING
VORBIS_TOOLS_DEPENDENCIES = libao libogg libvorbis libcurl
-VORBIS_TOOLS_CONF_OPT = --program-transform-name=''
+VORBIS_TOOLS_CONF_OPTS = --program-transform-name=''
# ogg123 calls math functions but forgets to link with libm
VORBIS_TOOLS_CONF_ENV = LIBS=-lm
diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk
--- a/package/vtun/vtun.mk
+++ b/package/vtun/vtun.mk
@@ -9,7 +9,7 @@
VTUN_DEPENDENCIES = host-bison host-flex zlib lzo openssl
VTUN_AUTORECONF = YES
-VTUN_CONF_OPT = \
+VTUN_CONF_OPTS = \
--with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \
--with-lzo-headers=$(STAGING_DIR)/usr/include/lzo \
--with-lzo-lib=$(STAGING_DIR)/usr/lib
diff --git a/package/wayland/wayland.mk b/package/wayland/wayland.mk
--- a/package/wayland/wayland.mk
+++ b/package/wayland/wayland.mk
@@ -14,7 +14,7 @@
WAYLAND_DEPENDENCIES = libffi host-pkgconf host-wayland expat
# wayland-scanner is only needed for building, not on the target
-WAYLAND_CONF_OPT = --disable-scanner
+WAYLAND_CONF_OPTS = --disable-scanner
# We must provide a specialy-crafted wayland-scanner .pc file
# which we vampirise and adapt from the host-wayland copy
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -39,7 +39,7 @@
CXXFLAGS="$(TARGET_CXXFLAGS) -Wno-cast-align -Wno-sign-compare" \
AR_FLAGS="cru"
-WEBKIT_CONF_OPT += \
+WEBKIT_CONF_OPTS += \
--with-gtk=2.0 \
--disable-geolocation \
--disable-webkit2 \
@@ -49,24 +49,24 @@
--disable-tests
# Xorg Dependencies
-WEBKIT_CONF_OPT += --with-target=x11
+WEBKIT_CONF_OPTS += --with-target=x11
WEBKIT_DEPENDENCIES += xlib_libXt
ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy)
-WEBKIT_CONF_OPT += --enable-gles2
+WEBKIT_CONF_OPTS += --enable-gles2
WEBKIT_DEPENDENCIES += libegl libgles
else
-WEBKIT_CONF_OPT += --disable-gles2
+WEBKIT_CONF_OPTS += --disable-gles2
endif
# gles/egl support is prefered over opengl by webkit configure
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
-WEBKIT_CONF_OPT += --with-acceleration-backend=opengl
+WEBKIT_CONF_OPTS += --with-acceleration-backend=opengl
WEBKIT_DEPENDENCIES += libgl
else
# OpenGL/glx is auto-detected due to the presence of gl.h/glx.h, which is not
# enough, so disable glx and the use of the OpenGL acceleration backend here
-WEBKIT_CONF_OPT += --disable-glx --with-acceleration-backend=none
+WEBKIT_CONF_OPTS += --disable-glx --with-acceleration-backend=none
endif
$(eval $(autotools-package))
diff --git a/package/webp/webp.mk b/package/webp/webp.mk
--- a/package/webp/webp.mk
+++ b/package/webp/webp.mk
@@ -11,7 +11,7 @@
WEBP_LICENSE_FILES = COPYING
WEBP_INSTALL_STAGING = YES
-WEBP_CONF_OPT += \
+WEBP_CONF_OPTS += \
--with-jpegincludedir=$(STAGING_DIR)/usr/include \
--with-jpeglibdir=$(STAGING_DIR)/usr/lib \
--with-tiffincludedir=$(STAGING_DIR)/usr/include \
diff --git a/package/webrtc-audio-processing/webrtc-audio-processing.mk b/package/webrtc-audio-processing/webrtc-audio-processing.mk
--- a/package/webrtc-audio-processing/webrtc-audio-processing.mk
+++ b/package/webrtc-audio-processing/webrtc-audio-processing.mk
@@ -12,7 +12,7 @@
WEBRTC_AUDIO_PROCESSING_LICENSE_FILES = COPYING
ifeq ($(BR2_SOFT_FLOAT),y)
-WEBRTC_AUDIO_PROCESSING_CONF_OPT += --with-ns-mode=fixed
+WEBRTC_AUDIO_PROCESSING_CONF_OPTS += --with-ns-mode=fixed
endif
$(eval $(autotools-package))
diff --git a/package/weston/weston.mk b/package/weston/weston.mk
--- a/package/weston/weston.mk
+++ b/package/weston/weston.mk
@@ -13,7 +13,7 @@
WESTON_DEPENDENCIES = host-pkgconf wayland libxkbcommon pixman libpng \
jpeg mtdev udev cairo
-WESTON_CONF_OPT = \
+WESTON_CONF_OPTS = \
--with-dtddir=$(STAGING_DIR)/usr/share/wayland \
--disable-egl \
--disable-simple-egl-clients \
@@ -27,33 +27,33 @@
ifeq ($(BR2_PACKAGE_LIBINPUT),y)
WESTON_DEPENDENCIES += libinput
-WESTON_CONF_OPT += --enable-libinput-backend
+WESTON_CONF_OPTS += --enable-libinput-backend
else
-WESTON_CONF_OPT += --disable-libinput-backend
+WESTON_CONF_OPTS += --disable-libinput-backend
endif
ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
WESTON_DEPENDENCIES += libunwind
else
-WESTON_CONF_OPT += --disable-libunwind
+WESTON_CONF_OPTS += --disable-libunwind
endif
ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y)
-WESTON_CONF_OPT += --enable-fbdev-compositor
+WESTON_CONF_OPTS += --enable-fbdev-compositor
else
-WESTON_CONF_OPT += --disable-fbdev-compositor
+WESTON_CONF_OPTS += --disable-fbdev-compositor
endif
ifeq ($(BR2_PACKAGE_WESTON_RPI),y)
WESTON_DEPENDENCIES += rpi-userland
-WESTON_CONF_OPT += --enable-rpi-compositor \
+WESTON_CONF_OPTS += --enable-rpi-compositor \
--disable-resize-optimization \
--disable-setuid-install \
--disable-xwayland-test \
--disable-simple-egl-clients \
WESTON_NATIVE_BACKEND=rpi-backend.so
else
-WESTON_CONF_OPT += --disable-rpi-compositor
+WESTON_CONF_OPTS += --disable-rpi-compositor
endif # BR2_PACKAGE_WESTON_RPI
$(eval $(autotools-package))
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -20,13 +20,13 @@
endif
ifeq ($(BR2_PACKAGE_GNUTLS),y)
- WGET_CONF_OPT += --with-ssl=gnutls \
+ WGET_CONF_OPTS += --with-ssl=gnutls \
--with-libgnutls-prefix=$(STAGING_DIR)
WGET_DEPENDENCIES += gnutls
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
- WGET_CONF_OPT += --with-ssl=openssl --with-libssl-prefix=$(STAGING_DIR)
+ WGET_CONF_OPTS += --with-ssl=openssl --with-libssl-prefix=$(STAGING_DIR)
WGET_DEPENDENCIES += openssl
endif
@@ -37,7 +37,7 @@
# --with-ssl is default
ifneq ($(BR2_PACKAGE_GNUTLS),y)
ifneq ($(BR2_PACKAGE_OPENSSL),y)
- WGET_CONF_OPT += --without-ssl
+ WGET_CONF_OPTS += --without-ssl
endif
endif
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -17,7 +17,7 @@
# wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup.
# Work around it by pointing includedir at staging
-WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \
+WIRESHARK_CONF_OPTS = --disable-wireshark --without-krb5 --disable-usr-local \
--enable-static=no --with-gnutls=no --with-libsmi=no \
--includedir=$(STAGING_DIR)/usr/include
diff --git a/package/wvstreams/wvstreams.mk b/package/wvstreams/wvstreams.mk
--- a/package/wvstreams/wvstreams.mk
+++ b/package/wvstreams/wvstreams.mk
@@ -16,9 +16,9 @@
WVSTREAMS_MAKE = $(MAKE1)
# Needed to work around problem with wvassert.h
-WVSTREAMS_CONF_OPT += CPPFLAGS=-DNDEBUG
+WVSTREAMS_CONF_OPTS += CPPFLAGS=-DNDEBUG
-WVSTREAMS_CONF_OPT += \
+WVSTREAMS_CONF_OPTS += \
--with-openssl \
--with-zlib \
--without-pam \
@@ -34,23 +34,23 @@
ifeq ($(BR2_PACKAGE_DBUS),y)
WVSTREAMS_DEPENDENCIES += dbus
- WVSTREAMS_CONF_OPT += --with-dbus
+ WVSTREAMS_CONF_OPTS += --with-dbus
else
- WVSTREAMS_CONF_OPT += --without-dbus
+ WVSTREAMS_CONF_OPTS += --without-dbus
endif
ifeq ($(BR2_PACKAGE_QT),y)
WVSTREAMS_DEPENDENCIES += qt
- WVSTREAMS_CONF_OPT += --with-qt
+ WVSTREAMS_CONF_OPTS += --with-qt
else
- WVSTREAMS_CONF_OPT += --without-qt
+ WVSTREAMS_CONF_OPTS += --without-qt
endif
ifeq ($(BR2_PACKAGE_VALGRIND),y)
WVSTREAMS_DEPENDENCIES += valgrind
- WVSTREAMS_CONF_OPT += --with-valgrind
+ WVSTREAMS_CONF_OPTS += --with-valgrind
else
- WVSTREAMS_CONF_OPT += --without-valgrind
+ WVSTREAMS_CONF_OPTS += --without-valgrind
endif
$(eval $(autotools-package))
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -16,8 +16,8 @@
host-libxslt libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
host-xcb-proto host-python host-pkgconf
-LIBXCB_CONF_OPT = --disable-build-docs
-HOST_LIBXCB_CONF_OPT = --disable-build-docs
+LIBXCB_CONF_OPTS = --disable-build-docs
+HOST_LIBXCB_CONF_OPTS = --disable-build-docs
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -11,7 +11,7 @@
XAPP_XDM_LICENSE_FILES = COPYING
XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
XAPP_XDM_DEPENDENCIES = xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
-XAPP_XDM_CONF_OPT = --with-utmp-file=/var/adm/utmpx \
+XAPP_XDM_CONF_OPTS = --with-utmp-file=/var/adm/utmpx \
--with-wtmp-file=/var/adm/wtmpx
define XAPP_XDM_INSTALL_STARTUP_SCRIPT
diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
--- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
+++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk
@@ -9,7 +9,7 @@
XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDPYINFO_LICENSE = MIT
XAPP_XDPYINFO_LICENSE_FILES = COPYING
-XAPP_XDPYINFO_CONF_OPT = --without-xf86misc # not in BR
+XAPP_XDPYINFO_CONF_OPTS = --without-xf86misc # not in BR
XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXtst \
$(if $(BR2_PACKAGE_XLIB_LIBXI),xlib_libXi) \
$(if $(BR2_PACKAGE_XLIB_LIBXRENDER),xlib_libXrender) \
@@ -19,19 +19,19 @@
ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86DGA),y)
XAPP_XDPYINFO_DEPENDENCIES += xlib_libXxf86dga
else
-XAPP_XDPYINFO_CONF_OPT += --without-dga
+XAPP_XDPYINFO_CONF_OPTS += --without-dga
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
XAPP_XDPYINFO_DEPENDENCIES += xlib_libdmx
else
-XAPP_XDPYINFO_CONF_OPT += --without-dmx
+XAPP_XDPYINFO_CONF_OPTS += --without-dmx
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
XAPP_XDPYINFO_DEPENDENCIES += xlib_libXinerama
else
-XAPP_XDPYINFO_CONF_OPT += --without-xinerama
+XAPP_XDPYINFO_CONF_OPTS += --without-xinerama
endif
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
--- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk
+++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk
@@ -10,6 +10,6 @@
XAPP_XRANDR_LICENSE = MIT
XAPP_XRANDR_LICENSE_FILES = COPYING
XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11
-XAPP_XRANDR_CONF_OPT = --disable-malloc0returnsnull
+XAPP_XRANDR_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -10,7 +10,7 @@
XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT
XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS = \
--disable-xvmc \
--enable-sna \
--disable-glamor \
@@ -28,20 +28,20 @@
# X.org server support for DRI depends on a Mesa3D DRI driver
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri --enable-dri1
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --enable-dri --enable-dri1
# quote from configure.ac: "UXA doesn't build without DRI2 headers"
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri2 --enable-uxa
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --enable-dri2 --enable-uxa
else
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri2 --disable-uxa
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri2 --disable-uxa
endif
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri3
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --enable-dri3
else
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri3
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri3
endif
else
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri
endif
$(eval $(autotools-package))
diff --git a/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
--- a/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -10,7 +10,7 @@
XKEYBOARD_CONFIG_LICENSE = MIT
XKEYBOARD_CONFIG_LICENSE_FILES = COPYING
-XKEYBOARD_CONFIG_CONF_OPT = --disable-runtime-deps
+XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps
XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -11,6 +11,6 @@
XLIB_LIBFS_LICENSE_FILES = COPYING
XLIB_LIBFS_INSTALL_STAGING = YES
XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto host-pkgconf
-XLIB_LIBFS_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBFS_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -11,6 +11,6 @@
XLIB_LIBSM_LICENSE_FILES = COPYING
XLIB_LIBSM_INSTALL_STAGING = YES
XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
-XLIB_LIBSM_CONF_OPT = --without-libuuid
+XLIB_LIBSM_CONF_OPTS = --without-libuuid
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -23,13 +23,13 @@
xproto_xf86bigfontproto \
host-xproto_xproto
-XLIB_LIBX11_CONF_OPT = \
+XLIB_LIBX11_CONF_OPTS = \
--disable-malloc0returnsnull \
--with-xcb \
--disable-specs \
--without-perl
-HOST_XLIB_LIBX11_CONF_OPT = \
+HOST_XLIB_LIBX11_CONF_OPTS = \
--disable-specs \
--without-perl
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -11,6 +11,6 @@
XLIB_LIBXSCRNSAVER_LICENSE_FILES = COPYING
XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
-XLIB_LIBXSCRNSAVER_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXSCRNSAVER_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -11,6 +11,6 @@
XLIB_LIBXAW_LICENSE_FILES = COPYING
XLIB_LIBXAW_INSTALL_STAGING = YES
XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto
-XLIB_LIBXAW_CONF_OPT = --disable-docs
+XLIB_LIBXAW_CONF_OPTS = --disable-docs
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -11,6 +11,6 @@
XLIB_LIBXEXT_LICENSE_FILES = COPYING
XLIB_LIBXEXT_INSTALL_STAGING = YES
XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
-XLIB_LIBXEXT_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXEXT_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -12,9 +12,9 @@
XLIB_LIBXFONT_AUTORECONF = YES
XLIB_LIBXFONT_INSTALL_STAGING = YES
XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings
-XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
+XLIB_LIBXFONT_CONF_OPTS = --disable-devel-docs
-HOST_XLIB_LIBXFONT_CONF_OPT = --disable-devel-docs
+HOST_XLIB_LIBXFONT_CONF_OPTS = --disable-devel-docs
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -18,6 +18,6 @@
xlib_libXext \
xlib_libXfixes
-XLIB_LIBXI_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXI_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -11,6 +11,6 @@
XLIB_LIBXINERAMA_LICENSE_FILES = COPYING
XLIB_LIBXINERAMA_INSTALL_STAGING = YES
XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
-XLIB_LIBXINERAMA_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXINERAMA_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -11,6 +11,6 @@
XLIB_LIBXRANDR_LICENSE_FILES = COPYING
XLIB_LIBXRANDR_INSTALL_STAGING = YES
XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
-XLIB_LIBXRANDR_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXRANDR_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -11,7 +11,7 @@
XLIB_LIBXRENDER_LICENSE_FILES = COPYING
XLIB_LIBXRENDER_INSTALL_STAGING = YES
XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
-XLIB_LIBXRENDER_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXRENDER_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -11,6 +11,6 @@
XLIB_LIBXRES_LICENSE_FILES = COPYING
XLIB_LIBXRES_INSTALL_STAGING = YES
XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
-XLIB_LIBXRES_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXRES_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -11,7 +11,7 @@
XLIB_LIBXT_LICENSE_FILES = COPYING
XLIB_LIBXT_INSTALL_STAGING = YES
XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto
-XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --disable-install-makestrs
+XLIB_LIBXT_CONF_OPTS = --disable-malloc0returnsnull --disable-install-makestrs
XLIB_LIBXT_AUTORECONF = YES
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -11,6 +11,6 @@
XLIB_LIBXV_LICENSE_FILES = COPYING
XLIB_LIBXV_INSTALL_STAGING = YES
XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
-XLIB_LIBXV_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXV_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -11,6 +11,6 @@
XLIB_LIBXVMC_LICENSE_FILES = COPYING
XLIB_LIBXVMC_INSTALL_STAGING = YES
XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
-XLIB_LIBXVMC_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXVMC_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -11,6 +11,6 @@
XLIB_LIBXXF86DGA_LICENSE_FILES = COPYING
XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
-XLIB_LIBXXF86DGA_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXXF86DGA_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -11,6 +11,6 @@
XLIB_LIBXXF86VM_LICENSE_FILES = COPYING
XLIB_LIBXXF86VM_INSTALL_STAGING = YES
XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
-XLIB_LIBXXF86VM_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBXXF86VM_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -11,6 +11,6 @@
XLIB_LIBDMX_LICENSE_FILES = COPYING
XLIB_LIBDMX_INSTALL_STAGING = YES
XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
-XLIB_LIBDMX_CONF_OPT = --disable-malloc0returnsnull
+XLIB_LIBDMX_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
@@ -10,8 +10,8 @@
XPROTO_XCMISCPROTO_LICENSE = MIT
XPROTO_XCMISCPROTO_LICENSE_FILES = COPYING
XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
-XPROTO_XCMISCPROTO_CONF_OPT = --disable-specs
-HOST_XPROTO_XCMISCPROTO_CONF_OPT = --disable-specs
+XPROTO_XCMISCPROTO_CONF_OPTS = --disable-specs
+HOST_XPROTO_XCMISCPROTO_CONF_OPTS = --disable-specs
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
@@ -10,8 +10,8 @@
XPROTO_XEXTPROTO_LICENSE = MIT
XPROTO_XEXTPROTO_LICENSE_FILES = COPYING
XPROTO_XEXTPROTO_INSTALL_STAGING = YES
-XPROTO_XEXTPROTO_CONF_OPT = --disable-specs
-HOST_XPROTO_XEXTPROTO_CONF_OPT = --disable-specs
+XPROTO_XEXTPROTO_CONF_OPTS = --disable-specs
+HOST_XPROTO_XEXTPROTO_CONF_OPTS = --disable-specs
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -54,7 +54,7 @@
mcookie \
host-pkgconf
-XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
+XSERVER_XORG_SERVER_CONF_OPTS = --disable-config-hal \
--disable-xnest --disable-xephyr --disable-dmx \
--with-builder-addr=buildroot at buildroot.org \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
@@ -62,14 +62,14 @@
--$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libpciaccess libdrm
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive --enable-xfbdev \
+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
@@ -77,66 +77,66 @@
XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive-evdev
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-evdev
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive-evdev
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-evdev
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive-kbd
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-kbd
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive-kbd
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-kbd
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-kdrive-mouse
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-mouse
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive-mouse
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-mouse
endif
else # modular
-XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
endif
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-dri --enable-glx
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-dri --disable-glx
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-null-root-cursor
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-null-root-cursor
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-null-root-cursor
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-null-root-cursor
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y)
-XSERVER_XORG_SERVER_CONF_OPT += --enable-aiglx
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-aiglx
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-aiglx
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-aiglx
endif
# Optional packages
ifeq ($(BR2_PACKAGE_TSLIB),y)
XSERVER_XORG_SERVER_DEPENDENCIES += tslib
-XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts"
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-tslib LDFLAGS="-lts"
endif
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
XSERVER_XORG_SERVER_DEPENDENCIES += udev
-XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
# udev kms support depends on libdrm
ifeq ($(BR2_PACKAGE_LIBDRM),y)
XSERVER_XORG_SERVER_DEPENDENCIES += libdrm
-XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev-kms
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-config-udev-kms
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
endif
else
ifeq ($(BR2_PACKAGE_DBUS),y)
XSERVER_XORG_SERVER_DEPENDENCIES += dbus
-XSERVER_XORG_SERVER_CONF_OPT += --enable-config-dbus
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-dbus
endif
endif
@@ -147,56 +147,56 @@
ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
XSERVER_XORG_SERVER_DEPENDENCIES += libunwind
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-libunwind
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind
endif
ifeq ($(BR2_PACKAGE_XPROTO_RECORDPROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
-XSERVER_XORG_SERVER_CONF_OPT += --enable-record
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-record
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-record
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
endif
ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
-XSERVER_XORG_SERVER_CONF_OPT += --disable-xvmc
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc
endif
ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y)
-XSERVER_XORG_SERVER_CONF_OPT += --disable-composite
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-composite
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
-XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2
endif
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
-XSERVER_XORG_SERVER_CONF_OPT += --enable-dri3
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
endif
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-dri2 --disable-dri3
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2 --disable-dri3
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver
-XSERVER_XORG_SERVER_CONF_OPT += --enable-screensaver
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-screensaver
else
-XSERVER_XORG_SERVER_CONF_OPT += --disable-screensaver
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-screensaver
endif
ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y)
-XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-dmx
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
-XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libcrypto
+XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libcrypto
XSERVER_XORG_SERVER_DEPENDENCIES += openssl
else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
-XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libgcrypt
+XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libgcrypt
XSERVER_XORG_SERVER_DEPENDENCIES += libgcrypt
else
-XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libsha1
+XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1
XSERVER_XORG_SERVER_DEPENDENCIES += libsha1
endif
diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -8,63 +8,63 @@
X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION)
# sdl support is not used in x11vnc, but host include / library search paths
# leak in if host has sdl-config
-X11VNC_CONF_OPT = --without-sdl
+X11VNC_CONF_OPTS = --without-sdl
X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst
X11VNC_LICENSE = GPLv2+
X11VNC_LICENSE_FILES = COPYING
ifneq ($(BR2_INET_IPV6),y)
# configure option only used for libvncserver
-X11VNC_CONF_OPT += --without-ipv6
+X11VNC_CONF_OPTS += --without-ipv6
X11VNC_CONF_ENV += CFLAGS='$(TARGET_CFLAGS) -DX11VNC_IPV6=0'
endif
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
X11VNC_DEPENDENCIES += avahi dbus
else
-X11VNC_CONF_OPT += --without-avahi
+X11VNC_CONF_OPTS += --without-avahi
endif
ifeq ($(BR2_PACKAGE_JPEG),y)
X11VNC_DEPENDENCIES += jpeg
else
-X11VNC_CONF_OPT += --without-jpeg
+X11VNC_CONF_OPTS += --without-jpeg
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
X11VNC_DEPENDENCIES += openssl
else
-X11VNC_CONF_OPT += --without-ssl --without-crypto
+X11VNC_CONF_OPTS += --without-ssl --without-crypto
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
X11VNC_DEPENDENCIES += xlib_libXinerama
else
-X11VNC_CONF_OPT += --without-xinerama
+X11VNC_CONF_OPTS += --without-xinerama
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
X11VNC_DEPENDENCIES += xlib_libXrandr
else
-X11VNC_CONF_OPT += --without-xrandr
+X11VNC_CONF_OPTS += --without-xrandr
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y)
X11VNC_DEPENDENCIES += xlib_libXfixes
else
-X11VNC_CONF_OPT += --without-xfixes
+X11VNC_CONF_OPTS += --without-xfixes
endif
ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y)
X11VNC_DEPENDENCIES += xlib_libXdamage
else
-X11VNC_CONF_OPT += --without-xdamage
+X11VNC_CONF_OPTS += --without-xdamage
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
X11VNC_DEPENDENCIES += zlib
else
-X11VNC_CONF_OPT += --without-zlib
+X11VNC_CONF_OPTS += --without-zlib
endif
diff --git a/package/xbmc-pvr-addons/xbmc-pvr-addons.mk b/package/xbmc-pvr-addons/xbmc-pvr-addons.mk
--- a/package/xbmc-pvr-addons/xbmc-pvr-addons.mk
+++ b/package/xbmc-pvr-addons/xbmc-pvr-addons.mk
@@ -20,15 +20,15 @@
# installed its own files
XBMC_PVR_ADDONS_DEPENDENCIES += xbmc
-XBMC_PVR_ADDONS_CONF_OPT = \
+XBMC_PVR_ADDONS_CONF_OPTS = \
--enable-release \
--enable-addons-with-dependencies
ifeq ($(BR2_PACKAGE_MYSQL),y)
-XBMC_PVR_ADDONS_CONF_OPT += --enable-mysql
+XBMC_PVR_ADDONS_CONF_OPTS += --enable-mysql
XBMC_PVR_ADDONS_DEPENDENCIES += mysql
else
-XBMC_PVR_ADDONS_CONF_OPT += --disable-mysql
+XBMC_PVR_ADDONS_CONF_OPTS += --disable-mysql
endif
$(eval $(autotools-package))
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -39,7 +39,7 @@
USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \
TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
-XBMC_CONF_OPT += \
+XBMC_CONF_OPTS += \
--with-arch=$(BR2_ARCH) \
--disable-crystalhd \
--disable-debug \
@@ -58,7 +58,7 @@
ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
XBMC_DEPENDENCIES += rpi-userland
-XBMC_CONF_OPT += --with-platform=raspberry-pi --enable-player=omxplayer
+XBMC_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
XBMC_CONF_ENV += INCLUDES="-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" \
LIBS="-lvcos -lvchostif"
@@ -66,23 +66,23 @@
ifeq ($(BR2_PACKAGE_XBMC_DBUS),y)
XBMC_DEPENDENCIES += dbus
-XBMC_CONF_OPT += --enable-dbus
+XBMC_CONF_OPTS += --enable-dbus
else
-XBMC_CONF_OPT += --disable-dbus
+XBMC_CONF_OPTS += --disable-dbus
endif
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
XBMC_DEPENDENCIES += alsa-lib
-XBMC_CONF_OPT += --enable-alsa
+XBMC_CONF_OPTS += --enable-alsa
else
-XBMC_CONF_OPT += --disable-alsa
+XBMC_CONF_OPTS += --disable-alsa
endif
ifeq ($(BR2_PACKAGE_LAME),y)
XBMC_DEPENDENCIES += lame
-XBMC_CONF_OPT += --enable-libmp3lame
+XBMC_CONF_OPTS += --enable-libmp3lame
else
-XBMC_CONF_OPT += --disable-libmp3lame
+XBMC_CONF_OPTS += --disable-libmp3lame
endif
# quote from xbmc/configure.in: "GLES overwrites GL if both set to yes."
@@ -90,7 +90,7 @@
ifeq ($(BR2_PACKAGE_XBMC_GL),y)
XBMC_DEPENDENCIES += libglew libglu libgl sdl_image xlib_libX11 xlib_libXext \
xlib_libXmu xlib_libXrandr xlib_libXt
-XBMC_CONF_OPT += --enable-gl --enable-sdl --enable-x11 --enable-xrandr --disable-gles
+XBMC_CONF_OPTS += --enable-gl --enable-sdl --enable-x11 --enable-xrandr --disable-gles
ifeq ($(BR2_PACKAGE_XBMC_RSXS),y)
# fix rsxs compile
# make sure target libpng-config is used, options taken from rsxs-0.9/acinclude.m4
@@ -101,87 +101,87 @@
mac_cv_pkg_cxxflags="`$(STAGING_DIR)/usr/bin/libpng-config --ccopts`" \
mac_cv_pkg_ldflags="`$(STAGING_DIR)/usr/bin/libpng-config --L_opts --R_opts`" \
mac_cv_pkg_libs="`$(STAGING_DIR)/usr/bin/libpng-config --libs`"
-XBMC_CONF_OPT += --enable-rsxs
+XBMC_CONF_OPTS += --enable-rsxs
else
-XBMC_CONF_OPT += --disable-rsxs
+XBMC_CONF_OPTS += --disable-rsxs
endif
else
-XBMC_CONF_OPT += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr
+XBMC_CONF_OPTS += --disable-gl --disable-rsxs --disable-sdl --disable-x11 --disable-xrandr
ifeq ($(BR2_PACKAGE_XBMC_EGL_GLES),y)
XBMC_DEPENDENCIES += libegl libgles
-XBMC_CONF_OPT += --enable-gles
+XBMC_CONF_OPTS += --enable-gles
else
-XBMC_CONF_OPT += --disable-gles
+XBMC_CONF_OPTS += --disable-gles
endif
endif
ifeq ($(BR2_PACKAGE_XBMC_GOOM),y)
-XBMC_CONF_OPT += --enable-goom
+XBMC_CONF_OPTS += --enable-goom
else
-XBMC_CONF_OPT += --disable-goom
+XBMC_CONF_OPTS += --disable-goom
endif
ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y)
XBMC_DEPENDENCIES += libusb-compat
-XBMC_CONF_OPT += --enable-libusb
+XBMC_CONF_OPTS += --enable-libusb
else
-XBMC_CONF_OPT += --disable-libusb
+XBMC_CONF_OPTS += --disable-libusb
endif
ifeq ($(BR2_PACKAGE_XBMC_LIBMICROHTTPD),y)
XBMC_DEPENDENCIES += libmicrohttpd
-XBMC_CONF_OPT += --enable-webserver
+XBMC_CONF_OPTS += --enable-webserver
else
-XBMC_CONF_OPT += --disable-webserver
+XBMC_CONF_OPTS += --disable-webserver
endif
ifeq ($(BR2_PACKAGE_XBMC_LIBSMBCLIENT),y)
XBMC_DEPENDENCIES += samba
-XBMC_CONF_OPT += --enable-samba
+XBMC_CONF_OPTS += --enable-samba
else
-XBMC_CONF_OPT += --disable-samba
+XBMC_CONF_OPTS += --disable-samba
endif
ifeq ($(BR2_PACKAGE_XBMC_LIBNFS),y)
XBMC_DEPENDENCIES += libnfs
-XBMC_CONF_OPT += --enable-nfs
+XBMC_CONF_OPTS += --enable-nfs
else
-XBMC_CONF_OPT += --disable-nfs
+XBMC_CONF_OPTS += --disable-nfs
endif
ifeq ($(BR2_PACKAGE_XBMC_RTMPDUMP),y)
XBMC_DEPENDENCIES += rtmpdump
-XBMC_CONF_OPT += --enable-rtmp
+XBMC_CONF_OPTS += --enable-rtmp
else
-XBMC_CONF_OPT += --disable-rtmp
+XBMC_CONF_OPTS += --disable-rtmp
endif
ifeq ($(BR2_PACKAGE_XBMC_LIBBLURAY),y)
XBMC_DEPENDENCIES += libbluray
-XBMC_CONF_OPT += --enable-libbluray
+XBMC_CONF_OPTS += --enable-libbluray
else
-XBMC_CONF_OPT += --disable-libbluray
+XBMC_CONF_OPTS += --disable-libbluray
endif
ifeq ($(BR2_PACKAGE_XBMC_LIBSHAIRPLAY),y)
XBMC_DEPENDENCIES += libshairplay
-XBMC_CONF_OPT += --enable-airplay
+XBMC_CONF_OPTS += --enable-airplay
else
-XBMC_CONF_OPT += --disable-airplay
+XBMC_CONF_OPTS += --disable-airplay
endif
ifeq ($(BR2_PACKAGE_XBMC_AVAHI),y)
XBMC_DEPENDENCIES += avahi
-XBMC_CONF_OPT += --enable-avahi
+XBMC_CONF_OPTS += --enable-avahi
else
-XBMC_CONF_OPT += --disable-avahi
+XBMC_CONF_OPTS += --disable-avahi
endif
ifeq ($(BR2_PACKAGE_XBMC_LIBCEC),y)
XBMC_DEPENDENCIES += libcec
-XBMC_CONF_OPT += --enable-libcec
+XBMC_CONF_OPTS += --enable-libcec
else
-XBMC_CONF_OPT += --disable-libcec
+XBMC_CONF_OPTS += --disable-libcec
endif
ifeq ($(BR2_PACKAGE_XBMC_WAVPACK),y)
@@ -195,9 +195,9 @@
# xbmc needs libva & libva-glx
ifeq ($(BR2_PACKAGE_XBMC_LIBVA)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),yy)
XBMC_DEPENDENCIES += mesa3d libva
-XBMC_CONF_OPT += --enable-vaapi
+XBMC_CONF_OPTS += --enable-vaapi
else
-XBMC_CONF_OPT += --disable-vaapi
+XBMC_CONF_OPTS += --disable-vaapi
endif
# Add HOST_DIR to PATH for codegenerator.mk to find swig
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -19,7 +19,7 @@
XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
-XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/ --disable-doc-install
+XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install
define XENOMAI_REMOVE_DEVFILES
for i in xeno-config xeno-info wrap-link.sh ; do \
diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk
--- a/package/xerces/xerces.mk
+++ b/package/xerces/xerces.mk
@@ -11,7 +11,7 @@
XERCES_LICENSE_FILES = LICENSE
XERCES_MAKE = $(MAKE1)
XERCES_INSTALL_STAGING = YES
-XERCES_CONF_OPT = --disable-threads \
+XERCES_CONF_OPTS = --disable-threads \
--with-gnu-ld
ifeq ($(BR2_PACKAGE_LIBICONV),y)
@@ -20,10 +20,10 @@
endif
ifeq ($(BR2_PACKAGE_LIBCURL),y)
-XERCES_CONF_OPT += --enable-netaccessor-curl
+XERCES_CONF_OPTS += --enable-netaccessor-curl
XERCES_DEPENDENCIES += libcurl
else
-XERCES_CONF_OPT += --disable-network
+XERCES_CONF_OPTS += --disable-network
endif
$(eval $(autotools-package))
diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
--- a/package/xfsprogs/xfsprogs.mk
+++ b/package/xfsprogs/xfsprogs.mk
@@ -10,7 +10,7 @@
XFSPROGS_DEPENDENCIES = util-linux
XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes
-XFSPROGS_CONF_OPT = \
+XFSPROGS_CONF_OPTS = \
--enable-lib64=no \
--enable-gettext=no \
INSTALL_USER=root \
diff --git a/package/xmlstarlet/xmlstarlet.mk b/package/xmlstarlet/xmlstarlet.mk
--- a/package/xmlstarlet/xmlstarlet.mk
+++ b/package/xmlstarlet/xmlstarlet.mk
@@ -12,15 +12,15 @@
XMLSTARLET_DEPENDENCIES += libxml2 libxslt \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
-XMLSTARLET_CONF_OPT += \
+XMLSTARLET_CONF_OPTS += \
--with-libxml-prefix=${STAGING_DIR}/usr \
--with-libxslt-prefix=${STAGING_DIR}/usr \
--with-libiconv-prefix=${STAGING_DIR}/usr
ifeq ($(BR2_PREFER_STATIC_LIB),y)
-XMLSTARLET_CONF_OPT += --enable-static-libs
+XMLSTARLET_CONF_OPTS += --enable-static-libs
else
-XMLSTARLET_CONF_OPT += --disable-static-libs
+XMLSTARLET_CONF_OPTS += --disable-static-libs
endif
$(eval $(autotools-package))
diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
--- a/package/xscreensaver/xscreensaver.mk
+++ b/package/xscreensaver/xscreensaver.mk
@@ -16,7 +16,7 @@
# otherwise we end up with host include/library dirs passed to the
# compiler/linker
-XSCREENSAVER_CONF_OPT = \
+XSCREENSAVER_CONF_OPTS = \
--includedir=$(STAGING_DIR)/usr/include \
--libdir=$(STAGING_DIR)/usr/lib
diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk
--- a/package/zeromq/zeromq.mk
+++ b/package/zeromq/zeromq.mk
@@ -15,12 +15,12 @@
# Only tools/curve_keygen.c needs this, but it doesn't hurt to pass it
# for the rest of the build as well (which automatically includes stdc++).
ifeq ($(BR2_PREFER_STATIC_LIB),y)
- ZEROMQ_CONF_OPT += LIBS=-lstdc++
+ ZEROMQ_CONF_OPTS += LIBS=-lstdc++
endif
ifeq ($(BR2_PACKAGE_ZEROMQ_PGM),y)
ZEROMQ_DEPENDENCIES += host-pkgconf openpgm
- ZEROMQ_CONF_OPT += --with-system-pgm
+ ZEROMQ_CONF_OPTS += --with-system-pgm
endif
$(eval $(autotools-package))
diff --git a/package/znc/znc.mk b/package/znc/znc.mk
--- a/package/znc/znc.mk
+++ b/package/znc/znc.mk
@@ -9,7 +9,7 @@
ZNC_LICENSE = Apache-2.0
ZNC_LICENSE_FILES = LICENSE
ZNC_DEPENDENCIES = host-pkgconf host-autoconf host-automake
-ZNC_CONF_OPT = --disable-perl
+ZNC_CONF_OPTS = --disable-perl
# The standard <pkg>_AUTORECONF = YES invocation doesn't work for this
# package, because it does not use automake in a normal way.
@@ -20,30 +20,30 @@
ifeq ($(BR2_PACKAGE_ICU),y)
ZNC_DEPENDENCIES += icu
-ZNC_CONF_OPT += --enable-icu
+ZNC_CONF_OPTS += --enable-icu
else
-ZNC_CONF_OPT += --disable-icu
+ZNC_CONF_OPTS += --disable-icu
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
ZNC_DEPENDENCIES += openssl
-ZNC_CONF_OPT += --enable-openssl
+ZNC_CONF_OPTS += --enable-openssl
else
-ZNC_CONF_OPT += --disable-openssl
+ZNC_CONF_OPTS += --disable-openssl
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
ZNC_DEPENDENCIES += zlib
-ZNC_CONF_OPT += --enable-zlib
+ZNC_CONF_OPTS += --enable-zlib
else
-ZNC_CONF_OPT += --disable-zlib
+ZNC_CONF_OPTS += --disable-zlib
endif
ifeq ($(BR2_PACKAGE_PYTHON3),y)
ZNC_DEPENDENCIES += python3 host-swig
-ZNC_CONF_OPT += --enable-python=python3
+ZNC_CONF_OPTS += --enable-python=python3
else
-ZNC_CONF_OPT += --disable-python
+ZNC_CONF_OPTS += --disable-python
endif
$(eval $(autotools-package))
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 08 of 15] packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (6 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 07 of 15] packages: rename FOO_CONF_OPT into FOO_CONF_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:20 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 09 of 15] packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS Thomas De Schampheleire
` (8 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_BUILD_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_BUILD_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
docs/manual/adding-packages-luarocks.txt | 6 +++---
docs/manual/adding-packages-perl.txt | 2 +-
docs/manual/adding-packages-python.txt | 4 ++--
package/pkg-luarocks.mk | 4 ++--
package/pkg-perl.mk | 8 ++++----
package/pkg-python.mk | 14 +++++++-------
package/python-numpy/python-numpy.mk | 2 +-
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/docs/manual/adding-packages-luarocks.txt b/docs/manual/adding-packages-luarocks.txt
--- a/docs/manual/adding-packages-luarocks.txt
+++ b/docs/manual/adding-packages-luarocks.txt
@@ -20,8 +20,8 @@
07: LUAFOO_VERSION = 1.0.2-1
08: LUAFOO_DEPENDENCIES = foo
09:
-10: LUAFOO_BUILD_OPT += FOO_INCDIR=$(STAGING_DIR)/usr/include
-11: LUAFOO_BUILD_OPT += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
+10: LUAFOO_BUILD_OPTS += FOO_INCDIR=$(STAGING_DIR)/usr/include
+11: LUAFOO_BUILD_OPTS += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
12: LUAFOO_LICENSE = luaFoo license
13: LUAFOO_LICENSE_FILES = COPYING
14:
@@ -86,5 +86,5 @@
* +LUAFOO_SUBDIR+, which defaults to
+luafoo-$(LUAFOO_VERSION_WITHOUT_ROCKSPEC_REVISION)+
-* +LUAFOO_BUILD_OPT+ contains additional build options for the
+* +LUAFOO_BUILD_OPTS+ contains additional build options for the
+luarocks build+ call.
diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
--- a/docs/manual/adding-packages-perl.txt
+++ b/docs/manual/adding-packages-perl.txt
@@ -105,7 +105,7 @@
configure options to pass to the +perl Makefile.PL+ or +perl Build.PL+.
By default, empty.
-* +PERL_FOO_BUILD_OPT+/+HOST_PERL_FOO_BUILD_OPT+, to specify additional
+* +PERL_FOO_BUILD_OPTS+/+HOST_PERL_FOO_BUILD_OPTS+, to specify additional
options to pass to +make pure_all+ or +perl Build build+ in the build step.
By default, empty.
diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
--- a/docs/manual/adding-packages-python.txt
+++ b/docs/manual/adding-packages-python.txt
@@ -122,9 +122,9 @@
setuptools target packages) and +HOST_PKG_PYTHON_SETUPTOOLS_ENV+
(for setuptools host packages).
-* +PYTHON_FOO_BUILD_OPT+, to specify additional options to pass to the
+* +PYTHON_FOO_BUILD_OPTS+, to specify additional options to pass to the
Python +setup.py+ script during the build step. For target distutils
- packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
+ packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPTS+ options are already
passed automatically by the infrastructure.
* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+,
diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
--- a/package/pkg-luarocks.mk
+++ b/package/pkg-luarocks.mk
@@ -33,7 +33,7 @@
define inner-luarocks-package
-$(2)_BUILD_OPT ?=
+$(2)_BUILD_OPTS ?=
$(2)_SUBDIR ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
$(2)_ROCKSPEC ?= $(1)-$$($(3)_VERSION).rockspec
$(2)_SOURCE ?= $(1)-$$($(3)_VERSION).src.rock
@@ -59,7 +59,7 @@
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
cd $$($(2)_SRCDIR) && \
- $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPT)
+ $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS)
endef
endif
diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
--- a/package/pkg-perl.mk
+++ b/package/pkg-perl.mk
@@ -129,11 +129,11 @@
# Build package for target
define $(2)_BUILD_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
- perl Build $$($(2)_BUILD_OPT) build; \
+ perl Build $$($(2)_BUILD_OPTS) build; \
else \
$$(MAKE1) \
PERL_INC=$$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \
- $$($(2)_BUILD_OPT) pure_all; \
+ $$($(2)_BUILD_OPTS) pure_all; \
fi
endef
else
@@ -141,9 +141,9 @@
# Build package for host
define $(2)_BUILD_CMDS
cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
- perl Build $$($(2)_BUILD_OPT) build; \
+ perl Build $$($(2)_BUILD_OPTS) build; \
else \
- $$(MAKE1) $$($(2)_BUILD_OPT) pure_all; \
+ $$(MAKE1) $$($(2)_BUILD_OPTS) pure_all; \
fi
endef
endif
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -32,7 +32,7 @@
_python_prefix=/usr \
_python_exec_prefix=/usr
-PKG_PYTHON_DISTUTILS_BUILD_OPT = \
+PKG_PYTHON_DISTUTILS_BUILD_OPTS = \
--executable=/usr/bin/python
PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
@@ -95,7 +95,7 @@
$(2)_BUILDDIR = $$($(2)_SRCDIR)
$(2)_ENV ?=
-$(2)_BUILD_OPT ?=
+$(2)_BUILD_OPTS ?=
$(2)_INSTALL_OPTS ?=
ifndef $(2)_SETUP_TYPE
@@ -111,13 +111,13 @@
ifeq ($(4),target)
$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
$(2)_BASE_BUILD_TGT = build
-$(2)_BASE_BUILD_OPT = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
+$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
else
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
$(2)_BASE_BUILD_TGT = build
-$(2)_BASE_BUILD_OPT =
+$(2)_BASE_BUILD_OPTS =
$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
endif
# Setuptools
@@ -125,13 +125,13 @@
ifeq ($(4),target)
$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
$(2)_BASE_BUILD_TGT = build
-$(2)_BASE_BUILD_OPT =
+$(2)_BASE_BUILD_OPTS =
$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
else
$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
$(2)_BASE_BUILD_TGT = build
-$(2)_BASE_BUILD_OPT =
+$(2)_BASE_BUILD_OPTS =
$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
endif
else
@@ -228,7 +228,7 @@
$$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
$$($(2)_PYTHON_INTERPRETER) setup.py \
$$($$(PKG)_BASE_BUILD_TGT) \
- $$($$(PKG)_BASE_BUILD_OPT) $$($$(PKG)_BUILD_OPT))
+ $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS))
endef
endif
diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk
--- a/package/python-numpy/python-numpy.mk
+++ b/package/python-numpy/python-numpy.mk
@@ -16,7 +16,7 @@
PYTHON_NUMPY_SITE_CFG_LIBS += blas lapack
endif
-PYTHON_NUMPY_BUILD_OPT = --fcompiler=None
+PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None
define PYTHON_NUMPY_CONFIGURE_CMDS
-rm -f $(@D)/site.cfg
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 09 of 15] packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (7 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 08 of 15] packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:26 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 10 of 15] packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS Thomas De Schampheleire
` (7 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_GETTEXTIZE_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_GETTEXTIZE_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
docs/manual/adding-packages-autotools.txt | 2 +-
package/pkg-autotools.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
--- a/docs/manual/adding-packages-autotools.txt
+++ b/docs/manual/adding-packages-autotools.txt
@@ -136,7 +136,7 @@
'gettextize'.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid
values are +YES+ and +NO+. The default is +NO+.
-* +LIBFOO_GETTEXTIZE_OPT+, to specify additional options passed to
+* +LIBFOO_GETTEXTIZE_OPTS+, to specify additional options passed to
the 'gettextize' program, if +LIBFOO_GETTEXTIZE=YES+. You may
use that if, for example, the +.po+ files are not located in the
standard place (i.e. in +po/+ at the root of the package.) By
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -96,7 +96,7 @@
endif
ifeq ($(4),host)
- $(2)_GETTEXTIZE_OPT ?= $$($(3)_GETTEXTIZE_OPT)
+ $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS)
endif
ifeq ($(4),host)
@@ -220,7 +220,7 @@
#
define GETTEXTIZE_HOOK
@$$(call MESSAGE,"Gettextizing")
- $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPT)
+ $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPTS)
endef
#
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 10 of 15] packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (8 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 09 of 15] packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:29 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 11 of 15] pkg-generic: introduce helper function to check for a deprecated variable Thomas De Schampheleire
` (6 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
make the same change for FOO_KCONFIG_OPT.
Sed command used:
find * -type f | xargs sed -i 's#_KCONFIG_OPT\>#&S#g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: new patch
docs/manual/adding-packages-kconfig.txt | 2 +-
package/busybox/busybox.mk | 2 +-
package/pkg-kconfig.mk | 6 +++---
package/uclibc/uclibc.mk | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
--- a/docs/manual/adding-packages-kconfig.txt
+++ b/docs/manual/adding-packages-kconfig.txt
@@ -46,7 +46,7 @@
* +FOO_KCONFIG_EDITORS+: a space-separated list of kconfig editors to
support, for example 'menuconfig xconfig'. By default, 'menuconfig'.
-* +FOO_KCONFIG_OPT+: extra options to pass when calling the kconfig
+* +FOO_KCONFIG_OPTS+: extra options to pass when calling the kconfig
editors. This may need to include '$(FOO_MAKE_OPTS)', for example. By
default, empty.
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -47,7 +47,7 @@
BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
-BUSYBOX_KCONFIG_OPT = $(BUSYBOX_MAKE_OPTS)
+BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
define BUSYBOX_PERMISSIONS
/bin/busybox f 4755 0 0 - - - - -
diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
--- a/package/pkg-kconfig.mk
+++ b/package/pkg-kconfig.mk
@@ -33,7 +33,7 @@
# Default values
$(2)_KCONFIG_EDITORS ?= menuconfig
-$(2)_KCONFIG_OPT ?=
+$(2)_KCONFIG_OPTS ?=
$(2)_KCONFIG_FIXUP_CMDS ?=
# FOO_KCONFIG_FILE is required
@@ -51,7 +51,7 @@
$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config
$$($(2)_KCONFIG_FIXUP_CMDS)
@yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
- $$($(2)_KCONFIG_OPT) oldconfig
+ $$($(2)_KCONFIG_OPTS) oldconfig
$$(Q)touch $$@
# Before running configure, the configuration file should be present and fixed
@@ -60,7 +60,7 @@
# Configuration editors (menuconfig, ...)
$$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $$($(2)_DIR)/.stamp_kconfig_fixup_done
$$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
- $$($(2)_KCONFIG_OPT) $$(subst $(1)-,,$$@)
+ $$($(2)_KCONFIG_OPTS) $$(subst $(1)-,,$$@)
rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built}
rm -f $$($(2)_DIR)/.stamp_{target,staging}_installed
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -39,7 +39,7 @@
UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE)
-UCLIBC_KCONFIG_OPT = \
+UCLIBC_KCONFIG_OPTS = \
$(UCLIBC_MAKE_FLAGS) \
PREFIX=$(STAGING_DIR) \
DEVEL_PREFIX=/usr/ \
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 11 of 15] pkg-generic: introduce helper function to check for a deprecated variable
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (9 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 10 of 15] packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-10-04 17:13 ` Thomas Petazzoni
2014-09-27 19:32 ` [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT Thomas De Schampheleire
` (5 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
This patch introduces a helper check-deprecated-variable, that throws an
error when a package defines a deprecated variable. This helps in detecting
transition errors when changing the buildroot infrastructures, and also
helps users that have created packages not part of mainline buildroot.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
v2: no changes
package/pkg-generic.mk | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -264,6 +264,21 @@
endef
################################################################################
+# check-deprecated-variable -- throw an error on deprecated variables
+#
+# argument 1 is the deprecated variable
+# argument 2 is the new variable to use
+#
+# example:
+# $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS))
+################################################################################
+define check-deprecated-variable
+ifneq ($$(origin $(1)),undefined)
+$$(error Package error: use $(2) instead of $(1). Please fix your .mk file)
+endif
+endef
+
+################################################################################
# inner-generic-package -- generates the make targets needed to build a
# generic package
#
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (10 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 11 of 15] pkg-generic: introduce helper function to check for a deprecated variable Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 21:49 ` Yann E. MORIN
2014-10-04 17:14 ` Thomas Petazzoni
2014-09-27 19:32 ` [Buildroot] [PATCH 13 of 15] packages: rename misc. occurrences of _OPT into _OPTS Thomas De Schampheleire
` (4 subsequent siblings)
16 siblings, 2 replies; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
This patch introduces a check for the usage of deprecated variable
FOO_BAR_OPT, and suggests to use FOO_BAR_OPTS instead.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: collapse patches that each add one check
package/pkg-generic.mk | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -717,6 +717,18 @@
$$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep)))
endif
+# Ensure unified variable name conventions between all packages
+$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
+$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
+
TARGETS += $(1)
ifneq ($$($(2)_PERMISSIONS),)
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 13 of 15] packages: rename misc. occurrences of _OPT into _OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (11 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-27 22:35 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 14 of 15] .mk files: remove alignment of line continuation characters Thomas De Schampheleire
` (3 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
change remaining occurrences of _OPT into _OPTS.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: rebase
linux/linux-ext-xenomai.mk | 6 +-
package/boost/boost.mk | 14 +++---
package/dhcpcd/dhcpcd.mk | 8 +-
package/freetype/freetype.mk | 2 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 40 +++++++++---------
package/gstreamer1/gst1-libav/gst1-libav.mk | 44 ++++++++++----------
6 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
--- a/linux/linux-ext-xenomai.mk
+++ b/linux/linux-ext-xenomai.mk
@@ -11,9 +11,9 @@
# Adeos patch version
XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
ifeq ($(XENOMAI_ADEOS_PATCH),)
-XENOMAI_ADEOS_OPT = --default
+XENOMAI_ADEOS_OPTS = --default
else
-XENOMAI_ADEOS_OPT = --adeos=$(XENOMAI_ADEOS_PATCH)
+XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
endif
# Prepare kernel patch
@@ -21,7 +21,7 @@
$(XENOMAI_DIR)/scripts/prepare-kernel.sh \
--linux=$(LINUX_DIR) \
--arch=$(KERNEL_ARCH) \
- $(XENOMAI_ADEOS_OPT) \
+ $(XENOMAI_ADEOS_OPTS) \
--verbose
endef
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -77,7 +77,7 @@
endif
endif
-HOST_BOOST_OPT += toolset=gcc threading=multi variant=release link=shared \
+HOST_BOOST_OPTS += toolset=gcc threading=multi variant=release link=shared \
runtime-link=shared
ifeq ($(BR2_MIPS_OABI32),y)
@@ -88,7 +88,7 @@
BOOST_ABI = sysv
endif
-BOOST_OPT += toolset=gcc \
+BOOST_OPTS += toolset=gcc \
threading=multi \
abi=$(BOOST_ABI) \
variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \
@@ -98,7 +98,7 @@
ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y)
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
# posix backend needs monetary.h which isn't available on uClibc
-BOOST_OPT += boost.locale.posix=off
+BOOST_OPTS += boost.locale.posix=off
endif
BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv)
@@ -123,7 +123,7 @@
define BOOST_INSTALL_TARGET_CMDS
(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
--user-config=$(@D)/user-config.jam \
- $(BOOST_OPT) \
+ $(BOOST_OPTS) \
--prefix=$(TARGET_DIR)/usr \
--layout=$(BOOST_LAYOUT) install )
endef
@@ -131,14 +131,14 @@
define HOST_BOOST_BUILD_CMDS
(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
--user-config=$(@D)/user-config.jam \
- $(HOST_BOOST_OPT) \
+ $(HOST_BOOST_OPTS) \
--prefix=$(HOST_DIR)/usr )
endef
define HOST_BOOST_INSTALL_CMDS
(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
--user-config=$(@D)/user-config.jam \
- $(HOST_BOOST_OPT) \
+ $(HOST_BOOST_OPTS) \
--prefix=$(HOST_DIR)/usr \
--layout=$(BOOST_LAYOUT) install )
endef
@@ -146,7 +146,7 @@
define BOOST_INSTALL_STAGING_CMDS
(cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -d+1 \
--user-config=$(@D)/user-config.jam \
- $(BOOST_OPT) \
+ $(BOOST_OPTS) \
--prefix=$(STAGING_DIR)/usr \
--layout=$(BOOST_LAYOUT) install)
endef
diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -11,15 +11,15 @@
DHCPCD_LICENSE = BSD-2c
ifeq ($(BR2_INET_IPV6),)
- DHCPCD_CONFIG_OPT += --disable-ipv6
+ DHCPCD_CONFIG_OPTS += --disable-ipv6
endif
ifeq ($(BR2_PREFER_STATIC_LIB),y)
- DHCPCD_CONFIG_OPT += --enable-static
+ DHCPCD_CONFIG_OPTS += --enable-static
endif
ifeq ($(BR2_USE_MMU),)
- DHCPCD_CONFIG_OPT += --disable-fork
+ DHCPCD_CONFIG_OPTS += --disable-fork
endif
define DHCPCD_CONFIGURE_CMDS
@@ -27,7 +27,7 @@
$(TARGET_CONFIGURE_OPTS) ./configure \
--target=$(BR2_GCC_TARGET_ARCH) \
--os=linux \
- $(DHCPCD_CONFIG_OPT) )
+ $(DHCPCD_CONFIG_OPTS) )
endef
define DHCPCD_BUILD_CMDS
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -20,7 +20,7 @@
# Regen required because the tarball ships with an experimental ltmain.sh
# that can't be patched by our infra.
# autogen.sh is because autotools stuff lives in other directories and
-# even AUTORECONF with _OPT doesn't do it properly.
+# even AUTORECONF with _OPTS doesn't do it properly.
# POST_PATCH is because we still need to patch libtool after the regen.
define FREETYPE_RUN_AUTOGEN
cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -10,69 +10,69 @@
GST_FFMPEG_INSTALL_STAGING = YES
GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base
-GST_FFMPEG_CONF_EXTRA_OPT = \
+GST_FFMPEG_CONF_EXTRA_OPTS = \
--cross-prefix=$(TARGET_CROSS) \
--target-os=linux
ifeq ($(BR2_PACKAGE_ZLIB),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-zlib
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib
GST_FFMPEG_DEPENDENCIES += zlib
else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-zlib
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-zlib
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-bzlib
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-bzlib
GST_FFMPEG_DEPENDENCIES += bzip2
else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-bzlib
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-bzlib
endif
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-yasm
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-yasm
GST_FFMPEG_DEPENDENCIES += host-yasm
else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-yasm
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-mmx
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-yasm
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-mmx
endif
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-sse
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-sse
else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-sse
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-sse
endif
ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-ssse3
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-ssse3
else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-ssse3
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-ssse3
endif
# Explicitly disable everything that doesn't match for ARM
# FFMPEG "autodetects" by compiling an extended instruction via AS
# This works on compilers that aren't built for generic by default
ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-armv5te
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te
endif
ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-armv6
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6
else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-armv6 --disable-armv6t2
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
endif
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-neon
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-neon
endif
ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-altivec
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-altivec
else
-GST_FFMPEG_CONF_EXTRA_OPT += --disable-altivec
+GST_FFMPEG_CONF_EXTRA_OPTS += --disable-altivec
endif
ifeq ($(BR2_PREFER_STATIC_LIB),)
-GST_FFMPEG_CONF_EXTRA_OPT += --enable-pic
+GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic
endif
-GST_FFMPEG_CONF_OPTS = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPT)"
+GST_FFMPEG_CONF_OPTS = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)"
$(eval $(autotools-package))
diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk
--- a/package/gstreamer1/gst1-libav/gst1-libav.mk
+++ b/package/gstreamer1/gst1-libav/gst1-libav.mk
@@ -10,74 +10,74 @@
GST1_LIBAV_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base
-GST1_LIBAV_CONF_EXTRA_OPT = \
+GST1_LIBAV_CONF_EXTRA_OPTS = \
--cross-prefix=$(TARGET_CROSS) \
--target-os=linux \
$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
ifeq ($(BR2_PACKAGE_ZLIB),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-zlib
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-zlib
GST1_LIBAV_DEPENDENCIES += zlib
else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-zlib
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-zlib
endif
ifeq ($(BR2_PACKAGE_BZIP2),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-bzlib
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-bzlib
GST1_LIBAV_DEPENDENCIES += bzip2
else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-bzlib
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib
endif
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-yasm
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-yasm
GST1_LIBAV_DEPENDENCIES += host-yasm
else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-yasm
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-mmx
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-yasm
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-mmx
endif
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-sse
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-sse
else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-sse
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-sse
endif
ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-ssse3
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-ssse3
else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-ssse3
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-ssse3
endif
# Explicitly disable everything that doesn't match for ARM
# FFMPEG "autodetects" by compiling an extended instruction via AS
# This works on compilers that aren't built for generic by default
ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-armv5te
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv5te
endif
ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-armv6
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-armv6
else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-armv6 --disable-armv6t2
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
endif
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-neon
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-neon
else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-neon
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-neon
endif
ifeq ($(BR2_ARM_CPU_HAS_VFPV2),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-vfp
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-vfp
else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-vfp
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-vfp
endif
ifeq ($(BR2_POWERPC_CPU_HASH_ALTIVEC),y)
-GST1_LIBAV_CONF_EXTRA_OPT += --enable-altivec
+GST1_LIBAV_CONF_EXTRA_OPTS += --enable-altivec
else
-GST1_LIBAV_CONF_EXTRA_OPT += --disable-altivec
+GST1_LIBAV_CONF_EXTRA_OPTS += --disable-altivec
endif
GST1_LIBAV_CONF_OPTS = \
- --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPT)"
+ --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPTS)"
$(eval $(autotools-package))
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 14 of 15] .mk files: remove alignment of line continuation characters
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (12 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 13 of 15] packages: rename misc. occurrences of _OPT into _OPTS Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-28 12:10 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 15 of 15] .mk files: remove alignment of assignments Thomas De Schampheleire
` (2 subsequent siblings)
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
The Buildroot coding style does not align assignments nor line continuation
characters (\). This patch updates the .mk files to reflect this.
Command used:
find * -name "*.mk" | xargs sed -i 's/\s\+\\\s*$/ \\/g'
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: new patch
boot/lpc32xxcdl/lpc32xxcdl.mk | 8 +-
boot/uboot/uboot.mk | 8 +-
linux/linux-ext-rtai.mk | 10 +-
linux/linux-ext-xenomai.mk | 6 +-
linux/linux.mk | 14 +-
package/acl/acl.mk | 14 +-
package/attr/attr.mk | 14 +-
package/bluez5_utils/bluez5_utils.mk | 6 +-
package/bluez_utils/bluez_utils.mk | 24 +-
package/boost/boost.mk | 14 +-
package/cegui06/cegui06.mk | 32 +-
package/celt051/celt051.mk | 14 +-
package/connman/connman.mk | 10 +-
package/dhcpcd/dhcpcd.mk | 8 +-
package/directfb/directfb.mk | 2 +-
package/dtc/dtc.mk | 4 +-
package/duma/duma.mk | 4 +-
package/efl/libecore/libecore.mk | 12 +-
package/enlightenment/enlightenment.mk | 24 +-
package/eudev/eudev.mk | 16 +-
package/ffmpeg/ffmpeg.mk | 4 +-
package/freetype/freetype.mk | 2 +-
package/glibc/glibc.mk | 4 +-
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 40 +-
package/gstreamer1/gst1-libav/gst1-libav.mk | 44 +-
package/gvfs/gvfs.mk | 16 +-
package/jack2/jack2.mk | 6 +-
package/keyutils/keyutils.mk | 10 +-
package/lesstif/lesstif.mk | 2 +-
package/libungif/libungif.mk | 6 +-
package/linux-firmware/linux-firmware.mk | 62 ++--
package/midori/midori.mk | 6 +-
package/mplayer/mplayer.mk | 6 +-
package/ngrep/ngrep.mk | 2 +-
package/opencv/opencv.mk | 116 +++++-----
package/openocd/openocd.mk | 8 +-
package/pkg-generic.mk | 4 +-
package/poco/poco.mk | 40 +-
package/python/python.mk | 52 ++--
package/python3/python3.mk | 42 +-
package/qemu/qemu.mk | 16 +-
package/rt-tests/rt-tests.mk | 12 +-
package/rtai/rtai.mk | 6 +-
package/samba/samba.mk | 8 +-
package/spice/spice.mk | 24 +-
package/squashfs/squashfs.mk | 16 +-
package/strongswan/strongswan.mk | 86 +++---
package/systemd/systemd.mk | 12 +-
package/tvheadend/tvheadend.mk | 20 +-
package/tz/tz.mk | 18 +-
package/tzdata/tzdata.mk | 18 +-
package/uboot-tools/uboot-tools.mk | 26 +-
package/udisks/udisks.mk | 18 +-
package/usbmount/usbmount.mk | 4 +-
package/vde2/vde2.mk | 12 +-
package/wpa_supplicant/wpa_supplicant.mk | 10 +-
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 84 +++---
package/xbmc/xbmc.mk | 2 +-
58 files changed, 554 insertions(+), 554 deletions(-)
diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
--- a/boot/lpc32xxcdl/lpc32xxcdl.mk
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@@ -33,10 +33,10 @@
endif
LPC32XXCDL_BUILD_FLAGS = \
- CROSS_COMPILE=$(TARGET_CROSS) \
- NXPMCU_WINBASE=$(@D) \
- NXPMCU_SOFTWARE=$(@D) \
- BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \
+ CROSS_COMPILE=$(TARGET_CROSS) \
+ NXPMCU_WINBASE=$(@D) \
+ NXPMCU_SOFTWARE=$(@D) \
+ BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \
CSP=lpc32xx TOOL=gnu GEN=lpc
LPC32XXCDL_BOARD_STARTUP_DIR = \
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -95,8 +95,8 @@
endif
define UBOOT_CONFIGURE_CMDS
- $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
- $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
+ $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
+ $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
$(UBOOT_BOARD_NAME)_config
@echo >> $(@D)/include/config.h
@echo "/* Add a wrapper around the values Buildroot sets. */" >> $(@D)/include/config.h
@@ -114,8 +114,8 @@
endef
define UBOOT_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
- $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
+ $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
+ $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
$(UBOOT_MAKE_TARGET)
endef
diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
--- a/linux/linux-ext-rtai.mk
+++ b/linux/linux-ext-rtai.mk
@@ -25,8 +25,8 @@
define RTAI_PREPARE_KERNEL
kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \
if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
- support/scripts/apply-patches.sh $(LINUX_DIR) \
- $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ \
+ support/scripts/apply-patches.sh $(LINUX_DIR) \
+ $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ \
hal-linux-$${kver}-*patch ; \
else \
echo "No RTAI patch for your kernel version" ; \
@@ -35,9 +35,9 @@
endef
else
define RTAI_PREPARE_KERNEL
- support/scripts/apply-patches.sh \
- $(LINUX_DIR) \
- $(dir $(RTAI_PATCH)) \
+ support/scripts/apply-patches.sh \
+ $(LINUX_DIR) \
+ $(dir $(RTAI_PATCH)) \
$(notdir $(RTAI_PATCH))
endef
endif
diff --git a/linux/linux.mk b/linux/linux.mk
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -266,8 +266,8 @@
$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
cp $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/)
$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
- @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
+ @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
+ $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
fi
$(LINUX_BUILD_DTB)
$(LINUX_APPEND_DTB)
@@ -284,8 +284,8 @@
define LINUX_INSTALL_HOST_TOOLS
# Installing dtc (device tree compiler) as host tool, if selected
- if grep -q "CONFIG_DTC=y" $(@D)/.config; then \
- $(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ; \
+ if grep -q "CONFIG_DTC=y" $(@D)/.config; then \
+ $(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ; \
fi
endef
@@ -299,10 +299,10 @@
$(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
# Install modules and remove symbolic links pointing to build
# directories, not relevant on the target
- @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
+ @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \
- rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
- rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
+ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
+ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
fi
$(LINUX_INSTALL_HOST_TOOLS)
endef
diff --git a/package/acl/acl.mk b/package/acl/acl.mk
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -16,15 +16,15 @@
# While the configuration system uses autoconf, the Makefiles are
# hand-written and do not use automake. Therefore, we have to hack
# around their deficiencies by passing installation paths.
-ACL_INSTALL_STAGING_OPTS = \
- prefix=$(STAGING_DIR)/usr \
- exec_prefix=$(STAGING_DIR)/usr \
- PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
+ACL_INSTALL_STAGING_OPTS = \
+ prefix=$(STAGING_DIR)/usr \
+ exec_prefix=$(STAGING_DIR)/usr \
+ PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
install-dev install-lib
-ACL_INSTALL_TARGET_OPTS = \
- prefix=$(TARGET_DIR)/usr \
- exec_prefix=$(TARGET_DIR)/usr \
+ACL_INSTALL_TARGET_OPTS = \
+ prefix=$(TARGET_DIR)/usr \
+ exec_prefix=$(TARGET_DIR)/usr \
install install-lib
$(eval $(autotools-package))
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -15,15 +15,15 @@
# While the configuration system uses autoconf, the Makefiles are
# hand-written and do not use automake. Therefore, we have to hack
# around their deficiencies by passing installation paths.
-ATTR_INSTALL_STAGING_OPTS = \
- prefix=$(STAGING_DIR)/usr \
- exec_prefix=$(STAGING_DIR)/usr \
- PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
+ATTR_INSTALL_STAGING_OPTS = \
+ prefix=$(STAGING_DIR)/usr \
+ exec_prefix=$(STAGING_DIR)/usr \
+ PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
install-dev install-lib
-ATTR_INSTALL_TARGET_OPTS = \
- prefix=$(TARGET_DIR)/usr \
- exec_prefix=$(TARGET_DIR)/usr \
+ATTR_INSTALL_TARGET_OPTS = \
+ prefix=$(TARGET_DIR)/usr \
+ exec_prefix=$(TARGET_DIR)/usr \
install install-lib
$(eval $(autotools-package))
diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
--- a/package/bluez5_utils/bluez5_utils.mk
+++ b/package/bluez5_utils/bluez5_utils.mk
@@ -12,9 +12,9 @@
BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+
BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
-BLUEZ5_UTILS_CONF_OPTS = \
- --enable-tools \
- --enable-library \
+BLUEZ5_UTILS_CONF_OPTS = \
+ --enable-tools \
+ --enable-library \
--disable-cups
ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
--- a/package/bluez_utils/bluez_utils.mk
+++ b/package/bluez_utils/bluez_utils.mk
@@ -16,24 +16,24 @@
# BlueZ 3.x compatibility
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
-BLUEZ_UTILS_CONF_OPTS += \
- --enable-hidd \
- --enable-pand \
- --enable-sdp \
+BLUEZ_UTILS_CONF_OPTS += \
+ --enable-hidd \
+ --enable-pand \
+ --enable-sdp \
--enable-dund
endif
# audio support
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
-BLUEZ_UTILS_DEPENDENCIES += \
- alsa-lib \
+BLUEZ_UTILS_DEPENDENCIES += \
+ alsa-lib \
libsndfile
-BLUEZ_UTILS_CONF_OPTS += \
- --enable-alsa \
+BLUEZ_UTILS_CONF_OPTS += \
+ --enable-alsa \
--enable-audio
else
-BLUEZ_UTILS_CONF_OPTS += \
- --disable-alsa \
+BLUEZ_UTILS_CONF_OPTS += \
+ --disable-alsa \
--disable-audio
endif
@@ -47,10 +47,10 @@
# USB support
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
BLUEZ_UTILS_DEPENDENCIES += libusb
-BLUEZ_UTILS_CONF_OPTS += \
+BLUEZ_UTILS_CONF_OPTS += \
--enable-usb
else
-BLUEZ_UTILS_CONF_OPTS += \
+BLUEZ_UTILS_CONF_OPTS += \
--disable-usb
endif
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
--- a/package/cegui06/cegui06.mk
+++ b/package/cegui06/cegui06.mk
@@ -13,24 +13,24 @@
CEGUI06_LICENSE_FILES = COPYING
CEGUI06_INSTALL_STAGING = YES
-CEGUI06_DEPENDENCIES = \
- expat \
- freetype \
- pcre \
+CEGUI06_DEPENDENCIES = \
+ expat \
+ freetype \
+ pcre \
-CEGUI06_CONF_OPTS = \
- --enable-expat \
- --disable-external-tinyxml \
- --disable-xerces-c \
- --disable-libxml \
- --disable-tinyxml \
- --disable-opengl-renderer \
- --disable-external-glew \
+CEGUI06_CONF_OPTS = \
+ --enable-expat \
+ --disable-external-tinyxml \
+ --disable-xerces-c \
+ --disable-libxml \
+ --disable-tinyxml \
+ --disable-opengl-renderer \
+ --disable-external-glew \
--disable-irrlicht-renderer \
--disable-directfb-renderer \
- --disable-samples \
- --disable-lua-module \
- --disable-toluacegui \
- --disable-external-toluapp \
+ --disable-samples \
+ --disable-lua-module \
+ --disable-toluacegui \
+ --disable-external-toluapp \
$(eval $(autotools-package))
diff --git a/package/celt051/celt051.mk b/package/celt051/celt051.mk
--- a/package/celt051/celt051.mk
+++ b/package/celt051/celt051.mk
@@ -18,13 +18,13 @@
# if target is the same kind as host (ie. same arch, same bitness,
# same endianness, so that /usr/lib contains libraries linkable by
# our cross-compiler)
-CELT051_CONF_OPTS = \
- --enable-fixed-point \
- --disable-fixed-point-debug \
+CELT051_CONF_OPTS = \
+ --enable-fixed-point \
+ --disable-fixed-point-debug \
--disable-experimental-postfilter \
- --disable-static-modes \
- --disable-assertions \
- --disable-oggtest \
- --with-ogg=$(STAGING_DIR)/usr \
+ --disable-static-modes \
+ --disable-assertions \
+ --disable-oggtest \
+ --with-ogg=$(STAGING_DIR)/usr \
$(eval $(autotools-package))
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -12,12 +12,12 @@
CONNMAN_LICENSE = GPLv2
CONNMAN_LICENSE_FILES = COPYING
CONNMAN_CONF_OPTS += --localstatedir=/var \
- $(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
- $(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
- $(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
+ $(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
+ $(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
+ $(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
$(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \
- $(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \
- $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
+ $(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \
+ $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
$(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \
$(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \
$(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system)
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -67,7 +67,7 @@
$(if $(BR2_PACKAGE_DIRECTFB_MATROX),matrox) \
$(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \
$(if $(BR2_PACKAGE_DIRECTFB_UNICHROME),unichrome) \
- $(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \
+ $(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \
$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
ifeq ($(strip $(DIRECTFB_GFX)),)
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -34,8 +34,8 @@
endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y
define DTC_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
+ $(TARGET_CONFIGURE_OPTS) \
+ CFLAGS="$(TARGET_CFLAGS)" \
$(MAKE) -C $(@D) PREFIX=/usr $(DTC_BUILD_GOAL)
endef
diff --git a/package/duma/duma.mk b/package/duma/duma.mk
--- a/package/duma/duma.mk
+++ b/package/duma/duma.mk
@@ -18,9 +18,9 @@
# The dependency of some source files in duma_config.h, which is generated at
# build time, is not specified in the Makefile. Force non-parallel build.
define DUMA_BUILD_CMDS
- $(MAKE1) $(TARGET_CONFIGURE_OPTS) \
+ $(MAKE1) $(TARGET_CONFIGURE_OPTS) \
OS=linux \
- DUMA_OPTIONS="$(DUMA_OPTIONS)" \
+ DUMA_OPTIONS="$(DUMA_OPTIONS)" \
$(DUMA_CPP) -C $(@D)
endef
diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
--- a/package/efl/libecore/libecore.mk
+++ b/package/efl/libecore/libecore.mk
@@ -15,12 +15,12 @@
LIBECORE_DEPENDENCIES = host-pkgconf libeina
HOST_LIBECORE_DEPENDENCIES = host-pkgconf host-libeina host-libevas
-HOST_LIBECORE_CONF_OPTS += \
- --enable-ecore-evas \
- --disable-simple-x11 \
- --disable-ecore-directfb \
- --disable-ecore-x \
- --disable-ecore-x-xcb \
+HOST_LIBECORE_CONF_OPTS += \
+ --enable-ecore-evas \
+ --disable-simple-x11 \
+ --disable-ecore-directfb \
+ --disable-ecore-x \
+ --disable-ecore-x-xcb \
--disable-ecore-imf-xim
# default options
diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
--- a/package/enlightenment/enlightenment.mk
+++ b/package/enlightenment/enlightenment.mk
@@ -9,19 +9,19 @@
ENLIGHTENMENT_LICENSE = BSD-2c
ENLIGHTENMENT_LICENSE_FILES = COPYING
-ENLIGHTENMENT_DEPENDENCIES = \
- host-pkgconf \
- libecore \
- libeet \
- libeina \
- libevas \
+ENLIGHTENMENT_DEPENDENCIES = \
+ host-pkgconf \
+ libecore \
+ libeet \
+ libeina \
+ libevas \
libevas-generic-loaders \
- libedje \
- libefreet \
- libedbus \
- libeio \
- host-libedje \
- host-libeet \
+ libedje \
+ libefreet \
+ libedbus \
+ libeio \
+ host-libedje \
+ host-libeet \
xcb-util-keysyms
ENLIGHTENMENT_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk
--- a/package/eudev/eudev.mk
+++ b/package/eudev/eudev.mk
@@ -14,14 +14,14 @@
# mq_getattr is in librt
EUDEV_CONF_ENV += LIBS=-lrt
-EUDEV_CONF_OPTS = \
- --disable-manpages \
- --sbindir=/sbin \
- --with-rootlibdir=/lib \
- --libexecdir=/lib \
- --with-firmware-path=/lib/firmware \
- --disable-introspection \
- --enable-split-usr \
+EUDEV_CONF_OPTS = \
+ --disable-manpages \
+ --sbindir=/sbin \
+ --with-rootlibdir=/lib \
+ --libexecdir=/lib \
+ --with-firmware-path=/lib/firmware \
+ --disable-introspection \
+ --enable-split-usr \
--enable-libkmod
EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -17,7 +17,7 @@
endif
FFMPEG_CONF_OPTS = \
- --prefix=/usr \
+ --prefix=/usr \
--enable-avfilter \
--disable-version3 \
--enable-logging \
@@ -326,7 +326,7 @@
$(TARGET_CONFIGURE_ARGS) \
$(FFMPEG_CONF_ENV) \
./configure \
- --enable-cross-compile \
+ --enable-cross-compile \
--cross-prefix=$(TARGET_CROSS) \
--sysroot=$(STAGING_DIR) \
--host-cc="$(HOSTCC)" \
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -102,8 +102,8 @@
#
GLIBC_LIBS_LIB = \
- ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* \
- libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.* \
+ ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* \
+ libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.* \
libnss_files.so.* libnss_dns.so.*
ifeq ($(BR2_PACKAGE_GDB),y)
diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -18,12 +18,12 @@
GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
GVFS_CONF_OPTS = \
- --disable-gconf \
- --disable-cdda \
- --disable-obexftp \
- --disable-gphoto2 \
- --disable-keyring \
- --disable-bash-completion \
+ --disable-gconf \
+ --disable-cdda \
+ --disable-obexftp \
+ --disable-gphoto2 \
+ --disable-keyring \
+ --disable-bash-completion \
--disable-hal
ifeq ($(BR2_PACKAGE_AVAHI),y)
@@ -82,8 +82,8 @@
endef
GVFS_POST_INSTALL_TARGET_HOOKS += \
- GVFS_REMOVE_USELESS_BINARY \
- GVFS_REMOVE_TARGET_SCHEMAS \
+ GVFS_REMOVE_USELESS_BINARY \
+ GVFS_REMOVE_TARGET_SCHEMAS \
GVFS_COMPILE_SCHEMAS
$(eval $(autotools-package))
diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk
--- a/package/jack2/jack2.mk
+++ b/package/jack2/jack2.mk
@@ -12,10 +12,10 @@
define JACK2_CONFIGURE_CMDS
(cd $(@D); \
- $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_OPTS) \
$(HOST_DIR)/usr/bin/python2 ./waf configure \
- --prefix=/usr \
- --alsa \
+ --prefix=/usr \
+ --alsa \
)
endef
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
--- a/package/keyutils/keyutils.mk
+++ b/package/keyutils/keyutils.mk
@@ -11,11 +11,11 @@
KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
KEYUTILS_INSTALL_STAGING = YES
-KEYUTILS_MAKE_ENV = \
- INSTALL=$(INSTALL) \
- LIBDIR=/usr/lib \
- USRLIBDIR=/usr/lib \
- LN=$(HOSTLN) \
+KEYUTILS_MAKE_ENV = \
+ INSTALL=$(INSTALL) \
+ LIBDIR=/usr/lib \
+ USRLIBDIR=/usr/lib \
+ LN=$(HOSTLN) \
define KEYUTILS_BUILD_CMDS
$(KEYUTILS_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
diff --git a/package/lesstif/lesstif.mk b/package/lesstif/lesstif.mk
--- a/package/lesstif/lesstif.mk
+++ b/package/lesstif/lesstif.mk
@@ -17,7 +17,7 @@
--with-gnu-ld \
--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \
--enable-debug=no \
- --enable-production=yes \
+ --enable-production=yes \
--enable-build-tests=no \
--no-recursion
diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
--- a/package/libungif/libungif.mk
+++ b/package/libungif/libungif.mk
@@ -13,9 +13,9 @@
LIBUNGIF_LICENSE_FILES = COPYING
LIBUNGIF_BINS = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifburst gifclip \
- gifclrmp gifcolor gifcomb gifcompose giffiltr giffix gifflip \
- gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
- gifrsize gifspnge giftext gifwedge icon2gif raw2gif rgb2gif \
+ gifclrmp gifcolor gifcomb gifcompose giffiltr giffix gifflip \
+ gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
+ gifrsize gifspnge giftext gifwedge icon2gif raw2gif rgb2gif \
text2gif
define LIBUNGIF_BINS_CLEANUP
diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -37,17 +37,17 @@
# rtl81xx
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX),y)
LINUX_FIRMWARE_FILES += \
- rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin \
- rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin \
- rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin \
- rtlwifi/rtl8188efw.bin rtlwifi/rtl8192cufw_A.bin \
+ rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin \
+ rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin \
+ rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin \
+ rtlwifi/rtl8188efw.bin rtlwifi/rtl8192cufw_A.bin \
rtlwifi/rtl8192cufw_B.bin rtlwifi/rtl8192cufw_TMSC.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
endif
# rtl87xx
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX),y)
-LINUX_FIRMWARE_FILES += rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin \
+LINUX_FIRMWARE_FILES += rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin \
rtlwifi/rtl8723fw_B.bin rtlwifi/rtl8723befw.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
endif
@@ -107,19 +107,19 @@
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y)
# wl1271-nvs.bin is a symlink to wl127x-nvs.bin
LINUX_FIRMWARE_FILES += \
- ti-connectivity/wl1271-fw-2.bin \
- ti-connectivity/wl1271-fw-ap.bin \
- ti-connectivity/wl1271-fw.bin \
- ti-connectivity/wl1271-nvs.bin \
- ti-connectivity/wl127x-fw-3.bin \
- ti-connectivity/wl127x-fw-plt-3.bin \
- ti-connectivity/wl127x-nvs.bin \
- ti-connectivity/wl127x-fw-4-mr.bin \
- ti-connectivity/wl127x-fw-4-plt.bin \
- ti-connectivity/wl127x-fw-4-sr.bin \
- ti-connectivity/wl127x-fw-5-mr.bin \
- ti-connectivity/wl127x-fw-5-plt.bin \
- ti-connectivity/wl127x-fw-5-sr.bin \
+ ti-connectivity/wl1271-fw-2.bin \
+ ti-connectivity/wl1271-fw-ap.bin \
+ ti-connectivity/wl1271-fw.bin \
+ ti-connectivity/wl1271-nvs.bin \
+ ti-connectivity/wl127x-fw-3.bin \
+ ti-connectivity/wl127x-fw-plt-3.bin \
+ ti-connectivity/wl127x-nvs.bin \
+ ti-connectivity/wl127x-fw-4-mr.bin \
+ ti-connectivity/wl127x-fw-4-plt.bin \
+ ti-connectivity/wl127x-fw-4-sr.bin \
+ ti-connectivity/wl127x-fw-5-mr.bin \
+ ti-connectivity/wl127x-fw-5-plt.bin \
+ ti-connectivity/wl127x-fw-5-sr.bin \
ti-connectivity/TIInit_7.2.31.bts
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
endif
@@ -127,19 +127,19 @@
# wl128x
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X),y)
LINUX_FIRMWARE_FILES += \
- ti-connectivity/wl128x-fw-3.bin \
- ti-connectivity/wl128x-fw-ap.bin \
- ti-connectivity/wl128x-fw-plt-3.bin \
- ti-connectivity/wl128x-fw.bin \
- ti-connectivity/wl1271-nvs.bin \
- ti-connectivity/wl128x-nvs.bin \
- ti-connectivity/wl12xx-nvs.bin \
- ti-connectivity/wl128x-fw-4-mr.bin \
- ti-connectivity/wl128x-fw-4-plt.bin \
- ti-connectivity/wl128x-fw-4-sr.bin \
- ti-connectivity/wl128x-fw-5-mr.bin \
- ti-connectivity/wl128x-fw-5-plt.bin \
- ti-connectivity/wl128x-fw-5-sr.bin \
+ ti-connectivity/wl128x-fw-3.bin \
+ ti-connectivity/wl128x-fw-ap.bin \
+ ti-connectivity/wl128x-fw-plt-3.bin \
+ ti-connectivity/wl128x-fw.bin \
+ ti-connectivity/wl1271-nvs.bin \
+ ti-connectivity/wl128x-nvs.bin \
+ ti-connectivity/wl12xx-nvs.bin \
+ ti-connectivity/wl128x-fw-4-mr.bin \
+ ti-connectivity/wl128x-fw-4-plt.bin \
+ ti-connectivity/wl128x-fw-4-sr.bin \
+ ti-connectivity/wl128x-fw-5-mr.bin \
+ ti-connectivity/wl128x-fw-5-plt.bin \
+ ti-connectivity/wl128x-fw-5-sr.bin \
ti-connectivity/TIInit_7.2.31.bts
# wl12xx-nvs.bin (above) is a symlink to:
LINUX_FIRMWARE_FILES += ti-connectivity/wl127x-nvs.bin
diff --git a/package/midori/midori.mk b/package/midori/midori.mk
--- a/package/midori/midori.mk
+++ b/package/midori/midori.mk
@@ -30,10 +30,10 @@
define MIDORI_CONFIGURE_CMDS
$(MIDORI_WITHOUT_X11)
(cd $(@D); \
- $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_OPTS) \
$(HOST_DIR)/usr/bin/python2 ./waf configure \
- --prefix=/usr \
- --disable-libnotify \
+ --prefix=/usr \
+ --disable-libnotify \
)
endef
diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -35,7 +35,7 @@
endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)
-MPLAYER_CONF_OPTS += \
+MPLAYER_CONF_OPTS += \
--enable-freetype \
--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
MPLAYER_DEPENDENCIES += freetype
@@ -44,7 +44,7 @@
endif
ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
-MPLAYER_CONF_OPTS += \
+MPLAYER_CONF_OPTS += \
--enable-dvdread \
--disable-dvdread-internal \
--with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config
@@ -52,7 +52,7 @@
endif
ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
-MPLAYER_CONF_OPTS += \
+MPLAYER_CONF_OPTS += \
--enable-dvdnav \
--with-dvdnav-config=$(STAGING_DIR)/usr/bin/dvdnav-config
MPLAYER_DEPENDENCIES += libdvdnav
diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
--- a/package/ngrep/ngrep.mk
+++ b/package/ngrep/ngrep.mk
@@ -17,7 +17,7 @@
endif
NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)"
-NGREP_CONF_OPTS = \
+NGREP_CONF_OPTS = \
--with-pcap-includes=$(STAGING_DIR)/usr/include \
--enable-pcre \
--with-pcre=$(STAGING_DIR)/usr \
diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -13,58 +13,58 @@
# OpenCV component options
OPENCV_CONF_OPTS += \
-DBUILD_WITH_DEBUG_INFO=OFF \
- -DBUILD_DOCS=OFF \
- -DBUILD_EXAMPLES=OFF \
+ -DBUILD_DOCS=OFF \
+ -DBUILD_EXAMPLES=OFF \
-DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS),ON,OFF) \
-DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF)
# OpenCV build options
OPENCV_CONF_OPTS += \
- -DBUILD_WITH_STATIC_CRT=OFF \
- -DENABLE_FAST_MATH=ON \
- -DENABLE_NOISY_WARNINGS=OFF \
- -DENABLE_OMIT_FRAME_POINTER=ON \
+ -DBUILD_WITH_STATIC_CRT=OFF \
+ -DENABLE_FAST_MATH=ON \
+ -DENABLE_NOISY_WARNINGS=OFF \
+ -DENABLE_OMIT_FRAME_POINTER=ON \
-DENABLE_PRECOMPILED_HEADERS=OFF \
- -DENABLE_PROFILING=OFF \
+ -DENABLE_PROFILING=OFF \
-DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON
# OpenCV link options
OPENCV_CONF_OPTS += \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
- -DCMAKE_SKIP_RPATH=OFF \
+ -DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_USE_RELATIVE_PATHS=OFF
# OpenCV packaging options:
OPENCV_CONF_OPTS += \
- -DBUILD_PACKAGE=OFF \
+ -DBUILD_PACKAGE=OFF \
-DENABLE_SOLUTION_FOLDERS=OFF \
-DINSTALL_CREATE_DISTRIB=OFF
# OpenCV module selection
OPENCV_CONF_OPTS += \
- -DBUILD_opencv_androidcamera=OFF \
- -DBUILD_opencv_apps=OFF \
- -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \
- -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \
- -DBUILD_opencv_core=ON \
- -DBUILD_opencv_dynamicuda=OFF \
+ -DBUILD_opencv_androidcamera=OFF \
+ -DBUILD_opencv_apps=OFF \
+ -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \
+ -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \
+ -DBUILD_opencv_core=ON \
+ -DBUILD_opencv_dynamicuda=OFF \
-DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \
- -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \
- -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \
- -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \
- -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \
- -DBUILD_opencv_java=OFF \
- -DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \
- -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \
- -DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \
+ -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \
+ -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \
+ -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \
+ -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \
+ -DBUILD_opencv_java=OFF \
+ -DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \
+ -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \
+ -DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \
-DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),ON,OFF) \
- -DBUILD_opencv_ocl=OFF \
- -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \
- -DBUILD_opencv_python=OFF \
+ -DBUILD_opencv_ocl=OFF \
+ -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \
+ -DBUILD_opencv_python=OFF \
-DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV_LIB_STITCHING),ON,OFF) \
-DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV_LIB_SUPERRES),ON,OFF) \
- -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \
- -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \
+ -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \
+ -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \
-DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB),ON,OFF) \
-DBUILD_opencv_world=OFF
@@ -74,17 +74,17 @@
# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
OPENCV_CONF_OPTS += \
-DENABLE_POWERPC=OFF \
- -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
- -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
- -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
- -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
+ -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
+ -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
+ -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
+ -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
-DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \
-DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
# Cuda stuff
OPENCV_CONF_OPTS += \
-DWITH_CUBLAS=OFF \
- -DWITH_CUDA=OFF \
+ -DWITH_CUDA=OFF \
-DWITH_CUFFT=OFF
# NVidia stuff
@@ -98,7 +98,7 @@
# Intel stuff
OPENCV_CONF_OPTS += \
-DWITH_INTELPERC=OFF \
- -DWITH_IPP=OFF \
+ -DWITH_IPP=OFF \
-DWITH_TBB=OFF
# Smartek stuff
@@ -112,53 +112,53 @@
# Non-Linux support (Android options) must remain OFF:
OPENCV_CONF_OPTS += \
- -DWITH_ANDROID_CAMERA=OFF \
+ -DWITH_ANDROID_CAMERA=OFF \
-DBUILD_ANDROID_CAMERA_WRAPPER=OFF \
- -DBUILD_ANDROID_EXAMPLES=OFF \
- -DINSTALL_ANDROID_EXAMPLES=OFF \
- -DBUILD_FAT_JAVA_LIB=OFF \
+ -DBUILD_ANDROID_EXAMPLES=OFF \
+ -DINSTALL_ANDROID_EXAMPLES=OFF \
+ -DBUILD_FAT_JAVA_LIB=OFF \
-DBUILD_JAVA_SUPPORT=OFF
# Non-Linux support (Mac OSX options) must remain OFF:
OPENCV_CONF_OPTS += \
- -DWITH_AVFOUNDATION=OFF \
- -DWITH_CARBON=OFF \
+ -DWITH_AVFOUNDATION=OFF \
+ -DWITH_CARBON=OFF \
-DWITH_QUICKTIME=OFF
# Non-Linux support (Windows options) must remain OFF:
OPENCV_CONF_OPTS += \
- -DWITH_VFW=OFF \
- -DWITH_WIN32UI=OFF \
+ -DWITH_VFW=OFF \
+ -DWITH_WIN32UI=OFF \
-DWITH_CSTRIPES=OFF \
- -DWITH_DSHOW=OFF \
- -DWITH_MSMF=OFF \
+ -DWITH_DSHOW=OFF \
+ -DWITH_MSMF=OFF \
-DWITH_VIDEOINPUT=OFF
# Software/3rd-party support options.
OPENCV_CONF_OPTS += \
- -DBUILD_JASPER=OFF \
- -DBUILD_JPEG=OFF \
+ -DBUILD_JASPER=OFF \
+ -DBUILD_JPEG=OFF \
-DBUILD_OPENEXR=OFF \
- -DBUILD_PNG=OFF \
- -DBUILD_TIFF=OFF \
- -DBUILD_ZLIB=OFF \
+ -DBUILD_PNG=OFF \
+ -DBUILD_TIFF=OFF \
+ -DBUILD_ZLIB=OFF \
-DBUILD_NEW_PYTHON_SUPPORT=OFF \
- -DINSTALL_C_EXAMPLES=OFF \
- -DINSTALL_PYTHON_EXAMPLES=OFF \
+ -DINSTALL_C_EXAMPLES=OFF \
+ -DINSTALL_PYTHON_EXAMPLES=OFF \
-DINSTALL_TO_MANGLED_PATHS=OFF
# Disabled features (mostly because they are not available in Buildroot), but
# - eigen: OpenCV does not use it, not take any benefit from it.
OPENCV_CONF_OPTS += \
- -DWITH_1394=OFF \
- -DWITH_EIGEN=OFF \
+ -DWITH_1394=OFF \
+ -DWITH_EIGEN=OFF \
-DWITH_IMAGEIO=OFF \
- -DWITH_OPENCL=OFF \
+ -DWITH_OPENCL=OFF \
-DWITH_OPENEXR=OFF \
- -DWITH_OPENGL=OFF \
- -DWITH_OPENMP=OFF \
- -DWITH_OPENNI=OFF \
- -DWITH_UNICAP=OFF \
+ -DWITH_OPENGL=OFF \
+ -DWITH_OPENMP=OFF \
+ -DWITH_OPENNI=OFF \
+ -DWITH_UNICAP=OFF \
-DWITH_XINE=OFF
OPENCV_DEPENDENCIES += zlib
diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
--- a/package/openocd/openocd.mk
+++ b/package/openocd/openocd.mk
@@ -35,11 +35,11 @@
HOST_OPENOCD_DEPENDENCIES = host-libusb-compat host-libftdi
-HOST_OPENOCD_CONF_OPTS = \
- --disable-doxygen-html \
- --enable-dummy \
+HOST_OPENOCD_CONF_OPTS = \
+ --disable-doxygen-html \
+ --enable-dummy \
--enable-ft2232_libftdi \
- --enable-jlink \
+ --enable-jlink \
--enable-vsllink
$(eval $(autotools-package))
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -49,8 +49,8 @@
# Time steps
define step_time
- printf "%s:%-5.5s:%-20.20s: %s\n" \
- "$$(date +%s)" "$(1)" "$(2)" "$(3)" \
+ printf "%s:%-5.5s:%-20.20s: %s\n" \
+ "$$(date +%s)" "$(1)" "$(2)" "$(3)" \
>>"$(BUILD_DIR)/build-time.log"
endef
GLOBAL_INSTRUMENTATION_HOOKS += step_time
diff --git a/package/poco/poco.mk b/package/poco/poco.mk
--- a/package/poco/poco.mk
+++ b/package/poco/poco.mk
@@ -12,22 +12,22 @@
POCO_LICENSE_FILES = LICENSE
POCO_INSTALL_STAGING = YES
-POCO_DEPENDENCIES = zlib pcre \
- $(if $(BR2_PACKAGE_POCO_XML),expat) \
- $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
- $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
- $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
+POCO_DEPENDENCIES = zlib pcre \
+ $(if $(BR2_PACKAGE_POCO_XML),expat) \
+ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
+ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
+ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql)
-POCO_OMIT = Data/ODBC PageCompiler \
- $(if $(BR2_PACKAGE_POCO_XML),,XML) \
- $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
- $(if $(BR2_PACKAGE_POCO_NET),,Net) \
- $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \
- $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \
- $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \
- $(if $(BR2_PACKAGE_POCO_DATA),,Data) \
- $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
+POCO_OMIT = Data/ODBC PageCompiler \
+ $(if $(BR2_PACKAGE_POCO_XML),,XML) \
+ $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
+ $(if $(BR2_PACKAGE_POCO_NET),,Net) \
+ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \
+ $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \
+ $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \
+ $(if $(BR2_PACKAGE_POCO_DATA),,Data) \
+ $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
ifeq ($(LIBC),uclibc)
@@ -41,12 +41,12 @@
define POCO_CONFIGURE_CMDS
(cd $(@D); ./configure \
- --config=Linux-CrossEnv \
- --prefix=/usr \
- --omit="$(POCO_OMIT)" \
- $(POCO_CONF_OPTS) \
- --unbundled \
- --no-tests \
+ --config=Linux-CrossEnv \
+ --prefix=/usr \
+ --omit="$(POCO_OMIT)" \
+ $(POCO_CONF_OPTS) \
+ --unbundled \
+ --no-tests \
--no-samples)
endef
diff --git a/package/python/python.mk b/package/python/python.mk
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -16,22 +16,22 @@
# also installed in $(HOST_DIR), as it is needed when cross-compiling
# third-party Python modules.
-HOST_PYTHON_CONF_OPTS += \
- --enable-static \
- --without-cxx-main \
- --disable-sqlite3 \
- --disable-tk \
- --with-expat=system \
- --disable-curses \
- --disable-codecs-cjk \
- --disable-nis \
- --enable-unicodedata \
- --disable-dbm \
- --disable-gdbm \
- --disable-bsddb \
- --disable-test-modules \
- --disable-bz2 \
- --disable-ssl \
+HOST_PYTHON_CONF_OPTS += \
+ --enable-static \
+ --without-cxx-main \
+ --disable-sqlite3 \
+ --disable-tk \
+ --with-expat=system \
+ --disable-curses \
+ --disable-codecs-cjk \
+ --disable-nis \
+ --enable-unicodedata \
+ --disable-dbm \
+ --disable-gdbm \
+ --disable-bsddb \
+ --disable-test-modules \
+ --disable-bz2 \
+ --disable-ssl \
--disable-pyo-build
# Make sure that LD_LIBRARY_PATH overrides -rpath.
@@ -125,16 +125,16 @@
ac_cv_working_tzset=yes
PYTHON_CONF_OPTS += \
- --without-cxx-main \
- --without-doc-strings \
- --with-system-ffi \
- --disable-pydoc \
- --disable-test-modules \
- --disable-lib2to3 \
- --disable-gdbm \
- --disable-tk \
- --disable-nis \
- --disable-dbm \
+ --without-cxx-main \
+ --without-doc-strings \
+ --with-system-ffi \
+ --disable-pydoc \
+ --disable-test-modules \
+ --disable-lib2to3 \
+ --disable-gdbm \
+ --disable-tk \
+ --disable-nis \
+ --disable-dbm \
--disable-pyo-build
# This is needed to make sure the Python build process doesn't try to
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -17,18 +17,18 @@
# installed in $(HOST_DIR), as it is needed when cross-compiling
# third-party Python modules.
-HOST_PYTHON3_CONF_OPTS += \
- --without-ensurepip \
- --without-cxx-main \
- --disable-sqlite3 \
- --disable-tk \
- --with-expat=system \
- --disable-curses \
- --disable-codecs-cjk \
- --disable-nis \
- --enable-unicodedata \
- --disable-test-modules \
- --disable-idle3 \
+HOST_PYTHON3_CONF_OPTS += \
+ --without-ensurepip \
+ --without-cxx-main \
+ --disable-sqlite3 \
+ --disable-tk \
+ --with-expat=system \
+ --disable-curses \
+ --disable-codecs-cjk \
+ --disable-nis \
+ --enable-unicodedata \
+ --disable-test-modules \
+ --disable-idle3 \
--disable-pyo-build
# Make sure that LD_LIBRARY_PATH overrides -rpath.
@@ -108,15 +108,15 @@
ac_cv_working_tzset=yes
PYTHON3_CONF_OPTS += \
- --without-ensurepip \
- --without-cxx-main \
- --with-system-ffi \
- --disable-pydoc \
- --disable-test-modules \
- --disable-lib2to3 \
- --disable-tk \
- --disable-nis \
- --disable-idle3 \
+ --without-ensurepip \
+ --without-cxx-main \
+ --with-system-ffi \
+ --disable-pydoc \
+ --disable-test-modules \
+ --disable-lib2to3 \
+ --disable-tk \
+ --disable-nis \
+ --disable-idle3 \
--disable-pyo-build
# This is needed to make sure the Python build process doesn't try to
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -63,14 +63,14 @@
# package, and ./configure chokes on options such as --host or --target.
# So, provide out own _CONFIGURE_CMDS to override the defaults.
define HOST_QEMU_CONFIGURE_CMDS
- (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \
- --target-list="$(HOST_QEMU_TARGETS)" \
- --prefix="$(HOST_DIR)/usr" \
- --interp-prefix=$(STAGING_DIR) \
- --cc="$(HOSTCC)" \
- --host-cc="$(HOSTCC)" \
- --extra-cflags="$(HOST_CFLAGS)" \
- --extra-ldflags="$(HOST_LDFLAGS)" \
+ (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \
+ --target-list="$(HOST_QEMU_TARGETS)" \
+ --prefix="$(HOST_DIR)/usr" \
+ --interp-prefix=$(STAGING_DIR) \
+ --cc="$(HOSTCC)" \
+ --host-cc="$(HOSTCC)" \
+ --extra-cflags="$(HOST_CFLAGS)" \
+ --extra-ldflags="$(HOST_LDFLAGS)" \
)
endef
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -15,16 +15,16 @@
endif
define RT_TESTS_BUILD_CMDS
- $(MAKE) -C $(@D) \
- CC="$(TARGET_CC)" \
- CFLAGS="$(TARGET_CFLAGS)" \
+ $(MAKE) -C $(@D) \
+ CC="$(TARGET_CC)" \
+ CFLAGS="$(TARGET_CFLAGS)" \
prefix=/usr
endef
define RT_TESTS_INSTALL_TARGET_CMDS
- $(MAKE) -C $(@D) \
- DESTDIR="$(TARGET_DIR)" \
- prefix=/usr \
+ $(MAKE) -C $(@D) \
+ DESTDIR="$(TARGET_DIR)" \
+ prefix=/usr \
$(if $(BR2_PACKAGE_PYTHON),HASPYTHON=1 PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/) \
install
endef
diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
--- a/package/rtai/rtai.mk
+++ b/package/rtai/rtai.mk
@@ -20,9 +20,9 @@
RTAI_CONF_OPTS = \
--includedir=/usr/include/rtai \
- --with-linux-dir=$(LINUX_DIR) \
- --disable-leds \
- --disable-rtailab \
+ --with-linux-dir=$(LINUX_DIR) \
+ --disable-leds \
+ --disable-rtailab \
--with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/rtai
RTAI_MAKE = $(MAKE1)
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -38,24 +38,24 @@
--with-logfilebase=/var/log \
--with-configdir=/etc/samba \
--with-privatedir=/etc/samba \
- \
+ \
--disable-cups \
--enable-shared-libs \
--disable-pie \
--disable-relro \
--disable-dnssd \
- \
+ \
$(if $(BR2_PACKAGE_SAMBA_AVAHI),--enable-avahi,--disable-avahi) \
$(if $(BR2_PACKAGE_SAMBA_GAMIN),--enable-fam,--disable-fam) \
$(if $(BR2_PACKAGE_SAMBA_SWAT),--enable-swat,--disable-swat) \
- \
+ \
--without-cluster-support \
--without-dnsupdate \
--with-sys-quotas \
--without-ads \
--without-ldap \
--with-included-iniparser \
- \
+ \
$(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),--with-readline=$(STAGING_DIR)) \
$(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),--with-readline=$(STAGING_DIR)) \
$(if $(BR2_PACKAGE_SAMBA_WINBINDD),--with-winbind,--without-winbind)
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -11,21 +11,21 @@
SPICE_LICENSE_FILES = COPYING
SPICE_INSTALL_STAGING = YES
SPICE_DEPENDENCIES = \
- alsa-lib \
- celt051 \
- jpeg \
- openssl \
- pixman \
- python-pyparsing \
- spice-protocol \
+ alsa-lib \
+ celt051 \
+ jpeg \
+ openssl \
+ pixman \
+ python-pyparsing \
+ spice-protocol \
# We disable everything for now, because the dependency tree can become
# quite deep if we try to enable some features, and I have not tested that.
-SPICE_CONF_OPTS = \
- --disable-opengl \
- --disable-smartcard \
+SPICE_CONF_OPTS = \
+ --disable-opengl \
+ --disable-smartcard \
--disable-automated-tests \
- --without-sasl \
+ --without-sasl \
SPICE_DEPENDENCIES += host-pkgconf
@@ -57,7 +57,7 @@
# it should link against libz and libjpeg. libz is pkg-config-aware, while
# libjpeg isn't, hence the two-line tweak
define SPICE_POST_INSTALL_STAGING_FIX_PC
- $(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
+ $(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
"$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
endef
SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
--- a/package/squashfs/squashfs.mk
+++ b/package/squashfs/squashfs.mk
@@ -53,16 +53,16 @@
# no libattr/xz in BR
HOST_SQUASHFS_MAKE_ARGS = \
XATTR_SUPPORT=0 \
- XZ_SUPPORT=1 \
- GZIP_SUPPORT=1 \
- LZ4_SUPPORT=1 \
- LZO_SUPPORT=1 \
+ XZ_SUPPORT=1 \
+ GZIP_SUPPORT=1 \
+ LZ4_SUPPORT=1 \
+ LZO_SUPPORT=1 \
LZMA_XZ_SUPPORT=1
define SQUASHFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) \
- CC="$(TARGET_CC)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ $(TARGET_MAKE_ENV) $(MAKE) \
+ CC="$(TARGET_CC)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
$(SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/
@@ -76,7 +76,7 @@
define HOST_SQUASHFS_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) \
CC="$(HOSTCC)" \
- EXTRA_CFLAGS="$(HOST_CFLAGS)" \
+ EXTRA_CFLAGS="$(HOST_CFLAGS)" \
EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
$(HOST_SQUASHFS_MAKE_ARGS) \
-C $(@D)/squashfs-tools/
diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -10,60 +10,60 @@
STRONGSWAN_LICENSE = GPLv2+
STRONGSWAN_LICENSE_FILES = COPYING LICENSE
STRONGSWAN_DEPENDENCIES = host-pkgconf
-STRONGSWAN_CONF_OPTS += \
- --without-lib-prefix \
- --enable-pkcs11=yes \
- --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
- --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
- --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
- --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
- --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
- --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
- --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \
- --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
- --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \
- --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \
- --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \
- --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \
- --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \
- --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \
- --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \
- --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no) \
+STRONGSWAN_CONF_OPTS += \
+ --without-lib-prefix \
+ --enable-pkcs11=yes \
+ --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
+ --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
+ --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
+ --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
+ --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
+ --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
+ --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \
+ --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
+ --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \
+ --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \
+ --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \
+ --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \
+ --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \
+ --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \
+ --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \
+ --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no) \
--enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no)
ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y)
-STRONGSWAN_CONF_OPTS += \
- --enable-eap-sim \
- --enable-eap-sim-file \
- --enable-eap-aka \
- --enable-eap-aka-3gpp2 \
- --enable-eap-simaka-sql \
+STRONGSWAN_CONF_OPTS += \
+ --enable-eap-sim \
+ --enable-eap-sim-file \
+ --enable-eap-aka \
+ --enable-eap-aka-3gpp2 \
+ --enable-eap-simaka-sql \
--enable-eap-simaka-pseudonym \
- --enable-eap-simaka-reauth \
- --enable-eap-identity \
- --enable-eap-md5 \
- --enable-eap-gtc \
- --enable-eap-mschapv2 \
- --enable-eap-tls \
- --enable-eap-ttls \
- --enable-eap-peap \
- --enable-eap-tnc \
- --enable-eap-dynamic \
+ --enable-eap-simaka-reauth \
+ --enable-eap-identity \
+ --enable-eap-md5 \
+ --enable-eap-gtc \
+ --enable-eap-mschapv2 \
+ --enable-eap-tls \
+ --enable-eap-ttls \
+ --enable-eap-peap \
+ --enable-eap-tnc \
+ --enable-eap-dynamic \
--enable-eap-radius
STRONGSWAN_DEPENDENCIES += gmp
endif
-STRONGSWAN_DEPENDENCIES += \
- $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \
- $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \
- $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \
- $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \
- $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \
+STRONGSWAN_DEPENDENCIES += \
+ $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \
+ $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \
+ $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \
+ $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \
+ $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \
$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite)
ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
-STRONGSWAN_DEPENDENCIES += \
- $(if $(BR2_PACKAGE_SQLITE),sqlite) \
+STRONGSWAN_DEPENDENCIES += \
+ $(if $(BR2_PACKAGE_SQLITE),sqlite) \
$(if $(BR2_PACKAGE_MYSQL),mysql)
endif
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -85,15 +85,15 @@
ifeq ($(BR2_PACKAGE_SYSTEMD_ALL_EXTRAS),y)
SYSTEMD_DEPENDENCIES += \
- xz \
+ xz \
libgcrypt
-SYSTEMD_CONF_OPTS += \
- --enable-xz \
- --enable-gcrypt \
+SYSTEMD_CONF_OPTS += \
+ --enable-xz \
+ --enable-gcrypt \
--with-libgcrypt-prefix=$(STAGING_DIR)/usr
else
-SYSTEMD_CONF_OPTS += \
- --disable-xz \
+SYSTEMD_CONF_OPTS += \
+ --disable-xz \
--disable-gcrypt
endif
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -21,15 +21,15 @@
TVHEADEND_DEPENDENCIES += dtv-scan-tables
define TVHEADEND_CONFIGURE_CMDS
- (cd $(@D); \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- ./configure \
- --prefix=/usr \
- --arch="$(ARCH)" \
- --cpu="$(BR2_GCC_TARGET_CPU)" \
- --python="$(HOST_DIR)/usr/bin/python" \
- --disable-dvbscan \
+ (cd $(@D); \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ ./configure \
+ --prefix=/usr \
+ --arch="$(ARCH)" \
+ --cpu="$(BR2_GCC_TARGET_CPU)" \
+ --python="$(HOST_DIR)/usr/bin/python" \
+ --disable-dvbscan \
)
endef
@@ -47,7 +47,7 @@
# - a default DB with a tvheadend admin
# - a non-root user to run as
define TVHEADEND_INSTALL_DB
- $(INSTALL) -D -m 0600 package/tvheadend/accesscontrol.1 \
+ $(INSTALL) -D -m 0600 package/tvheadend/accesscontrol.1 \
$(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
chmod -R go-rwx $(TARGET_DIR)/home/tvheadend
endef
diff --git a/package/tz/tz.mk b/package/tz/tz.mk
--- a/package/tz/tz.mk
+++ b/package/tz/tz.mk
@@ -11,11 +11,11 @@
TZ_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME))
define TZ_BUILD_CMDS
- (cd $(HOST_DIR)/usr/share/zoneinfo/posix/; \
- for i in $$(find . -type f); do \
- mkdir -p $(@D)/output/$$(dirname $$i); \
+ (cd $(HOST_DIR)/usr/share/zoneinfo/posix/; \
+ for i in $$(find . -type f); do \
+ mkdir -p $(@D)/output/$$(dirname $$i); \
$(TZDUMP) -p . -q $${i#./} > $(@D)/output/$$i; \
- done \
+ done \
)
endef
@@ -26,13 +26,13 @@
$(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
- if [ -n "$(TZ_LOCALTIME)" ]; then \
+ if [ -n "$(TZ_LOCALTIME)" ]; then \
if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \
printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
- "$(TZDATA_LOCALTIME)"; \
- exit 1; \
- fi; \
- cd $(TARGET_DIR)/etc; \
+ "$(TZDATA_LOCALTIME)"; \
+ exit 1; \
+ fi; \
+ cd $(TARGET_DIR)/etc; \
ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \
fi
endef
diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk
--- a/package/tzdata/tzdata.mk
+++ b/package/tzdata/tzdata.mk
@@ -28,19 +28,19 @@
define TZDATA_INSTALL_TARGET_CMDS
$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share
cp -a $(HOST_DIR)/usr/share/zoneinfo $(TARGET_DIR)/usr/share/zoneinfo
- cd $(TARGET_DIR)/usr/share/zoneinfo; \
- for zone in posix/*; do \
- ln -sfn "$${zone}" "$${zone##*/}"; \
+ cd $(TARGET_DIR)/usr/share/zoneinfo; \
+ for zone in posix/*; do \
+ ln -sfn "$${zone}" "$${zone##*/}"; \
done
- if [ -n "$(TZDATA_LOCALTIME)" ]; then \
+ if [ -n "$(TZDATA_LOCALTIME)" ]; then \
if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \
printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
- "$(TZDATA_LOCALTIME)"; \
- exit 1; \
- fi; \
- cd $(TARGET_DIR)/etc; \
+ "$(TZDATA_LOCALTIME)"; \
+ exit 1; \
+ fi; \
+ cd $(TARGET_DIR)/etc; \
ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) localtime; \
- echo "$(TZDATA_LOCALTIME)" >timezone; \
+ echo "$(TZDATA_LOCALTIME)" >timezone; \
fi
endef
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -11,16 +11,16 @@
UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
define UBOOT_TOOLS_BUILD_CMDS
- $(MAKE) -C $(@D) \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- CROSS_BUILD_TOOLS=y \
+ $(MAKE) -C $(@D) \
+ CROSS_COMPILE="$(TARGET_CROSS)" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ CROSS_BUILD_TOOLS=y \
tools-only
- $(MAKE) -C $(@D) \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
+ $(MAKE) -C $(@D) \
+ CROSS_COMPILE="$(TARGET_CROSS)" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
env no-dot-config-targets=env
endef
@@ -50,10 +50,10 @@
endef
define HOST_UBOOT_TOOLS_BUILD_CMDS
- $(MAKE1) -C $(@D) \
- HOSTCC="$(HOSTCC)" \
- HOSTCFLAGS="$(HOST_CFLAGS)" \
- HOSTLDFLAGS="$(HOST_LDFLAGS)" \
+ $(MAKE1) -C $(@D) \
+ HOSTCC="$(HOSTCC)" \
+ HOSTCFLAGS="$(HOST_CFLAGS)" \
+ HOSTLDFLAGS="$(HOST_LDFLAGS)" \
tools-only
endef
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -9,15 +9,15 @@
UDISKS_LICENSE = GPLv2+
UDISKS_LICENSE_FILES = COPYING
-UDISKS_DEPENDENCIES = \
- sg3_utils \
- host-pkgconf \
- udev \
- dbus \
- dbus-glib \
- polkit \
- parted \
- lvm2 \
+UDISKS_DEPENDENCIES = \
+ sg3_utils \
+ host-pkgconf \
+ udev \
+ dbus \
+ dbus-glib \
+ polkit \
+ parted \
+ lvm2 \
libatasmart
UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -14,9 +14,9 @@
define USBMOUNT_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
- $(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink \
+ $(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink \
$(TARGET_DIR)/etc/usbmount/usbmount.d/00_create_model_symlink
- $(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink \
+ $(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink \
$(TARGET_DIR)/etc/usbmount/usbmount.d/00_remove_model_symlink
$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@@ -25,13 +25,13 @@
#
# 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 \
+VDE2_CONF_OPTS = --disable-experimental \
+ --disable-cryptcab \
+ --disable-pcap \
+ --disable-python \
+ --disable-profile \
--disable-kernel-switch \
- --enable-tuntap \
+ --enable-tuntap \
#?Package does not build in parallel due to improper make rules
VDE2_MAKE = $(MAKE1)
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -20,10 +20,10 @@
WPA_SUPPLICANT_CONFIG_SET =
WPA_SUPPLICANT_CONFIG_ENABLE = \
- CONFIG_ELOOP_EPOLL \
- CONFIG_IEEE80211AC \
- CONFIG_IEEE80211N \
- CONFIG_IEEE80211R \
+ CONFIG_ELOOP_EPOLL \
+ CONFIG_IEEE80211AC \
+ CONFIG_IEEE80211N \
+ CONFIG_IEEE80211R \
CONFIG_INTERNAL_LIBTOMMATH
WPA_SUPPLICANT_CONFIG_DISABLE = \
@@ -77,7 +77,7 @@
ifeq ($(BR2_PACKAGE_DBUS),y)
WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus
WPA_SUPPLICANT_MAKE_ENV = \
- PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
+ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y)
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -10,48 +10,48 @@
XSERVER_XORG_SERVER_LICENSE = MIT
XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-XSERVER_XORG_SERVER_DEPENDENCIES = \
- xutil_util-macros \
- xlib_libXfont \
- xlib_libX11 \
- xlib_libXau \
- xlib_libXdmcp \
- xlib_libXext \
- xlib_libXfixes \
- xlib_libXi \
- xlib_libXrender \
- xlib_libXres \
- xlib_libXft \
- xlib_libXcursor \
- xlib_libXinerama \
- xlib_libXrandr \
- xlib_libXdamage \
- xlib_libXxf86vm \
- xlib_libxkbfile \
- xlib_xtrans \
- xdata_xbitmaps \
- xproto_bigreqsproto \
- xproto_compositeproto \
- xproto_damageproto \
- xproto_fixesproto \
- xproto_fontsproto \
- xproto_glproto \
- xproto_inputproto \
- xproto_kbproto \
- xproto_presentproto \
- xproto_randrproto \
- xproto_renderproto \
- xproto_resourceproto \
- xproto_videoproto \
- xproto_xcmiscproto \
- xproto_xextproto \
- xproto_xf86bigfontproto \
- xproto_xf86dgaproto \
- xproto_xf86vidmodeproto \
- xproto_xproto \
- xkeyboard-config \
- pixman \
- mcookie \
+XSERVER_XORG_SERVER_DEPENDENCIES = \
+ xutil_util-macros \
+ xlib_libXfont \
+ xlib_libX11 \
+ xlib_libXau \
+ xlib_libXdmcp \
+ xlib_libXext \
+ xlib_libXfixes \
+ xlib_libXi \
+ xlib_libXrender \
+ xlib_libXres \
+ xlib_libXft \
+ xlib_libXcursor \
+ xlib_libXinerama \
+ xlib_libXrandr \
+ xlib_libXdamage \
+ xlib_libXxf86vm \
+ xlib_libxkbfile \
+ xlib_xtrans \
+ xdata_xbitmaps \
+ xproto_bigreqsproto \
+ xproto_compositeproto \
+ xproto_damageproto \
+ xproto_fixesproto \
+ xproto_fontsproto \
+ xproto_glproto \
+ xproto_inputproto \
+ xproto_kbproto \
+ xproto_presentproto \
+ xproto_randrproto \
+ xproto_renderproto \
+ xproto_resourceproto \
+ xproto_videoproto \
+ xproto_xcmiscproto \
+ xproto_xextproto \
+ xproto_xf86bigfontproto \
+ xproto_xf86dgaproto \
+ xproto_xf86vidmodeproto \
+ xproto_xproto \
+ xkeyboard-config \
+ pixman \
+ mcookie \
host-pkgconf
XSERVER_XORG_SERVER_CONF_OPTS = --disable-config-hal \
diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -39,7 +39,7 @@
USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \
TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
-XBMC_CONF_OPTS += \
+XBMC_CONF_OPTS += \
--with-arch=$(BR2_ARCH) \
--disable-crystalhd \
--disable-debug \
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 15 of 15] .mk files: remove alignment of assignments
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (13 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 14 of 15] .mk files: remove alignment of line continuation characters Thomas De Schampheleire
@ 2014-09-27 19:32 ` Thomas De Schampheleire
2014-09-28 12:12 ` Yann E. MORIN
2014-09-27 21:15 ` [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Yann E. MORIN
2014-10-04 17:07 ` Thomas Petazzoni
16 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-09-27 19:32 UTC (permalink / raw)
To: buildroot
The Buildroot coding style does not align assignments nor line continuation
characters (\). This patch updates the .mk files to reflect this.
Command used:
find * -name "*.mk" | xargs sed -i 's/\s\+\(.\?=\)\s\+/ \1 /g'
Manual fixup:
pkg-utils.mk: fix alignment of FROM/TO variables in caseconvert-helper
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
v2: new patch
boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 10 +-
boot/grub/grub.mk | 4 +-
boot/mxs-bootlets/mxs-bootlets.mk | 2 +-
boot/syslinux/syslinux.mk | 4 +-
boot/uboot/uboot.mk | 42 ++--
boot/xloader/xloader.mk | 4 +-
fs/ext2/ext2.mk | 2 +-
package/atftp/atftp.mk | 2 +-
package/atk/atk.mk | 2 +-
package/bcusdk/bcusdk.mk | 2 +-
package/bind/bind.mk | 2 +-
package/ccache/ccache.mk | 4 +-
package/cegui06/cegui06.mk | 14 +-
package/celt051/celt051.mk | 12 +-
package/cjson/cjson.mk | 10 +-
package/copas/copas.mk | 2 +-
package/coxpcall/coxpcall.mk | 2 +-
package/dhcpdump/dhcpdump.mk | 2 +-
package/dmidecode/dmidecode.mk | 2 +-
package/dropbear/dropbear.mk | 2 +-
package/dtc/dtc.mk | 18 +-
package/dvbsnoop/dvbsnoop.mk | 8 +-
package/ecryptfs-utils/ecryptfs-utils.mk | 14 +-
package/efl/libedje/libedje.mk | 2 +-
package/eigen/eigen.mk | 2 +-
package/freescale-imx/freescale-imx.mk | 2 +-
package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 4 +-
package/freescale-imx/imx-lib/imx-lib.mk | 2 +-
package/freescale-imx/imx-vpu/imx-vpu.mk | 2 +-
package/gcc/gcc-final/gcc-final.mk | 6 +-
package/gcc/gcc-initial/gcc-initial.mk | 4 +-
package/gd/gd.mk | 24 +-
package/gdb/gdb.mk | 2 +-
package/genimage/genimage.mk | 10 +-
package/genpart/genpart.mk | 8 +-
package/git/git.mk | 10 +-
package/grantlee/grantlee.mk | 2 +-
package/heirloom-mailx/heirloom-mailx.mk | 4 +-
package/igh-ethercat/igh-ethercat.mk | 6 +-
package/input-tools/input-tools.mk | 4 +-
package/irda-utils/irda-utils.mk | 2 +-
package/keyutils/keyutils.mk | 10 +-
package/lbase64/lbase64.mk | 2 +-
package/lftp/lftp.mk | 2 +-
package/libatasmart/libatasmart.mk | 2 +-
package/libffi/libffi.mk | 2 +-
package/libmbim/libmbim.mk | 4 +-
package/libnspr/libnspr.mk | 2 +-
package/libqmi/libqmi.mk | 4 +-
package/libreplaygain/libreplaygain.mk | 2 +-
package/libseccomp/libseccomp.mk | 16 +-
package/libsvg-cairo/libsvg-cairo.mk | 10 +-
package/libsvg/libsvg.mk | 10 +-
package/liburcu/liburcu.mk | 4 +-
package/linux-fusion/linux-fusion.mk | 2 +-
package/ljlinenoise/ljlinenoise.mk | 2 +-
package/lmbench/lmbench.mk | 2 +-
package/localedef/localedef.mk | 4 +-
package/lpty/lpty.mk | 2 +-
package/lrandom/lrandom.mk | 2 +-
package/lsqlite3/lsqlite3.mk | 2 +-
package/ltp-testsuite/ltp-testsuite.mk | 4 +-
package/lttng-babeltrace/lttng-babeltrace.mk | 4 +-
package/lttng-libust/lttng-libust.mk | 6 +-
package/lttng-modules/lttng-modules.mk | 4 +-
package/lttng-tools/lttng-tools.mk | 4 +-
package/lua-coat/lua-coat.mk | 2 +-
package/lua-coatpersistent/lua-coatpersistent.mk | 2 +-
package/lua-csnappy/lua-csnappy.mk | 2 +-
package/lua-messagepack/lua-messagepack.mk | 2 +-
package/lua-testmore/lua-testmore.mk | 2 +-
package/luabitop/luabitop.mk | 2 +-
package/luajit/luajit.mk | 4 +-
package/luajson/luajson.mk | 2 +-
package/lualogging/lualogging.mk | 2 +-
package/luarocks/luarocks.mk | 2 +-
package/luasec/luasec.mk | 2 +-
package/luasocket/luasocket.mk | 2 +-
package/luasql-sqlite3/luasql-sqlite3.mk | 2 +-
package/lunit/lunit.mk | 2 +-
package/lzlib/lzlib.mk | 2 +-
package/mesa3d/mesa3d.mk | 10 +-
package/mii-diag/mii-diag.mk | 6 +-
package/mmc-utils/mmc-utils.mk | 2 +-
package/mplayer/mplayer.mk | 4 +-
package/mtd/mtd.mk | 76 +++++-----
package/musepack/musepack.mk | 2 +-
package/on2-8170-modules/on2-8170-modules.mk | 2 +-
package/open2300/open2300.mk | 6 +-
package/orbit/orbit.mk | 2 +-
package/perl/perl.mk | 4 +-
package/php/php.mk | 2 +-
package/picocom/picocom.mk | 2 +-
package/pinentry/pinentry.mk | 2 +-
package/pkg-autotools.mk | 6 +-
package/pkg-cmake.mk | 12 +-
package/pkg-generic.mk | 56 +++---
package/pkg-luarocks.mk | 10 +-
package/pkg-perl.mk | 2 +-
package/pkg-python.mk | 26 +-
package/pkg-utils.mk | 22 +-
package/python-dialog/python-dialog.mk | 4 +-
package/python-ipy/python-ipy.mk | 2 +-
package/python-netifaces/python-netifaces.mk | 4 +-
package/python-protobuf/python-protobuf.mk | 4 +-
package/python-pyparsing/python-pyparsing.mk | 12 +-
package/python-pyro/python-pyro.mk | 4 +-
package/python-serial/python-serial.mk | 4 +-
package/python-setuptools/python-setuptools.mk | 4 +-
package/python/python.mk | 10 +-
package/python3/python3.mk | 2 +-
package/qextserialport/qextserialport.mk | 4 +-
package/qjson/qjson.mk | 2 +-
package/qt/qt.mk | 76 +++++-----
package/qt5/qt5base/qt5base.mk | 50 +++---
package/qwt/qwt.mk | 2 +-
package/rings/rings.mk | 2 +-
package/rpcbind/rpcbind.mk | 4 +-
package/rtai/rtai.mk | 4 +-
package/sam-ba/sam-ba.mk | 4 +-
package/sg3_utils/sg3_utils.mk | 2 +-
package/slirp/slirp.mk | 8 +-
package/spice-protocol/spice-protocol.mk | 10 +-
package/spice/spice.mk | 12 +-
package/squid/squid.mk | 4 +-
package/sysvinit/sysvinit.mk | 6 +-
package/tcllib/tcllib.mk | 12 +-
package/tftpd/tftpd.mk | 6 +-
package/tstools/tstools.mk | 4 +-
package/tvheadend/tvheadend.mk | 2 +-
package/uboot-tools/uboot-tools.mk | 4 +-
package/udisks/udisks.mk | 2 +-
package/usbredir/usbredir.mk | 16 +-
package/valgrind/valgrind.mk | 4 +-
package/vde2/vde2.mk | 12 +-
package/vpnc/vpnc.mk | 10 +-
package/xinetd/xinetd.mk | 6 +-
toolchain/toolchain-external/toolchain-external.mk | 6 +-
138 files changed, 490 insertions(+), 490 deletions(-)
diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
--- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -4,11 +4,11 @@
#
################################################################################
-BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
-BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
-BOOT_WRAPPER_AARCH64_LICENSE = BSD3c
-BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
-BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux
+BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
+BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
+BOOT_WRAPPER_AARCH64_LICENSE = BSD3c
+BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
+BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux
BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES
# The Git repository does not have the generated configure script and
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -6,8 +6,8 @@
GRUB_VERSION = 0.97
GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
-GRUB_PATCH = grub_$(GRUB_VERSION)-67.diff.gz
-GRUB_SITE = http://snapshot.debian.org/archive/debian/20130129T225227Z/pool/main/g/grub
+GRUB_PATCH = grub_$(GRUB_VERSION)-67.diff.gz
+GRUB_SITE = http://snapshot.debian.org/archive/debian/20130129T225227Z/pool/main/g/grub
GRUB_LICENSE = GPLv2+
GRUB_LICENSE_FILES = COPYING
diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk
--- a/boot/mxs-bootlets/mxs-bootlets.mk
+++ b/boot/mxs-bootlets/mxs-bootlets.mk
@@ -7,7 +7,7 @@
ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL),y)
MXS_BOOTLETS_TARBALL = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL))
MXS_BOOTLETS_SITE = $(patsubst %/,%,$(dir $(MXS_BOOTLETS_TARBALL)))
- MXS_BOOTLETS_SOURCE = $(notdir $(MXS_BOOTLETS_TARBALL))
+ MXS_BOOTLETS_SOURCE = $(notdir $(MXS_BOOTLETS_TARBALL))
else ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT),y)
MXS_BOOTLETS_SITE = $(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL)
MXS_BOOTLETS_SITE_METHOD = git
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -5,8 +5,8 @@
################################################################################
SYSLINUX_VERSION = 6.02
-SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
-SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
+SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
+SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
SYSLINUX_LICENSE = GPLv2+
SYSLINUX_LICENSE_FILES = COPYING
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -4,7 +4,7 @@
#
################################################################################
-UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
+UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
UBOOT_LICENSE = GPLv2+
@@ -15,45 +15,45 @@
ifeq ($(UBOOT_VERSION),custom)
# Handle custom U-Boot tarballs as specified by the configuration
UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
-UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
-UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
+UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
+UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
-UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
+UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
UBOOT_SITE_METHOD = git
else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y)
-UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
+UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
UBOOT_SITE_METHOD = hg
else
# Handle stable official U-Boot versions
-UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot
-UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2
+UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot
+UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2
endif
ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
-UBOOT_BIN = u-boot
+UBOOT_BIN = u-boot
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
-UBOOT_BIN = u-boot.kwb
-UBOOT_MAKE_TARGET = $(UBOOT_BIN)
+UBOOT_BIN = u-boot.kwb
+UBOOT_MAKE_TARGET = $(UBOOT_BIN)
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y)
-UBOOT_BIN = u-boot.ais
-UBOOT_MAKE_TARGET = $(UBOOT_BIN)
+UBOOT_BIN = u-boot.ais
+UBOOT_MAKE_TARGET = $(UBOOT_BIN)
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
-UBOOT_BIN = u-boot.ldr
+UBOOT_BIN = u-boot.ldr
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
-UBOOT_BIN = u-boot-nand.bin
+UBOOT_BIN = u-boot-nand.bin
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
-UBOOT_BIN = u-boot.img
+UBOOT_BIN = u-boot.img
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
-UBOOT_BIN = u-boot.imx
+UBOOT_BIN = u-boot.imx
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
-UBOOT_BIN = u-boot.sb
-UBOOT_MAKE_TARGET = $(UBOOT_BIN)
+UBOOT_BIN = u-boot.sb
+UBOOT_MAKE_TARGET = $(UBOOT_BIN)
UBOOT_DEPENDENCIES += host-elftosb
else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
-UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
+UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
else
-UBOOT_BIN = u-boot.bin
-UBOOT_BIN_IFT = $(UBOOT_BIN).ift
+UBOOT_BIN = u-boot.bin
+UBOOT_BIN_IFT = $(UBOOT_BIN).ift
endif
UBOOT_ARCH=$(KERNEL_ARCH)
diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
--- a/boot/xloader/xloader.mk
+++ b/boot/xloader/xloader.mk
@@ -4,8 +4,8 @@
#
################################################################################
-XLOADER_VERSION = 6f3a26101303051e0f91b6213735b68ce804e94e
-XLOADER_SITE = git://gitorious.org/x-loader/x-loader.git
+XLOADER_VERSION = 6f3a26101303051e0f91b6213735b68ce804e94e
+XLOADER_SITE = git://gitorious.org/x-loader/x-loader.git
XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME))
XLOADER_LICENSE = GPLv2+
diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
--- a/fs/ext2/ext2.mk
+++ b/fs/ext2/ext2.mk
@@ -20,7 +20,7 @@
ROOTFS_EXT2_DEPENDENCIES = host-genext2fs host-e2fsprogs
-EXT2_ENV = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
+EXT2_ENV = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
EXT2_ENV += REV=$(BR2_TARGET_ROOTFS_EXT2_REV)
define ROOTFS_EXT2_CMD
diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk
--- a/package/atftp/atftp.mk
+++ b/package/atftp/atftp.mk
@@ -4,7 +4,7 @@
#
################################################################################
-ATFTP_VERSION = 0.7.1
+ATFTP_VERSION = 0.7.1
ATFTP_SITE = http://sourceforge.net/projects/atftp/files
ATFTP_LICENSE = GPLv2+
ATFTP_LICENSE_FILES = LICENSE
diff --git a/package/atk/atk.mk b/package/atk/atk.mk
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -41,7 +41,7 @@
jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
gl_cv_c_restrict=no ac_cv_prog_F77=no
-ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no \
+ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no \
--disable-debug
ATK_DEPENDENCIES = libglib2 host-pkgconf
diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk
--- a/package/bcusdk/bcusdk.mk
+++ b/package/bcusdk/bcusdk.mk
@@ -10,7 +10,7 @@
BCUSDK_LICENSE = GPLv2+
BCUSDK_LICENSE_FILES = COPYING
BCUSDK_INSTALL_STAGING = YES
-BCUSDK_CONF_OPTS = --enable-onlyeibd --enable-ft12 --enable-pei16 \
+BCUSDK_CONF_OPTS = --enable-onlyeibd --enable-ft12 --enable-pei16 \
--enable-eibnetip --enable-eibnetipserver \
--enable-eibnetiptunnel --without-pth-test \
--with-pth=$(STAGING_DIR)/usr
diff --git a/package/bind/bind.mk b/package/bind/bind.mk
--- a/package/bind/bind.mk
+++ b/package/bind/bind.mk
@@ -18,7 +18,7 @@
BIND_TARGET_SERVER_SBIN += named-compilezone rndc rndc-confgen dnssec-dsfromkey
BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone
BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate
-BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
+BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
BUILD_CFLAGS="$(TARGET_CFLAGS)"
BIND_CONF_OPTS = --localstatedir=/var \
--with-randomdev=/dev/urandom \
diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -5,8 +5,8 @@
################################################################################
CCACHE_VERSION = 3.1.8
-CCACHE_SITE = http://samba.org/ftp/ccache
-CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
+CCACHE_SITE = http://samba.org/ftp/ccache
+CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
CCACHE_LICENSE = GPLv3+, others
CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
--- a/package/cegui06/cegui06.mk
+++ b/package/cegui06/cegui06.mk
@@ -5,15 +5,15 @@
################################################################################
# Do not update the version, we need exactly that one for Spice.
-CEGUI06_VERSION_MAJOR = 0.6.2
-CEGUI06_VERSION = $(CEGUI06_VERSION_MAJOR)b
-CEGUI06_SOURCE = CEGUI-$(CEGUI06_VERSION).tar.gz
-CEGUI06_SITE = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR)
-CEGUI06_LICENSE = MIT
-CEGUI06_LICENSE_FILES = COPYING
+CEGUI06_VERSION_MAJOR = 0.6.2
+CEGUI06_VERSION = $(CEGUI06_VERSION_MAJOR)b
+CEGUI06_SOURCE = CEGUI-$(CEGUI06_VERSION).tar.gz
+CEGUI06_SITE = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR)
+CEGUI06_LICENSE = MIT
+CEGUI06_LICENSE_FILES = COPYING
CEGUI06_INSTALL_STAGING = YES
-CEGUI06_DEPENDENCIES = \
+CEGUI06_DEPENDENCIES = \
expat \
freetype \
pcre \
diff --git a/package/celt051/celt051.mk b/package/celt051/celt051.mk
--- a/package/celt051/celt051.mk
+++ b/package/celt051/celt051.mk
@@ -6,13 +6,13 @@
# Although version newer than 0.5.1.3 exists, we're
# stuck with 0.5.1.3 for use by Spice (coming later)
-CELT051_VERSION = 0.5.1.3
-CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz
-CELT051_SITE = http://downloads.xiph.org/releases/celt
-CELT051_LICENSE = BSD-2c
-CELT051_LICENSE_FILES = COPYING
+CELT051_VERSION = 0.5.1.3
+CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz
+CELT051_SITE = http://downloads.xiph.org/releases/celt
+CELT051_LICENSE = BSD-2c
+CELT051_LICENSE_FILES = COPYING
CELT051_INSTALL_STAGING = YES
-CELT051_DEPENDENCIES = libogg
+CELT051_DEPENDENCIES = libogg
# Need to specify --with-ogg, otherwise /usr/lib may be searched for
# if target is the same kind as host (ie. same arch, same bitness,
diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
--- a/package/cjson/cjson.mk
+++ b/package/cjson/cjson.mk
@@ -4,12 +4,12 @@
#
################################################################################
-CJSON_VERSION = 58
-CJSON_SITE_METHOD = svn
-CJSON_SITE = http://svn.code.sf.net/p/cjson/code
+CJSON_VERSION = 58
+CJSON_SITE_METHOD = svn
+CJSON_SITE = http://svn.code.sf.net/p/cjson/code
CJSON_INSTALL_STAGING = YES
-CJSON_LICENSE = MIT
-CJSON_LICENSE_FILES = LICENSE
+CJSON_LICENSE = MIT
+CJSON_LICENSE_FILES = LICENSE
define CJSON_BUILD_CMDS
cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC -lm \
diff --git a/package/copas/copas.mk b/package/copas/copas.mk
--- a/package/copas/copas.mk
+++ b/package/copas/copas.mk
@@ -5,7 +5,7 @@
################################################################################
COPAS_VERSION = 1.2.1-1
-COPAS_SUBDIR = copas-1_2_1
+COPAS_SUBDIR = copas-1_2_1
COPAS_LICENSE = MIT
$(eval $(luarocks-package))
diff --git a/package/coxpcall/coxpcall.mk b/package/coxpcall/coxpcall.mk
--- a/package/coxpcall/coxpcall.mk
+++ b/package/coxpcall/coxpcall.mk
@@ -5,7 +5,7 @@
################################################################################
COXPCALL_VERSION = 1.15.0-1
-COXPCALL_SUBDIR = coxpcall
+COXPCALL_SUBDIR = coxpcall
COXPCALL_LICENSE = MIT
$(eval $(luarocks-package))
diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk
--- a/package/dhcpdump/dhcpdump.mk
+++ b/package/dhcpdump/dhcpdump.mk
@@ -5,7 +5,7 @@
################################################################################
DHCPDUMP_VERSION = 1.8
-DHCPDUMP_SITE = http://www.mavetju.org/download
+DHCPDUMP_SITE = http://www.mavetju.org/download
DHCPDUMP_DEPENDENCIES = libpcap
DHCPDUMP_LICENSE = BSD-2c
DHCPDUMP_LICENSE_FILES = LICENSE
diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
--- a/package/dmidecode/dmidecode.mk
+++ b/package/dmidecode/dmidecode.mk
@@ -5,7 +5,7 @@
################################################################################
DMIDECODE_VERSION = 2.12
-DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
+DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
DMIDECODE_LICENSE = GPLv2+
DMIDECODE_LICENSE_FILES = LICENSE
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -8,7 +8,7 @@
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
-DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
+DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -4,12 +4,12 @@
#
################################################################################
-DTC_VERSION = v1.4.0
-DTC_SITE = git://git.jdl.com/software/dtc.git
-DTC_LICENSE = GPLv2+/BSD-2c
-DTC_LICENSE_FILES = README.license GPL
+DTC_VERSION = v1.4.0
+DTC_SITE = git://git.jdl.com/software/dtc.git
+DTC_LICENSE = GPLv2+/BSD-2c
+DTC_LICENSE_FILES = README.license GPL
DTC_INSTALL_STAGING = YES
-DTC_DEPENDENCIES = host-bison host-flex
+DTC_DEPENDENCIES = host-bison host-flex
define DTC_POST_INSTALL_TARGET_RM_DTDIFF
rm -f $(TARGET_DIR)/usr/bin/dtdiff
@@ -17,19 +17,19 @@
ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y)
-DTC_LICENSE += (for the library), GPLv2+ (for the executables)
+DTC_LICENSE += (for the library), GPLv2+ (for the executables)
# Use default goal to build everything
DTC_BUILD_GOAL =
-DTC_INSTALL_GOAL = install
+DTC_INSTALL_GOAL = install
ifeq ($(BR2_PACKAGE_BASH),)
DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF
endif
else # $(BR2_PACKAGE_DTC_PROGRAMS) != y
-DTC_BUILD_GOAL = libfdt
+DTC_BUILD_GOAL = libfdt
#?libfdt_install is our own install rule added by our patch
-DTC_INSTALL_GOAL = libfdt_install
+DTC_INSTALL_GOAL = libfdt_install
endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y
diff --git a/package/dvbsnoop/dvbsnoop.mk b/package/dvbsnoop/dvbsnoop.mk
--- a/package/dvbsnoop/dvbsnoop.mk
+++ b/package/dvbsnoop/dvbsnoop.mk
@@ -4,9 +4,9 @@
#
################################################################################
-DVBSNOOP_VERSION = 1.4.50
-DVBSNOOP_SITE = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
-DVBSNOOP_LICENSE = GPLv2
-DVBSNOOP_LICENSE_FILES = COPYING
+DVBSNOOP_VERSION = 1.4.50
+DVBSNOOP_SITE = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
+DVBSNOOP_LICENSE = GPLv2
+DVBSNOOP_LICENSE_FILES = COPYING
$(eval $(autotools-package))
diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
--- a/package/ecryptfs-utils/ecryptfs-utils.mk
+++ b/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -4,14 +4,14 @@
#
################################################################################
-ECRYPTFS_UTILS_VERSION = 104
-ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
-ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download
-ECRYPTFS_UTILS_LICENSE = GPLv2+
-ECRYPTFS_UTILS_LICENSE_FILES = COPYING
+ECRYPTFS_UTILS_VERSION = 104
+ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
+ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download
+ECRYPTFS_UTILS_LICENSE = GPLv2+
+ECRYPTFS_UTILS_LICENSE_FILES = COPYING
-ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool
-ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam
+ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool
+ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam
#Needed for build system to find pk11func.h and libnss3.so
ECRYPTFS_UTILS_CONF_ENV = \
diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
--- a/package/efl/libedje/libedje.mk
+++ b/package/efl/libedje/libedje.mk
@@ -6,7 +6,7 @@
LIBEDJE_VERSION = $(EFL_VERSION)
LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
-LIBEDJE_SITE = http://download.enlightenment.org/releases
+LIBEDJE_SITE = http://download.enlightenment.org/releases
LIBEDJE_LICENSE = GPLv2+ (epp binary), BSD-2c (everything else)
LIBEDJE_LICENSE_FILES = COPYING
diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
--- a/package/eigen/eigen.mk
+++ b/package/eigen/eigen.mk
@@ -6,7 +6,7 @@
# version 3.2
EIGEN_VERSION = ffa86ffb5570
-EIGEN_SITE = https://bitbucket.org/eigen/eigen
+EIGEN_SITE = https://bitbucket.org/eigen/eigen
EIGEN_SITE_METHOD = hg
EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1
EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README
diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
--- a/package/freescale-imx/freescale-imx.mk
+++ b/package/freescale-imx/freescale-imx.mk
@@ -5,6 +5,6 @@
################################################################################
FREESCALE_IMX_VERSION = 3.10.17-1.0.0
-FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
+FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
include $(sort $(wildcard package/freescale-imx/*/*.mk))
diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
--- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
+++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
@@ -9,8 +9,8 @@
else
GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-sfp
endif
-GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)
-GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
+GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)
+GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES
diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
--- a/package/freescale-imx/imx-lib/imx-lib.mk
+++ b/package/freescale-imx/imx-lib/imx-lib.mk
@@ -5,7 +5,7 @@
################################################################################
IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
-IMX_LIB_SITE = $(FREESCALE_IMX_SITE)
+IMX_LIB_SITE = $(FREESCALE_IMX_SITE)
IMX_LIB_LICENSE = LGPLv2.1+
IMX_LIB_LICENSE_FILES = EULA
diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
--- a/package/freescale-imx/imx-vpu/imx-vpu.mk
+++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
@@ -5,7 +5,7 @@
################################################################################
IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION)
-IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
+IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
IMX_VPU_LICENSE = Freescale License
IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt
IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -5,8 +5,8 @@
################################################################################
GCC_FINAL_VERSION = $(GCC_VERSION)
-GCC_FINAL_SITE = $(GCC_SITE)
-GCC_FINAL_SOURCE = $(GCC_SOURCE)
+GCC_FINAL_SITE = $(GCC_SITE)
+GCC_FINAL_SOURCE = $(GCC_SOURCE)
HOST_GCC_FINAL_DEPENDENCIES = \
$(HOST_GCC_COMMON_DEPENDENCIES) \
@@ -45,7 +45,7 @@
GCC_FINAL_CROSS_LANGUAGES-y = c
GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++
GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_FORTRAN) += fortran
-GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_OBJC) += objc
+GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_OBJC) += objc
GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y))
HOST_GCC_FINAL_CONF_OPTS = \
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -5,8 +5,8 @@
################################################################################
GCC_INITIAL_VERSION = $(GCC_VERSION)
-GCC_INITIAL_SITE = $(GCC_SITE)
-GCC_INITIAL_SOURCE = $(GCC_SOURCE)
+GCC_INITIAL_SITE = $(GCC_SITE)
+GCC_INITIAL_SOURCE = $(GCC_SOURCE)
HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
diff --git a/package/gd/gd.mk b/package/gd/gd.mk
--- a/package/gd/gd.mk
+++ b/package/gd/gd.mk
@@ -47,18 +47,18 @@
GD_DEPENDENCIES += zlib
endif
-GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE) += annotate
-GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD) += bdftogd
-GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL) += gd2copypal
-GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOGIF) += gd2togif
-GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOPNG) += gd2topng
-GD_TOOLS_$(BR2_PACKAGE_GD_GDCMPGIF) += gdcmpgif
-GD_TOOLS_$(BR2_PACKAGE_GD_GDPARTTOPNG) += gdparttopng
-GD_TOOLS_$(BR2_PACKAGE_GD_GDTOPNG) += gdtopng
-GD_TOOLS_$(BR2_PACKAGE_GD_GIFTOGD2) += giftogd2
-GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD) += pngtogd
-GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD2) += pngtogd2
-GD_TOOLS_$(BR2_PACKAGE_GD_WEBPNG) += webpng
+GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE) += annotate
+GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD) += bdftogd
+GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL) += gd2copypal
+GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOGIF) += gd2togif
+GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOPNG) += gd2topng
+GD_TOOLS_$(BR2_PACKAGE_GD_GDCMPGIF) += gdcmpgif
+GD_TOOLS_$(BR2_PACKAGE_GD_GDPARTTOPNG) += gdparttopng
+GD_TOOLS_$(BR2_PACKAGE_GD_GDTOPNG) += gdtopng
+GD_TOOLS_$(BR2_PACKAGE_GD_GIFTOGD2) += giftogd2
+GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD) += pngtogd
+GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD2) += pngtogd2
+GD_TOOLS_$(BR2_PACKAGE_GD_WEBPNG) += webpng
define GD_REMOVE_TOOLS
rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GD_TOOLS_))
diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@@ -5,7 +5,7 @@
################################################################################
GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION))
-GDB_SITE = $(BR2_GNU_MIRROR)/gdb
+GDB_SITE = $(BR2_GNU_MIRROR)/gdb
ifeq ($(BR2_arc),y)
GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION))
diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk
--- a/package/genimage/genimage.mk
+++ b/package/genimage/genimage.mk
@@ -4,10 +4,10 @@
#
################################################################################
-GENIMAGE_VERSION = 7
-GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
-GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download
-GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
-GENIMAGE_LICENSE = GPLv2
+GENIMAGE_VERSION = 7
+GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
+GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download
+GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
+GENIMAGE_LICENSE = GPLv2
$(eval $(host-autotools-package))
diff --git a/package/genpart/genpart.mk b/package/genpart/genpart.mk
--- a/package/genpart/genpart.mk
+++ b/package/genpart/genpart.mk
@@ -4,16 +4,16 @@
#
################################################################################
-GENPART_VERSION = 1.0.2
-GENPART_SOURCE = genpart-$(GENPART_VERSION).tar.bz2
-GENPART_SITE = http://www.pengutronix.de/software/genpart/download
+GENPART_VERSION = 1.0.2
+GENPART_SOURCE = genpart-$(GENPART_VERSION).tar.bz2
+GENPART_SITE = http://www.pengutronix.de/software/genpart/download
# genpart has no license embedded in its source release.
# However, their project page mentions:
# > This community portal offers an overview about our own OSS
# > projects and projects Pengutronix is or was involved with.
# We can thus assume genpart is under a FLOSS license.
# So, until the authors have clarified the licensing terms:
-GENPART_LICENSE = Unknown (clarification has been asked to the authors)
+GENPART_LICENSE = Unknown (clarification has been asked to the authors)
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/git/git.mk b/package/git/git.mk
--- a/package/git/git.mk
+++ b/package/git/git.mk
@@ -4,11 +4,11 @@
#
################################################################################
-GIT_VERSION = 1.8.5.4
-GIT_SITE = http://git-core.googlecode.com/files
-GIT_LICENSE = GPLv2 LGPLv2.1+
-GIT_LICENSE_FILES = COPYING LGPL-2.1
-GIT_DEPENDENCIES = zlib host-gettext
+GIT_VERSION = 1.8.5.4
+GIT_SITE = http://git-core.googlecode.com/files
+GIT_LICENSE = GPLv2 LGPLv2.1+
+GIT_LICENSE_FILES = COPYING LGPL-2.1
+GIT_DEPENDENCIES = zlib host-gettext
ifeq ($(BR2_PACKAGE_OPENSSL),y)
GIT_DEPENDENCIES += openssl
diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk
--- a/package/grantlee/grantlee.mk
+++ b/package/grantlee/grantlee.mk
@@ -7,7 +7,7 @@
GRANTLEE_VERSION = 0.2.0
GRANTLEE_SITE = http://downloads.grantlee.org
GRANTLEE_INSTALL_STAGING = YES
-GRANTLEE_DEPENDENCIES = qt
+GRANTLEE_DEPENDENCIES = qt
GRANTLEE_LICENSE = LGPLv2.1+
GRANTLEE_LICENSE_FILES = COPYING.LIB
diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk
--- a/package/heirloom-mailx/heirloom-mailx.mk
+++ b/package/heirloom-mailx/heirloom-mailx.mk
@@ -5,8 +5,8 @@
################################################################################
HEIRLOOM_MAILX_VERSION = 12.5
-HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
-HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/h/heirloom-mailx
+HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
+HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/h/heirloom-mailx
HEIRLOOM_MAILX_LICENSE = BSD-4c, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPLv1.1 (nss)
HEIRLOOM_MAILX_LICENSE_FILES = COPYING
diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
--- a/package/igh-ethercat/igh-ethercat.mk
+++ b/package/igh-ethercat/igh-ethercat.mk
@@ -5,12 +5,12 @@
################################################################################
IGH_ETHERCAT_VERSION = 1.5.2
-IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat
-IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
+IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat
+IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
IGH_ETHERCAT_LICENSE = GPLv2 (IgH EtherCAT master), LGPLv2.1 (libraries)
IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER
-IGH_ETHERCAT_DEPENDENCIES = linux
+IGH_ETHERCAT_DEPENDENCIES = linux
IGH_ETHERCAT_INSTALL_STAGING = YES
IGH_ETHERCAT_CONF_OPTS = \
diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
--- a/package/input-tools/input-tools.mk
+++ b/package/input-tools/input-tools.mk
@@ -12,8 +12,8 @@
INPUT_TOOLS_LICENSE_FILES = utils/Makefile
INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
-INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL) += jscal
-INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL) += jscal
+INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest
define INPUT_TOOLS_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \
diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
--- a/package/irda-utils/irda-utils.mk
+++ b/package/irda-utils/irda-utils.mk
@@ -27,7 +27,7 @@
IRDA_UTILS_SBINS-y =
IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRATTACH) += irattach
IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRDAPING) += irdaping
-IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRNETD) += irnetd
+IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRNETD) += irnetd
IRDA_UTILS_SBINS- += $(IRDA_UTILS_SBINS-y)
define IRDA_UTILS_INSTALL_TARGET_CMDS
diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
--- a/package/keyutils/keyutils.mk
+++ b/package/keyutils/keyutils.mk
@@ -4,11 +4,11 @@
#
################################################################################
-KEYUTILS_VERSION = 1.5.5
-KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
-KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
-KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+
-KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
+KEYUTILS_VERSION = 1.5.5
+KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
+KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
+KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+
+KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
KEYUTILS_INSTALL_STAGING = YES
KEYUTILS_MAKE_ENV = \
diff --git a/package/lbase64/lbase64.mk b/package/lbase64/lbase64.mk
--- a/package/lbase64/lbase64.mk
+++ b/package/lbase64/lbase64.mk
@@ -5,7 +5,7 @@
################################################################################
LBASE64_VERSION = 20120820-1
-LBASE64_SUBDIR = base64
+LBASE64_SUBDIR = base64
LBASE64_LICENSE = Public domain
LBASE64_LICENSE_FILES = $(LBASE64_SUBDIR)/README
diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk
--- a/package/lftp/lftp.mk
+++ b/package/lftp/lftp.mk
@@ -5,7 +5,7 @@
################################################################################
LFTP_VERSION = 4.5.5
-LFTP_SITE = http://lftp.yar.ru/ftp
+LFTP_SITE = http://lftp.yar.ru/ftp
LFTP_LICENSE = GPLv3+
LFTP_LICENSE_FILES = COPYING
LFTP_AUTORECONF = YES
diff --git a/package/libatasmart/libatasmart.mk b/package/libatasmart/libatasmart.mk
--- a/package/libatasmart/libatasmart.mk
+++ b/package/libatasmart/libatasmart.mk
@@ -6,7 +6,7 @@
LIBATASMART_VERSION = 0.19
LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz
-LIBATASMART_SITE = http://0pointer.de/public
+LIBATASMART_SITE = http://0pointer.de/public
LIBATASMART_LICENSE = LGPLv2.1
LIBATASMART_LICENSE_FILES = LGPL
LIBATASMART_INSTALL_STAGING = YES
diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
--- a/package/libffi/libffi.mk
+++ b/package/libffi/libffi.mk
@@ -5,7 +5,7 @@
################################################################################
LIBFFI_VERSION = 3.1
-LIBFFI_SITE = ftp://sourceware.org/pub/libffi
+LIBFFI_SITE = ftp://sourceware.org/pub/libffi
LIBFFI_LICENSE = MIT
LIBFFI_LICENSE_FILES = LICENSE
LIBFFI_INSTALL_STAGING = YES
diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
--- a/package/libmbim/libmbim.mk
+++ b/package/libmbim/libmbim.mk
@@ -5,8 +5,8 @@
################################################################################
LIBMBIM_VERSION = 1.10.0
-LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
-LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
+LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
+LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
LIBMBIM_LICENSE_FILES = COPYING
LIBMBIM_INSTALL_STAGING = YES
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -17,7 +17,7 @@
LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
HOST_LDFLAGS="-lc"
# NSPR mixes up --build and --host
-LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME)
+LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME)
LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
--- a/package/libqmi/libqmi.mk
+++ b/package/libqmi/libqmi.mk
@@ -5,8 +5,8 @@
################################################################################
LIBQMI_VERSION = 1.10.2
-LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
-LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
+LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
+LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
LIBQMI_LICENSE_FILES = COPYING
LIBQMI_INSTALL_STAGING = YES
diff --git a/package/libreplaygain/libreplaygain.mk b/package/libreplaygain/libreplaygain.mk
--- a/package/libreplaygain/libreplaygain.mk
+++ b/package/libreplaygain/libreplaygain.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBREPLAYGAIN_VERSION = r475
+LIBREPLAYGAIN_VERSION = r475
LIBREPLAYGAIN_SITE = http://files.musepack.net/source
LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
# upstream doesn't ship configure
diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
--- a/package/libseccomp/libseccomp.mk
+++ b/package/libseccomp/libseccomp.mk
@@ -4,18 +4,18 @@
#
################################################################################
-LIBSECCOMP_VERSION = 2.1.1
-LIBSECCOMP_SITE = http://downloads.sourceforge.net/project/libseccomp/libseccomp-$(LIBSECCOMP_VERSION)/
-LIBSECCOMP_LICENSE = LGPLv2.1
-LIBSECCOMP_LICENSE_FILES = LICENSE
+LIBSECCOMP_VERSION = 2.1.1
+LIBSECCOMP_SITE = http://downloads.sourceforge.net/project/libseccomp/libseccomp-$(LIBSECCOMP_VERSION)/
+LIBSECCOMP_LICENSE = LGPLv2.1
+LIBSECCOMP_LICENSE_FILES = LICENSE
LIBSECCOMP_INSTALL_STAGING = YES
# Needed for configure to find our system headers:
-LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
-LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
-LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
+LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
+LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
+LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
LIBSECCOMP_INSTALL_STAGING_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
-LIBSECCOMP_INSTALL_TARGET_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
+LIBSECCOMP_INSTALL_TARGET_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
# Not a real autotools package, but works quite OK nonetheless
$(eval $(autotools-package))
diff --git a/package/libsvg-cairo/libsvg-cairo.mk b/package/libsvg-cairo/libsvg-cairo.mk
--- a/package/libsvg-cairo/libsvg-cairo.mk
+++ b/package/libsvg-cairo/libsvg-cairo.mk
@@ -4,12 +4,12 @@
#
################################################################################
-LIBSVG_CAIRO_VERSION = 0.1.6
-LIBSVG_CAIRO_SITE = http://cairographics.org/snapshots
-LIBSVG_CAIRO_DEPENDENCIES = cairo libsvg
+LIBSVG_CAIRO_VERSION = 0.1.6
+LIBSVG_CAIRO_SITE = http://cairographics.org/snapshots
+LIBSVG_CAIRO_DEPENDENCIES = cairo libsvg
LIBSVG_CAIRO_INSTALL_STAGING = YES
-LIBSVG_CAIRO_LICENSE = LGPLv2.1+
-LIBSVG_CAIRO_LICENSE_FILES = COPYING
+LIBSVG_CAIRO_LICENSE = LGPLv2.1+
+LIBSVG_CAIRO_LICENSE_FILES = COPYING
LIBSVG_CAIRO_CONF_OPTS = --without-x
diff --git a/package/libsvg/libsvg.mk b/package/libsvg/libsvg.mk
--- a/package/libsvg/libsvg.mk
+++ b/package/libsvg/libsvg.mk
@@ -4,12 +4,12 @@
#
################################################################################
-LIBSVG_VERSION = 0.1.4
-LIBSVG_SITE = http://cairographics.org/snapshots
-LIBSVG_DEPENDENCIES = host-pkgconf libpng libjpeg
+LIBSVG_VERSION = 0.1.4
+LIBSVG_SITE = http://cairographics.org/snapshots
+LIBSVG_DEPENDENCIES = host-pkgconf libpng libjpeg
LIBSVG_INSTALL_STAGING = YES
-LIBSVG_LICENSE = LGPLv2+
-LIBSVG_LICENSE_FILES = COPYING
+LIBSVG_LICENSE = LGPLv2+
+LIBSVG_LICENSE_FILES = COPYING
# libsvg needs at last a XML parser
ifeq ($(BR2_PACKAGE_EXPAT),y)
diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
--- a/package/liburcu/liburcu.mk
+++ b/package/liburcu/liburcu.mk
@@ -5,8 +5,8 @@
################################################################################
LIBURCU_VERSION = 0.8.4
-LIBURCU_SITE = http://lttng.org/files/urcu
-LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
+LIBURCU_SITE = http://lttng.org/files/urcu
+LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE; GPLv2+ for test; GPLv3 for few *.m4 files
LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
--- a/package/linux-fusion/linux-fusion.mk
+++ b/package/linux-fusion/linux-fusion.mk
@@ -14,7 +14,7 @@
LINUX_FOR_FUSION=$(LINUX_VERSION_PROBED)
LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d
-LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION)
+LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION)
LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(LINUX_DIR)
LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(LINUX_DIR)
diff --git a/package/ljlinenoise/ljlinenoise.mk b/package/ljlinenoise/ljlinenoise.mk
--- a/package/ljlinenoise/ljlinenoise.mk
+++ b/package/ljlinenoise/ljlinenoise.mk
@@ -6,7 +6,7 @@
LJLINENOISE_VERSION_UPSTREAM = 0.1.1
LJLINENOISE_VERSION = $(LJLINENOISE_VERSION_UPSTREAM)-1
-LJLINENOISE_SUBDIR = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM)
+LJLINENOISE_SUBDIR = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM)
LJLINENOISE_LICENSE = MIT
LJLINENOISE_LICENSE_FILES = $(LJLINENOISE_SUBDIR)/COPYRIGHT
diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
--- a/package/lmbench/lmbench.mk
+++ b/package/lmbench/lmbench.mk
@@ -7,7 +7,7 @@
LMBENCH_VERSION = 3.0-a9
LMBENCH_SOURCE = lmbench-$(LMBENCH_VERSION).tgz
LMBENCH_SITE = http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION)
-LMBENCH_LICENSE = lmbench license (based on GPLv2)
+LMBENCH_LICENSE = lmbench license (based on GPLv2)
LMBENCH_LICENSE_FILES = COPYING COPYING-2
LMBENCH_CFLAGS = $(TARGET_CFLAGS)
diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
--- a/package/localedef/localedef.mk
+++ b/package/localedef/localedef.mk
@@ -5,8 +5,8 @@
################################################################################
LOCALEDEF_VERSION = 2.14.1-r17443-ptx1
-LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
-LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src
+LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
+LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src
HOST_LOCALEDEF_CONF_OPTS += \
--prefix=/usr \
diff --git a/package/lpty/lpty.mk b/package/lpty/lpty.mk
--- a/package/lpty/lpty.mk
+++ b/package/lpty/lpty.mk
@@ -6,7 +6,7 @@
LPTY_VERSION_UPSTREAM = 1.0.1
LPTY_VERSION = $(LPTY_VERSION_UPSTREAM)-1
-LPTY_SUBDIR = lpty-$(LPTY_VERSION)
+LPTY_SUBDIR = lpty-$(LPTY_VERSION)
LPTY_LICENSE = MIT
LPTY_LICENSE_FILES = $(LPTY_SUBDIR)/doc/LICENSE
diff --git a/package/lrandom/lrandom.mk b/package/lrandom/lrandom.mk
--- a/package/lrandom/lrandom.mk
+++ b/package/lrandom/lrandom.mk
@@ -9,7 +9,7 @@
else
LRANDOM_VERSION = 20120430.51-1
endif
-LRANDOM_SUBDIR = random
+LRANDOM_SUBDIR = random
LRANDOM_LICENSE = Public domain
$(eval $(luarocks-package))
diff --git a/package/lsqlite3/lsqlite3.mk b/package/lsqlite3/lsqlite3.mk
--- a/package/lsqlite3/lsqlite3.mk
+++ b/package/lsqlite3/lsqlite3.mk
@@ -5,7 +5,7 @@
################################################################################
LSQLITE3_VERSION = 0.9.1-2
-LSQLITE3_SUBDIR = lsqlite3_fsl09t
+LSQLITE3_SUBDIR = lsqlite3_fsl09t
LSQLITE3_DEPENDENCIES = sqlite
LSQLITE3_LICENSE = MIT
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
--- a/package/ltp-testsuite/ltp-testsuite.mk
+++ b/package/ltp-testsuite/ltp-testsuite.mk
@@ -5,8 +5,8 @@
################################################################################
LTP_TESTSUITE_VERSION = 20140115
-LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
-LTP_TESTSUITE_SITE = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
+LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
+LTP_TESTSUITE_SITE = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+
LTP_TESTSUITE_LICENSE_FILES = COPYING
diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
--- a/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -4,9 +4,9 @@
#
################################################################################
-LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace
+LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace
LTTNG_BABELTRACE_VERSION = 1.2.2
-LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
+LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
LTTNG_BABELTRACE_LICENSE = MIT; LGPL2.1 for include/babeltrace/list.h; GPLv2+ for test code
LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
--- a/package/lttng-libust/lttng-libust.mk
+++ b/package/lttng-libust/lttng-libust.mk
@@ -4,14 +4,14 @@
#
################################################################################
-LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
+LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
LTTNG_LIBUST_VERSION = 2.5.0
-LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
+LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
LTTNG_LIBUST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond)
LTTNG_LIBUST_LICENSE_FILES = COPYING
LTTNG_LIBUST_INSTALL_STAGING = YES
-LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
+LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
ifeq ($(BR2_PACKAGE_PYTHON),y)
LTTNG_LIBUST_DEPENDENCIES += python
diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
--- a/package/lttng-modules/lttng-modules.mk
+++ b/package/lttng-modules/lttng-modules.mk
@@ -5,8 +5,8 @@
################################################################################
LTTNG_MODULES_VERSION = 2.5.0
-LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
-LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
+LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
+LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/*
LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE
diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
--- a/package/lttng-tools/lttng-tools.mk
+++ b/package/lttng-tools/lttng-tools.mk
@@ -5,8 +5,8 @@
################################################################################
LTTNG_TOOLS_VERSION = 2.5.0
-LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
-LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
+LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
+LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/*
LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr
diff --git a/package/lua-coat/lua-coat.mk b/package/lua-coat/lua-coat.mk
--- a/package/lua-coat/lua-coat.mk
+++ b/package/lua-coat/lua-coat.mk
@@ -6,7 +6,7 @@
LUA_COAT_VERSION_UPSTREAM = 0.9.0
LUA_COAT_VERSION = $(LUA_COAT_VERSION_UPSTREAM)-1
-LUA_COAT_SUBDIR = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM)
+LUA_COAT_SUBDIR = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM)
LUA_COAT_LICENSE = MIT
LUA_COAT_LICENSE_FILES = $(LUA_COAT_SUBDIR)/COPYRIGHT
diff --git a/package/lua-coatpersistent/lua-coatpersistent.mk b/package/lua-coatpersistent/lua-coatpersistent.mk
--- a/package/lua-coatpersistent/lua-coatpersistent.mk
+++ b/package/lua-coatpersistent/lua-coatpersistent.mk
@@ -6,7 +6,7 @@
LUA_COATPERSISTENT_VERSION_UPSTREAM = 0.2.0
LUA_COATPERSISTENT_VERSION = $(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1
-LUA_COATPERSISTENT_SUBDIR = lua-CoatPersistent-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)
+LUA_COATPERSISTENT_SUBDIR = lua-CoatPersistent-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)
LUA_COATPERSISTENT_LICENSE = MIT
LUA_COATPERSISTENT_LICENSE_FILES = $(LUA_COATPERSISTENT_SUBDIR)/COPYRIGHT
diff --git a/package/lua-csnappy/lua-csnappy.mk b/package/lua-csnappy/lua-csnappy.mk
--- a/package/lua-csnappy/lua-csnappy.mk
+++ b/package/lua-csnappy/lua-csnappy.mk
@@ -6,7 +6,7 @@
LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.1
LUA_CSNAPPY_VERSION = $(LUA_CSNAPPY_VERSION_UPSTREAM)-1
-LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM)
+LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM)
LUA_CSNAPPY_LICENSE = BSD-3c
LUA_CSNAPPY_LICENSE_FILES = $(LUA_CSNAPPY_SUBDIR)/COPYRIGHT
diff --git a/package/lua-messagepack/lua-messagepack.mk b/package/lua-messagepack/lua-messagepack.mk
--- a/package/lua-messagepack/lua-messagepack.mk
+++ b/package/lua-messagepack/lua-messagepack.mk
@@ -6,7 +6,7 @@
LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.3.1
LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1
-LUA_MESSAGEPACK_SUBDIR = lua-MessagePack-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)
+LUA_MESSAGEPACK_SUBDIR = lua-MessagePack-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)
LUA_MESSAGEPACK_LICENSE = MIT
LUA_MESSAGEPACK_LICENSE_FILES = $(LUA_MESSAGEPACK_SUBDIR)/COPYRIGHT
diff --git a/package/lua-testmore/lua-testmore.mk b/package/lua-testmore/lua-testmore.mk
--- a/package/lua-testmore/lua-testmore.mk
+++ b/package/lua-testmore/lua-testmore.mk
@@ -6,7 +6,7 @@
LUA_TESTMORE_VERSION_UPSTREAM = 0.3.1
LUA_TESTMORE_VERSION = $(LUA_TESTMORE_VERSION_UPSTREAM)-1
-LUA_TESTMORE_SUBDIR = lua-TestMore-$(LUA_TESTMORE_VERSION_UPSTREAM)
+LUA_TESTMORE_SUBDIR = lua-TestMore-$(LUA_TESTMORE_VERSION_UPSTREAM)
LUA_TESTMORE_LICENSE = MIT
LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT
diff --git a/package/luabitop/luabitop.mk b/package/luabitop/luabitop.mk
--- a/package/luabitop/luabitop.mk
+++ b/package/luabitop/luabitop.mk
@@ -6,7 +6,7 @@
LUABITOP_VERSION_UPSTREAM = 1.0.2
LUABITOP_VERSION = $(LUABITOP_VERSION_UPSTREAM)-1
-LUABITOP_SUBDIR = LuaBitOp-$(LUABITOP_VERSION_UPSTREAM)
+LUABITOP_SUBDIR = LuaBitOp-$(LUABITOP_VERSION_UPSTREAM)
LUABITOP_LICENSE = MIT
LUABITOP_LICENSE_FILES = $(LUABITOP_SUBDIR)/README
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -5,8 +5,8 @@
################################################################################
LUAJIT_VERSION = 2.0.3
-LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
-LUAJIT_SITE = http://luajit.org/download
+LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
+LUAJIT_SITE = http://luajit.org/download
LUAJIT_LICENSE = MIT
LUAJIT_LICENSE_FILES = COPYRIGHT
diff --git a/package/luajson/luajson.mk b/package/luajson/luajson.mk
--- a/package/luajson/luajson.mk
+++ b/package/luajson/luajson.mk
@@ -5,7 +5,7 @@
################################################################################
LUAJSON_VERSION = 1.3.3-1
-LUAJSON_SUBDIR = luajson
+LUAJSON_SUBDIR = luajson
LUAJSON_LICENSE = MIT
LUAJSON_LICENSE_FILES = $(LUAJSON_SUBDIR)/LICENSE
diff --git a/package/lualogging/lualogging.mk b/package/lualogging/lualogging.mk
--- a/package/lualogging/lualogging.mk
+++ b/package/lualogging/lualogging.mk
@@ -5,7 +5,7 @@
################################################################################
LUALOGGING_VERSION = 1.3.0-1
-LUALOGGING_SUBDIR = lualogging
+LUALOGGING_SUBDIR = lualogging
LUALOGGING_LICENSE = MIT
LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -11,7 +11,7 @@
HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter
-LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks
+LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks
LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
HOST_LUAROCKS_CONF_OPTS = \
diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk
--- a/package/luasec/luasec.mk
+++ b/package/luasec/luasec.mk
@@ -6,7 +6,7 @@
LUASEC_VERSION_UPSTREAM = 0.5
LUASEC_VERSION = $(LUASEC_VERSION_UPSTREAM)-2
-LUASEC_SUBDIR = luasec
+LUASEC_SUBDIR = luasec
LUASEC_LICENSE = MIT
LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE
LUASEC_DEPENDENCIES = openssl
diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk
--- a/package/luasocket/luasocket.mk
+++ b/package/luasocket/luasocket.mk
@@ -5,7 +5,7 @@
################################################################################
LUASOCKET_VERSION = 3.0rc1-1
-LUASOCKET_SUBDIR = luasocket-3.0-rc1
+LUASOCKET_SUBDIR = luasocket-3.0-rc1
LUASOCKET_LICENSE = MIT
LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE
diff --git a/package/luasql-sqlite3/luasql-sqlite3.mk b/package/luasql-sqlite3/luasql-sqlite3.mk
--- a/package/luasql-sqlite3/luasql-sqlite3.mk
+++ b/package/luasql-sqlite3/luasql-sqlite3.mk
@@ -5,7 +5,7 @@
################################################################################
LUASQL_SQLITE3_VERSION = 2.3.0-1
-LUASQL_SQLITE3_SUBDIR = luasql
+LUASQL_SQLITE3_SUBDIR = luasql
LUASQL_SQLITE3_LICENSE = MIT
LUASQL_SQLITE3_LICENSE_FILES = $(LUASQL_SQLITE3_SUBDIR)/README
LUASQL_SQLITE3_DEPENDENCIES = sqlite
diff --git a/package/lunit/lunit.mk b/package/lunit/lunit.mk
--- a/package/lunit/lunit.mk
+++ b/package/lunit/lunit.mk
@@ -6,7 +6,7 @@
LUNIT_VERSION_UPSTREAM = 0.5
LUNIT_VERSION = $(LUNIT_VERSION_UPSTREAM)-2
-LUNIT_SUBDIR = lunit-$(LUNIT_VERSION_UPSTREAM)
+LUNIT_SUBDIR = lunit-$(LUNIT_VERSION_UPSTREAM)
LUNIT_LICENSE = MIT
LUNIT_LICENSE_FILES = $(LUNIT_SUBDIR)/LICENSE
diff --git a/package/lzlib/lzlib.mk b/package/lzlib/lzlib.mk
--- a/package/lzlib/lzlib.mk
+++ b/package/lzlib/lzlib.mk
@@ -5,7 +5,7 @@
################################################################################
LZLIB_VERSION = 0.4.work3-1
-LZLIB_SUBDIR = lzlib-0.4-work3
+LZLIB_SUBDIR = lzlib-0.4-work3
LZLIB_DEPENDENCIES = zlib
LZLIB_LICENSE = MIT
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -55,13 +55,13 @@
# Drivers
#Gallium Drivers
-MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau
-MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga
-MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast
# DRI Drivers
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
-MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915
-MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
+MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915
+MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
ifeq ($(MESA3D_GALLIUM_DRIVERS-y),)
diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
--- a/package/mii-diag/mii-diag.mk
+++ b/package/mii-diag/mii-diag.mk
@@ -5,9 +5,9 @@
################################################################################
MII_DIAG_VERSION = 2.11
-MII_DIAG_SOURCE = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
-MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
-MII_DIAG_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
+MII_DIAG_SOURCE = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
+MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
+MII_DIAG_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
MII_DIAG_LICENSE = GPL # No version specified
MII_DIAG_LICENSE_FILES = mii-diag.c
diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk
--- a/package/mmc-utils/mmc-utils.mk
+++ b/package/mmc-utils/mmc-utils.mk
@@ -5,7 +5,7 @@
################################################################################
MMC_UTILS_VERSION = 11f2ceabc4ad3f0dd568e0ce68166e4803e0615b
-MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
+MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
MMC_UTILS_LICENSE = GPLv2
define MMC_UTILS_BUILD_CMDS
diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -14,9 +14,9 @@
# mplayer needs pcm+mixer support, but configure fails to check for it
ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
MPLAYER_DEPENDENCIES += alsa-lib
-MPLAYER_CONF_OPTS += --enable-alsa
+MPLAYER_CONF_OPTS += --enable-alsa
else
-MPLAYER_CONF_OPTS += --disable-alsa
+MPLAYER_CONF_OPTS += --disable-alsa
endif
ifeq ($(BR2_ENDIAN),"BIG")
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -36,45 +36,45 @@
MKFS_JFFS2 = $(HOST_DIR)/usr/sbin/mkfs.jffs2
SUMTOOL = $(HOST_DIR)/usr/sbin/sumtool
-MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
-MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP) += flash_otp_dump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO) += flash_otp_info
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK) += flash_otp_lock
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE) += flash_otp_write
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
-MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
-MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
-MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
-MTD_TARGETS_$(BR2_PACKAGE_MTD_RECV_IMAGE) += recv_image
-MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDDUMP) += rfddump
-MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDFORMAT) += rfdformat
-MTD_TARGETS_$(BR2_PACKAGE_MTD_SERVE_IMAGE) += serve_image
-MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
+MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP) += flash_otp_dump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO) += flash_otp_info
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK) += flash_otp_lock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE) += flash_otp_write
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
+MTD_TARGETS_$(BR2_PACKAGE_MTD_RECV_IMAGE) += recv_image
+MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDDUMP) += rfddump
+MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDFORMAT) += rfdformat
+MTD_TARGETS_$(BR2_PACKAGE_MTD_SERVE_IMAGE) += serve_image
+MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_MTDINFO) += mtdinfo
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIFORMAT) += ubiformat
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINIZE) += ubinize
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRENAME) += ubirename
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK) += ubiblock
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_MTDINFO) += mtdinfo
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIFORMAT) += ubiformat
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINIZE) += ubinize
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRENAME) += ubirename
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol
+MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK) += ubiblock
MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS) += mkfs.ubifs/mkfs.ubifs
diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk
--- a/package/musepack/musepack.mk
+++ b/package/musepack/musepack.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MUSEPACK_VERSION = r475
+MUSEPACK_VERSION = r475
MUSEPACK_SITE = http://files.musepack.net/source
MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
diff --git a/package/on2-8170-modules/on2-8170-modules.mk b/package/on2-8170-modules/on2-8170-modules.mk
--- a/package/on2-8170-modules/on2-8170-modules.mk
+++ b/package/on2-8170-modules/on2-8170-modules.mk
@@ -5,7 +5,7 @@
################################################################################
ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39
-ON2_8170_MODULES_SITE = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
+ON2_8170_MODULES_SITE = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
ON2_8170_MODULES_DEPENDENCIES = linux
diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
--- a/package/open2300/open2300.mk
+++ b/package/open2300/open2300.mk
@@ -17,9 +17,9 @@
ifeq ($(BR2_PACKAGE_MYSQL),y)
OPEN2300_DEPENDENCIES += mysql
- OPEN2300_BINS += mysql2300 mysqlhistlog2300
- OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql
- OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient
+ OPEN2300_BINS += mysql2300 mysqlhistlog2300
+ OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql
+ OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient
endif
define OPEN2300_BUILD_CMDS
diff --git a/package/orbit/orbit.mk b/package/orbit/orbit.mk
--- a/package/orbit/orbit.mk
+++ b/package/orbit/orbit.mk
@@ -6,7 +6,7 @@
ORBIT_VERSION_UPSTREAM = 2.2.1
ORBIT_VERSION = $(ORBIT_VERSION_UPSTREAM)-1
-ORBIT_SUBDIR = orbit
+ORBIT_SUBDIR = orbit
ORBIT_LICENSE = MIT
ORBIT_LICENSE_FILES = $(ORBIT_SUBDIR)/doc/us/license.md
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -15,8 +15,8 @@
PERL_CROSS_VERSION = 0.8.5
PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).2
# DO NOT refactor with the github helper (the result is not the same)
-PERL_CROSS_SITE = http://raw.github.com/arsv/perl-cross/releases
-PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_SITE = http://raw.github.com/arsv/perl-cross/releases
+PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod
PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod
diff --git a/package/php/php.mk b/package/php/php.mk
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -13,7 +13,7 @@
PHP_DEPENDENCIES = host-pkgconf
PHP_LICENSE = PHP
PHP_LICENSE_FILES = LICENSE
-PHP_CONF_OPTS = --mandir=/usr/share/man \
+PHP_CONF_OPTS = --mandir=/usr/share/man \
--infodir=/usr/share/info \
--disable-all \
--without-pear \
diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
--- a/package/picocom/picocom.mk
+++ b/package/picocom/picocom.mk
@@ -5,7 +5,7 @@
################################################################################
PICOCOM_VERSION = 1.7
-PICOCOM_SITE = http://picocom.googlecode.com/files
+PICOCOM_SITE = http://picocom.googlecode.com/files
PICOCOM_LICENSE = GPLv2+
PICOCOM_LICENSE_FILES = LICENSE.txt
diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
--- a/package/pinentry/pinentry.mk
+++ b/package/pinentry/pinentry.mk
@@ -10,7 +10,7 @@
PINENTRY_LICENSE = GPLv2+
PINENTRY_LICENSE_FILES = COPYING
PINENTRY_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-PINENTRY_CONF_OPTS = --disable-pinentry-gtk # gtk1
+PINENTRY_CONF_OPTS = --disable-pinentry-gtk # gtk1
PINENTRY_CONF_OPTS += --disable-pinentry-qt # qt3
PINENTRY_CONF_OPTS += --without-libcap # requires PAM
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -107,9 +107,9 @@
$(2)_CONF_OPTS ?=
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
-$(2)_INSTALL_OPTS ?= install
-$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
-$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
+$(2)_INSTALL_OPTS ?= install
+$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
#
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
--- a/package/pkg-cmake.mk
+++ b/package/pkg-cmake.mk
@@ -38,15 +38,15 @@
$(2)_CONF_ENV ?=
$(2)_CONF_OPTS ?=
-$(2)_MAKE ?= $$(MAKE)
+$(2)_MAKE ?= $$(MAKE)
$(2)_MAKE_ENV ?=
$(2)_MAKE_OPTS ?=
-$(2)_INSTALL_HOST_OPTS ?= install
-$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
-$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
+$(2)_INSTALL_HOST_OPTS ?= install
+$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
+$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
-$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
-$(2)_BUILDDIR = $$($(2)_SRCDIR)
+$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
+$(2)_BUILDDIR = $$($(2)_SRCDIR)
#
# Configure step. Only define it if not already defined by the package
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -140,7 +140,7 @@
#
# For BR2_GLOBAL_PATCH_DIR, only generate if it is defined
$(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
-$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $(PKGDIR)
+$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $(PKGDIR)
$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS += $(addsuffix /$(RAWNAME),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)))
$(BUILD_DIR)/%/.stamp_patched:
@$(call step_start,patch)
@@ -322,9 +322,9 @@
# this information has only to be specified once, for both the
# target and host packages of a given .mk file.
-$(2)_TYPE = $(4)
-$(2)_NAME = $(1)
-$(2)_RAWNAME = $$(patsubst host-%,%,$(1))
+$(2)_TYPE = $(4)
+$(2)_NAME = $(1)
+$(2)_RAWNAME = $$(patsubst host-%,%,$(1))
# Keep the package version that may contain forward slashes in the _DL_VERSION
# variable, then replace all forward slashes ('/') by underscores ('_') to
@@ -344,9 +344,9 @@
$(2)_VERSION := $$(subst /,_,$$($(2)_VERSION))
endif
-$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
-$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME)
-$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME)
+$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
+$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME)
+$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME)
ifndef $(2)_SUBDIR
ifdef $(3)_SUBDIR
@@ -356,8 +356,8 @@
endif
endif
-$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
-$(2)_BUILDDIR ?= $$($(2)_SRCDIR)
+$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
+$(2)_BUILDDIR ?= $$($(2)_SRCDIR)
ifneq ($$($(2)_OVERRIDE_SRCDIR),)
$(2)_VERSION = custom
@@ -367,7 +367,7 @@
ifdef $(3)_SOURCE
$(2)_SOURCE = $$($(3)_SOURCE)
else
- $(2)_SOURCE ?= $$($(2)_RAWNAME)-$$($(2)_VERSION).tar.gz
+ $(2)_SOURCE ?= $$($(2)_RAWNAME)-$$($(2)_VERSION).tar.gz
endif
endif
@@ -404,7 +404,7 @@
endif
endif
-$(2)_LICENSE ?= unknown
+$(2)_LICENSE ?= unknown
ifndef $(2)_LICENSE_FILES
ifdef $(3)_LICENSE_FILES
@@ -418,12 +418,12 @@
endif
endif
-$(2)_REDISTRIBUTE ?= YES
+$(2)_REDISTRIBUTE ?= YES
# When a target package is a toolchain dependency set this variable to
# 'NO' so the 'toolchain' dependency is not added to prevent a circular
# dependency
-$(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES
+$(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES
ifeq ($(4),host)
$(2)_DEPENDENCIES ?= $$(filter-out host-toolchain $(1),\
@@ -438,23 +438,23 @@
# Eliminate duplicates in dependencies
$(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES))
-$(2)_INSTALL_STAGING ?= NO
-$(2)_INSTALL_IMAGES ?= NO
-$(2)_INSTALL_TARGET ?= YES
+$(2)_INSTALL_STAGING ?= NO
+$(2)_INSTALL_IMAGES ?= NO
+$(2)_INSTALL_TARGET ?= YES
# define sub-target stamps
-$(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed
-$(2)_TARGET_INSTALL_STAGING = $$($(2)_DIR)/.stamp_staging_installed
-$(2)_TARGET_INSTALL_IMAGES = $$($(2)_DIR)/.stamp_images_installed
-$(2)_TARGET_INSTALL_HOST = $$($(2)_DIR)/.stamp_host_installed
-$(2)_TARGET_BUILD = $$($(2)_DIR)/.stamp_built
-$(2)_TARGET_CONFIGURE = $$($(2)_DIR)/.stamp_configured
-$(2)_TARGET_RSYNC = $$($(2)_DIR)/.stamp_rsynced
-$(2)_TARGET_RSYNC_SOURCE = $$($(2)_DIR)/.stamp_rsync_sourced
-$(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched
-$(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted
-$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded
-$(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned
+$(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed
+$(2)_TARGET_INSTALL_STAGING = $$($(2)_DIR)/.stamp_staging_installed
+$(2)_TARGET_INSTALL_IMAGES = $$($(2)_DIR)/.stamp_images_installed
+$(2)_TARGET_INSTALL_HOST = $$($(2)_DIR)/.stamp_host_installed
+$(2)_TARGET_BUILD = $$($(2)_DIR)/.stamp_built
+$(2)_TARGET_CONFIGURE = $$($(2)_DIR)/.stamp_configured
+$(2)_TARGET_RSYNC = $$($(2)_DIR)/.stamp_rsynced
+$(2)_TARGET_RSYNC_SOURCE = $$($(2)_DIR)/.stamp_rsync_sourced
+$(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched
+$(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted
+$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded
+$(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned
# default extract command
$(2)_EXTRACT_CMDS ?= \
diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
--- a/package/pkg-luarocks.mk
+++ b/package/pkg-luarocks.mk
@@ -34,14 +34,14 @@
define inner-luarocks-package
$(2)_BUILD_OPTS ?=
-$(2)_SUBDIR ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
-$(2)_ROCKSPEC ?= $(1)-$$($(3)_VERSION).rockspec
-$(2)_SOURCE ?= $(1)-$$($(3)_VERSION).src.rock
-$(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
+$(2)_SUBDIR ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
+$(2)_ROCKSPEC ?= $(1)-$$($(3)_VERSION).rockspec
+$(2)_SOURCE ?= $(1)-$$($(3)_VERSION).src.rock
+$(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
# Since we do not support host-luarocks-package, we know this is
# a target package, and can just add the required dependencies
-$(2)_DEPENDENCIES += host-luarocks luainterpreter
+$(2)_DEPENDENCIES += host-luarocks luainterpreter
#
# Extract step
diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
--- a/package/pkg-perl.mk
+++ b/package/pkg-perl.mk
@@ -19,7 +19,7 @@
#
################################################################################
-PERL_ARCHNAME = $(ARCH)-linux
+PERL_ARCHNAME = $(ARCH)-linux
################################################################################
# inner-perl-package -- defines how the configuration, compilation and
diff --git a/package/pkg-python.mk b/package/pkg-python.mk
--- a/package/pkg-python.mk
+++ b/package/pkg-python.mk
@@ -91,8 +91,8 @@
define inner-python-package
-$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
-$(2)_BUILDDIR = $$($(2)_SRCDIR)
+$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
+$(2)_BUILDDIR = $$($(2)_SRCDIR)
$(2)_ENV ?=
$(2)_BUILD_OPTS ?=
@@ -109,28 +109,28 @@
# Distutils
ifeq ($$($(2)_SETUP_TYPE),distutils)
ifeq ($(4),target)
-$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
-$(2)_BASE_BUILD_TGT = build
-$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
-$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
+$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
+$(2)_BASE_BUILD_TGT = build
+$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
+$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
else
-$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
-$(2)_BASE_BUILD_TGT = build
+$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
+$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPTS =
$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
endif
# Setuptools
else ifeq ($$($(2)_SETUP_TYPE),setuptools)
ifeq ($(4),target)
-$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
-$(2)_BASE_BUILD_TGT = build
+$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
+$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPTS =
-$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
+$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
else
-$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
-$(2)_BASE_BUILD_TGT = build
+$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
+$(2)_BASE_BUILD_TGT = build
$(2)_BASE_BUILD_OPTS =
$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
endif
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -52,30 +52,30 @@
# directory from its makefile directory, using the $(MAKEFILE_LIST)
# variable provided by make. This is used by the *TARGETS macros to
# automagically find where the package is located.
-pkgdir = $(dir $(lastword $(MAKEFILE_LIST)))
-pkgname = $(lastword $(subst /, ,$(pkgdir)))
+pkgdir = $(dir $(lastword $(MAKEFILE_LIST)))
+pkgname = $(lastword $(subst /, ,$(pkgdir)))
# Define extractors for different archive suffixes
-INFLATE.bz2 = $(BZCAT)
-INFLATE.gz = $(ZCAT)
-INFLATE.tbz = $(BZCAT)
+INFLATE.bz2 = $(BZCAT)
+INFLATE.gz = $(ZCAT)
+INFLATE.tbz = $(BZCAT)
INFLATE.tbz2 = $(BZCAT)
-INFLATE.tgz = $(ZCAT)
-INFLATE.xz = $(XZCAT)
-INFLATE.tar = cat
+INFLATE.tgz = $(ZCAT)
+INFLATE.xz = $(XZCAT)
+INFLATE.tar = cat
# suitable-extractor(filename): returns extractor based on suffix
suitable-extractor = $(INFLATE$(suffix $(1)))
# MESSAGE Macro -- display a message in bold type
-MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
-TERM_BOLD := $(shell tput smso)
+MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
+TERM_BOLD := $(shell tput smso)
TERM_RESET := $(shell tput rmso)
# Utility functions for 'find'
# findfileclauses(filelist) => -name 'X' -o -name 'Y'
findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1)))
# finddirclauses(base, dirlist) => -path 'base/dirX' -o -path 'base/dirY'
-finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
+finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
# Miscellaneous utility functions
# notfirstword(wordlist): returns all but the first word in wordlist
diff --git a/package/python-dialog/python-dialog.mk b/package/python-dialog/python-dialog.mk
--- a/package/python-dialog/python-dialog.mk
+++ b/package/python-dialog/python-dialog.mk
@@ -5,8 +5,8 @@
################################################################################
PYTHON_DIALOG_VERSION = 3.0.1
-PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
-PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
+PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
+PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
PYTHON_DIALOG_LICENSE = LGPLv2.1+
PYTHON_DIALOG_LICENSE_FILES = COPYING
PYTHON_DIALOG_SETUP_TYPE = distutils
diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk
--- a/package/python-ipy/python-ipy.mk
+++ b/package/python-ipy/python-ipy.mk
@@ -5,7 +5,7 @@
################################################################################
PYTHON_IPY_VERSION = IPy-0.75
-PYTHON_IPY_SITE = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION))
+PYTHON_IPY_SITE = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION))
PYTHON_IPY_LICENSE = BSD-3c
PYTHON_IPY_LICENSE_FILES = COPYING
PYTHON_IPY_SETUP_TYPE = distutils
diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
--- a/package/python-netifaces/python-netifaces.mk
+++ b/package/python-netifaces/python-netifaces.mk
@@ -5,8 +5,8 @@
################################################################################
PYTHON_NETIFACES_VERSION = 0.7
-PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
-PYTHON_NETIFACES_SITE = http://alastairs-place.net/projects/netifaces
+PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
+PYTHON_NETIFACES_SITE = http://alastairs-place.net/projects/netifaces
PYTHON_NETIFACES_LICENSE = MIT
PYTHON_NETIFACES_LICENSE_FILES = README
PYTHON_NETIFACES_SETUP_TYPE = setuptools
diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk
--- a/package/python-protobuf/python-protobuf.mk
+++ b/package/python-protobuf/python-protobuf.mk
@@ -5,8 +5,8 @@
################################################################################
PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
-PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE)
-PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
+PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE)
+PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
PYTHON_PROTOBUF_LICENSE = BSD-3c
PYTHON_PROTOBUF_LICENSE_FILES = COPYING.txt
PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf
diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk
--- a/package/python-pyparsing/python-pyparsing.mk
+++ b/package/python-pyparsing/python-pyparsing.mk
@@ -4,11 +4,11 @@
#
################################################################################
-PYTHON_PYPARSING_VERSION = 1.5.6
-PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
-PYTHON_PYPARSING_SITE = http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-$(PYTHON_PYPARSING_VERSION)
-PYTHON_PYPARSING_LICENSE = MIT
-PYTHON_PYPARSING_LICENSE_FILES = LICENSE
-PYTHON_PYPARSING_SETUP_TYPE = distutils
+PYTHON_PYPARSING_VERSION = 1.5.6
+PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
+PYTHON_PYPARSING_SITE = http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-$(PYTHON_PYPARSING_VERSION)
+PYTHON_PYPARSING_LICENSE = MIT
+PYTHON_PYPARSING_LICENSE_FILES = LICENSE
+PYTHON_PYPARSING_SETUP_TYPE = distutils
$(eval $(python-package))
diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk
--- a/package/python-pyro/python-pyro.mk
+++ b/package/python-pyro/python-pyro.mk
@@ -5,8 +5,8 @@
################################################################################
PYTHON_PYRO_VERSION = 3.14
-PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
-PYTHON_PYRO_SITE = https://pypi.python.org/packages/source/P/Pyro
+PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
+PYTHON_PYRO_SITE = https://pypi.python.org/packages/source/P/Pyro
PYTHON_PYRO_LICENSE = MIT
PYTHON_PYRO_LICENSE_FILES = LICENSE
PYTHON_PYRO_SETUP_TYPE = distutils
diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
--- a/package/python-serial/python-serial.mk
+++ b/package/python-serial/python-serial.mk
@@ -5,8 +5,8 @@
################################################################################
PYTHON_SERIAL_VERSION = 2.6
-PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
-PYTHON_SERIAL_SITE = http://pypi.python.org/packages/source/p/pyserial
+PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
+PYTHON_SERIAL_SITE = http://pypi.python.org/packages/source/p/pyserial
PYTHON_SERIAL_LICENSE = Python Software Foundation License
PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt
PYTHON_SERIAL_SETUP_TYPE = distutils
diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
--- a/package/python-setuptools/python-setuptools.mk
+++ b/package/python-setuptools/python-setuptools.mk
@@ -5,8 +5,8 @@
################################################################################
PYTHON_SETUPTOOLS_VERSION = 2.1.2
-PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
-PYTHON_SETUPTOOLS_SITE = http://pypi.python.org/packages/source/s/setuptools
+PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
+PYTHON_SETUPTOOLS_SITE = http://pypi.python.org/packages/source/s/setuptools
PYTHON_SETUPTOOLS_LICENSE = Python Software Foundation or Zope Public License
PYTHON_SETUPTOOLS_LICENSE_FILES = PKG-INFO
PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
diff --git a/package/python/python.mk b/package/python/python.mk
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -5,10 +5,10 @@
################################################################################
PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).8
-PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
-PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
-PYTHON_LICENSE = Python software foundation license v2, others
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).8
+PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
+PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
+PYTHON_LICENSE = Python software foundation license v2, others
PYTHON_LICENSE_FILES = LICENSE
# Python needs itself to be built, so in order to cross-compile
@@ -48,7 +48,7 @@
# MAKE1 has shown to workaround the problem.
HOST_PYTHON_MAKE = $(MAKE1)
-PYTHON_DEPENDENCIES = host-python libffi
+PYTHON_DEPENDENCIES = host-python libffi
HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -37,7 +37,7 @@
HOST_PYTHON3_CONF_ENV += \
LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags"
-PYTHON3_DEPENDENCIES = host-python3 libffi
+PYTHON3_DEPENDENCIES = host-python3 libffi
HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib
diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
--- a/package/qextserialport/qextserialport.mk
+++ b/package/qextserialport/qextserialport.mk
@@ -4,8 +4,8 @@
#
################################################################################
-QEXTSERIALPORT_VERSION = 6c47244de4ce6db43c2f05caee957666c951dae1
-QEXTSERIALPORT_SITE = https://qextserialport.googlecode.com/git
+QEXTSERIALPORT_VERSION = 6c47244de4ce6db43c2f05caee957666c951dae1
+QEXTSERIALPORT_SITE = https://qextserialport.googlecode.com/git
QEXTSERIALPORT_SITE_METHOD = git
QEXTSERIALPORT_LICENSE = MIT
diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk
--- a/package/qjson/qjson.mk
+++ b/package/qjson/qjson.mk
@@ -8,7 +8,7 @@
QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION))
QJSON_INSTALL_STAGING = YES
-QJSON_DEPENDENCIES = qt
+QJSON_DEPENDENCIES = qt
QJSON_LICENSE = LGPLv2.1
QJSON_LICENSE_FILES = COPYING.lib
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -13,8 +13,8 @@
QT_VERSION_MAJOR = 4.8
QT_VERSION = $(QT_VERSION_MAJOR).6
-QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
-QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
+QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
+QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
QT_DEPENDENCIES = host-pkgconf
QT_INSTALL_STAGING = YES
@@ -252,7 +252,7 @@
else
ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y)
QT_CONFIGURE_OPTS += -system-zlib
-QT_DEPENDENCIES += zlib
+QT_DEPENDENCIES += zlib
endif
endif
@@ -261,7 +261,7 @@
else
ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y)
QT_CONFIGURE_OPTS += -system-libjpeg
-QT_DEPENDENCIES += jpeg
+QT_DEPENDENCIES += jpeg
else
QT_CONFIGURE_OPTS += -no-libjpeg
endif
@@ -272,7 +272,7 @@
else
ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y)
QT_CONFIGURE_OPTS += -system-libpng
-QT_DEPENDENCIES += libpng
+QT_DEPENDENCIES += libpng
else
QT_CONFIGURE_OPTS += -no-libpng
endif
@@ -283,7 +283,7 @@
else
ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y)
QT_CONFIGURE_OPTS += -system-libtiff
-QT_DEPENDENCIES += tiff
+QT_DEPENDENCIES += tiff
else
QT_CONFIGURE_OPTS += -no-libtiff
endif
@@ -302,29 +302,29 @@
ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
QT_CONFIGURE_OPTS += -system-freetype
QT_CONFIGURE_OPTS += -I $(STAGING_DIR)/usr/include/freetype2/
-QT_DEPENDENCIES += freetype
+QT_DEPENDENCIES += freetype
else
QT_CONFIGURE_OPTS += -no-freetype
endif
endif
ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-QT_DEPENDENCIES += dbus
+QT_DEPENDENCIES += dbus
endif
ifeq ($(BR2_PACKAGE_QT_OPENSSL),y)
QT_CONFIGURE_OPTS += -openssl
-QT_DEPENDENCIES += openssl
+QT_DEPENDENCIES += openssl
else
QT_CONFIGURE_OPTS += -no-openssl
endif
ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
QT_CONFIGURE_OPTS += -opengl es2 -egl
-QT_DEPENDENCIES += libgles libegl
-QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
+QT_DEPENDENCIES += libgles libegl
+QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
-QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)
+QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)
else
QT_CONFIGURE_OPTS += -no-opengl
endif
@@ -336,22 +336,22 @@
endif
ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
-QT_DEPENDENCIES += mysql
+QT_DEPENDENCIES += mysql
endif
ifeq ($(BR2_PACKAGE_QT_ODBC),y)
QT_CONFIGURE_OPTS += -qt-sql-odbc
endif
ifeq ($(BR2_PACKAGE_QT_PSQL),y)
QT_CONFIGURE_OPTS += -qt-sql-psql
-QT_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
-QT_DEPENDENCIES += postgresql
+QT_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
+QT_DEPENDENCIES += postgresql
endif
ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
QT_CONFIGURE_OPTS += -qt-sql-sqlite
else
ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
QT_CONFIGURE_OPTS += -system-sqlite
-QT_DEPENDENCIES += sqlite
+QT_DEPENDENCIES += sqlite
else
QT_CONFIGURE_OPTS += -no-sql-sqlite
endif
@@ -380,14 +380,14 @@
ifeq ($(BR2_PACKAGE_QT_AUDIO_BACKEND),y)
QT_CONFIGURE_OPTS += -audio-backend
-QT_DEPENDENCIES += alsa-lib
+QT_DEPENDENCIES += alsa-lib
else
QT_CONFIGURE_OPTS += -no-audio-backend
endif
ifeq ($(BR2_PACKAGE_QT_PHONON),y)
QT_CONFIGURE_OPTS += -phonon
-QT_DEPENDENCIES += gstreamer gst-plugins-base
+QT_DEPENDENCIES += gstreamer gst-plugins-base
else
QT_CONFIGURE_OPTS += -no-phonon
endif
@@ -532,60 +532,60 @@
# Build the list of libraries and plugins to install to the target
-QT_INSTALL_LIBS += QtCore
-QT_HOST_PROGRAMS += moc rcc qmake lrelease
+QT_INSTALL_LIBS += QtCore
+QT_HOST_PROGRAMS += moc rcc qmake lrelease
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-QT_INSTALL_LIBS += QtGui
-QT_HOST_PROGRAMS += uic
+QT_INSTALL_LIBS += QtGui
+QT_HOST_PROGRAMS += uic
endif
ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
-QT_INSTALL_LIBS += QtSql
+QT_INSTALL_LIBS += QtSql
endif
ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
-QT_INSTALL_LIBS += QtMultimedia
+QT_INSTALL_LIBS += QtMultimedia
endif
ifeq ($(BR2_PACKAGE_QT_PHONON),y)
-QT_INSTALL_LIBS += phonon
+QT_INSTALL_LIBS += phonon
endif
ifeq ($(BR2_PACKAGE_QT_SVG),y)
-QT_INSTALL_LIBS += QtSvg
+QT_INSTALL_LIBS += QtSvg
endif
ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
-QT_INSTALL_LIBS += QtNetwork
+QT_INSTALL_LIBS += QtNetwork
endif
ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
-QT_INSTALL_LIBS += QtWebKit
+QT_INSTALL_LIBS += QtWebKit
endif
ifeq ($(BR2_PACKAGE_QT_XML),y)
-QT_INSTALL_LIBS += QtXml
+QT_INSTALL_LIBS += QtXml
endif
ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-QT_INSTALL_LIBS += QtDBus
+QT_INSTALL_LIBS += QtDBus
endif
ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
-QT_INSTALL_LIBS += QtXmlPatterns
+QT_INSTALL_LIBS += QtXmlPatterns
endif
ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
-QT_INSTALL_LIBS += QtScript
+QT_INSTALL_LIBS += QtScript
endif
ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
-QT_INSTALL_LIBS += QtScriptTools
+QT_INSTALL_LIBS += QtScriptTools
endif
ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
-QT_INSTALL_LIBS += QtDeclarative
+QT_INSTALL_LIBS += QtDeclarative
endif
ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
-QT_INSTALL_LIBS += Qt3Support
+QT_INSTALL_LIBS += Qt3Support
endif
ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
-QT_INSTALL_LIBS += QtOpenGL
+QT_INSTALL_LIBS += QtOpenGL
endif
ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
-QT_INSTALL_LIBS += pvrQWSWSEGL
+QT_INSTALL_LIBS += pvrQWSWSEGL
endif
ifeq ($(BR2_PACKAGE_QT_TEST),y)
-QT_INSTALL_LIBS += QtTest
+QT_INSTALL_LIBS += QtTest
endif
QT_CONF_FILE=$(HOST_DIR)/usr/bin/qt.conf
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -61,22 +61,22 @@
ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
-QT5BASE_DEPENDENCIES += mysql
+QT5BASE_DEPENDENCIES += mysql
else
QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
endif
ifeq ($(BR2_PACKAGE_QT5BASE_PSQL),y)
QT5BASE_CONFIGURE_OPTS += -plugin-sql-psql
-QT5BASE_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
-QT5BASE_DEPENDENCIES += postgresql
+QT5BASE_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
+QT5BASE_DEPENDENCIES += postgresql
else
QT5BASE_CONFIGURE_OPTS += -no-sql-psql
endif
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
endif
@@ -86,11 +86,11 @@
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
-QT5BASE_DEPENDENCIES += \
+QT5BASE_DEPENDENCIES += \
libxcb \
xcb-util-wm \
xcb-util-image \
@@ -98,7 +98,7 @@
xlib_libX11 \
libxkbcommon
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
-QT5BASE_DEPENDENCIES += xlib_libXext
+QT5BASE_DEPENDENCIES += xlib_libXext
endif
else
QT5BASE_CONFIGURE_OPTS += -no-xcb
@@ -106,10 +106,10 @@
ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),y)
QT5BASE_CONFIGURE_OPTS += -opengl desktop
-QT5BASE_DEPENDENCIES += libgl
+QT5BASE_DEPENDENCIES += libgl
else ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_ES2),y)
QT5BASE_CONFIGURE_OPTS += -opengl es2
-QT5BASE_DEPENDENCIES += libgles
+QT5BASE_DEPENDENCIES += libgles
else
QT5BASE_CONFIGURE_OPTS += -no-opengl
endif
@@ -119,7 +119,7 @@
ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
QT5BASE_CONFIGURE_OPTS += -eglfs
-QT5BASE_DEPENDENCIES += libegl
+QT5BASE_DEPENDENCIES += libegl
ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
$(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
@@ -133,41 +133,41 @@
endif
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GIF),,-no-gif)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_JPEG),-system-libjpeg,-no-libjpeg)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),-tslib,-no-tslib)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),tslib)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),tslib)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_ICU),-icu,-no-icu)
-QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
+QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples
# Build the list of libraries to be installed on the target
-QT5BASE_INSTALL_LIBS_y += Qt5Core
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
+QT5BASE_INSTALL_LIBS_y += Qt5Core
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui
-QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui
+QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -10,7 +10,7 @@
QWT_INSTALL_STAGING = YES
QWT_DEPENDENCIES = qt
-QWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
+QWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDesigner.*$$/\# QWT_CONFIG += QwtDesigner/'
QWT_CONFIG += -e 's%/features%/mkspecs/features%'
diff --git a/package/rings/rings.mk b/package/rings/rings.mk
--- a/package/rings/rings.mk
+++ b/package/rings/rings.mk
@@ -6,7 +6,7 @@
RINGS_VERSION_MAJOR = 1.3.0
RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1
-RINGS_SUBDIR = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR))
+RINGS_SUBDIR = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR))
RINGS_LICENSE = MIT
$(eval $(luarocks-package))
diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk
--- a/package/rpcbind/rpcbind.mk
+++ b/package/rpcbind/rpcbind.mk
@@ -5,8 +5,8 @@
################################################################################
RPCBIND_VERSION = 0.2.1
-RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
-RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
+RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
+RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
RPCBIND_LICENSE = BSD-3c
RPCBIND_LICENSE_FILES = COPYING
RPCBIND_AUTORECONF = YES
diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
--- a/package/rtai/rtai.mk
+++ b/package/rtai/rtai.mk
@@ -5,8 +5,8 @@
################################################################################
RTAI_VERSION = 3.8.1
-RTAI_SOURCE = rtai-$(RTAI_VERSION).tar.bz2
-RTAI_SITE = https://www.rtai.org/userfiles/downloads/RTAI
+RTAI_SOURCE = rtai-$(RTAI_VERSION).tar.bz2
+RTAI_SITE = https://www.rtai.org/userfiles/downloads/RTAI
RTAI_INSTALL_STAGING = YES
# The <pkg>_CONFIG_SCRIPTS cannot apply here to the specificities of rtai-config
diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
--- a/package/sam-ba/sam-ba.mk
+++ b/package/sam-ba/sam-ba.mk
@@ -4,9 +4,9 @@
#
################################################################################
-SAM_BA_SITE = http://www.atmel.com/dyn/resources/prod_documents
+SAM_BA_SITE = http://www.atmel.com/dyn/resources/prod_documents
SAM_BA_VERSION = 2.12
-SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION).zip
+SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION).zip
SAM_BA_PATCH = sam-ba_$(SAM_BA_VERSION)_patch5.gz
SAM_BA_LICENSE = BSD-like (partly binary-only)
SAM_BA_LICENSE_FILES = doc/readme.txt
diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk
--- a/package/sg3_utils/sg3_utils.mk
+++ b/package/sg3_utils/sg3_utils.mk
@@ -6,7 +6,7 @@
SG3_UTILS_VERSION = 1.39
SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
-SG3_UTILS_SITE = http://sg.danny.cz/sg/p
+SG3_UTILS_SITE = http://sg.danny.cz/sg/p
SG3_UTILS_LICENSE = BSD-3c
# utils progs are GPLv2+ licenced
ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y)
diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
--- a/package/slirp/slirp.mk
+++ b/package/slirp/slirp.mk
@@ -7,15 +7,15 @@
# There's no tarball releases of slirp, so we use the git repo
# Also, there's no tag, so we use a random SHA1 (master's HEAD
# of today)
-SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550
-SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp
-SLIRP_LICENSE = BSD-4c BSD-2c
+SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550
+SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp
+SLIRP_LICENSE = BSD-4c BSD-2c
# Note: The license file 'COPYRIGHT' is missing from the sources,
# although some files refer to it.
SLIRP_INSTALL_STAGING = YES
# As we're using the git tree, there's no ./configure,
# so we need to autoreconf.
-SLIRP_AUTORECONF = YES
+SLIRP_AUTORECONF = YES
$(eval $(autotools-package))
diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk
--- a/package/spice-protocol/spice-protocol.mk
+++ b/package/spice-protocol/spice-protocol.mk
@@ -4,11 +4,11 @@
#
################################################################################
-SPICE_PROTOCOL_VERSION = 0.12.6
-SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
-SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases
-SPICE_PROTOCOL_LICENSE = BSD-3c
-SPICE_PROTOCOL_LICENSE_FILES = COPYING
+SPICE_PROTOCOL_VERSION = 0.12.6
+SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
+SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases
+SPICE_PROTOCOL_LICENSE = BSD-3c
+SPICE_PROTOCOL_LICENSE_FILES = COPYING
SPICE_PROTOCOL_INSTALL_STAGING = YES
$(eval $(autotools-package))
diff --git a/package/spice/spice.mk b/package/spice/spice.mk
--- a/package/spice/spice.mk
+++ b/package/spice/spice.mk
@@ -4,13 +4,13 @@
#
################################################################################
-SPICE_VERSION = 0.12.4
-SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
-SPICE_SITE = http://www.spice-space.org/download/releases
-SPICE_LICENSE = LGPLv2.1+
-SPICE_LICENSE_FILES = COPYING
+SPICE_VERSION = 0.12.4
+SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
+SPICE_SITE = http://www.spice-space.org/download/releases
+SPICE_LICENSE = LGPLv2.1+
+SPICE_LICENSE_FILES = COPYING
SPICE_INSTALL_STAGING = YES
-SPICE_DEPENDENCIES = \
+SPICE_DEPENDENCIES = \
alsa-lib \
celt051 \
jpeg \
diff --git a/package/squid/squid.mk b/package/squid/squid.mk
--- a/package/squid/squid.mk
+++ b/package/squid/squid.mk
@@ -14,10 +14,10 @@
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 \
+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 \
+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 \
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -5,9 +5,9 @@
################################################################################
SYSVINIT_VERSION = 2.88
-SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
-SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-13.1.diff.gz
-SYSVINIT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit
+SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
+SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-13.1.diff.gz
+SYSVINIT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit
SYSVINIT_LICENSE = GPLv2+
SYSVINIT_LICENSE_FILES = COPYING
diff --git a/package/tcllib/tcllib.mk b/package/tcllib/tcllib.mk
--- a/package/tcllib/tcllib.mk
+++ b/package/tcllib/tcllib.mk
@@ -4,12 +4,12 @@
#
################################################################################
-TCLLIB_VERSION = 1.13
-TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.bz2
-TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
-TCLLIB_LICENSE = tcl license
+TCLLIB_VERSION = 1.13
+TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.bz2
+TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
+TCLLIB_LICENSE = tcl license
TCLLIB_LICENSE_FILES = license.terms
-TCLLIB_DEPENDENCIES = host-tcl
-TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)"
+TCLLIB_DEPENDENCIES = host-tcl
+TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)"
$(eval $(autotools-package))
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -4,9 +4,9 @@
#
################################################################################
-TFTPD_VERSION = 5.2
-TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
-TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
+TFTPD_VERSION = 5.2
+TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
+TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
TFTPD_CONF_OPTS = --without-tcpwrappers
ifneq ($(BR2_INET_IPV6),y)
diff --git a/package/tstools/tstools.mk b/package/tstools/tstools.mk
--- a/package/tstools/tstools.mk
+++ b/package/tstools/tstools.mk
@@ -5,8 +5,8 @@
################################################################################
TSTOOLS_VERSION = 1_11
-TSTOOLS_SITE = https://tstools.googlecode.com/files
-TSTOOLS_SOURCE = tstools-$(TSTOOLS_VERSION).tgz
+TSTOOLS_SITE = https://tstools.googlecode.com/files
+TSTOOLS_SOURCE = tstools-$(TSTOOLS_VERSION).tgz
TSTOOLS_LICENSE = MPL v1.1
define TSTOOLS_BUILD_CMDS
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -51,7 +51,7 @@
$(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
chmod -R go-rwx $(TARGET_DIR)/home/tvheadend
endef
-TVHEADEND_POST_INSTALL_TARGET_HOOKS = TVHEADEND_INSTALL_DB
+TVHEADEND_POST_INSTALL_TARGET_HOOKS = TVHEADEND_INSTALL_DB
define TVHEADEND_INSTALL_INIT_SYSV
$(INSTALL) -D package/tvheadend/etc.default.tvheadend $(TARGET_DIR)/etc/default/tvheadend
diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
--- a/package/uboot-tools/uboot-tools.mk
+++ b/package/uboot-tools/uboot-tools.mk
@@ -5,8 +5,8 @@
################################################################################
UBOOT_TOOLS_VERSION = 2014.07
-UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
-UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
+UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
+UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
UBOOT_TOOLS_LICENSE = GPLv2+
UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -5,7 +5,7 @@
################################################################################
UDISKS_VERSION = 1.0.4
-UDISKS_SITE = http://hal.freedesktop.org/releases
+UDISKS_SITE = http://hal.freedesktop.org/releases
UDISKS_LICENSE = GPLv2+
UDISKS_LICENSE_FILES = COPYING
diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
--- a/package/usbredir/usbredir.mk
+++ b/package/usbredir/usbredir.mk
@@ -4,18 +4,18 @@
#
################################################################################
-USBREDIR_VERSION = 0.6
-USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2
-USBREDIR_SITE = http://spice-space.org/download/usbredir
-USBREDIR_LICENSE = LGPLv2.1+
-USBREDIR_LICENSE_FILES = COPYING.LIB
+USBREDIR_VERSION = 0.6
+USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2
+USBREDIR_SITE = http://spice-space.org/download/usbredir
+USBREDIR_LICENSE = LGPLv2.1+
+USBREDIR_LICENSE_FILES = COPYING.LIB
USBREDIR_INSTALL_STAGING = YES
-USBREDIR_DEPENDENCIES = host-pkgconf libusb
+USBREDIR_DEPENDENCIES = host-pkgconf libusb
ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y)
-USBREDIR_LICENSE += (for the library), GPLv2+ (for the server)
-USBREDIR_LICENSE_FILES += COPYING
+USBREDIR_LICENSE += (for the library), GPLv2+ (for the server)
+USBREDIR_LICENSE_FILES += COPYING
else # BR2_PACKAGE_USBREDIR_SERVER != y
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -5,8 +5,8 @@
################################################################################
VALGRIND_VERSION = 3.10.0
-VALGRIND_SITE = http://valgrind.org/downloads
-VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
+VALGRIND_SITE = http://valgrind.org/downloads
+VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
VALGRIND_LICENSE = GPLv2 GFDLv1.2
VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
VALGRIND_CONF_OPTS = --disable-tls
diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
--- a/package/vde2/vde2.mk
+++ b/package/vde2/vde2.mk
@@ -4,15 +4,15 @@
#
################################################################################
-VDE2_VERSION = 2.3.2
-VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
-VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
-VDE2_LICENSE = GPLv2+ LGPLv2.1+ BSD-3c
-VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
+VDE2_VERSION = 2.3.2
+VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
+VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
+VDE2_LICENSE = GPLv2+ LGPLv2.1+ BSD-3c
+VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
VDE2_INSTALL_STAGING = YES
# We touch configure.ac, so we need to autoreconf
-VDE2_AUTORECONF = YES
+VDE2_AUTORECONF = YES
# Reasons for enabling/disabling stuff:
#?- tuntap is enabled in the hope we're using a recent-enough toolchain
diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
--- a/package/vpnc/vpnc.mk
+++ b/package/vpnc/vpnc.mk
@@ -4,14 +4,14 @@
#
################################################################################
-VPNC_VERSION = 0.5.3
-VPNC_SITE = http://www.unix-ag.uni-kl.de/~massar/vpnc
-VPNC_LICENSE = GPLv2+
+VPNC_VERSION = 0.5.3
+VPNC_SITE = http://www.unix-ag.uni-kl.de/~massar/vpnc
+VPNC_LICENSE = GPLv2+
VPNC_LICENSE_FILES = COPYING
-VPNC_DEPENDENCIES = libgcrypt libgpg-error
+VPNC_DEPENDENCIES = libgcrypt libgpg-error
-VPNC_LDFLAGS = $(TARGET_LDFLAGS) -lgcrypt -lgpg-error
+VPNC_LDFLAGS = $(TARGET_LDFLAGS) -lgcrypt -lgpg-error
VPNC_CPPFLAGS = -DVERSION=\\\"$(VPNC_VERSION)\\\"
define VPNC_BUILD_CMDS
diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
--- a/package/xinetd/xinetd.mk
+++ b/package/xinetd/xinetd.mk
@@ -4,9 +4,9 @@
#
################################################################################
-XINETD_VERSION = 2.3.15
-XINETD_SITE = http://www.xinetd.org
-XINETD_LICENSE = xinetd license
+XINETD_VERSION = 2.3.15
+XINETD_SITE = http://www.xinetd.org
+XINETD_LICENSE = xinetd license
XINETD_LICENSE_FILES = COPYRIGHT
XINETD_CFLAGS = $(TARGET_CFLAGS)
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -333,15 +333,15 @@
TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
-TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2012R2/2012R2-RC2/i386/
+TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2012R2/2012R2-RC2/i386/
TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2012R2-RC2.i386.tar.bz2
TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1),y)
-TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2013R1/2013R1-RC1/i386/
+TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2013R1/2013R1-RC1/i386/
TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2013R1-RC1.i386.tar.bz2
TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2013R1-RC1.i386.tar.bz2
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1),y)
-TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2014R1/2014R1-RC2/i386/
+TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2014R1/2014R1-RC2/i386/
TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2014R1-RC2.i386.tar.bz2
TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3),y)
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (14 preceding siblings ...)
2014-09-27 19:32 ` [Buildroot] [PATCH 15 of 15] .mk files: remove alignment of assignments Thomas De Schampheleire
@ 2014-09-27 21:15 ` Yann E. MORIN
2014-10-04 17:07 ` Thomas Petazzoni
16 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 21:15 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> This patch series renames the various FOO_BAR_OPT variables into
> FOO_BAR_OPTS, to increase consistency between the various infrastructures
> (generic vs other infras specifically).
> In particular, this solves an issue detected while introducing
> kconfig-package. See the description of the MAKE_OPT patch for details.
>
> To help detecting usage of the old variables, checks are added that error
> out early.
>
> OPTS was chosen over OPT, as it is more logical (more than one option), and
> since TARGET_CONFIGURE_OPTS etc. already existed.
>
> Changes in v2:
> - mostly rebasing
> - add sed commands used for the replacement, for easier review (Yann)
> - reorder patches and fold the check-adding-patches into one
> - add two patches that fix the indentation issues caused by the renaming
>
> This is rebased against commit 6f5bffc426f7418c555291450d482a0ceede0865.
Thanks for the respin, I'm reviewing that now. Ideally I should finish
tonight.
I think this series should be applied very soon, to avoid the rebase
hell if new packages are to be added.
BTW, I've marked your old series as superseded in Patchwork. ;-)
Regards,
Yann E. MORIN.
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> ---
> Thomas De Schampheleire (15)
> packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
> packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
> packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
> packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
> packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
> packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
> packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
> packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS
> packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS
> packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS
> pkg-generic: introduce helper function to check for a deprecated variable
> pkg-generic: add checks on deprecated variables FOO_BAR_OPT
> packages: rename misc. occurrences of _OPT into _OPTS
> .mk files: remove alignment of line continuation characters
> .mk files: remove alignment of assignments
>
> boot/at91bootstrap3/at91bootstrap3.mk | 4 +-
> boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 12 +-
> boot/grub/grub.mk | 6 +-
> boot/grub2/grub2.mk | 4 +-
> boot/gummiboot/gummiboot.mk | 2 +-
> boot/lpc32xxcdl/lpc32xxcdl.mk | 8 +-
> boot/mxs-bootlets/mxs-bootlets.mk | 2 +-
> boot/syslinux/syslinux.mk | 4 +-
> boot/uboot/uboot.mk | 50 +-
> boot/xloader/xloader.mk | 4 +-
> docs/manual/adding-packages-autotools.txt | 14 +-
> docs/manual/adding-packages-cmake.txt | 10 +-
> docs/manual/adding-packages-kconfig.txt | 4 +-
> docs/manual/adding-packages-luarocks.txt | 6 +-
> docs/manual/adding-packages-perl.txt | 8 +-
> docs/manual/adding-packages-python.txt | 20 +-
> docs/manual/writing-rules.txt | 8 +-
> fs/ext2/ext2.mk | 2 +-
> linux/linux-ext-rtai.mk | 10 +-
> linux/linux-ext-xenomai.mk | 6 +-
> linux/linux.mk | 14 +-
> package/acl/acl.mk | 16 +-
> package/agentpp/agentpp.mk | 2 +-
> package/alsa-lib/alsa-lib.mk | 30 +-
> package/alsa-utils/alsa-utils.mk | 4 +-
> package/apitrace/apitrace.mk | 2 +-
> package/apr-util/apr-util.mk | 2 +-
> package/at/at.mk | 2 +-
> package/atftp/atftp.mk | 12 +-
> package/atk/atk.mk | 4 +-
> package/attr/attr.mk | 16 +-
> package/audiofile/audiofile.mk | 6 +-
> package/aumix/aumix.mk | 2 +-
> package/avahi/avahi.mk | 22 +-
> package/bandwidthd/bandwidthd.mk | 10 +-
> package/bash/bash.mk | 4 +-
> package/bcusdk/bcusdk.mk | 2 +-
> package/beecrypt/beecrypt.mk | 4 +-
> package/bind/bind.mk | 24 +-
> package/binutils/binutils.mk | 10 +-
> package/blackbox/blackbox.mk | 2 +-
> package/bluez5_utils/bluez5_utils.mk | 30 +-
> package/bluez_utils/bluez_utils.mk | 30 +-
> package/bmon/bmon.mk | 4 +-
> package/boost/boost.mk | 14 +-
> package/bootutils/bootutils.mk | 2 +-
> package/bridge-utils/bridge-utils.mk | 2 +-
> package/busybox/busybox.mk | 2 +-
> package/bwm-ng/bwm-ng.mk | 4 +-
> package/cairo/cairo.mk | 58 +-
> package/ccache/ccache.mk | 6 +-
> package/cdrkit/cdrkit.mk | 12 +-
> package/cegui06/cegui06.mk | 44 +-
> package/celt051/celt051.mk | 26 +-
> package/chrony/chrony.mk | 10 +-
> package/cifs-utils/cifs-utils.mk | 2 +-
> package/civetweb/civetweb.mk | 10 +-
> package/cjson/cjson.mk | 10 +-
> package/clapack/clapack.mk | 4 +-
> package/classpath/classpath.mk | 24 +-
> package/cloog/cloog.mk | 2 +-
> package/collectd/collectd.mk | 12 +-
> package/connman/connman.mk | 16 +-
> package/copas/copas.mk | 2 +-
> package/coreutils/coreutils.mk | 2 +-
> package/coxpcall/coxpcall.mk | 2 +-
> package/cppcms/cppcms.mk | 4 +-
> package/cppdb/cppdb.mk | 2 +-
> package/ctorrent/ctorrent.mk | 4 +-
> package/cups/cups.mk | 18 +-
> package/cvs/cvs.mk | 2 +-
> package/cwiid/cwiid.mk | 6 +-
> package/dbus-cpp/dbus-cpp.mk | 12 +-
> package/dbus-glib/dbus-glib.mk | 4 +-
> package/dbus-python/dbus-python.mk | 2 +-
> package/dbus/dbus.mk | 16 +-
> package/dhcp/dhcp.mk | 6 +-
> package/dhcpcd/dhcpcd.mk | 8 +-
> package/dhcpdump/dhcpdump.mk | 2 +-
> package/dialog/dialog.mk | 4 +-
> package/dillo/dillo.mk | 16 +-
> package/directfb/directfb.mk | 56 +-
> package/distcc/distcc.mk | 2 +-
> package/dmalloc/dmalloc.mk | 10 +-
> package/dmidecode/dmidecode.mk | 2 +-
> package/dmraid/dmraid.mk | 2 +-
> package/dnsmasq/dnsmasq.mk | 12 +-
> package/dropbear/dropbear.mk | 8 +-
> package/dtc/dtc.mk | 22 +-
> package/duma/duma.mk | 4 +-
> package/dvbsnoop/dvbsnoop.mk | 8 +-
> package/e2fsprogs/e2fsprogs.mk | 6 +-
> package/ecryptfs-utils/ecryptfs-utils.mk | 18 +-
> package/ed/ed.mk | 2 +-
> package/efl/libecore/libecore.mk | 46 +-
> package/efl/libedbus/libedbus.mk | 12 +-
> package/efl/libedje/libedje.mk | 8 +-
> package/efl/libeet/libeet.mk | 4 +-
> package/efl/libelementary/libelementary.mk | 6 +-
> package/efl/libethumb/libethumb.mk | 2 +-
> package/efl/libevas-generic-loaders/libevas-generic-loaders.mk | 6 +-
> package/efl/libevas/libevas.mk | 90 +-
> package/eigen/eigen.mk | 2 +-
> package/elf2flt/elf2flt.mk | 2 +-
> package/elfutils/elfutils.mk | 18 +-
> package/enlightenment/enlightenment.mk | 26 +-
> package/enscript/enscript.mk | 4 +-
> package/erlang/erlang.mk | 16 +-
> package/eudev/eudev.mk | 22 +-
> package/evemu/evemu.mk | 6 +-
> package/expat/expat.mk | 4 +-
> package/expect/expect.mk | 4 +-
> package/faifa/faifa.mk | 2 +-
> package/fbdump/fbdump.mk | 4 +-
> package/fetchmail/fetchmail.mk | 2 +-
> package/ffmpeg/ffmpeg.mk | 152 +-
> package/flac/flac.mk | 10 +-
> package/flann/flann.mk | 2 +-
> package/flickcurl/flickcurl.mk | 2 +-
> package/flite/flite.mk | 4 +-
> package/fltk/fltk.mk | 8 +-
> package/fluxbox/fluxbox.mk | 6 +-
> package/fontconfig/fontconfig.mk | 4 +-
> package/foomatic-filters/foomatic-filters.mk | 6 +-
> package/freerdp/freerdp.mk | 28 +-
> package/freescale-imx/freescale-imx.mk | 2 +-
> package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 4 +-
> package/freescale-imx/imx-lib/imx-lib.mk | 2 +-
> package/freescale-imx/imx-vpu/imx-vpu.mk | 2 +-
> package/freetype/freetype.mk | 18 +-
> package/gamin/gamin.mk | 4 +-
> package/gcc/gcc-final/gcc-final.mk | 22 +-
> package/gcc/gcc-initial/gcc-initial.mk | 12 +-
> package/gcc/gcc.mk | 52 +-
> package/gd/gd.mk | 40 +-
> package/gdb/gdb.mk | 28 +-
> package/gdk-pixbuf/gdk-pixbuf.mk | 12 +-
> package/genimage/genimage.mk | 10 +-
> package/genpart/genpart.mk | 8 +-
> package/gettext/gettext.mk | 6 +-
> package/giblib/giblib.mk | 2 +-
> package/git/git.mk | 34 +-
> package/glib-networking/glib-networking.mk | 4 +-
> package/glibc/glibc.mk | 6 +-
> package/gmpc/gmpc.mk | 2 +-
> package/gnupg/gnupg.mk | 12 +-
> package/gnupg2/gnupg2.mk | 2 +-
> package/gnuplot/gnuplot.mk | 10 +-
> package/gnutls/gnutls.mk | 14 +-
> package/google-breakpad/google-breakpad.mk | 2 +-
> package/gpm/gpm.mk | 2 +-
> package/grantlee/grantlee.mk | 2 +-
> package/grep/grep.mk | 4 +-
> package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 40 +-
> package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk | 4 +-
> package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk | 2 +-
> package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk | 366 ++++----
> package/gstreamer/gst-plugins-base/gst-plugins-base.mk | 98 +-
> package/gstreamer/gst-plugins-good/gst-plugins-good.mk | 234 ++--
> package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk | 46 +-
> package/gstreamer/gstreamer/gstreamer.mk | 2 +-
> package/gstreamer1/gst-omx/gst-omx.mk | 4 +-
> package/gstreamer1/gst1-libav/gst1-libav.mk | 46 +-
> package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 394 +++++-----
> package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 102 +-
> package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 246 +++---
> package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 42 +-
> package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +-
> package/gtest/gtest.mk | 2 +-
> package/gtk2-engines/gtk2-engines.mk | 2 +-
> package/gutenprint/gutenprint.mk | 4 +-
> package/gvfs/gvfs.mk | 38 +-
> package/harfbuzz/harfbuzz.mk | 18 +-
> package/haserl/haserl.mk | 4 +-
> package/heimdal/heimdal.mk | 2 +-
> package/heirloom-mailx/heirloom-mailx.mk | 4 +-
> package/hiawatha/hiawatha.mk | 6 +-
> package/hplip/hplip.mk | 6 +-
> package/htop/htop.mk | 2 +-
> package/httping/httping.mk | 6 +-
> package/icu/icu.mk | 4 +-
> package/ifplugd/ifplugd.mk | 4 +-
> package/igh-ethercat/igh-ethercat.mk | 18 +-
> package/imagemagick/imagemagick.mk | 42 +-
> package/imlib2/imlib2.mk | 26 +-
> package/input-tools/input-tools.mk | 4 +-
> package/iperf/iperf.mk | 2 +-
> package/ipmitool/ipmitool.mk | 2 +-
> package/ipsec-tools/ipsec-tools.mk | 32 +-
> package/ipset/ipset.mk | 2 +-
> package/iptables/iptables.mk | 2 +-
> package/iputils/iputils.mk | 6 +-
> package/irda-utils/irda-utils.mk | 2 +-
> package/iw/iw.mk | 6 +-
> package/jack2/jack2.mk | 6 +-
> package/jamvm/jamvm.mk | 2 +-
> package/joe/joe.mk | 4 +-
> package/jpeg-turbo/jpeg-turbo.mk | 6 +-
> package/json-c/json-c.mk | 2 +-
> package/kbd/kbd.mk | 2 +-
> package/kexec/kexec.mk | 4 +-
> package/keyutils/keyutils.mk | 20 +-
> package/kismet/kismet.mk | 2 +-
> package/kmod/kmod.mk | 14 +-
> package/knock/knock.mk | 2 +-
> package/lame/lame.mk | 4 +-
> package/lbase64/lbase64.mk | 2 +-
> package/lbreakout2/lbreakout2.mk | 8 +-
> package/lcdproc/lcdproc.mk | 4 +-
> package/lcms2/lcms2.mk | 14 +-
> package/lesstif/lesstif.mk | 4 +-
> package/lftp/lftp.mk | 12 +-
> package/libao/libao.mk | 6 +-
> package/libarchive/libarchive.mk | 32 +-
> package/libargtable2/libargtable2.mk | 2 +-
> package/libass/libass.mk | 12 +-
> package/libassuan/libassuan.mk | 2 +-
> package/libatasmart/libatasmart.mk | 2 +-
> package/libbluray/libbluray.mk | 4 +-
> package/libcap-ng/libcap-ng.mk | 2 +-
> package/libcdio/libcdio.mk | 6 +-
> package/libcec/libcec.mk | 4 +-
> package/libcgicc/libcgicc.mk | 2 +-
> package/libcgroup/libcgroup.mk | 6 +-
> package/libconfig/libconfig.mk | 4 +-
> package/libconfuse/libconfuse.mk | 2 +-
> package/libcurl/libcurl.mk | 14 +-
> package/libdaemon/libdaemon.mk | 2 +-
> package/libdnet/libdnet.mk | 10 +-
> package/libdrm/libdrm.mk | 36 +-
> package/libdvdnav/libdvdnav.mk | 2 +-
> package/libeXosip2/libeXosip2.mk | 6 +-
> package/libedit/libedit.mk | 2 +-
> package/libexif/libexif.mk | 2 +-
> package/libffi/libffi.mk | 2 +-
> package/libftdi/libftdi.mk | 6 +-
> package/libfuse/libfuse.mk | 2 +-
> package/libgail/libgail.mk | 2 +-
> package/libgcrypt/libgcrypt.mk | 2 +-
> package/libglib2/libglib2.mk | 14 +-
> package/libgpgme/libgpgme.mk | 2 +-
> package/libgtk2/libgtk2.mk | 22 +-
> package/libhid/libhid.mk | 2 +-
> package/libidn/libidn.mk | 2 +-
> package/libinput/libinput.mk | 2 +-
> package/libjson/libjson.mk | 12 +-
> package/libksba/libksba.mk | 2 +-
> package/liblockfile/liblockfile.mk | 2 +-
> package/liblog4c-localtime/liblog4c-localtime.mk | 2 +-
> package/liblogging/liblogging.mk | 6 +-
> package/libmad/libmad.mk | 2 +-
> package/libmbim/libmbim.mk | 6 +-
> package/libmemcached/libmemcached.mk | 2 +-
> package/libmicrohttpd/libmicrohttpd.mk | 8 +-
> package/libmpeg2/libmpeg2.mk | 6 +-
> package/libndp/libndp.mk | 2 +-
> package/libnfc/libnfc.mk | 6 +-
> package/libnftnl/libnftnl.mk | 8 +-
> package/libnl/libnl.mk | 4 +-
> package/libnspr/libnspr.mk | 10 +-
> package/liboauth/liboauth.mk | 2 +-
> package/liboping/liboping.mk | 2 +-
> package/libosip2/libosip2.mk | 2 +-
> package/libpcap/libpcap.mk | 14 +-
> package/libphidget/libphidget.mk | 2 +-
> package/libplayer/libplayer.mk | 12 +-
> package/libpng/libpng.mk | 2 +-
> package/libpthsem/libpthsem.mk | 4 +-
> package/libqmi/libqmi.mk | 6 +-
> package/libqrencode/libqrencode.mk | 6 +-
> package/libraw/libraw.mk | 2 +-
> package/libreplaygain/libreplaygain.mk | 2 +-
> package/libroxml/libroxml.mk | 2 +-
> package/librsvg/librsvg.mk | 2 +-
> package/librtlsdr/librtlsdr.mk | 4 +-
> package/libsamplerate/libsamplerate.mk | 2 +-
> package/libseccomp/libseccomp.mk | 18 +-
> package/libsecret/libsecret.mk | 6 +-
> package/libsoc/libsoc.mk | 2 +-
> package/libsoup/libsoup.mk | 8 +-
> package/libsoxr/libsoxr.mk | 8 +-
> package/libssh2/libssh2.mk | 10 +-
> package/libstrophe/libstrophe.mk | 2 +-
> package/libsvg-cairo/libsvg-cairo.mk | 12 +-
> package/libsvg/libsvg.mk | 14 +-
> package/libtheora/libtheora.mk | 2 +-
> package/libtirpc/libtirpc.mk | 2 +-
> package/libtorrent/libtorrent.mk | 2 +-
> package/libubox/libubox.mk | 4 +-
> package/libuci/libuci.mk | 4 +-
> package/libungif/libungif.mk | 8 +-
> package/liburcu/liburcu.mk | 4 +-
> package/libusb/libusb.mk | 6 +-
> package/libv4l/libv4l.mk | 8 +-
> package/libva-intel-driver/libva-intel-driver.mk | 8 +-
> package/libva/libva.mk | 18 +-
> package/libvncserver/libvncserver.mk | 16 +-
> package/libvorbis/libvorbis.mk | 2 +-
> package/libvpx/libvpx.mk | 4 +-
> package/libwebsockets/libwebsockets.mk | 4 +-
> package/libxml2/libxml2.mk | 12 +-
> package/libxmlrpc/libxmlrpc.mk | 2 +-
> package/libxslt/libxslt.mk | 6 +-
> package/lighttpd/lighttpd.mk | 26 +-
> package/linknx/linknx.mk | 10 +-
> package/links/links.mk | 10 +-
> package/linphone/linphone.mk | 6 +-
> package/linux-firmware/linux-firmware.mk | 62 +-
> package/linux-fusion/linux-fusion.mk | 2 +-
> package/linux-pam/linux-pam.mk | 4 +-
> package/linux-zigbee/linux-zigbee.mk | 8 +-
> package/lite/lite.mk | 2 +-
> package/ljlinenoise/ljlinenoise.mk | 2 +-
> package/lm-sensors/lm-sensors.mk | 12 +-
> package/lmbench/lmbench.mk | 2 +-
> package/localedef/localedef.mk | 6 +-
> package/log4cxx/log4cxx.mk | 2 +-
> package/lpty/lpty.mk | 2 +-
> package/lrandom/lrandom.mk | 2 +-
> package/lrzsz/lrzsz.mk | 2 +-
> package/lshw/lshw.mk | 6 +-
> package/lsqlite3/lsqlite3.mk | 2 +-
> package/ltp-testsuite/ltp-testsuite.mk | 4 +-
> package/ltrace/ltrace.mk | 6 +-
> package/ltris/ltris.mk | 4 +-
> package/lttng-babeltrace/lttng-babeltrace.mk | 4 +-
> package/lttng-libust/lttng-libust.mk | 6 +-
> package/lttng-modules/lttng-modules.mk | 4 +-
> package/lttng-tools/lttng-tools.mk | 10 +-
> package/lua-coat/lua-coat.mk | 2 +-
> package/lua-coatpersistent/lua-coatpersistent.mk | 2 +-
> package/lua-csnappy/lua-csnappy.mk | 2 +-
> package/lua-ev/lua-ev.mk | 2 +-
> package/lua-messagepack/lua-messagepack.mk | 2 +-
> package/lua-testmore/lua-testmore.mk | 2 +-
> package/luabitop/luabitop.mk | 2 +-
> package/luajit/luajit.mk | 4 +-
> package/luajson/luajson.mk | 2 +-
> package/lualogging/lualogging.mk | 2 +-
> package/luaposix/luaposix.mk | 2 +-
> package/luarocks/luarocks.mk | 8 +-
> package/luasec/luasec.mk | 2 +-
> package/luasocket/luasocket.mk | 2 +-
> package/luasql-sqlite3/luasql-sqlite3.mk | 2 +-
> package/lunit/lunit.mk | 2 +-
> package/lvm2/lvm2.mk | 14 +-
> package/lxc/lxc.mk | 2 +-
> package/lzlib/lzlib.mk | 2 +-
> package/lzma/lzma.mk | 2 +-
> package/m4/m4.mk | 2 +-
> package/madplay/madplay.mk | 2 +-
> package/matchbox/matchbox-common/matchbox-common.mk | 2 +-
> package/matchbox/matchbox-desktop/matchbox-desktop.mk | 6 +-
> package/matchbox/matchbox-fakekey/matchbox-fakekey.mk | 2 +-
> package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +-
> package/matchbox/matchbox-lib/matchbox-lib.mk | 18 +-
> package/matchbox/matchbox-panel/matchbox-panel.mk | 6 +-
> package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk | 2 +-
> package/matchbox/matchbox-wm/matchbox-wm.mk | 8 +-
> package/mcrypt/mcrypt.mk | 2 +-
> package/mdadm/mdadm.mk | 4 +-
> package/media-ctl/media-ctl.mk | 2 +-
> package/mediastreamer/mediastreamer.mk | 42 +-
> package/memcached/memcached.mk | 2 +-
> package/mesa3d/mesa3d.mk | 42 +-
> package/metacity/metacity.mk | 2 +-
> package/midori/midori.mk | 6 +-
> package/mii-diag/mii-diag.mk | 10 +-
> package/minidlna/minidlna.mk | 2 +-
> package/mmc-utils/mmc-utils.mk | 2 +-
> package/modem-manager/modem-manager.mk | 8 +-
> package/monit/monit.mk | 10 +-
> package/mpd/mpd.mk | 90 +-
> package/mpdecimal/mpdecimal.mk | 2 +-
> package/mpfr/mpfr.mk | 2 +-
> package/mpg123/mpg123.mk | 14 +-
> package/mplayer/mplayer.mk | 10 +-
> package/msmtp/msmtp.mk | 8 +-
> package/mtd/mtd.mk | 76 +-
> package/mtools/mtools.mk | 2 +-
> package/mtr/mtr.mk | 2 +-
> package/musepack/musepack.mk | 2 +-
> package/mutt/mutt.mk | 18 +-
> package/mxml/mxml.mk | 4 +-
> package/mysql/mysql.mk | 12 +-
> package/nano/nano.mk | 4 +-
> package/nbd/nbd.mk | 2 +-
> package/ncurses/ncurses.mk | 8 +-
> package/ndisc6/ndisc6.mk | 2 +-
> package/ne10/ne10.mk | 4 +-
> package/neard/neard.mk | 4 +-
> package/neon/neon.mk | 20 +-
> package/netatalk/netatalk.mk | 12 +-
> package/netperf/netperf.mk | 2 +-
> package/netsnmp/netsnmp.mk | 20 +-
> package/nettle/nettle.mk | 8 +-
> package/network-manager/network-manager.mk | 20 +-
> package/newt/newt.mk | 2 +-
> package/nfs-utils/nfs-utils.mk | 6 +-
> package/ngrep/ngrep.mk | 2 +-
> package/nmap/nmap.mk | 8 +-
> package/nss-mdns/nss-mdns.mk | 2 +-
> package/ntfs-3g/ntfs-3g.mk | 8 +-
> package/ntp/ntp.mk | 10 +-
> package/nut/nut.mk | 34 +-
> package/ofono/ofono.mk | 10 +-
> package/ola/ola.mk | 74 +-
> package/omniorb/omniorb.mk | 8 +-
> package/on2-8170-modules/on2-8170-modules.mk | 2 +-
> package/open2300/open2300.mk | 6 +-
> package/opencv/opencv.mk | 188 ++--
> package/openntpd/openntpd.mk | 2 +-
> package/openobex/openobex.mk | 10 +-
> package/openocd/openocd.mk | 16 +-
> package/openpowerlink/openpowerlink.mk | 38 +-
> package/openssh/openssh.mk | 6 +-
> package/openswan/openswan.mk | 12 +-
> package/openvmtools/openvmtools.mk | 16 +-
> package/openvpn/openvpn.mk | 10 +-
> package/opkg/opkg.mk | 6 +-
> package/oprofile/oprofile.mk | 2 +-
> package/opus-tools/opus-tools.mk | 8 +-
> package/opus/opus.mk | 4 +-
> package/orbit/orbit.mk | 2 +-
> package/ortp/ortp.mk | 2 +-
> package/p11-kit/p11-kit.mk | 2 +-
> package/pango/pango.mk | 6 +-
> package/parted/parted.mk | 12 +-
> package/pcmanfm/pcmanfm.mk | 2 +-
> package/pcre/pcre.mk | 12 +-
> package/pcsc-lite/pcsc-lite.mk | 10 +-
> package/perl-gd/perl-gd.mk | 2 +-
> package/perl-xml-libxml/perl-xml-libxml.mk | 2 +-
> package/perl-xml-parser/perl-xml-parser.mk | 2 +-
> package/perl/perl.mk | 16 +-
> package/php-geoip/php-geoip.mk | 2 +-
> package/php-gnupg/php-gnupg.mk | 2 +-
> package/php-imagick/php-imagick.mk | 2 +-
> package/php-memcached/php-memcached.mk | 2 +-
> package/php-ssh2/php-ssh2.mk | 2 +-
> package/php-yaml/php-yaml.mk | 2 +-
> package/php-zmq/php-zmq.mk | 2 +-
> package/php/php.mk | 68 +-
> package/picocom/picocom.mk | 2 +-
> package/pinentry/pinentry.mk | 24 +-
> package/pixman/pixman.mk | 4 +-
> package/pkg-autotools.mk | 32 +-
> package/pkg-cmake.mk | 30 +-
> package/pkg-generic.mk | 87 +-
> package/pkg-kconfig.mk | 6 +-
> package/pkg-luarocks.mk | 14 +-
> package/pkg-perl.mk | 26 +-
> package/pkg-python.mk | 70 +-
> package/pkg-utils.mk | 22 +-
> package/poco/poco.mk | 44 +-
> package/polarssl/polarssl.mk | 2 +-
> package/polkit/polkit.mk | 2 +-
> package/poppler/poppler.mk | 30 +-
> package/popt/popt.mk | 2 +-
> package/portaudio/portaudio.mk | 2 +-
> package/postgresql/postgresql.mk | 12 +-
> package/powerpc-utils/powerpc-utils.mk | 2 +-
> package/pppd/pppd.mk | 8 +-
> package/prboom/prboom.mk | 2 +-
> package/procps-ng/procps-ng.mk | 4 +-
> package/proftpd/proftpd.mk | 4 +-
> package/protobuf-c/protobuf-c.mk | 2 +-
> package/protobuf/protobuf.mk | 2 +-
> package/psmisc/psmisc.mk | 2 +-
> package/ptpd2/ptpd2.mk | 4 +-
> package/pulseaudio/pulseaudio.mk | 18 +-
> package/pv/pv.mk | 2 +-
> package/python-dialog/python-dialog.mk | 4 +-
> package/python-ipy/python-ipy.mk | 2 +-
> package/python-netifaces/python-netifaces.mk | 4 +-
> package/python-numpy/python-numpy.mk | 2 +-
> package/python-protobuf/python-protobuf.mk | 4 +-
> package/python-pyparsing/python-pyparsing.mk | 12 +-
> package/python-pyro/python-pyro.mk | 4 +-
> package/python-serial/python-serial.mk | 4 +-
> package/python-setuptools/python-setuptools.mk | 4 +-
> package/python/python.mk | 86 +-
> package/python3/python3.mk | 66 +-
> package/qemu/qemu.mk | 16 +-
> package/qextserialport/qextserialport.mk | 4 +-
> package/qjson/qjson.mk | 2 +-
> package/qt/qt.mk | 76 +-
> package/qt5/qt5base/qt5base.mk | 50 +-
> package/quagga/quagga.mk | 28 +-
> package/quota/quota.mk | 4 +-
> package/qwt/qwt.mk | 2 +-
> package/rdesktop/rdesktop.mk | 4 +-
> package/rings/rings.mk | 2 +-
> package/rp-pppoe/rp-pppoe.mk | 4 +-
> package/rpcbind/rpcbind.mk | 6 +-
> package/rpi-userland/rpi-userland.mk | 2 +-
> package/rpm/rpm.mk | 16 +-
> package/rrdtool/rrdtool.mk | 2 +-
> package/rsync/rsync.mk | 4 +-
> package/rsyslog/rsyslog.mk | 6 +-
> package/rt-tests/rt-tests.mk | 12 +-
> package/rtai/rtai.mk | 12 +-
> package/rubix/rubix.mk | 4 +-
> package/ruby/ruby.mk | 8 +-
> package/sam-ba/sam-ba.mk | 4 +-
> package/samba/samba.mk | 18 +-
> package/samba4/samba4.mk | 32 +-
> package/sane-backends/sane-backends.mk | 8 +-
> package/schifra/schifra.mk | 4 +-
> package/sconeserver/sconeserver.mk | 56 +-
> package/scons/scons.mk | 2 +-
> package/screen/screen.mk | 2 +-
> package/sdl/sdl.mk | 22 +-
> package/sdl_gfx/sdl_gfx.mk | 6 +-
> package/sdl_image/sdl_image.mk | 4 +-
> package/sdl_mixer/sdl_mixer.mk | 10 +-
> package/sdl_net/sdl_net.mk | 2 +-
> package/sdl_sound/sdl_sound.mk | 6 +-
> package/sdl_ttf/sdl_ttf.mk | 4 +-
> package/sed/sed.mk | 2 +-
> package/setserial/setserial.mk | 2 +-
> package/sg3_utils/sg3_utils.mk | 2 +-
> package/shared-mime-info/shared-mime-info.mk | 4 +-
> package/sispmctl/sispmctl.mk | 2 +-
> package/slang/slang.mk | 16 +-
> package/slirp/slirp.mk | 8 +-
> package/smcroute/smcroute.mk | 2 +-
> package/snmppp/snmppp.mk | 6 +-
> package/socat/socat.mk | 4 +-
> package/socketcand/socketcand.mk | 2 +-
> package/sox/sox.mk | 30 +-
> package/spawn-fcgi/spawn-fcgi.mk | 2 +-
> package/speex/speex.mk | 8 +-
> package/spice-protocol/spice-protocol.mk | 10 +-
> package/spice/spice.mk | 50 +-
> package/sqlcipher/sqlcipher.mk | 6 +-
> package/sqlite/sqlite.mk | 12 +-
> package/squashfs/squashfs.mk | 16 +-
> package/squid/squid.mk | 6 +-
> package/startup-notification/startup-notification.mk | 2 +-
> package/stress/stress.mk | 2 +-
> package/strongswan/strongswan.mk | 86 +-
> package/stunnel/stunnel.mk | 2 +-
> package/subversion/subversion.mk | 2 +-
> package/sudo/sudo.mk | 2 +-
> package/swig/swig.mk | 2 +-
> package/sylpheed/sylpheed.mk | 6 +-
> package/synergy/synergy.mk | 2 +-
> package/sysstat/sysstat.mk | 6 +-
> package/systemd/systemd.mk | 48 +-
> package/sysvinit/sysvinit.mk | 6 +-
> package/taglib/taglib.mk | 4 +-
> package/tcl/tcl.mk | 4 +-
> package/tcllib/tcllib.mk | 12 +-
> package/tcpdump/tcpdump.mk | 2 +-
> package/tcpreplay/tcpreplay.mk | 2 +-
> package/tftpd/tftpd.mk | 10 +-
> package/thrift/thrift.mk | 12 +-
> package/tiff/tiff.mk | 26 +-
> package/tn5250/tn5250.mk | 6 +-
> package/torsmo/torsmo.mk | 2 +-
> package/transmission/transmission.mk | 22 +-
> package/tslib/tslib.mk | 2 +-
> package/tstools/tstools.mk | 4 +-
> package/tvheadend/tvheadend.mk | 22 +-
> package/tz/tz.mk | 18 +-
> package/tzdata/tzdata.mk | 18 +-
> package/uboot-tools/uboot-tools.mk | 30 +-
> package/uclibc/uclibc.mk | 2 +-
> package/udisks/udisks.mk | 24 +-
> package/ulogd/ulogd.mk | 8 +-
> package/urg/urg.mk | 4 +-
> package/usbmount/usbmount.mk | 4 +-
> package/usbredir/usbredir.mk | 16 +-
> package/usbutils/usbutils.mk | 2 +-
> package/util-linux/util-linux.mk | 18 +-
> package/valgrind/valgrind.mk | 8 +-
> package/vde2/vde2.mk | 24 +-
> package/vim/vim.mk | 2 +-
> package/vlc/vlc.mk | 140 +-
> package/vo-aacenc/vo-aacenc.mk | 8 +-
> package/vorbis-tools/vorbis-tools.mk | 2 +-
> package/vpnc/vpnc.mk | 10 +-
> package/vtun/vtun.mk | 2 +-
> package/wayland/wayland.mk | 2 +-
> package/webkit/webkit.mk | 18 +-
> package/webp/webp.mk | 2 +-
> package/webrtc-audio-processing/webrtc-audio-processing.mk | 2 +-
> package/weston/weston.mk | 16 +-
> package/wget/wget.mk | 6 +-
> package/whois/whois.mk | 6 +-
> package/wireshark/wireshark.mk | 2 +-
> package/wpa_supplicant/wpa_supplicant.mk | 10 +-
> package/wvstreams/wvstreams.mk | 16 +-
> package/x11r7/libxcb/libxcb.mk | 4 +-
> package/x11r7/xapp_xcalc/xapp_xcalc.mk | 2 +-
> package/x11r7/xapp_xdm/xapp_xdm.mk | 2 +-
> package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk | 8 +-
> package/x11r7/xapp_xrandr/xapp_xrandr.mk | 2 +-
> package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 14 +-
> package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk | 4 +-
> package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 4 +-
> package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk | 4 +-
> package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk | 4 +-
> package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk | 4 +-
> package/x11r7/xfont_font-alias/xfont_font-alias.mk | 4 +-
> package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 4 +-
> package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk | 4 +-
> package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk | 4 +-
> package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk | 4 +-
> package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk | 4 +-
> package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk | 4 +-
> package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk | 4 +-
> package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk | 4 +-
> package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk | 4 +-
> package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk | 4 +-
> package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk | 4 +-
> package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 4 +-
> package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 4 +-
> package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk | 4 +-
> package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk | 4 +-
> package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk | 4 +-
> package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk | 4 +-
> package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk | 4 +-
> package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk | 4 +-
> package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk | 4 +-
> package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk | 4 +-
> package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 4 +-
> package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk | 4 +-
> package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk | 4 +-
> package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk | 4 +-
> package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk | 4 +-
> package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk | 4 +-
> package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk | 4 +-
> package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk | 4 +-
> package/x11r7/xkeyboard-config/xkeyboard-config.mk | 2 +-
> package/x11r7/xlib_libFS/xlib_libFS.mk | 2 +-
> package/x11r7/xlib_libSM/xlib_libSM.mk | 2 +-
> package/x11r7/xlib_libX11/xlib_libX11.mk | 4 +-
> package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 2 +-
> package/x11r7/xlib_libXaw/xlib_libXaw.mk | 2 +-
> package/x11r7/xlib_libXext/xlib_libXext.mk | 2 +-
> package/x11r7/xlib_libXfont/xlib_libXfont.mk | 4 +-
> package/x11r7/xlib_libXi/xlib_libXi.mk | 2 +-
> package/x11r7/xlib_libXinerama/xlib_libXinerama.mk | 2 +-
> package/x11r7/xlib_libXrandr/xlib_libXrandr.mk | 2 +-
> package/x11r7/xlib_libXrender/xlib_libXrender.mk | 2 +-
> package/x11r7/xlib_libXres/xlib_libXres.mk | 2 +-
> package/x11r7/xlib_libXt/xlib_libXt.mk | 2 +-
> package/x11r7/xlib_libXv/xlib_libXv.mk | 2 +-
> package/x11r7/xlib_libXvMC/xlib_libXvMC.mk | 2 +-
> package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk | 2 +-
> package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 2 +-
> package/x11r7/xlib_libdmx/xlib_libdmx.mk | 2 +-
> package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk | 4 +-
> package/x11r7/xproto_xextproto/xproto_xextproto.mk | 4 +-
> package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 156 +-
> package/x11vnc/x11vnc.mk | 20 +-
> package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 6 +-
> package/xbmc/xbmc.mk | 72 +-
> package/xenomai/xenomai.mk | 6 +-
> package/xerces/xerces.mk | 6 +-
> package/xfsprogs/xfsprogs.mk | 4 +-
> package/xinetd/xinetd.mk | 8 +-
> package/xmlstarlet/xmlstarlet.mk | 6 +-
> package/xscreensaver/xscreensaver.mk | 4 +-
> package/xterm/xterm.mk | 2 +-
> package/zeromq/zeromq.mk | 4 +-
> package/zmqpp/zmqpp.mk | 8 +-
> package/znc/znc.mk | 18 +-
> package/zxing/zxing.mk | 4 +-
> toolchain/toolchain-external/toolchain-external.mk | 6 +-
> 672 files changed, 4175 insertions(+), 4148 deletions(-)
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT
2014-09-27 19:32 ` [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT Thomas De Schampheleire
@ 2014-09-27 21:49 ` Yann E. MORIN
2014-10-04 17:14 ` Thomas Petazzoni
1 sibling, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 21:49 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> This patch introduces a check for the usage of deprecated variable
> FOO_BAR_OPT, and suggests to use FOO_BAR_OPTS instead.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> v2: collapse patches that each add one check
>
> package/pkg-generic.mk | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -717,6 +717,18 @@
> $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep)))
> endif
>
> +# Ensure unified variable name conventions between all packages
> +$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
> +
> TARGETS += $(1)
>
> ifneq ($$($(2)_PERMISSIONS),)
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 01 of 15] packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 01 of 15] packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS Thomas De Schampheleire
@ 2014-09-27 22:04 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:04 UTC (permalink / raw)
To: buildroot
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> While the autotools infrastructure was using FOO_MAKE_OPT, generic packages
> were typically using FOO_MAKE_OPTS. This inconsistency becomes a problem
> when a new infrastructure is introduced that wants to make use of
> FOO_MAKE_OPT(S), and can live alongside either generic-package or
> autotools-package. The new infrastructure will have to choose between either
> OPT or OPTS, and thus rule out transparent usage by respectively generic
> packages or generic packages. An example of such an infrastructure is
> kconfig-package, which provides kconfig-related make targets.
>
> The OPTS variant is more logical, as there are typically multiple options.
>
> This patch renames all occurrences of FOO_MAKE_OPT in FOO_MAKE_OPTS.
> Sed command used:
> find * -type f | xargs sed -i 's#_MAKE_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Casual visual review, plus:
git difftool -y -x 'diff -du -I "_MAKE_OPTS\?\>"' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
> boot/at91bootstrap3/at91bootstrap3.mk | 4 ++--
> docs/manual/adding-packages-autotools.txt | 2 +-
> docs/manual/adding-packages-cmake.txt | 2 +-
> docs/manual/adding-packages-kconfig.txt | 2 +-
> package/avahi/avahi.mk | 2 +-
> package/dnsmasq/dnsmasq.mk | 12 ++++++------
> package/e2fsprogs/e2fsprogs.mk | 2 +-
> package/faifa/faifa.mk | 2 +-
> package/freetype/freetype.mk | 2 +-
> package/gcc/gcc-initial/gcc-initial.mk | 2 +-
> package/httping/httping.mk | 6 +++---
> package/ipsec-tools/ipsec-tools.mk | 2 +-
> package/iputils/iputils.mk | 6 +++---
> package/iw/iw.mk | 6 +++---
> package/libdnet/libdnet.mk | 6 +++---
> package/libjson/libjson.mk | 12 ++++++------
> package/libseccomp/libseccomp.mk | 2 +-
> package/linux-pam/linux-pam.mk | 2 +-
> package/lm-sensors/lm-sensors.mk | 12 ++++++------
> package/lshw/lshw.mk | 6 +++---
> package/lvm2/lvm2.mk | 2 +-
> package/mdadm/mdadm.mk | 2 +-
> package/mii-diag/mii-diag.mk | 4 ++--
> package/mpfr/mpfr.mk | 2 +-
> package/openswan/openswan.mk | 12 ++++++------
> package/openvmtools/openvmtools.mk | 2 +-
> package/pkg-autotools.mk | 6 +++---
> package/pkg-cmake.mk | 12 ++++++------
> package/pppd/pppd.mk | 8 ++++----
> package/pv/pv.mk | 2 +-
> package/quota/quota.mk | 2 +-
> package/rp-pppoe/rp-pppoe.mk | 2 +-
> package/rubix/rubix.mk | 2 +-
> package/schifra/schifra.mk | 4 ++--
> package/sdl_ttf/sdl_ttf.mk | 2 +-
> package/setserial/setserial.mk | 2 +-
> package/speex/speex.mk | 2 +-
> package/sysstat/sysstat.mk | 2 +-
> package/systemd/systemd.mk | 4 ++--
> package/tn5250/tn5250.mk | 2 +-
> package/util-linux/util-linux.mk | 2 +-
> package/whois/whois.mk | 6 +++---
> package/xinetd/xinetd.mk | 2 +-
> package/zmqpp/zmqpp.mk | 8 ++++----
> package/zxing/zxing.mk | 4 ++--
> 45 files changed, 95 insertions(+), 95 deletions(-)
>
> diff --git a/boot/at91bootstrap3/at91bootstrap3.mk b/boot/at91bootstrap3/at91bootstrap3.mk
> --- a/boot/at91bootstrap3/at91bootstrap3.mk
> +++ b/boot/at91bootstrap3/at91bootstrap3.mk
> @@ -17,7 +17,7 @@
> AT91BOOTSTRAP3_CUSTOM_PATCH_DIR = \
> $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_PATCH_DIR))
>
> -AT91BOOTSTRAP3_MAKE_OPT = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR)
> +AT91BOOTSTRAP3_MAKE_OPTS = CROSS_COMPILE=$(TARGET_CROSS) DESTDIR=$(BINARIES_DIR)
>
> ifneq ($(AT91BOOTSTRAP3_CUSTOM_PATCH_DIR),)
> define AT91BOOTSTRAP3_APPLY_CUSTOM_PATCHES
> @@ -41,7 +41,7 @@
> endef
>
> define AT91BOOTSTRAP3_BUILD_CMDS
> - $(MAKE) $(AT91BOOTSTRAP3_MAKE_OPT) -C $(@D) boot
> + $(MAKE) $(AT91BOOTSTRAP3_MAKE_OPTS) -C $(@D) boot
> endef
>
> define AT91BOOTSTRAP3_INSTALL_IMAGES_CMDS
> diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
> --- a/docs/manual/adding-packages-autotools.txt
> +++ b/docs/manual/adding-packages-autotools.txt
> @@ -111,7 +111,7 @@
> variables to pass to make in the build step. These are passed before
> the +make+ command. By default, empty.
>
> -* +LIBFOO_MAKE_OPT+, to specify additional variables to
> +* +LIBFOO_MAKE_OPTS+, to specify additional variables to
> pass to make in the build step. These are passed after the
> +make+ command. By default, empty.
>
> diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
> --- a/docs/manual/adding-packages-cmake.txt
> +++ b/docs/manual/adding-packages-cmake.txt
> @@ -108,7 +108,7 @@
> pass to make in the build step. These are passed before the +make+
> command. By default, empty.
>
> -* +LIBFOO_MAKE_OPT+, to specify additional variables to pass to make
> +* +LIBFOO_MAKE_OPTS+, to specify additional variables to pass to make
> in the build step. These are passed after the +make+ command. By
> default, empty.
>
> diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
> --- a/docs/manual/adding-packages-kconfig.txt
> +++ b/docs/manual/adding-packages-kconfig.txt
> @@ -47,7 +47,7 @@
> support, for example 'menuconfig xconfig'. By default, 'menuconfig'.
>
> * +FOO_KCONFIG_OPT+: extra options to pass when calling the kconfig
> - ediftors. This may need to include '$(FOO_MAKE_OPT)', for example. By
> + editors. This may need to include '$(FOO_MAKE_OPTS)', for example. By
> default, empty.
>
> * +FOO_KCONFIG_FIXUP_CMDS+: a list of shell commands needed to fixup the
> diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
> --- a/package/avahi/avahi.mk
> +++ b/package/avahi/avahi.mk
> @@ -138,7 +138,7 @@
> AVAHI_CONF_OPT += --disable-python
> endif
>
> -AVAHI_MAKE_OPT += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
> +AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
>
> define AVAHI_USERS
> avahi -1 avahi -1 * - - -
> diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
> --- a/package/dnsmasq/dnsmasq.mk
> +++ b/package/dnsmasq/dnsmasq.mk
> @@ -8,8 +8,8 @@
> DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz
> DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
> DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
> -DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
> -DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
> +DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
> +DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
> DNSMASQ_DEPENDENCIES = host-pkgconf
> DNSMASQ_LICENSE = Dual GPLv2/GPLv3
> DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
> @@ -37,7 +37,7 @@
> # NLS requires IDN so only enable it (i18n) when IDN is true
> ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
> DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext
> - DNSMASQ_MAKE_OPT += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
> + DNSMASQ_MAKE_OPTS += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
> DNSMASQ_COPTS += -DHAVE_IDN
> DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)
> endif
> @@ -58,7 +58,7 @@
>
> # liblua uses dlopen when dynamically linked
> ifneq ($(BR2_PREFER_STATIC_LIB),y)
> - DNSMASQ_MAKE_OPT += LIBS+="-ldl"
> + DNSMASQ_MAKE_OPTS += LIBS+="-ldl"
> endif
>
> define DNSMASQ_ENABLE_LUA
> @@ -98,11 +98,11 @@
> $(DNSMASQ_ENABLE_DBUS)
> $(DNSMASQ_ENABLE_LUA)
> $(DNSMASQ_ENABLE_CONNTRACK)
> - $(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPT) all$(DNSMASQ_I18N)
> + $(DNSMASQ_MAKE_ENV) $(MAKE1) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N)
> endef
>
> define DNSMASQ_INSTALL_TARGET_CMDS
> - $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT) install$(DNSMASQ_I18N)
> + $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) install$(DNSMASQ_I18N)
> mkdir -p $(TARGET_DIR)/var/lib/misc/
> endef
>
> diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
> --- a/package/e2fsprogs/e2fsprogs.mk
> +++ b/package/e2fsprogs/e2fsprogs.mk
> @@ -31,7 +31,7 @@
>
> E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
>
> -E2FSPROGS_MAKE_OPT = \
> +E2FSPROGS_MAKE_OPTS = \
> LDCONFIG=true
>
> define HOST_E2FSPROGS_INSTALL_CMDS
> diff --git a/package/faifa/faifa.mk b/package/faifa/faifa.mk
> --- a/package/faifa/faifa.mk
> +++ b/package/faifa/faifa.mk
> @@ -11,7 +11,7 @@
> FAIFA_LICENSE = BSD-3c
> FAIFA_LICENSE_FILES = COPYING
>
> -FAIFA_MAKE_OPT += GIT_REV=$(FAIFA_VERSION)
> +FAIFA_MAKE_OPTS += GIT_REV=$(FAIFA_VERSION)
>
> # This package uses autoconf, but not automake, so we need to call
> # their special autogen.sh script, and have custom target and staging
> diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
> --- a/package/freetype/freetype.mk
> +++ b/package/freetype/freetype.mk
> @@ -8,7 +8,7 @@
> FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
> FREETYPE_SITE = http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
> FREETYPE_INSTALL_STAGING = YES
> -FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
> +FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)"
> FREETYPE_LICENSE = Dual FTL/GPLv2+
> FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT
> FREETYPE_DEPENDENCIES = host-pkgconf
> diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
> --- a/package/gcc/gcc-initial/gcc-initial.mk
> +++ b/package/gcc/gcc-initial/gcc-initial.mk
> @@ -53,7 +53,7 @@
> # We need to tell gcc that the C library will be providing the ssp
> # support, as it can't guess it since the C library hasn't been built
> # yet (we're gcc-initial).
> -HOST_GCC_INITIAL_MAKE_OPT = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
> +HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
> HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
>
> $(eval $(host-autotools-package))
> diff --git a/package/httping/httping.mk b/package/httping/httping.mk
> --- a/package/httping/httping.mk
> +++ b/package/httping/httping.mk
> @@ -18,19 +18,19 @@
> $(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \
> $(if $(BR2_PACKAGE_OPENSSL),openssl) \
> $(if $(BR2_PACKAGE_FFTW),fftw)
> -HTTPING_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) \
> +HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
> FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \
> NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \
> SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
> TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no)
>
> define HTTPING_BUILD_CMDS
> - $(HTTPING_MAKE_OPT) LDFLAGS="$(HTTPING_LDFLAGS)" \
> + $(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \
> $(MAKE) DEBUG=no -C $(@D)
> endef
>
> define HTTPING_INSTALL_TARGET_CMDS
> - $(HTTPING_MAKE_OPT) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
> + $(HTTPING_MAKE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
> endef
>
> $(eval $(generic-package))
> diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
> --- a/package/ipsec-tools/ipsec-tools.mk
> +++ b/package/ipsec-tools/ipsec-tools.mk
> @@ -13,7 +13,7 @@
> IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
>
> # configure hardcodes -Werror, so override CFLAGS on make invocation
> -IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
> +IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)'
>
> # openssl uses zlib, so we need to explicitly link with it when static
> ifeq ($(BR2_PREFER_STATIC_LIB),y)
> diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
> --- a/package/iputils/iputils.mk
> +++ b/package/iputils/iputils.mk
> @@ -18,7 +18,7 @@
> endif
>
> # Disabling CAP_SETPCAP (file capabilities)
> -IPUTILS_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
> +IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
> CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
> arping clockdiff ping rarpd rdisc tftpd tracepath
>
> @@ -26,7 +26,7 @@
> # To support md5 for ping6
> IPUTILS_DEPENDENCIES += openssl
>
> -IPUTILS_MAKE_OPT += ping6 tracepath6 traceroute6
> +IPUTILS_MAKE_OPTS += ping6 tracepath6 traceroute6
>
> define IPUTILS_IPV6_INSTALL_TARGET_CMDS
> $(INSTALL) -D -m 755 $(@D)/ping6 $(TARGET_DIR)/bin/ping6
> @@ -36,7 +36,7 @@
> endif
>
> define IPUTILS_BUILD_CMDS
> - $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPT)
> + $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
> endef
>
> define IPUTILS_INSTALL_TARGET_CMDS
> diff --git a/package/iw/iw.mk b/package/iw/iw.mk
> --- a/package/iw/iw.mk
> +++ b/package/iw/iw.mk
> @@ -10,18 +10,18 @@
> IW_LICENSE = iw license
> IW_LICENSE_FILES = COPYING
> IW_DEPENDENCIES = host-pkgconf libnl
> -IW_MAKE_OPT = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
> +IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
> IW_MAKE_ENV = PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
> GIT_DIR=$(IW_DIR)
>
> ifeq ($(BR2_PREFER_STATIC_LIB),y)
> # libnl needs pthread/m, so we need to explicitly with them when static
> # these need to added AFTER libnl, so we have to override LIBS completely
> -IW_MAKE_OPT += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
> +IW_MAKE_OPTS += LIBS='-lnl-genl-3 -lnl-3 -lpthread -lm'
> endif
>
> define IW_BUILD_CMDS
> - $(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPT) -C $(@D)
> + $(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPTS) -C $(@D)
> endef
>
> define IW_INSTALL_TARGET_CMDS
> diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
> --- a/package/libdnet/libdnet.mk
> +++ b/package/libdnet/libdnet.mk
> @@ -17,9 +17,9 @@
> ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
> LIBDNET_DEPENDENCIES = python
> LIBDNET_CONF_OPT += --with-python
> -LIBDNET_MAKE_OPT = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
> -LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
> -LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
> +LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
> +LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
> +LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
> endif
>
> # Needed for autoreconf to work properly
> diff --git a/package/libjson/libjson.mk b/package/libjson/libjson.mk
> --- a/package/libjson/libjson.mk
> +++ b/package/libjson/libjson.mk
> @@ -14,13 +14,13 @@
> LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG
>
> ifeq ($(BR2_PREFER_STATIC_LIB),y)
> -LIBJSON_MAKE_OPT += SHARED=0
> +LIBJSON_MAKE_OPTS += SHARED=0
> else
> -LIBJSON_MAKE_OPT += SHARED=1
> +LIBJSON_MAKE_OPTS += SHARED=1
> LIBJSON_CXXFLAGS += -fPIC
> endif
>
> -LIBJSON_MAKE_OPT += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
> +LIBJSON_MAKE_OPTS += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)"
>
> define LIBJSON_EXTRACT_CMDS
> unzip -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE)
> @@ -33,17 +33,17 @@
> mkdir -p $(@D)/Objects_$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
> $(@D)/_internal/Source/Dependencies
> $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> - $(LIBJSON_MAKE_OPT) -C $(@D)
> + $(LIBJSON_MAKE_OPTS) -C $(@D)
> endef
>
> define LIBJSON_INSTALL_TARGET_CMDS
> $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> - $(LIBJSON_MAKE_OPT) prefix=$(TARGET_DIR)/usr install -C $(@D)
> + $(LIBJSON_MAKE_OPTS) prefix=$(TARGET_DIR)/usr install -C $(@D)
> endef
>
> define LIBJSON_INSTALL_STAGING_CMDS
> $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> - $(LIBJSON_MAKE_OPT) prefix=$(STAGING_DIR)/usr install -C $(@D)
> + $(LIBJSON_MAKE_OPTS) prefix=$(STAGING_DIR)/usr install -C $(@D)
> endef
>
> $(eval $(generic-package))
> diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
> --- a/package/libseccomp/libseccomp.mk
> +++ b/package/libseccomp/libseccomp.mk
> @@ -13,7 +13,7 @@
> # Needed for configure to find our system headers:
> LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
> LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
> -LIBSECCOMP_MAKE_OPT = SUBDIRS_BUILD=src
> +LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
> LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
> LIBSECCOMP_INSTALL_TARGET_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
>
> diff --git a/package/linux-pam/linux-pam.mk b/package/linux-pam/linux-pam.mk
> --- a/package/linux-pam/linux-pam.mk
> +++ b/package/linux-pam/linux-pam.mk
> @@ -23,7 +23,7 @@
>
> ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
> LINUX_PAM_DEPENDENCIES += gettext
> - LINUX_PAM_MAKE_OPT += LIBS=-lintl
> + LINUX_PAM_MAKE_OPTS += LIBS=-lintl
> endif
>
> # Install default pam config (deny everything)
> diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
> --- a/package/lm-sensors/lm-sensors.mk
> +++ b/package/lm-sensors/lm-sensors.mk
> @@ -20,28 +20,28 @@
> LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig
> LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect
>
> -LM_SENSORS_MAKE_OPT = \
> +LM_SENSORS_MAKE_OPTS = \
> BUILD_STATIC_LIB=1 \
> MACHINE=$(KERNEL_ARCH) \
> PREFIX=/usr
>
> ifeq ($(BR2_PREFER_STATIC_LIB),y)
> -LM_SENSORS_MAKE_OPT += BUILD_SHARED_LIB=0
> +LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0
> else
> -LM_SENSORS_MAKE_OPT += BUILD_SHARED_LIB=1
> +LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=1
> endif
>
> define LM_SENSORS_BUILD_CMDS
> - $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPT) -C $(@D)
> + $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPTS) -C $(@D)
> endef
>
> define LM_SENSORS_INSTALL_STAGING_CMDS
> - $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPT) DESTDIR=$(STAGING_DIR) install
> + $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
> rm -f $(addprefix $(STAGING_DIR)/usr/,$(LM_SENSORS_BINS_) $(LM_SENSORS_BINS_y))
> endef
>
> define LM_SENSORS_INSTALL_TARGET_CMDS
> - $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
> + $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
> rm -f $(addprefix $(TARGET_DIR)/usr/,$(LM_SENSORS_BINS_))
> endef
>
> diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
> --- a/package/lshw/lshw.mk
> +++ b/package/lshw/lshw.mk
> @@ -14,18 +14,18 @@
> LSHW_CFLAGS += -DNONLS
> endif
>
> -LSHW_MAKE_OPT = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
> +LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
> RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all
> LSHW_MAKE_ENV = LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
> LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
>
> define LSHW_BUILD_CMDS
> - $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPT)
> + $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS)
> endef
>
> define LSHW_INSTALL_TARGET_CMDS
> $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \
> - $(LSHW_MAKE_OPT) install
> + $(LSHW_MAKE_OPTS) install
> endef
>
> $(eval $(generic-package))
> diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
> --- a/package/lvm2/lvm2.mk
> +++ b/package/lvm2/lvm2.mk
> @@ -32,7 +32,7 @@
> endif
>
> ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
> -LVM2_MAKE_OPT = device-mapper
> +LVM2_MAKE_OPTS = device-mapper
> LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
> LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper
> endif
> diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
> --- a/package/mdadm/mdadm.mk
> +++ b/package/mdadm/mdadm.mk
> @@ -10,7 +10,7 @@
> MDADM_LICENSE = GPLv2+
> MDADM_LICENSE_FILES = COPYING
>
> -MDADM_MAKE_OPT = \
> +MDADM_MAKE_OPTS = \
> CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
>
> MDADM_INSTALL_TARGET_OPT = \
> diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
> --- a/package/mii-diag/mii-diag.mk
> +++ b/package/mii-diag/mii-diag.mk
> @@ -11,7 +11,7 @@
> MII_DIAG_LICENSE = GPL # No version specified
> MII_DIAG_LICENSE_FILES = mii-diag.c
>
> -MII_DIAG_MAKE_OPT = $(TARGET_CONFIGURE_OPTS)
> +MII_DIAG_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS)
>
> define MII_DIAG_DEBIAN_PATCHES
> if [ -d $(@D)/debian/patches ]; then \
> @@ -22,7 +22,7 @@
> MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES
>
> define MII_DIAG_BUILD_CMDS
> - $(MAKE) $(MII_DIAG_MAKE_OPT) -C $(@D) mii-diag
> + $(MAKE) $(MII_DIAG_MAKE_OPTS) -C $(@D) mii-diag
> endef
>
> define MII_DIAG_INSTALL_TARGET_CMDS
> diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
> --- a/package/mpfr/mpfr.mk
> +++ b/package/mpfr/mpfr.mk
> @@ -11,7 +11,7 @@
> MPFR_LICENSE_FILES = COPYING.LESSER
> MPFR_INSTALL_STAGING = YES
> MPFR_DEPENDENCIES = gmp
> -MPFR_MAKE_OPT = RANLIB=$(TARGET_RANLIB)
> +MPFR_MAKE_OPTS = RANLIB=$(TARGET_RANLIB)
>
> $(eval $(autotools-package))
> $(eval $(host-autotools-package))
> diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
> --- a/package/openswan/openswan.mk
> +++ b/package/openswan/openswan.mk
> @@ -10,31 +10,31 @@
> OPENSWAN_LICENSE_FILES = COPYING LICENSE
>
> OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2
> -OPENSWAN_MAKE_OPT = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
> +OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \
> USERCOMPILE="$(TARGET_CFLAGS) -fPIE" INC_USRLOCAL=/usr \
> USE_KLIPS=false USE_MAST=false USE_NM=false
>
> ifeq ($(BR2_PACKAGE_LIBCURL),y)
> OPENSWAN_DEPENDENCIES += libcurl
> - OPENSWAN_MAKE_OPT += USE_LIBCURL=true
> + OPENSWAN_MAKE_OPTS += USE_LIBCURL=true
> endif
>
> ifeq ($(BR2_PACKAGE_OPENSSL),y)
> OPENSWAN_DEPENDENCIES += openssl
> - OPENSWAN_MAKE_OPT += HAVE_OPENSSL=true
> + OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true
> ifeq ($(BR2_PACKAGE_OCF_LINUX),y)
> - OPENSWAN_MAKE_OPT += HAVE_OCF=true
> + OPENSWAN_MAKE_OPTS += HAVE_OCF=true
> endif
> endif
>
> define OPENSWAN_BUILD_CMDS
> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
> - $(OPENSWAN_MAKE_OPT) programs
> + $(OPENSWAN_MAKE_OPTS) programs
> endef
>
> define OPENSWAN_INSTALL_TARGET_CMDS
> $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
> - $(OPENSWAN_MAKE_OPT) DESTDIR=$(TARGET_DIR) install
> + $(OPENSWAN_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
> endef
>
> $(eval $(generic-package))
> diff --git a/package/openvmtools/openvmtools.mk b/package/openvmtools/openvmtools.mk
> --- a/package/openvmtools/openvmtools.mk
> +++ b/package/openvmtools/openvmtools.mk
> @@ -41,7 +41,7 @@
>
> ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PAM),y)
> OPENVMTOOLS_CONF_OPT += --with-pam
> -OPENVMTOOLS_MAKE_OPT += CFLAGS+="-Wno-unused-local-typedefs"
> +OPENVMTOOLS_MAKE_OPTS += CFLAGS+="-Wno-unused-local-typedefs"
> OPENVMTOOLS_DEPENDENCIES += linux-pam
> else
> OPENVMTOOLS_CONF_OPT += --without-pam
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -106,7 +106,7 @@
> $(2)_CONF_ENV ?=
> $(2)_CONF_OPT ?=
> $(2)_MAKE_ENV ?=
> -$(2)_MAKE_OPT ?=
> +$(2)_MAKE_OPTS ?=
> $(2)_INSTALL_OPT ?= install
> $(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
> $(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
> @@ -270,11 +270,11 @@
> ifndef $(2)_BUILD_CMDS
> ifeq ($(4),target)
> define $(2)_BUILD_CMDS
> - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
> + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR)
> endef
> else
> define $(2)_BUILD_CMDS
> - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_SRCDIR)
> + $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR)
> endef
> endif
> endif
> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> --- a/package/pkg-cmake.mk
> +++ b/package/pkg-cmake.mk
> @@ -40,7 +40,7 @@
> $(2)_CONF_OPT ?=
> $(2)_MAKE ?= $$(MAKE)
> $(2)_MAKE_ENV ?=
> -$(2)_MAKE_OPT ?=
> +$(2)_MAKE_OPTS ?=
> $(2)_INSTALL_HOST_OPT ?= install
> $(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
> $(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
> @@ -109,11 +109,11 @@
> ifndef $(2)_BUILD_CMDS
> ifeq ($(4),target)
> define $(2)_BUILD_CMDS
> - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR)
> + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR)
> endef
> else
> define $(2)_BUILD_CMDS
> - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) -C $$($$(PKG)_BUILDDIR)
> + $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR)
> endef
> endif
> endif
> @@ -124,7 +124,7 @@
> #
> ifndef $(2)_INSTALL_CMDS
> define $(2)_INSTALL_CMDS
> - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
> + $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
> endef
> endif
>
> @@ -134,7 +134,7 @@
> #
> ifndef $(2)_INSTALL_STAGING_CMDS
> define $(2)_INSTALL_STAGING_CMDS
> - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
> + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
> endef
> endif
>
> @@ -144,7 +144,7 @@
> #
> ifndef $(2)_INSTALL_TARGET_CMDS
> define $(2)_INSTALL_TARGET_CMDS
> - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPT) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
> + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
> endef
> endif
>
> diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
> --- a/package/pppd/pppd.mk
> +++ b/package/pppd/pppd.mk
> @@ -19,11 +19,11 @@
>
> ifeq ($(BR2_PACKAGE_PPPD_FILTER),y)
> PPPD_DEPENDENCIES += libpcap
> - PPPD_MAKE_OPT += FILTER=y
> + PPPD_MAKE_OPTS += FILTER=y
> endif
>
> ifeq ($(BR2_INET_IPV6),y)
> - PPPD_MAKE_OPT += HAVE_INET6=y
> + PPPD_MAKE_OPTS += HAVE_INET6=y
> endif
>
> # pppd bundles some but not all of the needed kernel headers. The embedded
> @@ -43,7 +43,7 @@
>
> define PPPD_BUILD_CMDS
> $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \
> - -C $(@D) $(PPPD_MAKE_OPT)
> + -C $(@D) $(PPPD_MAKE_OPTS)
> endef
>
> ifeq ($(BR2_PACKAGE_PPPD_RADIUS),y)
> @@ -94,7 +94,7 @@
> endef
>
> define PPPD_INSTALL_STAGING_CMDS
> - $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPT) install-devel
> + $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel
> endef
>
> $(eval $(generic-package))
> diff --git a/package/pv/pv.mk b/package/pv/pv.mk
> --- a/package/pv/pv.mk
> +++ b/package/pv/pv.mk
> @@ -23,7 +23,7 @@
> # configuration, as the ld default emulation may not necessarily be
> # the correct one. By passing the below values for LD and LDFLAGS, we
> # ensure that 'gcc' is used to do these partial linking steps.
> -PV_MAKE_OPT = \
> +PV_MAKE_OPTS = \
> LD="$(TARGET_CC)" \
> LDFLAGS="-Wl,-r -nostdlib"
>
> diff --git a/package/quota/quota.mk b/package/quota/quota.mk
> --- a/package/quota/quota.mk
> +++ b/package/quota/quota.mk
> @@ -24,7 +24,7 @@
> QUOTA_LDFLAGS += -ltirpc
> endif
>
> -QUOTA_MAKE_OPT = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
> +QUOTA_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
> QUOTA_CONF_ENV = \
> CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
>
> diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
> --- a/package/rp-pppoe/rp-pppoe.mk
> +++ b/package/rp-pppoe/rp-pppoe.mk
> @@ -11,7 +11,7 @@
> RP_PPPOE_DEPENDENCIES = pppd
> RP_PPPOE_SUBDIR = src
> RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff
> -RP_PPPOE_MAKE_OPT = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
> +RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION)
> RP_PPPOE_CONF_OPT = --disable-debugging
> RP_PPPOE_CONF_ENV = \
> rpppoe_cv_pack_bitfields=normal \
> diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
> --- a/package/rubix/rubix.mk
> +++ b/package/rubix/rubix.mk
> @@ -11,7 +11,7 @@
> RUBIX_LICENSE = Public Domain
> RUBIX_LICENSE_FILES = LICENCE
>
> -RUBIX_MAKE_OPT = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
> +RUBIX_MAKE_OPTS = CC="$(TARGET_CC)" XINC="-I$(STAGING_DIR)/usr/include/X11" XLIB="-L$(STAGING_DIR)/usr/lib -lX11"
>
> RUBIX_DEPENDENCIES = xlib_libX11
>
> diff --git a/package/schifra/schifra.mk b/package/schifra/schifra.mk
> --- a/package/schifra/schifra.mk
> +++ b/package/schifra/schifra.mk
> @@ -11,13 +11,13 @@
> SCHIFRA_LICENSE = schifra license
> SCHIFRA_LICENSE_FILES = schifra_license.txt
>
> -SCHIFRA_MAKE_OPT = COMPILER="$(TARGET_CXX)" \
> +SCHIFRA_MAKE_OPTS = COMPILER="$(TARGET_CXX)" \
> OPTIONS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o"
>
> # The examples are the only buildable artefacts.
> ifeq ($(BR2_PACKAGE_SCHIFRA_EXAMPLES),y)
> define SCHIFRA_BUILD_CMDS
> - $(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPT) all
> + $(MAKE) -C $(@D) $(SCHIFRA_MAKE_OPTS) all
> endef
>
> define SCHIFRA_INSTALL_EXAMPLES
> diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk
> --- a/package/sdl_ttf/sdl_ttf.mk
> +++ b/package/sdl_ttf/sdl_ttf.mk
> @@ -16,5 +16,5 @@
> --with-freetype-prefix=$(STAGING_DIR)/usr \
> --with-sdl-prefix=$(STAGING_DIR)/usr
>
> -SDL_TTF_MAKE_OPT = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL" LDFLAGS="-L$(STAGING_DIR)/usr/lib"
> +SDL_TTF_MAKE_OPTS = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL" LDFLAGS="-L$(STAGING_DIR)/usr/lib"
> $(eval $(autotools-package))
> diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
> --- a/package/setserial/setserial.mk
> +++ b/package/setserial/setserial.mk
> @@ -11,7 +11,7 @@
> SETSERIAL_LICENSE = GPLv2
> SETSERIAL_LICENSE_FILES = debian/copyright
> # make all also builds setserial.cat which needs nroff
> -SETSERIAL_MAKE_OPT = setserial
> +SETSERIAL_MAKE_OPTS = setserial
>
> define SETSERIAL_APPLY_DEBIAN_PATCHES
> # Touching gorhack.h is needed for the Debian patch 18 to work
> diff --git a/package/speex/speex.mk b/package/speex/speex.mk
> --- a/package/speex/speex.mk
> +++ b/package/speex/speex.mk
> @@ -31,7 +31,7 @@
> SPEEX_POST_CONFIGURE_HOOKS += SPEEX_LIBTOOL_FIXUP
>
> define SPEEX_BUILD_CMDS
> - $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
> + $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) -C $(@D)/$($(PKG)_SUBDIR)
> endef
>
> $(eval $(autotools-package))
> diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
> --- a/package/sysstat/sysstat.mk
> +++ b/package/sysstat/sysstat.mk
> @@ -14,7 +14,7 @@
>
> ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
> SYSSTAT_DEPENDENCIES += gettext
> -SYSSTAT_MAKE_OPT += CFLAGS="$(TARGET_CFLAGS) -lintl"
> +SYSSTAT_MAKE_OPTS += CFLAGS="$(TARGET_CFLAGS) -lintl"
> endif
>
> # The isag tool is a post processing script that depends on tcl/tk
> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> --- a/package/systemd/systemd.mk
> +++ b/package/systemd/systemd.mk
> @@ -138,8 +138,8 @@
> endif
>
> # mq_getattr needs -lrt
> -SYSTEMD_MAKE_OPT += LIBS=-lrt
> -SYSTEMD_MAKE_OPT += LDFLAGS+=-ldl
> +SYSTEMD_MAKE_OPTS += LIBS=-lrt
> +SYSTEMD_MAKE_OPTS += LDFLAGS+=-ldl
>
> define SYSTEMD_INSTALL_INIT_HOOK
> ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init
> diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
> --- a/package/tn5250/tn5250.mk
> +++ b/package/tn5250/tn5250.mk
> @@ -6,7 +6,7 @@
>
> TN5250_VERSION = 0.17.4
> TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
> -TN5250_MAKE_OPT = CPPFLAGS=""
> +TN5250_MAKE_OPTS = CPPFLAGS=""
> TN5250_DEPENDENCIES = ncurses
> TN5250_LICENSE = LGPLv2.1+
> TN5250_LICENSE_FILES = COPYING
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -44,7 +44,7 @@
>
> ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
> UTIL_LINUX_DEPENDENCIES += gettext
> -UTIL_LINUX_MAKE_OPT += LIBS=-lintl
> +UTIL_LINUX_MAKE_OPTS += LIBS=-lintl
> endif
>
> ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
> diff --git a/package/whois/whois.mk b/package/whois/whois.mk
> --- a/package/whois/whois.mk
> +++ b/package/whois/whois.mk
> @@ -10,7 +10,7 @@
> # take precedence over busybox implementation
> WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox)
> WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
> -WHOIS_MAKE_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
> +WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
> LIBS="$(WHOIS_EXTRA_LIBS)"
> WHOIS_LICENSE = GPLv2+
> WHOIS_LICENSE_FILES = COPYING
> @@ -32,11 +32,11 @@
> endif
>
> define WHOIS_BUILD_CMDS
> - $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPT) -C $(@D)
> + $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) -C $(@D)
> endef
>
> define WHOIS_INSTALL_TARGET_CMDS
> - $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPT) \
> + $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) \
> BASEDIR="$(TARGET_DIR)" install -C $(@D)
> endef
>
> diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
> --- a/package/xinetd/xinetd.mk
> +++ b/package/xinetd/xinetd.mk
> @@ -28,6 +28,6 @@
> CFLAGS="$(XINETD_CFLAGS)" \
> LIBS="$(XINETD_LIBS)"
>
> -XINETD_MAKE_OPT = AR="$(TARGET_AR)"
> +XINETD_MAKE_OPTS = AR="$(TARGET_AR)"
>
> $(eval $(autotools-package))
> diff --git a/package/zmqpp/zmqpp.mk b/package/zmqpp/zmqpp.mk
> --- a/package/zmqpp/zmqpp.mk
> +++ b/package/zmqpp/zmqpp.mk
> @@ -11,7 +11,7 @@
> ZMQPP_LICENSE = LGPLv3+ with exceptions
> ZMQPP_LICENSE_FILES = COPYING COPYING.LESSER
>
> -ZMQPP_MAKE_OPT = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
> +ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
> ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread
>
> ifeq ($(BR2_PACKAGE_ZMQPP_CLIENT),y)
> @@ -21,19 +21,19 @@
> define ZMQPP_BUILD_CMDS
> $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> LDFLAGS="$(ZMQPP_LDFLAGS)" \
> - $(ZMQPP_MAKE_OPT) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
> + $(ZMQPP_MAKE_OPTS) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),all) -C $(@D)
> endef
>
> define ZMQPP_INSTALL_TARGET_CMDS
> $(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/include/zmqpp
> $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> - $(ZMQPP_MAKE_OPT) DESTDIR=$(TARGET_DIR) install -C $(@D)
> + $(ZMQPP_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -C $(@D)
> endef
>
> define ZMQPP_INSTALL_STAGING_CMDS
> $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/zmqpp
> $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> - $(ZMQPP_MAKE_OPT) DESTDIR=$(STAGING_DIR) install -C $(@D)
> + $(ZMQPP_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -C $(@D)
> endef
>
> $(eval $(generic-package))
> diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk
> --- a/package/zxing/zxing.mk
> +++ b/package/zxing/zxing.mk
> @@ -17,7 +17,7 @@
> else
> # There is no locale support in the toolchain and libiconv
> # is not available so disable iconv support in zxing
> -ZING_MAKE_OPT=CXXFLAGS+="-DNO_ICONV"
> +ZING_MAKE_OPTS=CXXFLAGS+="-DNO_ICONV"
> endif
> endif
>
> @@ -26,7 +26,7 @@
> endef
>
> define ZXING_BUILD_CMDS
> - $(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPT)
> + $(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPTS)
> endef
>
> define ZXING_INSTALL_STAGING_CMDS
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 02 of 15] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 02 of 15] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS Thomas De Schampheleire
@ 2014-09-27 22:05 ` Yann E. MORIN
2014-09-27 22:07 ` Yann E. MORIN
0 siblings, 1 reply; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:05 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_INSTALL_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_INSTALL_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Casual visual review, plus:
git difftool -y -x 'diff -du -I "_INSTALL_OPTS\?\>"' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
> docs/manual/adding-packages-perl.txt | 2 +-
> docs/manual/adding-packages-python.txt | 6 +++---
> package/gcc/gcc-initial/gcc-initial.mk | 2 +-
> package/pkg-autotools.mk | 4 ++--
> package/pkg-python.mk | 12 ++++++------
> package/scons/scons.mk | 2 +-
> package/util-linux/util-linux.mk | 2 +-
> 7 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
> --- a/docs/manual/adding-packages-perl.txt
> +++ b/docs/manual/adding-packages-perl.txt
> @@ -113,6 +113,6 @@
> pass to +make pure_install+ or +perl Build install+ in the install step.
> By default, empty.
>
> -* +HOST_PERL_FOO_INSTALL_OPT+, to specify additional options to
> +* +HOST_PERL_FOO_INSTALL_OPTS+, to specify additional options to
> pass to +make pure_install+ or +perl Build install+ in the install step.
> By default, empty.
> diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
> --- a/docs/manual/adding-packages-python.txt
> +++ b/docs/manual/adding-packages-python.txt
> @@ -128,16 +128,16 @@
> passed automatically by the infrastructure.
>
> * +PYTHON_FOO_INSTALL_TARGET_OPT+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
> - +HOST_PYTHON_FOO_INSTALL_OPT+ to specify additional options to pass
> + +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
> to the Python +setup.py+ script during the target installation step,
> the staging installation step or the host installation,
> respectively. Note that the infrastructure is automatically passing
> some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT+
> or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
> - packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT+ (for host
> + packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
> distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT+ or
> +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
> - packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT+ (for host
> + packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
> setuptools packages).
>
> * +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python
> diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
> --- a/package/gcc/gcc-initial/gcc-initial.mk
> +++ b/package/gcc/gcc-initial/gcc-initial.mk
> @@ -54,6 +54,6 @@
> # support, as it can't guess it since the C library hasn't been built
> # yet (we're gcc-initial).
> HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
> -HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
> +HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc
>
> $(eval $(host-autotools-package))
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -107,7 +107,7 @@
> $(2)_CONF_OPT ?=
> $(2)_MAKE_ENV ?=
> $(2)_MAKE_OPTS ?=
> -$(2)_INSTALL_OPT ?= install
> +$(2)_INSTALL_OPTS ?= install
> $(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
> $(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
>
> @@ -285,7 +285,7 @@
> #
> ifndef $(2)_INSTALL_CMDS
> define $(2)_INSTALL_CMDS
> - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPT) -C $$($$(PKG)_SRCDIR)
> + $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_SRCDIR)
> endef
> endif
>
> diff --git a/package/pkg-python.mk b/package/pkg-python.mk
> --- a/package/pkg-python.mk
> +++ b/package/pkg-python.mk
> @@ -45,7 +45,7 @@
> HOST_PKG_PYTHON_DISTUTILS_ENV = \
> PATH=$(BR_PATH)
>
> -HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
> +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
> --prefix=$(HOST_DIR)/usr
>
> # Target setuptools-based packages
> @@ -72,7 +72,7 @@
> HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
> PATH=$(BR_PATH)
>
> -HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
> +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
> --prefix=$(HOST_DIR)/usr
>
> ################################################################################
> @@ -96,7 +96,7 @@
>
> $(2)_ENV ?=
> $(2)_BUILD_OPT ?=
> -$(2)_INSTALL_OPT ?=
> +$(2)_INSTALL_OPTS ?=
>
> ifndef $(2)_SETUP_TYPE
> ifdef $(3)_SETUP_TYPE
> @@ -118,7 +118,7 @@
> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
> $(2)_BASE_BUILD_TGT = build
> $(2)_BASE_BUILD_OPT =
> -$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT)
> +$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
> endif
> # Setuptools
> else ifeq ($$($(2)_SETUP_TYPE),setuptools)
> @@ -132,7 +132,7 @@
> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
> $(2)_BASE_BUILD_TGT = build
> $(2)_BASE_BUILD_OPT =
> -$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT)
> +$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
> endif
> else
> $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'")
> @@ -241,7 +241,7 @@
> (cd $$($$(PKG)_BUILDDIR)/; \
> $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
> $$($(2)_PYTHON_INTERPRETER) setup.py install \
> - $$($$(PKG)_BASE_INSTALL_OPT) $$($$(PKG)_INSTALL_OPT))
> + $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS))
> endef
> endif
>
> diff --git a/package/scons/scons.mk b/package/scons/scons.mk
> --- a/package/scons/scons.mk
> +++ b/package/scons/scons.mk
> @@ -12,7 +12,7 @@
>
> HOST_SCONS_NEEDS_HOST_PYTHON = python2
>
> -HOST_SCONS_INSTALL_OPT = \
> +HOST_SCONS_INSTALL_OPTS = \
> --install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION)
>
> $(eval $(host-python-package))
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -141,4 +141,4 @@
> # one, so it disappears
> UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> -HOST_UTIL_LINUX_INSTALL_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> +HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 03 of 15] packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 03 of 15] packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS Thomas De Schampheleire
@ 2014-09-27 22:06 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:06 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_INSTALL_TARGET_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_INSTALL_TARGET_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Casual visual review, plus:
git difftool -y -x 'diff -du -I "_INSTALL_TARGET_OPTS\?\>"' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
>
> boot/grub2/grub2.mk | 2 +-
> docs/manual/adding-packages-autotools.txt | 2 +-
> docs/manual/adding-packages-cmake.txt | 2 +-
> docs/manual/adding-packages-perl.txt | 2 +-
> docs/manual/adding-packages-python.txt | 6 ++--
> package/acl/acl.mk | 2 +-
> package/attr/attr.mk | 2 +-
> package/cups/cups.mk | 2 +-
> package/dmraid/dmraid.mk | 2 +-
> package/expat/expat.mk | 2 +-
> package/expect/expect.mk | 2 +-
> package/ifplugd/ifplugd.mk | 2 +-
> package/libdnet/libdnet.mk | 2 +-
> package/libseccomp/libseccomp.mk | 2 +-
> package/lvm2/lvm2.mk | 2 +-
> package/mdadm/mdadm.mk | 2 +-
> package/mxml/mxml.mk | 2 +-
> package/netsnmp/netsnmp.mk | 2 +-
> package/php/php.mk | 2 +-
> package/pkg-autotools.mk | 4 +-
> package/pkg-cmake.mk | 4 +-
> package/pkg-perl.mk | 8 +++---
> package/pkg-python.mk | 12 +++++-----
> package/quota/quota.mk | 2 +-
> package/rpm/rpm.mk | 2 +-
> package/rubix/rubix.mk | 2 +-
> package/samba/samba.mk | 2 +-
> package/screen/screen.mk | 2 +-
> package/sysstat/sysstat.mk | 2 +-
> package/util-linux/util-linux.mk | 2 +-
> package/webkit/webkit.mk | 2 +-
> package/x11r7/xapp_xcalc/xapp_xcalc.mk | 2 +-
> package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk | 2 +-
> package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 2 +-
> package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk | 2 +-
> package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk | 2 +-
> package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk | 2 +-
> package/x11r7/xfont_font-alias/xfont_font-alias.mk | 2 +-
> package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 2 +-
> package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk | 2 +-
> package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk | 2 +-
> package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk | 2 +-
> package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk | 2 +-
> package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk | 2 +-
> package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk | 2 +-
> package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk | 2 +-
> package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk | 2 +-
> package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk | 2 +-
> package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk | 2 +-
> package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 2 +-
> package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 2 +-
> package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk | 2 +-
> package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk | 2 +-
> package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk | 2 +-
> package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk | 2 +-
> package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk | 2 +-
> package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk | 2 +-
> package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk | 2 +-
> package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk | 2 +-
> package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 2 +-
> package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk | 2 +-
> package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk | 2 +-
> package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk | 2 +-
> package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk | 2 +-
> package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk | 2 +-
> package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk | 2 +-
> package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk | 2 +-
> package/xenomai/xenomai.mk | 2 +-
> package/xfsprogs/xfsprogs.mk | 2 +-
> package/xscreensaver/xscreensaver.mk | 2 +-
> package/xterm/xterm.mk | 2 +-
> 71 files changed, 83 insertions(+), 83 deletions(-)
>
> diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
> --- a/boot/grub2/grub2.mk
> +++ b/boot/grub2/grub2.mk
> @@ -65,7 +65,7 @@
> # directory, and the image generation process (below) will use the
> # grub-mkimage tool and Grub2 modules from the host directory.
>
> -GRUB2_INSTALL_TARGET_OPT = DESTDIR=$(HOST_DIR) install
> +GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install
>
> define GRUB2_IMAGE_INSTALLATION
> mkdir -p $(dir $(GRUB2_IMAGE))
> diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
> --- a/docs/manual/adding-packages-autotools.txt
> +++ b/docs/manual/adding-packages-autotools.txt
> @@ -153,7 +153,7 @@
> correct for most autotools packages. It is still possible to override
> it.
>
> -* +LIBFOO_INSTALL_TARGET_OPT+ contains the make options
> +* +LIBFOO_INSTALL_TARGET_OPTS+ contains the make options
> used to install the package to the target directory. By default, the
> value is +DESTDIR=$(TARGET_DIR) install+. The default
> value is correct for most autotools packages, but it is still possible
> diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
> --- a/docs/manual/adding-packages-cmake.txt
> +++ b/docs/manual/adding-packages-cmake.txt
> @@ -117,7 +117,7 @@
> is +DESTDIR=$(STAGING_DIR) install+, which is correct for most
> CMake packages. It is still possible to override it.
>
> -* +LIBFOO_INSTALL_TARGET_OPT+ contains the make options used to
> +* +LIBFOO_INSTALL_TARGET_OPTS+ contains the make options used to
> install the package to the target directory. By default, the value
> is +DESTDIR=$(TARGET_DIR) install+. The default value is correct
> for most CMake packages, but it is still possible to override it if
> diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
> --- a/docs/manual/adding-packages-perl.txt
> +++ b/docs/manual/adding-packages-perl.txt
> @@ -109,7 +109,7 @@
> options to pass to +make pure_all+ or +perl Build build+ in the build step.
> By default, empty.
>
> -* +PERL_FOO_INSTALL_TARGET_OPT+, to specify additional options to
> +* +PERL_FOO_INSTALL_TARGET_OPTS+, to specify additional options to
> pass to +make pure_install+ or +perl Build install+ in the install step.
> By default, empty.
>
> diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
> --- a/docs/manual/adding-packages-python.txt
> +++ b/docs/manual/adding-packages-python.txt
> @@ -127,15 +127,15 @@
> packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
> passed automatically by the infrastructure.
>
> -* +PYTHON_FOO_INSTALL_TARGET_OPT+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
> +* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
> +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
> to the Python +setup.py+ script during the target installation step,
> the staging installation step or the host installation,
> respectively. Note that the infrastructure is automatically passing
> - some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT+
> + some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+
> or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
> packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
> - distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT+ or
> + distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS+ or
> +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
> packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
> setuptools packages).
> diff --git a/package/acl/acl.mk b/package/acl/acl.mk
> --- a/package/acl/acl.mk
> +++ b/package/acl/acl.mk
> @@ -22,7 +22,7 @@
> PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
> install-dev install-lib
>
> -ACL_INSTALL_TARGET_OPT = \
> +ACL_INSTALL_TARGET_OPTS = \
> prefix=$(TARGET_DIR)/usr \
> exec_prefix=$(TARGET_DIR)/usr \
> install install-lib
> diff --git a/package/attr/attr.mk b/package/attr/attr.mk
> --- a/package/attr/attr.mk
> +++ b/package/attr/attr.mk
> @@ -21,7 +21,7 @@
> PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
> install-dev install-lib
>
> -ATTR_INSTALL_TARGET_OPT = \
> +ATTR_INSTALL_TARGET_OPTS = \
> prefix=$(TARGET_DIR)/usr \
> exec_prefix=$(TARGET_DIR)/usr \
> install install-lib
> diff --git a/package/cups/cups.mk b/package/cups/cups.mk
> --- a/package/cups/cups.mk
> +++ b/package/cups/cups.mk
> @@ -11,7 +11,7 @@
> CUPS_LICENSE_FILES = LICENSE.txt
> CUPS_INSTALL_STAGING = YES
> CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
> -CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
> +CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
> CUPS_CONF_OPT = --without-perl \
> --without-java \
> --without-php \
> diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
> --- a/package/dmraid/dmraid.mk
> +++ b/package/dmraid/dmraid.mk
> @@ -11,7 +11,7 @@
> # lib and tools race with parallel make
> DMRAID_MAKE = $(MAKE1)
> DMRAID_INSTALL_STAGING = YES
> -DMRAID_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
> +DMRAID_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install
> DMRAID_LICENSE = GPLv2
> DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE
>
> diff --git a/package/expat/expat.mk b/package/expat/expat.mk
> --- a/package/expat/expat.mk
> +++ b/package/expat/expat.mk
> @@ -8,7 +8,7 @@
> EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
> EXPAT_INSTALL_STAGING = YES
> EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
> -EXPAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) installlib
> +EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib
> EXPAT_DEPENDENCIES = host-pkgconf
> EXPAT_LICENSE = MIT
> EXPAT_LICENSE_FILES = COPYING
> diff --git a/package/expect/expect.mk b/package/expect/expect.mk
> --- a/package/expect/expect.mk
> +++ b/package/expect/expect.mk
> @@ -15,6 +15,6 @@
> EXPECT_CONF_OPT = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
>
> # Since we don't want examples installed
> -EXPECT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-binaries
> +EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-binaries
>
> $(eval $(autotools-package))
> diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
> --- a/package/ifplugd/ifplugd.mk
> +++ b/package/ifplugd/ifplugd.mk
> @@ -11,7 +11,7 @@
> IFPLUGD_AUTORECONF = YES
>
> # install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.*
> -IFPLUGD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
> +IFPLUGD_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec
> IFPLUGD_CONF_OPT = --disable-lynx --with-initdir=/etc/init.d/
> IFPLUGD_DEPENDENCIES = libdaemon
>
> diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
> --- a/package/libdnet/libdnet.mk
> +++ b/package/libdnet/libdnet.mk
> @@ -18,7 +18,7 @@
> LIBDNET_DEPENDENCIES = python
> LIBDNET_CONF_OPT += --with-python
> LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
> -LIBDNET_INSTALL_TARGET_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
> +LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
> LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
> endif
>
> diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
> --- a/package/libseccomp/libseccomp.mk
> +++ b/package/libseccomp/libseccomp.mk
> @@ -15,7 +15,7 @@
> LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
> LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
> LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
> -LIBSECCOMP_INSTALL_TARGET_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
> +LIBSECCOMP_INSTALL_TARGET_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
>
> # Not a real autotools package, but works quite OK nonetheless
> $(eval $(autotools-package))
> diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
> --- a/package/lvm2/lvm2.mk
> +++ b/package/lvm2/lvm2.mk
> @@ -34,7 +34,7 @@
> ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
> LVM2_MAKE_OPTS = device-mapper
> LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
> -LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper
> +LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install_device-mapper
> endif
>
> ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y)
> diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
> --- a/package/mdadm/mdadm.mk
> +++ b/package/mdadm/mdadm.mk
> @@ -13,7 +13,7 @@
> MDADM_MAKE_OPTS = \
> CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
>
> -MDADM_INSTALL_TARGET_OPT = \
> +MDADM_INSTALL_TARGET_OPTS = \
> DESTDIR=$(TARGET_DIR)/usr -C $(MDADM_DIR) install-mdadm
>
> define MDADM_CONFIGURE_CMDS
> diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
> --- a/package/mxml/mxml.mk
> +++ b/package/mxml/mxml.mk
> @@ -11,6 +11,6 @@
> MXML_INSTALL_STAGING = YES
>
> MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install
> -MXML_INSTALL_TARGET_OPT = DSTROOT=$(TARGET_DIR) install
> +MXML_INSTALL_TARGET_OPTS = DSTROOT=$(TARGET_DIR) install
>
> $(eval $(autotools-package))
> diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
> --- a/package/netsnmp/netsnmp.mk
> +++ b/package/netsnmp/netsnmp.mk
> @@ -25,7 +25,7 @@
> --with-out-transports="Unix" \
> --disable-manuals
> NETSNMP_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install
> -NETSNMP_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
> +NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install
> NETSNMP_MAKE = $(MAKE1)
> NETSNMP_CONFIG_SCRIPTS = net-snmp-config
>
> diff --git a/package/php/php.mk b/package/php/php.mk
> --- a/package/php/php.mk
> +++ b/package/php/php.mk
> @@ -9,7 +9,7 @@
> PHP_SOURCE = php-$(PHP_VERSION).tar.xz
> PHP_INSTALL_STAGING = YES
> PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
> -PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
> +PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
> PHP_DEPENDENCIES = host-pkgconf
> PHP_LICENSE = PHP
> PHP_LICENSE_FILES = LICENSE
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -109,7 +109,7 @@
> $(2)_MAKE_OPTS ?=
> $(2)_INSTALL_OPTS ?= install
> $(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
> -$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
> +$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
>
>
> #
> @@ -325,7 +325,7 @@
> #
> ifndef $(2)_INSTALL_TARGET_CMDS
> define $(2)_INSTALL_TARGET_CMDS
> - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_SRCDIR)
> + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_SRCDIR)
> endef
> endif
>
> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> --- a/package/pkg-cmake.mk
> +++ b/package/pkg-cmake.mk
> @@ -43,7 +43,7 @@
> $(2)_MAKE_OPTS ?=
> $(2)_INSTALL_HOST_OPT ?= install
> $(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
> -$(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
> +$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
>
> $(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
> $(2)_BUILDDIR = $$($(2)_SRCDIR)
> @@ -144,7 +144,7 @@
> #
> ifndef $(2)_INSTALL_TARGET_CMDS
> define $(2)_INSTALL_TARGET_CMDS
> - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPT) -C $$($$(PKG)_BUILDDIR)
> + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR)
> endef
> endif
>
> diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
> --- a/package/pkg-perl.mk
> +++ b/package/pkg-perl.mk
> @@ -156,9 +156,9 @@
> ifndef $(2)_INSTALL_CMDS
> define $(2)_INSTALL_CMDS
> cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
> - perl Build $$($(2)_INSTALL_TARGET_OPT) install; \
> + perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
> else \
> - $$(MAKE1) $$($(2)_INSTALL_TARGET_OPT) pure_install; \
> + $$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
> fi
> endef
> endif
> @@ -170,9 +170,9 @@
> ifndef $(2)_INSTALL_TARGET_CMDS
> define $(2)_INSTALL_TARGET_CMDS
> cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
> - perl Build $$($(2)_INSTALL_TARGET_OPT) install; \
> + perl Build $$($(2)_INSTALL_TARGET_OPTS) install; \
> else \
> - $$(MAKE1) $$($(2)_INSTALL_TARGET_OPT) pure_install; \
> + $$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \
> fi
> endef
> endif
> diff --git a/package/pkg-python.mk b/package/pkg-python.mk
> --- a/package/pkg-python.mk
> +++ b/package/pkg-python.mk
> @@ -35,7 +35,7 @@
> PKG_PYTHON_DISTUTILS_BUILD_OPT = \
> --executable=/usr/bin/python
>
> -PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT = \
> +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
> --prefix=$(TARGET_DIR)/usr
>
> PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT = \
> @@ -56,7 +56,7 @@
> _python_prefix=/usr \
> _python_exec_prefix=/usr
>
> -PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT = \
> +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \
> --prefix=$(TARGET_DIR)/usr \
> --executable=/usr/bin/python \
> --single-version-externally-managed \
> @@ -112,7 +112,7 @@
> $(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
> $(2)_BASE_BUILD_TGT = build
> $(2)_BASE_BUILD_OPT = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
> -$(2)_BASE_INSTALL_TARGET_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT)
> +$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
> $(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT)
> else
> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
> @@ -126,7 +126,7 @@
> $(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
> $(2)_BASE_BUILD_TGT = build
> $(2)_BASE_BUILD_OPT =
> -$(2)_BASE_INSTALL_TARGET_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT)
> +$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
> $(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT)
> else
> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
> @@ -254,8 +254,8 @@
> (cd $$($$(PKG)_BUILDDIR)/; \
> $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
> $$($(2)_PYTHON_INTERPRETER) setup.py install \
> - $$($$(PKG)_BASE_INSTALL_TARGET_OPT) \
> - $$($$(PKG)_INSTALL_TARGET_OPT))
> + $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \
> + $$($$(PKG)_INSTALL_TARGET_OPTS))
> endef
> endif
>
> diff --git a/package/quota/quota.mk b/package/quota/quota.mk
> --- a/package/quota/quota.mk
> +++ b/package/quota/quota.mk
> @@ -29,7 +29,7 @@
> CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LDFLAGS="$(QUOTA_LDFLAGS)"
>
> # Package uses autoconf but not automake.
> -QUOTA_INSTALL_TARGET_OPT = \
> +QUOTA_INSTALL_TARGET_OPTS = \
> ROOTDIR=$(TARGET_DIR) \
> install
>
> diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
> --- a/package/rpm/rpm.mk
> +++ b/package/rpm/rpm.mk
> @@ -47,6 +47,6 @@
>
> RPM_MAKE = $(MAKE1)
>
> -RPM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) program_transform_name= install
> +RPM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) program_transform_name= install
>
> $(eval $(autotools-package))
> diff --git a/package/rubix/rubix.mk b/package/rubix/rubix.mk
> --- a/package/rubix/rubix.mk
> +++ b/package/rubix/rubix.mk
> @@ -7,7 +7,7 @@
> RUBIX_VERSION = 1.0.5
> RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2
> RUBIX_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix
> -RUBIX_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
> +RUBIX_INSTALL_TARGET_OPTS = GAMESDIR=$(TARGET_DIR)/usr/games install
> RUBIX_LICENSE = Public Domain
> RUBIX_LICENSE_FILES = LICENCE
>
> diff --git a/package/samba/samba.mk b/package/samba/samba.mk
> --- a/package/samba/samba.mk
> +++ b/package/samba/samba.mk
> @@ -60,7 +60,7 @@
> $(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),--with-readline=$(STAGING_DIR)) \
> $(if $(BR2_PACKAGE_SAMBA_WINBINDD),--with-winbind,--without-winbind)
>
> -SAMBA_INSTALL_TARGET_OPT = \
> +SAMBA_INSTALL_TARGET_OPTS = \
> DESTDIR=$(TARGET_DIR) -C $(SAMBA_DIR)/$(SAMBA_SUBDIR) \
> installlibs installservers installbin installscripts \
> $(if $(BR2_PACKAGE_SAMBA_SWAT),installswat)
> diff --git a/package/screen/screen.mk b/package/screen/screen.mk
> --- a/package/screen/screen.mk
> +++ b/package/screen/screen.mk
> @@ -12,7 +12,7 @@
> SCREEN_AUTORECONF = YES
> SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)"
> SCREEN_MAKE = $(MAKE1)
> -SCREEN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
> +SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
>
> define SCREEN_INSTALL_SCREENRC
> if [ ! -f $(TARGET_DIR)/etc/screenrc ]; then \
> diff --git a/package/sysstat/sysstat.mk b/package/sysstat/sysstat.mk
> --- a/package/sysstat/sysstat.mk
> +++ b/package/sysstat/sysstat.mk
> @@ -19,6 +19,6 @@
>
> # The isag tool is a post processing script that depends on tcl/tk
> # among other things. So we don't install it.
> -SYSSTAT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install
> +SYSSTAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install
>
> $(eval $(autotools-package))
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -140,5 +140,5 @@
> # MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
> # one, so it disappears
> UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> -UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> +UTIL_LINUX_INSTALL_TARGET_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
> --- a/package/webkit/webkit.mk
> +++ b/package/webkit/webkit.mk
> @@ -21,7 +21,7 @@
>
> # parallel make install deadlocks with make 3.81
> WEBKIT_INSTALL_STAGING_OPT = -j1 DESTDIR=$(STAGING_DIR) install
> -WEBKIT_INSTALL_TARGET_OPT = -j1 DESTDIR=$(TARGET_DIR) install
> +WEBKIT_INSTALL_TARGET_OPTS = -j1 DESTDIR=$(TARGET_DIR) install
>
> # Does not build and it's disabled by default
> # in newer releases
> diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
> --- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk
> +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk
> @@ -9,7 +9,7 @@
> XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app
> XAPP_XCALC_LICENSE = MIT
> XAPP_XCALC_LICENSE_FILES = COPYING
> -XAPP_XCALC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec install-data
> +XAPP_XCALC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec install-data
> XAPP_XCALC_DEPENDENCIES = xlib_libXaw
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
> --- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
> +++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
> --- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
> +++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
> --- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
> +++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
> --- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
> +++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
> --- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
> +++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING
>
> XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
> --- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
> +++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_ALIAS_LICENSE_FILES = COPYING
>
> XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_ALIAS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
> --- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
> +++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
> --- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
> +++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
> --- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
> +++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
> --- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
> +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
> --- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
> +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
> --- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
> +++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING
>
> XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_BH_TTF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
> --- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
> +++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING
>
> XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
> --- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
> +++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
> --- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
> +++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
>
> XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
> --- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
> +++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING
>
> XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
> --- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
> +++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
>
> XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
> --- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
> +++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
> --- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
> +++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
> --- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
> +++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
> --- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
> +++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING
>
> XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
> --- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
> +++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
> --- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
> +++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
> --- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
> +++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
> --- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
> +++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
>
> XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
> --- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
> +++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING
>
> XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
> --- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
> +++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING
>
> XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
> --- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
> +++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
> --- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
> +++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
> --- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
> +++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
> --- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
> +++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
>
> XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
> --- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
> +++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
> --- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
> +++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
>
> XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
> --- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
> +++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
>
> XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
> --- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
> +++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
> @@ -11,7 +11,7 @@
> XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING
>
> XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> -XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> +XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> $(eval $(autotools-package))
> diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
> --- a/package/xenomai/xenomai.mk
> +++ b/package/xenomai/xenomai.mk
> @@ -16,7 +16,7 @@
> XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING
>
> XENOMAI_INSTALL_STAGING = YES
> -XENOMAI_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-user
> +XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
> XENOMAI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-user
>
> XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/ --disable-doc-install
> diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk
> --- a/package/xfsprogs/xfsprogs.mk
> +++ b/package/xfsprogs/xfsprogs.mk
> @@ -16,6 +16,6 @@
> INSTALL_USER=root \
> INSTALL_GROUP=root
>
> -XFSPROGS_INSTALL_TARGET_OPT = DIST_ROOT=$(TARGET_DIR) install
> +XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install
>
> $(eval $(autotools-package))
> diff --git a/package/xscreensaver/xscreensaver.mk b/package/xscreensaver/xscreensaver.mk
> --- a/package/xscreensaver/xscreensaver.mk
> +++ b/package/xscreensaver/xscreensaver.mk
> @@ -20,6 +20,6 @@
> --includedir=$(STAGING_DIR)/usr/include \
> --libdir=$(STAGING_DIR)/usr/lib
>
> -XSCREENSAVER_INSTALL_TARGET_OPT = install_prefix="$(TARGET_DIR)" install
> +XSCREENSAVER_INSTALL_TARGET_OPTS = install_prefix="$(TARGET_DIR)" install
>
> $(eval $(autotools-package))
> diff --git a/package/xterm/xterm.mk b/package/xterm/xterm.mk
> --- a/package/xterm/xterm.mk
> +++ b/package/xterm/xterm.mk
> @@ -8,7 +8,7 @@
> XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz
> XTERM_SITE = ftp://invisible-island.net/xterm
> XTERM_DEPENDENCIES = ncurses xlib_libXaw
> -XTERM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
> +XTERM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install
> XTERM_LICENSE = MIT
> XTERM_LICENSE_FILES = version.c
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 02 of 15] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
2014-09-27 22:05 ` Yann E. MORIN
@ 2014-09-27 22:07 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:07 UTC (permalink / raw)
To: buildroot
On 2014-09-28 00:05 +0200, Yann E. MORIN spake thusly:
> Thomas, All,
>
> On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> > To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> > make the same change for FOO_INSTALL_OPT.
> >
> > Sed command used:
> > find * -type f | xargs sed -i 's#_INSTALL_OPT\>#&S#g'
> >
> > Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> Casual visual review, plus:
> git difftool -y -x 'diff -du -I "_INSTALL_OPTS\?\>"' CSET^..CSET
So:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
>
> > ---
> > v2: rebase
> >
> > docs/manual/adding-packages-perl.txt | 2 +-
> > docs/manual/adding-packages-python.txt | 6 +++---
> > package/gcc/gcc-initial/gcc-initial.mk | 2 +-
> > package/pkg-autotools.mk | 4 ++--
> > package/pkg-python.mk | 12 ++++++------
> > package/scons/scons.mk | 2 +-
> > package/util-linux/util-linux.mk | 2 +-
> > 7 files changed, 15 insertions(+), 15 deletions(-)
> >
> > diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
> > --- a/docs/manual/adding-packages-perl.txt
> > +++ b/docs/manual/adding-packages-perl.txt
> > @@ -113,6 +113,6 @@
> > pass to +make pure_install+ or +perl Build install+ in the install step.
> > By default, empty.
> >
> > -* +HOST_PERL_FOO_INSTALL_OPT+, to specify additional options to
> > +* +HOST_PERL_FOO_INSTALL_OPTS+, to specify additional options to
> > pass to +make pure_install+ or +perl Build install+ in the install step.
> > By default, empty.
> > diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
> > --- a/docs/manual/adding-packages-python.txt
> > +++ b/docs/manual/adding-packages-python.txt
> > @@ -128,16 +128,16 @@
> > passed automatically by the infrastructure.
> >
> > * +PYTHON_FOO_INSTALL_TARGET_OPT+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
> > - +HOST_PYTHON_FOO_INSTALL_OPT+ to specify additional options to pass
> > + +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
> > to the Python +setup.py+ script during the target installation step,
> > the staging installation step or the host installation,
> > respectively. Note that the infrastructure is automatically passing
> > some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPT+
> > or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
> > - packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT+ (for host
> > + packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
> > distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPT+ or
> > +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
> > - packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT+ (for host
> > + packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
> > setuptools packages).
> >
> > * +HOST_PYTHON_FOO_NEEDS_HOST_PYTHON+, to define the host python
> > diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
> > --- a/package/gcc/gcc-initial/gcc-initial.mk
> > +++ b/package/gcc/gcc-initial/gcc-initial.mk
> > @@ -54,6 +54,6 @@
> > # support, as it can't guess it since the C library hasn't been built
> > # yet (we're gcc-initial).
> > HOST_GCC_INITIAL_MAKE_OPTS = $(if $(BR2_TOOLCHAIN_HAS_SSP),gcc_cv_libc_provides_ssp=yes) all-gcc all-target-libgcc
> > -HOST_GCC_INITIAL_INSTALL_OPT = install-gcc install-target-libgcc
> > +HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc install-target-libgcc
> >
> > $(eval $(host-autotools-package))
> > diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> > --- a/package/pkg-autotools.mk
> > +++ b/package/pkg-autotools.mk
> > @@ -107,7 +107,7 @@
> > $(2)_CONF_OPT ?=
> > $(2)_MAKE_ENV ?=
> > $(2)_MAKE_OPTS ?=
> > -$(2)_INSTALL_OPT ?= install
> > +$(2)_INSTALL_OPTS ?= install
> > $(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
> > $(2)_INSTALL_TARGET_OPT ?= DESTDIR=$$(TARGET_DIR) install
> >
> > @@ -285,7 +285,7 @@
> > #
> > ifndef $(2)_INSTALL_CMDS
> > define $(2)_INSTALL_CMDS
> > - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPT) -C $$($$(PKG)_SRCDIR)
> > + $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_SRCDIR)
> > endef
> > endif
> >
> > diff --git a/package/pkg-python.mk b/package/pkg-python.mk
> > --- a/package/pkg-python.mk
> > +++ b/package/pkg-python.mk
> > @@ -45,7 +45,7 @@
> > HOST_PKG_PYTHON_DISTUTILS_ENV = \
> > PATH=$(BR_PATH)
> >
> > -HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT = \
> > +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
> > --prefix=$(HOST_DIR)/usr
> >
> > # Target setuptools-based packages
> > @@ -72,7 +72,7 @@
> > HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
> > PATH=$(BR_PATH)
> >
> > -HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT = \
> > +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
> > --prefix=$(HOST_DIR)/usr
> >
> > ################################################################################
> > @@ -96,7 +96,7 @@
> >
> > $(2)_ENV ?=
> > $(2)_BUILD_OPT ?=
> > -$(2)_INSTALL_OPT ?=
> > +$(2)_INSTALL_OPTS ?=
> >
> > ifndef $(2)_SETUP_TYPE
> > ifdef $(3)_SETUP_TYPE
> > @@ -118,7 +118,7 @@
> > $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
> > $(2)_BASE_BUILD_TGT = build
> > $(2)_BASE_BUILD_OPT =
> > -$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPT)
> > +$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
> > endif
> > # Setuptools
> > else ifeq ($$($(2)_SETUP_TYPE),setuptools)
> > @@ -132,7 +132,7 @@
> > $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
> > $(2)_BASE_BUILD_TGT = build
> > $(2)_BASE_BUILD_OPT =
> > -$(2)_BASE_INSTALL_OPT = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPT)
> > +$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
> > endif
> > else
> > $$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'")
> > @@ -241,7 +241,7 @@
> > (cd $$($$(PKG)_BUILDDIR)/; \
> > $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
> > $$($(2)_PYTHON_INTERPRETER) setup.py install \
> > - $$($$(PKG)_BASE_INSTALL_OPT) $$($$(PKG)_INSTALL_OPT))
> > + $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS))
> > endef
> > endif
> >
> > diff --git a/package/scons/scons.mk b/package/scons/scons.mk
> > --- a/package/scons/scons.mk
> > +++ b/package/scons/scons.mk
> > @@ -12,7 +12,7 @@
> >
> > HOST_SCONS_NEEDS_HOST_PYTHON = python2
> >
> > -HOST_SCONS_INSTALL_OPT = \
> > +HOST_SCONS_INSTALL_OPTS = \
> > --install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION)
> >
> > $(eval $(host-python-package))
> > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> > --- a/package/util-linux/util-linux.mk
> > +++ b/package/util-linux/util-linux.mk
> > @@ -141,4 +141,4 @@
> > # one, so it disappears
> > UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> > UTIL_LINUX_INSTALL_TARGET_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> > -HOST_UTIL_LINUX_INSTALL_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> > +HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 04 of 15] packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 04 of 15] packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS Thomas De Schampheleire
@ 2014-09-27 22:08 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:08 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_INSTALL_STAGING_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_INSTALL_STAGING_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Casual visaul review, plus:
git difftool -y -x 'diff -du -I "_INSTALL_STAGING_OPTS\?\>"' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
> docs/manual/adding-packages-autotools.txt | 2 +-
> docs/manual/adding-packages-cmake.txt | 2 +-
> docs/manual/adding-packages-python.txt | 6 ++--
> package/acl/acl.mk | 2 +-
> package/atk/atk.mk | 2 +-
> package/attr/attr.mk | 2 +-
> package/cups/cups.mk | 2 +-
> package/e2fsprogs/e2fsprogs.mk | 2 +-
> package/expat/expat.mk | 2 +-
> package/glibc/glibc.mk | 2 +-
> package/libdnet/libdnet.mk | 2 +-
> package/libglib2/libglib2.mk | 2 +-
> package/libseccomp/libseccomp.mk | 2 +-
> package/lite/lite.mk | 2 +-
> package/lvm2/lvm2.mk | 2 +-
> package/mxml/mxml.mk | 2 +-
> package/netsnmp/netsnmp.mk | 2 +-
> package/php/php.mk | 2 +-
> package/pkg-autotools.mk | 4 +-
> package/pkg-cmake.mk | 4 +-
> package/pkg-python.mk | 12 +++++-----
> package/tslib/tslib.mk | 2 +-
> package/util-linux/util-linux.mk | 2 +-
> package/webkit/webkit.mk | 2 +-
> package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk | 2 +-
> package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk | 2 +-
> package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk | 2 +-
> package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk | 2 +-
> package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk | 2 +-
> package/x11r7/xfont_font-alias/xfont_font-alias.mk | 2 +-
> package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk | 2 +-
> package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk | 2 +-
> package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk | 2 +-
> package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk | 2 +-
> package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk | 2 +-
> package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk | 2 +-
> package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk | 2 +-
> package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk | 2 +-
> package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk | 2 +-
> package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk | 2 +-
> package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk | 2 +-
> package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk | 2 +-
> package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk | 2 +-
> package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk | 2 +-
> package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk | 2 +-
> package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk | 2 +-
> package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk | 2 +-
> package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk | 2 +-
> package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk | 2 +-
> package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk | 2 +-
> package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk | 2 +-
> package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk | 2 +-
> package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk | 2 +-
> package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk | 2 +-
> package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk | 2 +-
> package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk | 2 +-
> package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk | 2 +-
> package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk | 2 +-
> package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk | 2 +-
> package/xenomai/xenomai.mk | 2 +-
> 60 files changed, 69 insertions(+), 69 deletions(-)
>
> diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
> --- a/docs/manual/adding-packages-autotools.txt
> +++ b/docs/manual/adding-packages-autotools.txt
> @@ -147,7 +147,7 @@
> not. Valid values are +YES+ and +NO+. By
> default, the value is +YES+
>
> -* +LIBFOO_INSTALL_STAGING_OPT+ contains the make options
> +* +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options
> used to install the package to the staging directory. By default, the
> value is +DESTDIR=$(STAGING_DIR) install+, which is
> correct for most autotools packages. It is still possible to override
> diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt
> --- a/docs/manual/adding-packages-cmake.txt
> +++ b/docs/manual/adding-packages-cmake.txt
> @@ -112,7 +112,7 @@
> in the build step. These are passed after the +make+ command. By
> default, empty.
>
> -* +LIBFOO_INSTALL_STAGING_OPT+ contains the make options used to
> +* +LIBFOO_INSTALL_STAGING_OPTS+ contains the make options used to
> install the package to the staging directory. By default, the value
> is +DESTDIR=$(STAGING_DIR) install+, which is correct for most
> CMake packages. It is still possible to override it.
> diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
> --- a/docs/manual/adding-packages-python.txt
> +++ b/docs/manual/adding-packages-python.txt
> @@ -127,16 +127,16 @@
> packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
> passed automatically by the infrastructure.
>
> -* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPT+,
> +* +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+,
> +HOST_PYTHON_FOO_INSTALL_OPTS+ to specify additional options to pass
> to the Python +setup.py+ script during the target installation step,
> the staging installation step or the host installation,
> respectively. Note that the infrastructure is automatically passing
> some options, defined in +PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS+
> - or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT+ (for target distutils
> + or +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS+ (for target distutils
> packages), +HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS+ (for host
> distutils packages), +PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS+ or
> - +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT+ (for target setuptools
> + +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS+ (for target setuptools
> packages) and +HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS+ (for host
> setuptools packages).
>
> diff --git a/package/acl/acl.mk b/package/acl/acl.mk
> --- a/package/acl/acl.mk
> +++ b/package/acl/acl.mk
> @@ -16,7 +16,7 @@
> # While the configuration system uses autoconf, the Makefiles are
> # hand-written and do not use automake. Therefore, we have to hack
> # around their deficiencies by passing installation paths.
> -ACL_INSTALL_STAGING_OPT = \
> +ACL_INSTALL_STAGING_OPTS = \
> prefix=$(STAGING_DIR)/usr \
> exec_prefix=$(STAGING_DIR)/usr \
> PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
> diff --git a/package/atk/atk.mk b/package/atk/atk.mk
> --- a/package/atk/atk.mk
> +++ b/package/atk/atk.mk
> @@ -11,7 +11,7 @@
> ATK_LICENSE = LGPLv2+
> ATK_LICENSE_FILES = COPYING
> ATK_INSTALL_STAGING = YES
> -ATK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
> +ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
>
> ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
> glib_cv_stack_grows=no glib_cv_uscore=no \
> diff --git a/package/attr/attr.mk b/package/attr/attr.mk
> --- a/package/attr/attr.mk
> +++ b/package/attr/attr.mk
> @@ -15,7 +15,7 @@
> # While the configuration system uses autoconf, the Makefiles are
> # hand-written and do not use automake. Therefore, we have to hack
> # around their deficiencies by passing installation paths.
> -ATTR_INSTALL_STAGING_OPT = \
> +ATTR_INSTALL_STAGING_OPTS = \
> prefix=$(STAGING_DIR)/usr \
> exec_prefix=$(STAGING_DIR)/usr \
> PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
> diff --git a/package/cups/cups.mk b/package/cups/cups.mk
> --- a/package/cups/cups.mk
> +++ b/package/cups/cups.mk
> @@ -10,7 +10,7 @@
> CUPS_LICENSE = GPLv2 LGPLv2
> CUPS_LICENSE_FILES = LICENSE.txt
> CUPS_INSTALL_STAGING = YES
> -CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
> +CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
> CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
> CUPS_CONF_OPT = --without-perl \
> --without-java \
> diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
> --- a/package/e2fsprogs/e2fsprogs.mk
> +++ b/package/e2fsprogs/e2fsprogs.mk
> @@ -9,7 +9,7 @@
> E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause
> E2FSPROGS_LICENSE_FILES = COPYING lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
> E2FSPROGS_INSTALL_STAGING = YES
> -E2FSPROGS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-libs
> +E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs
>
> E2FSPROGS_CONF_OPT = \
> $(if $(BR2_PREFER_STATIC_LIB),,--enable-elf-shlibs) \
> diff --git a/package/expat/expat.mk b/package/expat/expat.mk
> --- a/package/expat/expat.mk
> +++ b/package/expat/expat.mk
> @@ -7,7 +7,7 @@
> EXPAT_VERSION = 2.1.0
> EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
> EXPAT_INSTALL_STAGING = YES
> -EXPAT_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) installlib
> +EXPAT_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) installlib
> EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib
> EXPAT_DEPENDENCIES = host-pkgconf
> EXPAT_LICENSE = MIT
> diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
> --- a/package/glibc/glibc.mk
> +++ b/package/glibc/glibc.mk
> @@ -30,7 +30,7 @@
>
> GLIBC_INSTALL_STAGING = YES
>
> -GLIBC_INSTALL_STAGING_OPT = install_root=$(STAGING_DIR) install
> +GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install
>
> # Thumb build is broken, build in ARM mode
> ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
> diff --git a/package/libdnet/libdnet.mk b/package/libdnet/libdnet.mk
> --- a/package/libdnet/libdnet.mk
> +++ b/package/libdnet/libdnet.mk
> @@ -19,7 +19,7 @@
> LIBDNET_CONF_OPT += --with-python
> LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib
> LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec
> -LIBDNET_INSTALL_STAGING_OPT = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
> +LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
> endif
>
> # Needed for autoreconf to work properly
> diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
> --- a/package/libglib2/libglib2.mk
> +++ b/package/libglib2/libglib2.mk
> @@ -13,7 +13,7 @@
>
> LIBGLIB2_AUTORECONF = YES
> LIBGLIB2_INSTALL_STAGING = YES
> -LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
> +LIBGLIB2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
>
> LIBGLIB2_CONF_ENV = \
> ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
> diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
> --- a/package/libseccomp/libseccomp.mk
> +++ b/package/libseccomp/libseccomp.mk
> @@ -14,7 +14,7 @@
> LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
> LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
> LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
> -LIBSECCOMP_INSTALL_STAGING_OPT = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
> +LIBSECCOMP_INSTALL_STAGING_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
> LIBSECCOMP_INSTALL_TARGET_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
>
> # Not a real autotools package, but works quite OK nonetheless
> diff --git a/package/lite/lite.mk b/package/lite/lite.mk
> --- a/package/lite/lite.mk
> +++ b/package/lite/lite.mk
> @@ -8,7 +8,7 @@
> LITE_SOURCE = LiTE-$(LITE_VERSION).tar.gz
> LITE_SITE = http://www.directfb.org/downloads/Libs
> LITE_INSTALL_STAGING = YES
> -LITE_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
> +LITE_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
> LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb
> LITE_DEPENDENCIES = directfb
> LITE_LICENSE = LGPLv2.1+
> diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
> --- a/package/lvm2/lvm2.mk
> +++ b/package/lvm2/lvm2.mk
> @@ -33,7 +33,7 @@
>
> ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
> LVM2_MAKE_OPTS = device-mapper
> -LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
> +LVM2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install_device-mapper
> LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install_device-mapper
> endif
>
> diff --git a/package/mxml/mxml.mk b/package/mxml/mxml.mk
> --- a/package/mxml/mxml.mk
> +++ b/package/mxml/mxml.mk
> @@ -10,7 +10,7 @@
> MXML_LICENSE_FILES = COPYING
> MXML_INSTALL_STAGING = YES
>
> -MXML_INSTALL_STAGING_OPT = DSTROOT=$(STAGING_DIR) install
> +MXML_INSTALL_STAGING_OPTS = DSTROOT=$(STAGING_DIR) install
> MXML_INSTALL_TARGET_OPTS = DSTROOT=$(TARGET_DIR) install
>
> $(eval $(autotools-package))
> diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
> --- a/package/netsnmp/netsnmp.mk
> +++ b/package/netsnmp/netsnmp.mk
> @@ -24,7 +24,7 @@
> --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \
> --with-out-transports="Unix" \
> --disable-manuals
> -NETSNMP_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install
> +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)
> NETSNMP_CONFIG_SCRIPTS = net-snmp-config
> diff --git a/package/php/php.mk b/package/php/php.mk
> --- a/package/php/php.mk
> +++ b/package/php/php.mk
> @@ -8,7 +8,7 @@
> PHP_SITE = http://www.php.net/distributions
> PHP_SOURCE = php-$(PHP_VERSION).tar.xz
> PHP_INSTALL_STAGING = YES
> -PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
> +PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
> PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
> PHP_DEPENDENCIES = host-pkgconf
> PHP_LICENSE = PHP
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -108,7 +108,7 @@
> $(2)_MAKE_ENV ?=
> $(2)_MAKE_OPTS ?=
> $(2)_INSTALL_OPTS ?= install
> -$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
> +$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
>
>
> @@ -309,7 +309,7 @@
> #
> ifndef $(2)_INSTALL_STAGING_CMDS
> define $(2)_INSTALL_STAGING_CMDS
> - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)
> + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_SRCDIR)
> find $$(STAGING_DIR)/usr/lib* -name "*.la" | xargs --no-run-if-empty \
> $$(SED) "s:$$(BASE_DIR):@BASE_DIR@:g" \
> -e "s:$$(STAGING_DIR):@STAGING_DIR@:g" \
> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> --- a/package/pkg-cmake.mk
> +++ b/package/pkg-cmake.mk
> @@ -42,7 +42,7 @@
> $(2)_MAKE_ENV ?=
> $(2)_MAKE_OPTS ?=
> $(2)_INSTALL_HOST_OPT ?= install
> -$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
> +$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
>
> $(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
> @@ -134,7 +134,7 @@
> #
> ifndef $(2)_INSTALL_STAGING_CMDS
> define $(2)_INSTALL_STAGING_CMDS
> - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_BUILDDIR)
> + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR)
> endef
> endif
>
> diff --git a/package/pkg-python.mk b/package/pkg-python.mk
> --- a/package/pkg-python.mk
> +++ b/package/pkg-python.mk
> @@ -38,7 +38,7 @@
> PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
> --prefix=$(TARGET_DIR)/usr
>
> -PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT = \
> +PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \
> --prefix=$(STAGING_DIR)/usr
>
> # Host distutils-based packages
> @@ -62,7 +62,7 @@
> --single-version-externally-managed \
> --root=/
>
> -PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT = \
> +PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \
> --prefix=$(STAGING_DIR)/usr \
> --executable=/usr/bin/python \
> --single-version-externally-managed \
> @@ -113,7 +113,7 @@
> $(2)_BASE_BUILD_TGT = build
> $(2)_BASE_BUILD_OPT = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
> $(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
> -$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPT)
> +$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
> else
> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
> $(2)_BASE_BUILD_TGT = build
> @@ -127,7 +127,7 @@
> $(2)_BASE_BUILD_TGT = build
> $(2)_BASE_BUILD_OPT =
> $(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
> -$(2)_BASE_INSTALL_STAGING_OPT = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPT)
> +$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
> else
> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
> $(2)_BASE_BUILD_TGT = build
> @@ -268,8 +268,8 @@
> (cd $$($$(PKG)_BUILDDIR)/; \
> $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
> $$($(2)_PYTHON_INTERPRETER) setup.py install \
> - $$($$(PKG)_BASE_INSTALL_STAGING_OPT) \
> - $$($$(PKG)_INSTALL_STAGING_OPT))
> + $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \
> + $$($$(PKG)_INSTALL_STAGING_OPTS))
> endef
> endif
>
> diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
> --- a/package/tslib/tslib.mk
> +++ b/package/tslib/tslib.mk
> @@ -11,6 +11,6 @@
>
> TSLIB_AUTORECONF = YES
> TSLIB_INSTALL_STAGING = YES
> -TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
> +TSLIB_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
>
> $(eval $(autotools-package))
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -139,6 +139,6 @@
>
> # MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
> # one, so it disappears
> -UTIL_LINUX_INSTALL_STAGING_OPT += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> +UTIL_LINUX_INSTALL_STAGING_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> UTIL_LINUX_INSTALL_TARGET_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> HOST_UTIL_LINUX_INSTALL_OPTS += MKINSTALLDIRS=$(@D)/config/mkinstalldirs
> diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
> --- a/package/webkit/webkit.mk
> +++ b/package/webkit/webkit.mk
> @@ -20,7 +20,7 @@
> WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
>
> # parallel make install deadlocks with make 3.81
> -WEBKIT_INSTALL_STAGING_OPT = -j1 DESTDIR=$(STAGING_DIR) install
> +WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install
> WEBKIT_INSTALL_TARGET_OPTS = -j1 DESTDIR=$(TARGET_DIR) install
>
> # Does not build and it's disabled by default
> diff --git a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
> --- a/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
> +++ b/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_ADOBE_100DPI_LICENSE = MIT
> XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
> --- a/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
> +++ b/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_ADOBE_75DPI_LICENSE = MIT
> XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
> --- a/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
> +++ b/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE = Adobe License (no modification allowed)
> XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
> --- a/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
> +++ b/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE = Adobe License (no modification allowed)
> XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
> --- a/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
> +++ b/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE = Adobe License (no modification allowed)
> XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING
>
> -XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
> --- a/package/x11r7/xfont_font-alias/xfont_font-alias.mk
> +++ b/package/x11r7/xfont_font-alias/xfont_font-alias.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_ALIAS_LICENSE = MIT
> XFONT_FONT_ALIAS_LICENSE_FILES = COPYING
>
> -XFONT_FONT_ALIAS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_ALIAS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
> --- a/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
> +++ b/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_ARABIC_MISC_LICENSE = MIT
> XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
> --- a/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
> +++ b/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_BH_100DPI_LICENSE = Bigelow & Holmes License (no modification)
> XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
> --- a/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
> +++ b/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_BH_75DPI_LICENSE = Bigelow & Holmes License (no modification)
> XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
> --- a/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
> +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE = Bigelow & Holmes License (no modification)
> XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
> --- a/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
> +++ b/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE = Bigelow & Holmes License (no modification)
> XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
> --- a/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
> +++ b/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_BH_TTF_LICENSE = Bigelow & Holmes License (no modification)
> XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING
>
> -XFONT_FONT_BH_TTF_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_BH_TTF_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
> --- a/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
> +++ b/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_BH_TYPE1_LICENSE = Bigelow & Holmes License (no modification)
> XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING
>
> -XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
> --- a/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
> +++ b/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_BITSTREAM_100DPI_LICENSE = MIT
> XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
> --- a/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
> +++ b/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_BITSTREAM_75DPI_LICENSE = MIT
> XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
>
> -XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
> --- a/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
> +++ b/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_BITSTREAM_TYPE1_LICENSE = MIT
> XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING
>
> -XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
> --- a/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
> +++ b/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_CRONYX_CYRILLIC_LICENSE = MIT
> XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
> --- a/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
> +++ b/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_CURSOR_MISC_LICENSE = unencumbered
> XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
> --- a/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
> +++ b/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
> @@ -9,7 +9,7 @@
> XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
> XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
> --- a/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
> +++ b/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_DEC_MISC_LICENSE = MIT
> XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
> --- a/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
> +++ b/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_IBM_TYPE1_LICENSE = IBM/MIT X Consortium Courier Typefont agreement (no modification)
> XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING
>
> -XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
> --- a/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
> +++ b/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_ISAS_MISC_LICENSE = MIT
> XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
> --- a/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
> +++ b/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
> @@ -9,7 +9,7 @@
> XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
> XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
> --- a/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
> +++ b/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_MICRO_MISC_LICENSE = Public Domain
> XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
> --- a/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
> +++ b/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_MISC_CYRILLIC_LICENSE = MIT / Public Domain
> XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
> --- a/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
> +++ b/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_MISC_ETHIOPIC_LICENSE = MIT
> XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
> --- a/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
> +++ b/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_MISC_MELTHO_LICENSE = Meltho License
> XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING
>
> -XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
> --- a/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
> +++ b/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_MISC_MISC_LICENSE = Public Domain
> XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
> --- a/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
> +++ b/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_MUTT_MISC_LICENSE = MIT
> XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
> --- a/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
> +++ b/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_SCHUMACHER_MISC_LICENSE = MIT
> XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
> --- a/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
> +++ b/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_SCREEN_CYRILLIC_LICENSE = MIT
> XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
> --- a/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
> +++ b/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_SONY_MISC_LICENSE = MIT
> XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
> --- a/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
> +++ b/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_SUN_MISC_LICENSE = MIT
> XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
> --- a/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
> +++ b/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_WINITZKI_CYRILLIC_LICENSE = Public Domain
> XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
>
> -XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
> --- a/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
> +++ b/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
> @@ -10,7 +10,7 @@
> XFONT_FONT_XFREE86_TYPE1_LICENSE = MIT
> XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING
>
> -XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> +XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
> XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
> XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
>
> diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
> --- a/package/xenomai/xenomai.mk
> +++ b/package/xenomai/xenomai.mk
> @@ -17,7 +17,7 @@
>
> XENOMAI_INSTALL_STAGING = YES
> XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
> -XENOMAI_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install-user
> +XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
>
> XENOMAI_CONF_OPT += --includedir=/usr/include/xenomai/ --disable-doc-install
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS Thomas De Schampheleire
@ 2014-09-27 22:15 ` Yann E. MORIN
2014-10-04 16:52 ` Thomas Petazzoni
0 siblings, 1 reply; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:15 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_INSTALL_HOST_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_INSTALL_HOST_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
However, I have a comment that is not related to this change...
> ---
> v2: rebase
>
> package/pkg-cmake.mk | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> --- a/package/pkg-cmake.mk
> +++ b/package/pkg-cmake.mk
> @@ -41,7 +41,7 @@
> $(2)_MAKE ?= $$(MAKE)
> $(2)_MAKE_ENV ?=
> $(2)_MAKE_OPTS ?=
> -$(2)_INSTALL_HOST_OPT ?= install
> +$(2)_INSTALL_HOST_OPTS ?= install
The other infras do not use a 'HOST_' in the middle of host-variant
variables; 'HOST_' is only present at the beginning.
For example, we have HOST_LIBFOO_INSTALL_CMDS that contrasts to
LIBFOO_INSTALL_{TARGET,STAGING,IMAGES}_CMDS.
So, I find there is a bit of discrepancy in this variable naming. Plus,
it is not documented in the manual.
Samuel, is there a reason for the naming of this variable?
Regards,
Yann E. MORIN.
> $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
> $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
>
> @@ -124,7 +124,7 @@
> #
> ifndef $(2)_INSTALL_CMDS
> define $(2)_INSTALL_CMDS
> - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPT) -C $$($$(PKG)_BUILDDIR)
> + $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_HOST_OPTS) -C $$($$(PKG)_BUILDDIR)
> endef
> endif
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 06 of 15] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 06 of 15] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS Thomas De Schampheleire
@ 2014-09-27 22:17 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:17 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_AUTORECONF_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_AUTORECONF_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Casual inspection, plus:
git difftool -y -x 'diff -du -I "_AUTORECONF_OPTS\?\>"' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
> docs/manual/adding-packages-autotools.txt | 2 +-
> package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk | 2 +-
> package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +-
> package/pkg-autotools.mk | 4 ++--
> package/webkit/webkit.mk | 2 +-
> 5 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
> --- a/docs/manual/adding-packages-autotools.txt
> +++ b/docs/manual/adding-packages-autotools.txt
> @@ -126,7 +126,7 @@
> +LIBFOO_AUTORECONF=YES+. These are passed in the environment of
> the 'autoreconf' command. By default, empty.
>
> -* +LIBFOO_AUTORECONF_OPT+ to specify additional options
> +* +LIBFOO_AUTORECONF_OPTS+ to specify additional options
> passed to the 'autoreconf' program if
> +LIBFOO_AUTORECONF=YES+. By default, empty.
>
> diff --git a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
> --- a/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
> +++ b/package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk
> @@ -12,7 +12,7 @@
>
> # There is no generated configure script in the tarball.
> GST_PLUGIN_X170_AUTORECONF = YES
> -GST_PLUGIN_X170_AUTORECONF_OPT = -Im4/
> +GST_PLUGIN_X170_AUTORECONF_OPTS = -Im4/
> GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs
>
> $(eval $(autotools-package))
> diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
> @@ -13,7 +13,7 @@
> GST1_PLUGINS_BAD_LICENSE = LGPLv2+ LGPLv2.1+
>
> GST1_PLUGINS_BAD_AUTORECONF = YES
> -GST1_PLUGINS_BAD_AUTORECONF_OPT = -I $(@D)/common/m4
> +GST1_PLUGINS_BAD_AUTORECONF_OPTS = -I $(@D)/common/m4
> GST1_PLUGINS_BAD_GETTEXTIZE = YES
>
> GST1_PLUGINS_BAD_CONF_OPT = \
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -100,7 +100,7 @@
> endif
>
> ifeq ($(4),host)
> - $(2)_AUTORECONF_OPT ?= $$($(3)_AUTORECONF_OPT)
> + $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS)
> endif
>
> $(2)_CONF_ENV ?=
> @@ -228,7 +228,7 @@
> #
> define AUTORECONF_HOOK
> @$$(call MESSAGE,"Autoreconfiguring")
> - $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
> + $$(Q)cd $$($$(PKG)_SRCDIR) && $$($$(PKG)_AUTORECONF_ENV) $$(AUTORECONF) $$($$(PKG)_AUTORECONF_OPTS)
> $$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
> for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
> ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
> diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
> --- a/package/webkit/webkit.mk
> +++ b/package/webkit/webkit.mk
> @@ -17,7 +17,7 @@
>
> # webkit-disable-tests.patch changes configure.ac therefore autoreconf required
> WEBKIT_AUTORECONF = YES
> -WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
> +WEBKIT_AUTORECONF_OPTS = -I $(@D)/Source/autotools
>
> # parallel make install deadlocks with make 3.81
> WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 07 of 15] packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 07 of 15] packages: rename FOO_CONF_OPT into FOO_CONF_OPTS Thomas De Schampheleire
@ 2014-09-27 22:18 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:18 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_CONF_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Casual visual inspection, plus:
git difftool -y -x 'diff -du -I "_CONF_OPTS\?\>"' CSET^..CSET
(Note: stripped entire patch from reply, too big for the list)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 08 of 15] packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 08 of 15] packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS Thomas De Schampheleire
@ 2014-09-27 22:20 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:20 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_BUILD_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_BUILD_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Causual visual review, plus:
git difftool -y -x 'diff -du -I "_BUILD_OPTS\?\>"' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
> docs/manual/adding-packages-luarocks.txt | 6 +++---
> docs/manual/adding-packages-perl.txt | 2 +-
> docs/manual/adding-packages-python.txt | 4 ++--
> package/pkg-luarocks.mk | 4 ++--
> package/pkg-perl.mk | 8 ++++----
> package/pkg-python.mk | 14 +++++++-------
> package/python-numpy/python-numpy.mk | 2 +-
> 7 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/docs/manual/adding-packages-luarocks.txt b/docs/manual/adding-packages-luarocks.txt
> --- a/docs/manual/adding-packages-luarocks.txt
> +++ b/docs/manual/adding-packages-luarocks.txt
> @@ -20,8 +20,8 @@
> 07: LUAFOO_VERSION = 1.0.2-1
> 08: LUAFOO_DEPENDENCIES = foo
> 09:
> -10: LUAFOO_BUILD_OPT += FOO_INCDIR=$(STAGING_DIR)/usr/include
> -11: LUAFOO_BUILD_OPT += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
> +10: LUAFOO_BUILD_OPTS += FOO_INCDIR=$(STAGING_DIR)/usr/include
> +11: LUAFOO_BUILD_OPTS += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
> 12: LUAFOO_LICENSE = luaFoo license
> 13: LUAFOO_LICENSE_FILES = COPYING
> 14:
> @@ -86,5 +86,5 @@
> * +LUAFOO_SUBDIR+, which defaults to
> +luafoo-$(LUAFOO_VERSION_WITHOUT_ROCKSPEC_REVISION)+
>
> -* +LUAFOO_BUILD_OPT+ contains additional build options for the
> +* +LUAFOO_BUILD_OPTS+ contains additional build options for the
> +luarocks build+ call.
> diff --git a/docs/manual/adding-packages-perl.txt b/docs/manual/adding-packages-perl.txt
> --- a/docs/manual/adding-packages-perl.txt
> +++ b/docs/manual/adding-packages-perl.txt
> @@ -105,7 +105,7 @@
> configure options to pass to the +perl Makefile.PL+ or +perl Build.PL+.
> By default, empty.
>
> -* +PERL_FOO_BUILD_OPT+/+HOST_PERL_FOO_BUILD_OPT+, to specify additional
> +* +PERL_FOO_BUILD_OPTS+/+HOST_PERL_FOO_BUILD_OPTS+, to specify additional
> options to pass to +make pure_all+ or +perl Build build+ in the build step.
> By default, empty.
>
> diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt
> --- a/docs/manual/adding-packages-python.txt
> +++ b/docs/manual/adding-packages-python.txt
> @@ -122,9 +122,9 @@
> setuptools target packages) and +HOST_PKG_PYTHON_SETUPTOOLS_ENV+
> (for setuptools host packages).
>
> -* +PYTHON_FOO_BUILD_OPT+, to specify additional options to pass to the
> +* +PYTHON_FOO_BUILD_OPTS+, to specify additional options to pass to the
> Python +setup.py+ script during the build step. For target distutils
> - packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPT+ options are already
> + packages, the +PKG_PYTHON_DISTUTILS_BUILD_OPTS+ options are already
> passed automatically by the infrastructure.
>
> * +PYTHON_FOO_INSTALL_TARGET_OPTS+, +PYTHON_FOO_INSTALL_STAGING_OPTS+,
> diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
> --- a/package/pkg-luarocks.mk
> +++ b/package/pkg-luarocks.mk
> @@ -33,7 +33,7 @@
>
> define inner-luarocks-package
>
> -$(2)_BUILD_OPT ?=
> +$(2)_BUILD_OPTS ?=
> $(2)_SUBDIR ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
> $(2)_ROCKSPEC ?= $(1)-$$($(3)_VERSION).rockspec
> $(2)_SOURCE ?= $(1)-$$($(3)_VERSION).src.rock
> @@ -59,7 +59,7 @@
> ifndef $(2)_INSTALL_TARGET_CMDS
> define $(2)_INSTALL_TARGET_CMDS
> cd $$($(2)_SRCDIR) && \
> - $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPT)
> + $$(LUAROCKS_RUN) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS)
> endef
> endif
>
> diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
> --- a/package/pkg-perl.mk
> +++ b/package/pkg-perl.mk
> @@ -129,11 +129,11 @@
> # Build package for target
> define $(2)_BUILD_CMDS
> cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
> - perl Build $$($(2)_BUILD_OPT) build; \
> + perl Build $$($(2)_BUILD_OPTS) build; \
> else \
> $$(MAKE1) \
> PERL_INC=$$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \
> - $$($(2)_BUILD_OPT) pure_all; \
> + $$($(2)_BUILD_OPTS) pure_all; \
> fi
> endef
> else
> @@ -141,9 +141,9 @@
> # Build package for host
> define $(2)_BUILD_CMDS
> cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] ; then \
> - perl Build $$($(2)_BUILD_OPT) build; \
> + perl Build $$($(2)_BUILD_OPTS) build; \
> else \
> - $$(MAKE1) $$($(2)_BUILD_OPT) pure_all; \
> + $$(MAKE1) $$($(2)_BUILD_OPTS) pure_all; \
> fi
> endef
> endif
> diff --git a/package/pkg-python.mk b/package/pkg-python.mk
> --- a/package/pkg-python.mk
> +++ b/package/pkg-python.mk
> @@ -32,7 +32,7 @@
> _python_prefix=/usr \
> _python_exec_prefix=/usr
>
> -PKG_PYTHON_DISTUTILS_BUILD_OPT = \
> +PKG_PYTHON_DISTUTILS_BUILD_OPTS = \
> --executable=/usr/bin/python
>
> PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \
> @@ -95,7 +95,7 @@
> $(2)_BUILDDIR = $$($(2)_SRCDIR)
>
> $(2)_ENV ?=
> -$(2)_BUILD_OPT ?=
> +$(2)_BUILD_OPTS ?=
> $(2)_INSTALL_OPTS ?=
>
> ifndef $(2)_SETUP_TYPE
> @@ -111,13 +111,13 @@
> ifeq ($(4),target)
> $(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
> $(2)_BASE_BUILD_TGT = build
> -$(2)_BASE_BUILD_OPT = $$(PKG_PYTHON_DISTUTILS_BUILD_OPT)
> +$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
> $(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
> $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
> else
> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
> $(2)_BASE_BUILD_TGT = build
> -$(2)_BASE_BUILD_OPT =
> +$(2)_BASE_BUILD_OPTS =
> $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
> endif
> # Setuptools
> @@ -125,13 +125,13 @@
> ifeq ($(4),target)
> $(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
> $(2)_BASE_BUILD_TGT = build
> -$(2)_BASE_BUILD_OPT =
> +$(2)_BASE_BUILD_OPTS =
> $(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
> $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
> else
> $(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
> $(2)_BASE_BUILD_TGT = build
> -$(2)_BASE_BUILD_OPT =
> +$(2)_BASE_BUILD_OPTS =
> $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
> endif
> else
> @@ -228,7 +228,7 @@
> $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \
> $$($(2)_PYTHON_INTERPRETER) setup.py \
> $$($$(PKG)_BASE_BUILD_TGT) \
> - $$($$(PKG)_BASE_BUILD_OPT) $$($$(PKG)_BUILD_OPT))
> + $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS))
> endef
> endif
>
> diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk
> --- a/package/python-numpy/python-numpy.mk
> +++ b/package/python-numpy/python-numpy.mk
> @@ -16,7 +16,7 @@
> PYTHON_NUMPY_SITE_CFG_LIBS += blas lapack
> endif
>
> -PYTHON_NUMPY_BUILD_OPT = --fcompiler=None
> +PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None
>
> define PYTHON_NUMPY_CONFIGURE_CMDS
> -rm -f $(@D)/site.cfg
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 09 of 15] packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 09 of 15] packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS Thomas De Schampheleire
@ 2014-09-27 22:26 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:26 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_GETTEXTIZE_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_GETTEXTIZE_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
> docs/manual/adding-packages-autotools.txt | 2 +-
> package/pkg-autotools.mk | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/docs/manual/adding-packages-autotools.txt b/docs/manual/adding-packages-autotools.txt
> --- a/docs/manual/adding-packages-autotools.txt
> +++ b/docs/manual/adding-packages-autotools.txt
> @@ -136,7 +136,7 @@
> 'gettextize'.) Only valid when +LIBFOO_AUTORECONF=YES+. Valid
> values are +YES+ and +NO+. The default is +NO+.
>
> -* +LIBFOO_GETTEXTIZE_OPT+, to specify additional options passed to
> +* +LIBFOO_GETTEXTIZE_OPTS+, to specify additional options passed to
> the 'gettextize' program, if +LIBFOO_GETTEXTIZE=YES+. You may
> use that if, for example, the +.po+ files are not located in the
> standard place (i.e. in +po/+ at the root of the package.) By
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -96,7 +96,7 @@
> endif
>
> ifeq ($(4),host)
> - $(2)_GETTEXTIZE_OPT ?= $$($(3)_GETTEXTIZE_OPT)
> + $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS)
> endif
>
> ifeq ($(4),host)
> @@ -220,7 +220,7 @@
> #
> define GETTEXTIZE_HOOK
> @$$(call MESSAGE,"Gettextizing")
> - $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPT)
> + $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPTS)
> endef
>
> #
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 10 of 15] packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 10 of 15] packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS Thomas De Schampheleire
@ 2014-09-27 22:29 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:29 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> make the same change for FOO_KCONFIG_OPT.
>
> Sed command used:
> find * -type f | xargs sed -i 's#_KCONFIG_OPT\>#&S#g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> v2: new patch
>
> docs/manual/adding-packages-kconfig.txt | 2 +-
> package/busybox/busybox.mk | 2 +-
> package/pkg-kconfig.mk | 6 +++---
> package/uclibc/uclibc.mk | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/docs/manual/adding-packages-kconfig.txt b/docs/manual/adding-packages-kconfig.txt
> --- a/docs/manual/adding-packages-kconfig.txt
> +++ b/docs/manual/adding-packages-kconfig.txt
> @@ -46,7 +46,7 @@
> * +FOO_KCONFIG_EDITORS+: a space-separated list of kconfig editors to
> support, for example 'menuconfig xconfig'. By default, 'menuconfig'.
>
> -* +FOO_KCONFIG_OPT+: extra options to pass when calling the kconfig
> +* +FOO_KCONFIG_OPTS+: extra options to pass when calling the kconfig
> editors. This may need to include '$(FOO_MAKE_OPTS)', for example. By
> default, empty.
>
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -47,7 +47,7 @@
>
> BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
> BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
> -BUSYBOX_KCONFIG_OPT = $(BUSYBOX_MAKE_OPTS)
> +BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
>
> define BUSYBOX_PERMISSIONS
> /bin/busybox f 4755 0 0 - - - - -
> diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk
> --- a/package/pkg-kconfig.mk
> +++ b/package/pkg-kconfig.mk
> @@ -33,7 +33,7 @@
>
> # Default values
> $(2)_KCONFIG_EDITORS ?= menuconfig
> -$(2)_KCONFIG_OPT ?=
> +$(2)_KCONFIG_OPTS ?=
> $(2)_KCONFIG_FIXUP_CMDS ?=
>
> # FOO_KCONFIG_FILE is required
> @@ -51,7 +51,7 @@
> $$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/.config
> $$($(2)_KCONFIG_FIXUP_CMDS)
> @yes "" | $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
> - $$($(2)_KCONFIG_OPT) oldconfig
> + $$($(2)_KCONFIG_OPTS) oldconfig
> $$(Q)touch $$@
>
> # Before running configure, the configuration file should be present and fixed
> @@ -60,7 +60,7 @@
> # Configuration editors (menuconfig, ...)
> $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $$($(2)_DIR)/.stamp_kconfig_fixup_done
> $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \
> - $$($(2)_KCONFIG_OPT) $$(subst $(1)-,,$$@)
> + $$($(2)_KCONFIG_OPTS) $$(subst $(1)-,,$$@)
> rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built}
> rm -f $$($(2)_DIR)/.stamp_{target,staging}_installed
>
> diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
> --- a/package/uclibc/uclibc.mk
> +++ b/package/uclibc/uclibc.mk
> @@ -39,7 +39,7 @@
>
> UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE)
>
> -UCLIBC_KCONFIG_OPT = \
> +UCLIBC_KCONFIG_OPTS = \
> $(UCLIBC_MAKE_FLAGS) \
> PREFIX=$(STAGING_DIR) \
> DEVEL_PREFIX=/usr/ \
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 13 of 15] packages: rename misc. occurrences of _OPT into _OPTS
2014-09-27 19:32 ` [Buildroot] [PATCH 13 of 15] packages: rename misc. occurrences of _OPT into _OPTS Thomas De Schampheleire
@ 2014-09-27 22:35 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-27 22:35 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS,
> change remaining occurrences of _OPT into _OPTS.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Visual review, plus:
git difftool -y -x 'diff -du -I "_OPTS\?\>"' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: rebase
>
> linux/linux-ext-xenomai.mk | 6 +-
> package/boost/boost.mk | 14 +++---
> package/dhcpcd/dhcpcd.mk | 8 +-
> package/freetype/freetype.mk | 2 +-
> package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 40 +++++++++---------
> package/gstreamer1/gst1-libav/gst1-libav.mk | 44 ++++++++++----------
> 6 files changed, 57 insertions(+), 57 deletions(-)
>
> diff --git a/linux/linux-ext-xenomai.mk b/linux/linux-ext-xenomai.mk
> --- a/linux/linux-ext-xenomai.mk
> +++ b/linux/linux-ext-xenomai.mk
> @@ -11,9 +11,9 @@
> # Adeos patch version
> XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
> ifeq ($(XENOMAI_ADEOS_PATCH),)
> -XENOMAI_ADEOS_OPT = --default
> +XENOMAI_ADEOS_OPTS = --default
> else
> -XENOMAI_ADEOS_OPT = --adeos=$(XENOMAI_ADEOS_PATCH)
> +XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
> endif
>
> # Prepare kernel patch
> @@ -21,7 +21,7 @@
> $(XENOMAI_DIR)/scripts/prepare-kernel.sh \
> --linux=$(LINUX_DIR) \
> --arch=$(KERNEL_ARCH) \
> - $(XENOMAI_ADEOS_OPT) \
> + $(XENOMAI_ADEOS_OPTS) \
> --verbose
> endef
>
> diff --git a/package/boost/boost.mk b/package/boost/boost.mk
> --- a/package/boost/boost.mk
> +++ b/package/boost/boost.mk
> @@ -77,7 +77,7 @@
> endif
> endif
>
> -HOST_BOOST_OPT += toolset=gcc threading=multi variant=release link=shared \
> +HOST_BOOST_OPTS += toolset=gcc threading=multi variant=release link=shared \
> runtime-link=shared
>
> ifeq ($(BR2_MIPS_OABI32),y)
> @@ -88,7 +88,7 @@
> BOOST_ABI = sysv
> endif
>
> -BOOST_OPT += toolset=gcc \
> +BOOST_OPTS += toolset=gcc \
> threading=multi \
> abi=$(BOOST_ABI) \
> variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \
> @@ -98,7 +98,7 @@
> ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y)
> ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
> # posix backend needs monetary.h which isn't available on uClibc
> -BOOST_OPT += boost.locale.posix=off
> +BOOST_OPTS += boost.locale.posix=off
> endif
>
> BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv)
> @@ -123,7 +123,7 @@
> define BOOST_INSTALL_TARGET_CMDS
> (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
> --user-config=$(@D)/user-config.jam \
> - $(BOOST_OPT) \
> + $(BOOST_OPTS) \
> --prefix=$(TARGET_DIR)/usr \
> --layout=$(BOOST_LAYOUT) install )
> endef
> @@ -131,14 +131,14 @@
> define HOST_BOOST_BUILD_CMDS
> (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
> --user-config=$(@D)/user-config.jam \
> - $(HOST_BOOST_OPT) \
> + $(HOST_BOOST_OPTS) \
> --prefix=$(HOST_DIR)/usr )
> endef
>
> define HOST_BOOST_INSTALL_CMDS
> (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q -d+1 \
> --user-config=$(@D)/user-config.jam \
> - $(HOST_BOOST_OPT) \
> + $(HOST_BOOST_OPTS) \
> --prefix=$(HOST_DIR)/usr \
> --layout=$(BOOST_LAYOUT) install )
> endef
> @@ -146,7 +146,7 @@
> define BOOST_INSTALL_STAGING_CMDS
> (cd $(@D) && ./bjam -j$(PARALLEL_JOBS) -d+1 \
> --user-config=$(@D)/user-config.jam \
> - $(BOOST_OPT) \
> + $(BOOST_OPTS) \
> --prefix=$(STAGING_DIR)/usr \
> --layout=$(BOOST_LAYOUT) install)
> endef
> diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
> --- a/package/dhcpcd/dhcpcd.mk
> +++ b/package/dhcpcd/dhcpcd.mk
> @@ -11,15 +11,15 @@
> DHCPCD_LICENSE = BSD-2c
>
> ifeq ($(BR2_INET_IPV6),)
> - DHCPCD_CONFIG_OPT += --disable-ipv6
> + DHCPCD_CONFIG_OPTS += --disable-ipv6
> endif
>
> ifeq ($(BR2_PREFER_STATIC_LIB),y)
> - DHCPCD_CONFIG_OPT += --enable-static
> + DHCPCD_CONFIG_OPTS += --enable-static
> endif
>
> ifeq ($(BR2_USE_MMU),)
> - DHCPCD_CONFIG_OPT += --disable-fork
> + DHCPCD_CONFIG_OPTS += --disable-fork
> endif
>
> define DHCPCD_CONFIGURE_CMDS
> @@ -27,7 +27,7 @@
> $(TARGET_CONFIGURE_OPTS) ./configure \
> --target=$(BR2_GCC_TARGET_ARCH) \
> --os=linux \
> - $(DHCPCD_CONFIG_OPT) )
> + $(DHCPCD_CONFIG_OPTS) )
> endef
>
> define DHCPCD_BUILD_CMDS
> diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
> --- a/package/freetype/freetype.mk
> +++ b/package/freetype/freetype.mk
> @@ -20,7 +20,7 @@
> # Regen required because the tarball ships with an experimental ltmain.sh
> # that can't be patched by our infra.
> # autogen.sh is because autotools stuff lives in other directories and
> -# even AUTORECONF with _OPT doesn't do it properly.
> +# even AUTORECONF with _OPTS doesn't do it properly.
> # POST_PATCH is because we still need to patch libtool after the regen.
> define FREETYPE_RUN_AUTOGEN
> cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
> diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
> --- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
> +++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
> @@ -10,69 +10,69 @@
> GST_FFMPEG_INSTALL_STAGING = YES
> GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base
>
> -GST_FFMPEG_CONF_EXTRA_OPT = \
> +GST_FFMPEG_CONF_EXTRA_OPTS = \
> --cross-prefix=$(TARGET_CROSS) \
> --target-os=linux
>
> ifeq ($(BR2_PACKAGE_ZLIB),y)
> -GST_FFMPEG_CONF_EXTRA_OPT += --enable-zlib
> +GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib
> GST_FFMPEG_DEPENDENCIES += zlib
> else
> -GST_FFMPEG_CONF_EXTRA_OPT += --disable-zlib
> +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-zlib
> endif
>
> ifeq ($(BR2_PACKAGE_BZIP2),y)
> -GST_FFMPEG_CONF_EXTRA_OPT += --enable-bzlib
> +GST_FFMPEG_CONF_EXTRA_OPTS += --enable-bzlib
> GST_FFMPEG_DEPENDENCIES += bzip2
> else
> -GST_FFMPEG_CONF_EXTRA_OPT += --disable-bzlib
> +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-bzlib
> endif
>
> ifeq ($(BR2_X86_CPU_HAS_MMX),y)
> -GST_FFMPEG_CONF_EXTRA_OPT += --enable-yasm
> +GST_FFMPEG_CONF_EXTRA_OPTS += --enable-yasm
> GST_FFMPEG_DEPENDENCIES += host-yasm
> else
> -GST_FFMPEG_CONF_EXTRA_OPT += --disable-yasm
> -GST_FFMPEG_CONF_EXTRA_OPT += --disable-mmx
> +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-yasm
> +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-mmx
> endif
>
> ifeq ($(BR2_X86_CPU_HAS_SSE),y)
> -GST_FFMPEG_CONF_EXTRA_OPT += --enable-sse
> +GST_FFMPEG_CONF_EXTRA_OPTS += --enable-sse
> else
> -GST_FFMPEG_CONF_EXTRA_OPT += --disable-sse
> +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-sse
> endif
>
> ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
> -GST_FFMPEG_CONF_EXTRA_OPT += --enable-ssse3
> +GST_FFMPEG_CONF_EXTRA_OPTS += --enable-ssse3
> else
> -GST_FFMPEG_CONF_EXTRA_OPT += --disable-ssse3
> +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-ssse3
> endif
>
> # Explicitly disable everything that doesn't match for ARM
> # FFMPEG "autodetects" by compiling an extended instruction via AS
> # This works on compilers that aren't built for generic by default
> ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
> -GST_FFMPEG_CONF_EXTRA_OPT += --disable-armv5te
> +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te
> endif
> ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
> -GST_FFMPEG_CONF_EXTRA_OPT += --enable-armv6
> +GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6
> else
> -GST_FFMPEG_CONF_EXTRA_OPT += --disable-armv6 --disable-armv6t2
> +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
> endif
> ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
> -GST_FFMPEG_CONF_EXTRA_OPT += --enable-neon
> +GST_FFMPEG_CONF_EXTRA_OPTS += --enable-neon
> endif
>
> ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
> -GST_FFMPEG_CONF_EXTRA_OPT += --enable-altivec
> +GST_FFMPEG_CONF_EXTRA_OPTS += --enable-altivec
> else
> -GST_FFMPEG_CONF_EXTRA_OPT += --disable-altivec
> +GST_FFMPEG_CONF_EXTRA_OPTS += --disable-altivec
> endif
>
> ifeq ($(BR2_PREFER_STATIC_LIB),)
> -GST_FFMPEG_CONF_EXTRA_OPT += --enable-pic
> +GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic
> endif
>
> -GST_FFMPEG_CONF_OPTS = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPT)"
> +GST_FFMPEG_CONF_OPTS = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)"
>
> $(eval $(autotools-package))
> diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk
> --- a/package/gstreamer1/gst1-libav/gst1-libav.mk
> +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk
> @@ -10,74 +10,74 @@
>
> GST1_LIBAV_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base
>
> -GST1_LIBAV_CONF_EXTRA_OPT = \
> +GST1_LIBAV_CONF_EXTRA_OPTS = \
> --cross-prefix=$(TARGET_CROSS) \
> --target-os=linux \
> $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
>
> ifeq ($(BR2_PACKAGE_ZLIB),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --enable-zlib
> +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-zlib
> GST1_LIBAV_DEPENDENCIES += zlib
> else
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-zlib
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-zlib
> endif
>
> ifeq ($(BR2_PACKAGE_BZIP2),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --enable-bzlib
> +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-bzlib
> GST1_LIBAV_DEPENDENCIES += bzip2
> else
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-bzlib
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib
> endif
>
> ifeq ($(BR2_X86_CPU_HAS_MMX),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --enable-yasm
> +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-yasm
> GST1_LIBAV_DEPENDENCIES += host-yasm
> else
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-yasm
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-mmx
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-yasm
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-mmx
> endif
>
> ifeq ($(BR2_X86_CPU_HAS_SSE),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --enable-sse
> +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-sse
> else
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-sse
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-sse
> endif
>
> ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --enable-ssse3
> +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-ssse3
> else
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-ssse3
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-ssse3
> endif
>
> # Explicitly disable everything that doesn't match for ARM
> # FFMPEG "autodetects" by compiling an extended instruction via AS
> # This works on compilers that aren't built for generic by default
> ifeq ($(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-armv5te
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv5te
> endif
> ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --enable-armv6
> +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-armv6
> else
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-armv6 --disable-armv6t2
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2
> endif
> ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --enable-neon
> +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-neon
> else
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-neon
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-neon
> endif
> ifeq ($(BR2_ARM_CPU_HAS_VFPV2),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --enable-vfp
> +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-vfp
> else
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-vfp
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-vfp
> endif
>
> ifeq ($(BR2_POWERPC_CPU_HASH_ALTIVEC),y)
> -GST1_LIBAV_CONF_EXTRA_OPT += --enable-altivec
> +GST1_LIBAV_CONF_EXTRA_OPTS += --enable-altivec
> else
> -GST1_LIBAV_CONF_EXTRA_OPT += --disable-altivec
> +GST1_LIBAV_CONF_EXTRA_OPTS += --disable-altivec
> endif
>
> GST1_LIBAV_CONF_OPTS = \
> - --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPT)"
> + --with-libav-extra-configure="$(GST1_LIBAV_CONF_EXTRA_OPTS)"
>
> $(eval $(autotools-package))
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 14 of 15] .mk files: remove alignment of line continuation characters
2014-09-27 19:32 ` [Buildroot] [PATCH 14 of 15] .mk files: remove alignment of line continuation characters Thomas De Schampheleire
@ 2014-09-28 12:10 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-28 12:10 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> The Buildroot coding style does not align assignments nor line continuation
> characters (\). This patch updates the .mk files to reflect this.
>
> Command used:
> find * -name "*.mk" | xargs sed -i 's/\s\+\\\s*$/ \\/g'
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Casual visual inspection, plus:
git difftool -y -x 'diff -dub' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: new patch
>
> boot/lpc32xxcdl/lpc32xxcdl.mk | 8 +-
> boot/uboot/uboot.mk | 8 +-
> linux/linux-ext-rtai.mk | 10 +-
> linux/linux-ext-xenomai.mk | 6 +-
> linux/linux.mk | 14 +-
> package/acl/acl.mk | 14 +-
> package/attr/attr.mk | 14 +-
> package/bluez5_utils/bluez5_utils.mk | 6 +-
> package/bluez_utils/bluez_utils.mk | 24 +-
> package/boost/boost.mk | 14 +-
> package/cegui06/cegui06.mk | 32 +-
> package/celt051/celt051.mk | 14 +-
> package/connman/connman.mk | 10 +-
> package/dhcpcd/dhcpcd.mk | 8 +-
> package/directfb/directfb.mk | 2 +-
> package/dtc/dtc.mk | 4 +-
> package/duma/duma.mk | 4 +-
> package/efl/libecore/libecore.mk | 12 +-
> package/enlightenment/enlightenment.mk | 24 +-
> package/eudev/eudev.mk | 16 +-
> package/ffmpeg/ffmpeg.mk | 4 +-
> package/freetype/freetype.mk | 2 +-
> package/glibc/glibc.mk | 4 +-
> package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 40 +-
> package/gstreamer1/gst1-libav/gst1-libav.mk | 44 +-
> package/gvfs/gvfs.mk | 16 +-
> package/jack2/jack2.mk | 6 +-
> package/keyutils/keyutils.mk | 10 +-
> package/lesstif/lesstif.mk | 2 +-
> package/libungif/libungif.mk | 6 +-
> package/linux-firmware/linux-firmware.mk | 62 ++--
> package/midori/midori.mk | 6 +-
> package/mplayer/mplayer.mk | 6 +-
> package/ngrep/ngrep.mk | 2 +-
> package/opencv/opencv.mk | 116 +++++-----
> package/openocd/openocd.mk | 8 +-
> package/pkg-generic.mk | 4 +-
> package/poco/poco.mk | 40 +-
> package/python/python.mk | 52 ++--
> package/python3/python3.mk | 42 +-
> package/qemu/qemu.mk | 16 +-
> package/rt-tests/rt-tests.mk | 12 +-
> package/rtai/rtai.mk | 6 +-
> package/samba/samba.mk | 8 +-
> package/spice/spice.mk | 24 +-
> package/squashfs/squashfs.mk | 16 +-
> package/strongswan/strongswan.mk | 86 +++---
> package/systemd/systemd.mk | 12 +-
> package/tvheadend/tvheadend.mk | 20 +-
> package/tz/tz.mk | 18 +-
> package/tzdata/tzdata.mk | 18 +-
> package/uboot-tools/uboot-tools.mk | 26 +-
> package/udisks/udisks.mk | 18 +-
> package/usbmount/usbmount.mk | 4 +-
> package/vde2/vde2.mk | 12 +-
> package/wpa_supplicant/wpa_supplicant.mk | 10 +-
> package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 84 +++---
> package/xbmc/xbmc.mk | 2 +-
> 58 files changed, 554 insertions(+), 554 deletions(-)
>
> diff --git a/boot/lpc32xxcdl/lpc32xxcdl.mk b/boot/lpc32xxcdl/lpc32xxcdl.mk
> --- a/boot/lpc32xxcdl/lpc32xxcdl.mk
> +++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
> @@ -33,10 +33,10 @@
> endif
>
> LPC32XXCDL_BUILD_FLAGS = \
> - CROSS_COMPILE=$(TARGET_CROSS) \
> - NXPMCU_WINBASE=$(@D) \
> - NXPMCU_SOFTWARE=$(@D) \
> - BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \
> + CROSS_COMPILE=$(TARGET_CROSS) \
> + NXPMCU_WINBASE=$(@D) \
> + NXPMCU_SOFTWARE=$(@D) \
> + BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \
> CSP=lpc32xx TOOL=gnu GEN=lpc
>
> LPC32XXCDL_BOARD_STARTUP_DIR = \
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -95,8 +95,8 @@
> endif
>
> define UBOOT_CONFIGURE_CMDS
> - $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
> - $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
> + $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
> + $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
> $(UBOOT_BOARD_NAME)_config
> @echo >> $(@D)/include/config.h
> @echo "/* Add a wrapper around the values Buildroot sets. */" >> $(@D)/include/config.h
> @@ -114,8 +114,8 @@
> endef
>
> define UBOOT_BUILD_CMDS
> - $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
> - $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
> + $(TARGET_CONFIGURE_OPTS) $(UBOOT_CONFIGURE_OPTS) \
> + $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
> $(UBOOT_MAKE_TARGET)
> endef
>
> diff --git a/linux/linux-ext-rtai.mk b/linux/linux-ext-rtai.mk
> --- a/linux/linux-ext-rtai.mk
> +++ b/linux/linux-ext-rtai.mk
> @@ -25,8 +25,8 @@
> define RTAI_PREPARE_KERNEL
> kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \
> if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
> - support/scripts/apply-patches.sh $(LINUX_DIR) \
> - $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ \
> + support/scripts/apply-patches.sh $(LINUX_DIR) \
> + $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ \
> hal-linux-$${kver}-*patch ; \
> else \
> echo "No RTAI patch for your kernel version" ; \
> @@ -35,9 +35,9 @@
> endef
> else
> define RTAI_PREPARE_KERNEL
> - support/scripts/apply-patches.sh \
> - $(LINUX_DIR) \
> - $(dir $(RTAI_PATCH)) \
> + support/scripts/apply-patches.sh \
> + $(LINUX_DIR) \
> + $(dir $(RTAI_PATCH)) \
> $(notdir $(RTAI_PATCH))
> endef
> endif
> diff --git a/linux/linux.mk b/linux/linux.mk
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -266,8 +266,8 @@
> $(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
> cp $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/)
> $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
> - @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
> - $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
> + @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
> + $(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
> fi
> $(LINUX_BUILD_DTB)
> $(LINUX_APPEND_DTB)
> @@ -284,8 +284,8 @@
>
> define LINUX_INSTALL_HOST_TOOLS
> # Installing dtc (device tree compiler) as host tool, if selected
> - if grep -q "CONFIG_DTC=y" $(@D)/.config; then \
> - $(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ; \
> + if grep -q "CONFIG_DTC=y" $(@D)/.config; then \
> + $(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/dtc ; \
> fi
> endef
>
> @@ -299,10 +299,10 @@
> $(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
> # Install modules and remove symbolic links pointing to build
> # directories, not relevant on the target
> - @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
> + @if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
> $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \
> - rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
> - rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
> + rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ; \
> + rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ; \
> fi
> $(LINUX_INSTALL_HOST_TOOLS)
> endef
> diff --git a/package/acl/acl.mk b/package/acl/acl.mk
> --- a/package/acl/acl.mk
> +++ b/package/acl/acl.mk
> @@ -16,15 +16,15 @@
> # While the configuration system uses autoconf, the Makefiles are
> # hand-written and do not use automake. Therefore, we have to hack
> # around their deficiencies by passing installation paths.
> -ACL_INSTALL_STAGING_OPTS = \
> - prefix=$(STAGING_DIR)/usr \
> - exec_prefix=$(STAGING_DIR)/usr \
> - PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
> +ACL_INSTALL_STAGING_OPTS = \
> + prefix=$(STAGING_DIR)/usr \
> + exec_prefix=$(STAGING_DIR)/usr \
> + PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
> install-dev install-lib
>
> -ACL_INSTALL_TARGET_OPTS = \
> - prefix=$(TARGET_DIR)/usr \
> - exec_prefix=$(TARGET_DIR)/usr \
> +ACL_INSTALL_TARGET_OPTS = \
> + prefix=$(TARGET_DIR)/usr \
> + exec_prefix=$(TARGET_DIR)/usr \
> install install-lib
>
> $(eval $(autotools-package))
> diff --git a/package/attr/attr.mk b/package/attr/attr.mk
> --- a/package/attr/attr.mk
> +++ b/package/attr/attr.mk
> @@ -15,15 +15,15 @@
> # While the configuration system uses autoconf, the Makefiles are
> # hand-written and do not use automake. Therefore, we have to hack
> # around their deficiencies by passing installation paths.
> -ATTR_INSTALL_STAGING_OPTS = \
> - prefix=$(STAGING_DIR)/usr \
> - exec_prefix=$(STAGING_DIR)/usr \
> - PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
> +ATTR_INSTALL_STAGING_OPTS = \
> + prefix=$(STAGING_DIR)/usr \
> + exec_prefix=$(STAGING_DIR)/usr \
> + PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
> install-dev install-lib
>
> -ATTR_INSTALL_TARGET_OPTS = \
> - prefix=$(TARGET_DIR)/usr \
> - exec_prefix=$(TARGET_DIR)/usr \
> +ATTR_INSTALL_TARGET_OPTS = \
> + prefix=$(TARGET_DIR)/usr \
> + exec_prefix=$(TARGET_DIR)/usr \
> install install-lib
>
> $(eval $(autotools-package))
> diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk
> --- a/package/bluez5_utils/bluez5_utils.mk
> +++ b/package/bluez5_utils/bluez5_utils.mk
> @@ -12,9 +12,9 @@
> BLUEZ5_UTILS_LICENSE = GPLv2+ LGPLv2.1+
> BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
>
> -BLUEZ5_UTILS_CONF_OPTS = \
> - --enable-tools \
> - --enable-library \
> +BLUEZ5_UTILS_CONF_OPTS = \
> + --enable-tools \
> + --enable-library \
> --disable-cups
>
> ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
> diff --git a/package/bluez_utils/bluez_utils.mk b/package/bluez_utils/bluez_utils.mk
> --- a/package/bluez_utils/bluez_utils.mk
> +++ b/package/bluez_utils/bluez_utils.mk
> @@ -16,24 +16,24 @@
>
> # BlueZ 3.x compatibility
> ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
> -BLUEZ_UTILS_CONF_OPTS += \
> - --enable-hidd \
> - --enable-pand \
> - --enable-sdp \
> +BLUEZ_UTILS_CONF_OPTS += \
> + --enable-hidd \
> + --enable-pand \
> + --enable-sdp \
> --enable-dund
> endif
>
> # audio support
> ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
> -BLUEZ_UTILS_DEPENDENCIES += \
> - alsa-lib \
> +BLUEZ_UTILS_DEPENDENCIES += \
> + alsa-lib \
> libsndfile
> -BLUEZ_UTILS_CONF_OPTS += \
> - --enable-alsa \
> +BLUEZ_UTILS_CONF_OPTS += \
> + --enable-alsa \
> --enable-audio
> else
> -BLUEZ_UTILS_CONF_OPTS += \
> - --disable-alsa \
> +BLUEZ_UTILS_CONF_OPTS += \
> + --disable-alsa \
> --disable-audio
> endif
>
> @@ -47,10 +47,10 @@
> # USB support
> ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
> BLUEZ_UTILS_DEPENDENCIES += libusb
> -BLUEZ_UTILS_CONF_OPTS += \
> +BLUEZ_UTILS_CONF_OPTS += \
> --enable-usb
> else
> -BLUEZ_UTILS_CONF_OPTS += \
> +BLUEZ_UTILS_CONF_OPTS += \
> --disable-usb
> endif
>
> diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
> --- a/package/cegui06/cegui06.mk
> +++ b/package/cegui06/cegui06.mk
> @@ -13,24 +13,24 @@
> CEGUI06_LICENSE_FILES = COPYING
> CEGUI06_INSTALL_STAGING = YES
>
> -CEGUI06_DEPENDENCIES = \
> - expat \
> - freetype \
> - pcre \
> +CEGUI06_DEPENDENCIES = \
> + expat \
> + freetype \
> + pcre \
>
> -CEGUI06_CONF_OPTS = \
> - --enable-expat \
> - --disable-external-tinyxml \
> - --disable-xerces-c \
> - --disable-libxml \
> - --disable-tinyxml \
> - --disable-opengl-renderer \
> - --disable-external-glew \
> +CEGUI06_CONF_OPTS = \
> + --enable-expat \
> + --disable-external-tinyxml \
> + --disable-xerces-c \
> + --disable-libxml \
> + --disable-tinyxml \
> + --disable-opengl-renderer \
> + --disable-external-glew \
> --disable-irrlicht-renderer \
> --disable-directfb-renderer \
> - --disable-samples \
> - --disable-lua-module \
> - --disable-toluacegui \
> - --disable-external-toluapp \
> + --disable-samples \
> + --disable-lua-module \
> + --disable-toluacegui \
> + --disable-external-toluapp \
>
> $(eval $(autotools-package))
> diff --git a/package/celt051/celt051.mk b/package/celt051/celt051.mk
> --- a/package/celt051/celt051.mk
> +++ b/package/celt051/celt051.mk
> @@ -18,13 +18,13 @@
> # if target is the same kind as host (ie. same arch, same bitness,
> # same endianness, so that /usr/lib contains libraries linkable by
> # our cross-compiler)
> -CELT051_CONF_OPTS = \
> - --enable-fixed-point \
> - --disable-fixed-point-debug \
> +CELT051_CONF_OPTS = \
> + --enable-fixed-point \
> + --disable-fixed-point-debug \
> --disable-experimental-postfilter \
> - --disable-static-modes \
> - --disable-assertions \
> - --disable-oggtest \
> - --with-ogg=$(STAGING_DIR)/usr \
> + --disable-static-modes \
> + --disable-assertions \
> + --disable-oggtest \
> + --with-ogg=$(STAGING_DIR)/usr \
>
> $(eval $(autotools-package))
> diff --git a/package/connman/connman.mk b/package/connman/connman.mk
> --- a/package/connman/connman.mk
> +++ b/package/connman/connman.mk
> @@ -12,12 +12,12 @@
> CONNMAN_LICENSE = GPLv2
> CONNMAN_LICENSE_FILES = COPYING
> CONNMAN_CONF_OPTS += --localstatedir=/var \
> - $(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
> - $(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
> - $(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
> + $(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
> + $(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
> + $(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
> $(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \
> - $(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \
> - $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
> + $(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \
> + $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
> $(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \
> $(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \
> $(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system)
> diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
> --- a/package/directfb/directfb.mk
> +++ b/package/directfb/directfb.mk
> @@ -67,7 +67,7 @@
> $(if $(BR2_PACKAGE_DIRECTFB_MATROX),matrox) \
> $(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \
> $(if $(BR2_PACKAGE_DIRECTFB_UNICHROME),unichrome) \
> - $(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \
> + $(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \
> $(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
>
> ifeq ($(strip $(DIRECTFB_GFX)),)
> diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
> --- a/package/dtc/dtc.mk
> +++ b/package/dtc/dtc.mk
> @@ -34,8 +34,8 @@
> endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y
>
> define DTC_BUILD_CMDS
> - $(TARGET_CONFIGURE_OPTS) \
> - CFLAGS="$(TARGET_CFLAGS)" \
> + $(TARGET_CONFIGURE_OPTS) \
> + CFLAGS="$(TARGET_CFLAGS)" \
> $(MAKE) -C $(@D) PREFIX=/usr $(DTC_BUILD_GOAL)
> endef
>
> diff --git a/package/duma/duma.mk b/package/duma/duma.mk
> --- a/package/duma/duma.mk
> +++ b/package/duma/duma.mk
> @@ -18,9 +18,9 @@
> # The dependency of some source files in duma_config.h, which is generated at
> # build time, is not specified in the Makefile. Force non-parallel build.
> define DUMA_BUILD_CMDS
> - $(MAKE1) $(TARGET_CONFIGURE_OPTS) \
> + $(MAKE1) $(TARGET_CONFIGURE_OPTS) \
> OS=linux \
> - DUMA_OPTIONS="$(DUMA_OPTIONS)" \
> + DUMA_OPTIONS="$(DUMA_OPTIONS)" \
> $(DUMA_CPP) -C $(@D)
> endef
>
> diff --git a/package/efl/libecore/libecore.mk b/package/efl/libecore/libecore.mk
> --- a/package/efl/libecore/libecore.mk
> +++ b/package/efl/libecore/libecore.mk
> @@ -15,12 +15,12 @@
> LIBECORE_DEPENDENCIES = host-pkgconf libeina
>
> HOST_LIBECORE_DEPENDENCIES = host-pkgconf host-libeina host-libevas
> -HOST_LIBECORE_CONF_OPTS += \
> - --enable-ecore-evas \
> - --disable-simple-x11 \
> - --disable-ecore-directfb \
> - --disable-ecore-x \
> - --disable-ecore-x-xcb \
> +HOST_LIBECORE_CONF_OPTS += \
> + --enable-ecore-evas \
> + --disable-simple-x11 \
> + --disable-ecore-directfb \
> + --disable-ecore-x \
> + --disable-ecore-x-xcb \
> --disable-ecore-imf-xim
>
> # default options
> diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk
> --- a/package/enlightenment/enlightenment.mk
> +++ b/package/enlightenment/enlightenment.mk
> @@ -9,19 +9,19 @@
> ENLIGHTENMENT_LICENSE = BSD-2c
> ENLIGHTENMENT_LICENSE_FILES = COPYING
>
> -ENLIGHTENMENT_DEPENDENCIES = \
> - host-pkgconf \
> - libecore \
> - libeet \
> - libeina \
> - libevas \
> +ENLIGHTENMENT_DEPENDENCIES = \
> + host-pkgconf \
> + libecore \
> + libeet \
> + libeina \
> + libevas \
> libevas-generic-loaders \
> - libedje \
> - libefreet \
> - libedbus \
> - libeio \
> - host-libedje \
> - host-libeet \
> + libedje \
> + libefreet \
> + libedbus \
> + libeio \
> + host-libedje \
> + host-libeet \
> xcb-util-keysyms
>
> ENLIGHTENMENT_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
> diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk
> --- a/package/eudev/eudev.mk
> +++ b/package/eudev/eudev.mk
> @@ -14,14 +14,14 @@
> # mq_getattr is in librt
> EUDEV_CONF_ENV += LIBS=-lrt
>
> -EUDEV_CONF_OPTS = \
> - --disable-manpages \
> - --sbindir=/sbin \
> - --with-rootlibdir=/lib \
> - --libexecdir=/lib \
> - --with-firmware-path=/lib/firmware \
> - --disable-introspection \
> - --enable-split-usr \
> +EUDEV_CONF_OPTS = \
> + --disable-manpages \
> + --sbindir=/sbin \
> + --with-rootlibdir=/lib \
> + --libexecdir=/lib \
> + --with-firmware-path=/lib/firmware \
> + --disable-introspection \
> + --enable-split-usr \
> --enable-libkmod
>
> EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod
> diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
> --- a/package/ffmpeg/ffmpeg.mk
> +++ b/package/ffmpeg/ffmpeg.mk
> @@ -17,7 +17,7 @@
> endif
>
> FFMPEG_CONF_OPTS = \
> - --prefix=/usr \
> + --prefix=/usr \
> --enable-avfilter \
> --disable-version3 \
> --enable-logging \
> @@ -326,7 +326,7 @@
> $(TARGET_CONFIGURE_ARGS) \
> $(FFMPEG_CONF_ENV) \
> ./configure \
> - --enable-cross-compile \
> + --enable-cross-compile \
> --cross-prefix=$(TARGET_CROSS) \
> --sysroot=$(STAGING_DIR) \
> --host-cc="$(HOSTCC)" \
> diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
> --- a/package/glibc/glibc.mk
> +++ b/package/glibc/glibc.mk
> @@ -102,8 +102,8 @@
> #
>
> GLIBC_LIBS_LIB = \
> - ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* \
> - libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.* \
> + ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* \
> + libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.* \
> libnss_files.so.* libnss_dns.so.*
>
> ifeq ($(BR2_PACKAGE_GDB),y)
> diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
> --- a/package/gvfs/gvfs.mk
> +++ b/package/gvfs/gvfs.mk
> @@ -18,12 +18,12 @@
> GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
>
> GVFS_CONF_OPTS = \
> - --disable-gconf \
> - --disable-cdda \
> - --disable-obexftp \
> - --disable-gphoto2 \
> - --disable-keyring \
> - --disable-bash-completion \
> + --disable-gconf \
> + --disable-cdda \
> + --disable-obexftp \
> + --disable-gphoto2 \
> + --disable-keyring \
> + --disable-bash-completion \
> --disable-hal
>
> ifeq ($(BR2_PACKAGE_AVAHI),y)
> @@ -82,8 +82,8 @@
> endef
>
> GVFS_POST_INSTALL_TARGET_HOOKS += \
> - GVFS_REMOVE_USELESS_BINARY \
> - GVFS_REMOVE_TARGET_SCHEMAS \
> + GVFS_REMOVE_USELESS_BINARY \
> + GVFS_REMOVE_TARGET_SCHEMAS \
> GVFS_COMPILE_SCHEMAS
>
> $(eval $(autotools-package))
> diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk
> --- a/package/jack2/jack2.mk
> +++ b/package/jack2/jack2.mk
> @@ -12,10 +12,10 @@
>
> define JACK2_CONFIGURE_CMDS
> (cd $(@D); \
> - $(TARGET_CONFIGURE_OPTS) \
> + $(TARGET_CONFIGURE_OPTS) \
> $(HOST_DIR)/usr/bin/python2 ./waf configure \
> - --prefix=/usr \
> - --alsa \
> + --prefix=/usr \
> + --alsa \
> )
> endef
>
> diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
> --- a/package/keyutils/keyutils.mk
> +++ b/package/keyutils/keyutils.mk
> @@ -11,11 +11,11 @@
> KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
> KEYUTILS_INSTALL_STAGING = YES
>
> -KEYUTILS_MAKE_ENV = \
> - INSTALL=$(INSTALL) \
> - LIBDIR=/usr/lib \
> - USRLIBDIR=/usr/lib \
> - LN=$(HOSTLN) \
> +KEYUTILS_MAKE_ENV = \
> + INSTALL=$(INSTALL) \
> + LIBDIR=/usr/lib \
> + USRLIBDIR=/usr/lib \
> + LN=$(HOSTLN) \
>
> define KEYUTILS_BUILD_CMDS
> $(KEYUTILS_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
> diff --git a/package/lesstif/lesstif.mk b/package/lesstif/lesstif.mk
> --- a/package/lesstif/lesstif.mk
> +++ b/package/lesstif/lesstif.mk
> @@ -17,7 +17,7 @@
> --with-gnu-ld \
> --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \
> --enable-debug=no \
> - --enable-production=yes \
> + --enable-production=yes \
> --enable-build-tests=no \
> --no-recursion
>
> diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk
> --- a/package/libungif/libungif.mk
> +++ b/package/libungif/libungif.mk
> @@ -13,9 +13,9 @@
> LIBUNGIF_LICENSE_FILES = COPYING
>
> LIBUNGIF_BINS = gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifburst gifclip \
> - gifclrmp gifcolor gifcomb gifcompose giffiltr giffix gifflip \
> - gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
> - gifrsize gifspnge giftext gifwedge icon2gif raw2gif rgb2gif \
> + gifclrmp gifcolor gifcomb gifcompose giffiltr giffix gifflip \
> + gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
> + gifrsize gifspnge giftext gifwedge icon2gif raw2gif rgb2gif \
> text2gif
>
> define LIBUNGIF_BINS_CLEANUP
> diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
> --- a/package/linux-firmware/linux-firmware.mk
> +++ b/package/linux-firmware/linux-firmware.mk
> @@ -37,17 +37,17 @@
> # rtl81xx
> ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX),y)
> LINUX_FIRMWARE_FILES += \
> - rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin \
> - rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin \
> - rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin \
> - rtlwifi/rtl8188efw.bin rtlwifi/rtl8192cufw_A.bin \
> + rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin \
> + rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin \
> + rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin \
> + rtlwifi/rtl8188efw.bin rtlwifi/rtl8192cufw_A.bin \
> rtlwifi/rtl8192cufw_B.bin rtlwifi/rtl8192cufw_TMSC.bin
> LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
> endif
>
> # rtl87xx
> ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX),y)
> -LINUX_FIRMWARE_FILES += rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin \
> +LINUX_FIRMWARE_FILES += rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin \
> rtlwifi/rtl8723fw_B.bin rtlwifi/rtl8723befw.bin
> LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
> endif
> @@ -107,19 +107,19 @@
> ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y)
> # wl1271-nvs.bin is a symlink to wl127x-nvs.bin
> LINUX_FIRMWARE_FILES += \
> - ti-connectivity/wl1271-fw-2.bin \
> - ti-connectivity/wl1271-fw-ap.bin \
> - ti-connectivity/wl1271-fw.bin \
> - ti-connectivity/wl1271-nvs.bin \
> - ti-connectivity/wl127x-fw-3.bin \
> - ti-connectivity/wl127x-fw-plt-3.bin \
> - ti-connectivity/wl127x-nvs.bin \
> - ti-connectivity/wl127x-fw-4-mr.bin \
> - ti-connectivity/wl127x-fw-4-plt.bin \
> - ti-connectivity/wl127x-fw-4-sr.bin \
> - ti-connectivity/wl127x-fw-5-mr.bin \
> - ti-connectivity/wl127x-fw-5-plt.bin \
> - ti-connectivity/wl127x-fw-5-sr.bin \
> + ti-connectivity/wl1271-fw-2.bin \
> + ti-connectivity/wl1271-fw-ap.bin \
> + ti-connectivity/wl1271-fw.bin \
> + ti-connectivity/wl1271-nvs.bin \
> + ti-connectivity/wl127x-fw-3.bin \
> + ti-connectivity/wl127x-fw-plt-3.bin \
> + ti-connectivity/wl127x-nvs.bin \
> + ti-connectivity/wl127x-fw-4-mr.bin \
> + ti-connectivity/wl127x-fw-4-plt.bin \
> + ti-connectivity/wl127x-fw-4-sr.bin \
> + ti-connectivity/wl127x-fw-5-mr.bin \
> + ti-connectivity/wl127x-fw-5-plt.bin \
> + ti-connectivity/wl127x-fw-5-sr.bin \
> ti-connectivity/TIInit_7.2.31.bts
> LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
> endif
> @@ -127,19 +127,19 @@
> # wl128x
> ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X),y)
> LINUX_FIRMWARE_FILES += \
> - ti-connectivity/wl128x-fw-3.bin \
> - ti-connectivity/wl128x-fw-ap.bin \
> - ti-connectivity/wl128x-fw-plt-3.bin \
> - ti-connectivity/wl128x-fw.bin \
> - ti-connectivity/wl1271-nvs.bin \
> - ti-connectivity/wl128x-nvs.bin \
> - ti-connectivity/wl12xx-nvs.bin \
> - ti-connectivity/wl128x-fw-4-mr.bin \
> - ti-connectivity/wl128x-fw-4-plt.bin \
> - ti-connectivity/wl128x-fw-4-sr.bin \
> - ti-connectivity/wl128x-fw-5-mr.bin \
> - ti-connectivity/wl128x-fw-5-plt.bin \
> - ti-connectivity/wl128x-fw-5-sr.bin \
> + ti-connectivity/wl128x-fw-3.bin \
> + ti-connectivity/wl128x-fw-ap.bin \
> + ti-connectivity/wl128x-fw-plt-3.bin \
> + ti-connectivity/wl128x-fw.bin \
> + ti-connectivity/wl1271-nvs.bin \
> + ti-connectivity/wl128x-nvs.bin \
> + ti-connectivity/wl12xx-nvs.bin \
> + ti-connectivity/wl128x-fw-4-mr.bin \
> + ti-connectivity/wl128x-fw-4-plt.bin \
> + ti-connectivity/wl128x-fw-4-sr.bin \
> + ti-connectivity/wl128x-fw-5-mr.bin \
> + ti-connectivity/wl128x-fw-5-plt.bin \
> + ti-connectivity/wl128x-fw-5-sr.bin \
> ti-connectivity/TIInit_7.2.31.bts
> # wl12xx-nvs.bin (above) is a symlink to:
> LINUX_FIRMWARE_FILES += ti-connectivity/wl127x-nvs.bin
> diff --git a/package/midori/midori.mk b/package/midori/midori.mk
> --- a/package/midori/midori.mk
> +++ b/package/midori/midori.mk
> @@ -30,10 +30,10 @@
> define MIDORI_CONFIGURE_CMDS
> $(MIDORI_WITHOUT_X11)
> (cd $(@D); \
> - $(TARGET_CONFIGURE_OPTS) \
> + $(TARGET_CONFIGURE_OPTS) \
> $(HOST_DIR)/usr/bin/python2 ./waf configure \
> - --prefix=/usr \
> - --disable-libnotify \
> + --prefix=/usr \
> + --disable-libnotify \
> )
> endef
>
> diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
> --- a/package/mplayer/mplayer.mk
> +++ b/package/mplayer/mplayer.mk
> @@ -35,7 +35,7 @@
> endif
>
> ifeq ($(BR2_PACKAGE_FREETYPE),y)
> -MPLAYER_CONF_OPTS += \
> +MPLAYER_CONF_OPTS += \
> --enable-freetype \
> --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
> MPLAYER_DEPENDENCIES += freetype
> @@ -44,7 +44,7 @@
> endif
>
> ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
> -MPLAYER_CONF_OPTS += \
> +MPLAYER_CONF_OPTS += \
> --enable-dvdread \
> --disable-dvdread-internal \
> --with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config
> @@ -52,7 +52,7 @@
> endif
>
> ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
> -MPLAYER_CONF_OPTS += \
> +MPLAYER_CONF_OPTS += \
> --enable-dvdnav \
> --with-dvdnav-config=$(STAGING_DIR)/usr/bin/dvdnav-config
> MPLAYER_DEPENDENCIES += libdvdnav
> diff --git a/package/ngrep/ngrep.mk b/package/ngrep/ngrep.mk
> --- a/package/ngrep/ngrep.mk
> +++ b/package/ngrep/ngrep.mk
> @@ -17,7 +17,7 @@
> endif
> NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)"
>
> -NGREP_CONF_OPTS = \
> +NGREP_CONF_OPTS = \
> --with-pcap-includes=$(STAGING_DIR)/usr/include \
> --enable-pcre \
> --with-pcre=$(STAGING_DIR)/usr \
> diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
> --- a/package/opencv/opencv.mk
> +++ b/package/opencv/opencv.mk
> @@ -13,58 +13,58 @@
> # OpenCV component options
> OPENCV_CONF_OPTS += \
> -DBUILD_WITH_DEBUG_INFO=OFF \
> - -DBUILD_DOCS=OFF \
> - -DBUILD_EXAMPLES=OFF \
> + -DBUILD_DOCS=OFF \
> + -DBUILD_EXAMPLES=OFF \
> -DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS),ON,OFF) \
> -DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF)
>
> # OpenCV build options
> OPENCV_CONF_OPTS += \
> - -DBUILD_WITH_STATIC_CRT=OFF \
> - -DENABLE_FAST_MATH=ON \
> - -DENABLE_NOISY_WARNINGS=OFF \
> - -DENABLE_OMIT_FRAME_POINTER=ON \
> + -DBUILD_WITH_STATIC_CRT=OFF \
> + -DENABLE_FAST_MATH=ON \
> + -DENABLE_NOISY_WARNINGS=OFF \
> + -DENABLE_OMIT_FRAME_POINTER=ON \
> -DENABLE_PRECOMPILED_HEADERS=OFF \
> - -DENABLE_PROFILING=OFF \
> + -DENABLE_PROFILING=OFF \
> -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON
>
> # OpenCV link options
> OPENCV_CONF_OPTS += \
> -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
> - -DCMAKE_SKIP_RPATH=OFF \
> + -DCMAKE_SKIP_RPATH=OFF \
> -DCMAKE_USE_RELATIVE_PATHS=OFF
>
> # OpenCV packaging options:
> OPENCV_CONF_OPTS += \
> - -DBUILD_PACKAGE=OFF \
> + -DBUILD_PACKAGE=OFF \
> -DENABLE_SOLUTION_FOLDERS=OFF \
> -DINSTALL_CREATE_DISTRIB=OFF
>
> # OpenCV module selection
> OPENCV_CONF_OPTS += \
> - -DBUILD_opencv_androidcamera=OFF \
> - -DBUILD_opencv_apps=OFF \
> - -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \
> - -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \
> - -DBUILD_opencv_core=ON \
> - -DBUILD_opencv_dynamicuda=OFF \
> + -DBUILD_opencv_androidcamera=OFF \
> + -DBUILD_opencv_apps=OFF \
> + -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \
> + -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \
> + -DBUILD_opencv_core=ON \
> + -DBUILD_opencv_dynamicuda=OFF \
> -DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \
> - -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \
> - -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \
> - -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \
> - -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \
> - -DBUILD_opencv_java=OFF \
> - -DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \
> - -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \
> - -DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \
> + -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \
> + -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \
> + -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \
> + -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \
> + -DBUILD_opencv_java=OFF \
> + -DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \
> + -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \
> + -DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \
> -DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),ON,OFF) \
> - -DBUILD_opencv_ocl=OFF \
> - -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \
> - -DBUILD_opencv_python=OFF \
> + -DBUILD_opencv_ocl=OFF \
> + -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \
> + -DBUILD_opencv_python=OFF \
> -DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV_LIB_STITCHING),ON,OFF) \
> -DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV_LIB_SUPERRES),ON,OFF) \
> - -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \
> - -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \
> + -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \
> + -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \
> -DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB),ON,OFF) \
> -DBUILD_opencv_world=OFF
>
> @@ -74,17 +74,17 @@
> # adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
> OPENCV_CONF_OPTS += \
> -DENABLE_POWERPC=OFF \
> - -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
> - -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
> - -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
> - -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
> + -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
> + -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
> + -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
> + -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
> -DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \
> -DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
>
> # Cuda stuff
> OPENCV_CONF_OPTS += \
> -DWITH_CUBLAS=OFF \
> - -DWITH_CUDA=OFF \
> + -DWITH_CUDA=OFF \
> -DWITH_CUFFT=OFF
>
> # NVidia stuff
> @@ -98,7 +98,7 @@
> # Intel stuff
> OPENCV_CONF_OPTS += \
> -DWITH_INTELPERC=OFF \
> - -DWITH_IPP=OFF \
> + -DWITH_IPP=OFF \
> -DWITH_TBB=OFF
>
> # Smartek stuff
> @@ -112,53 +112,53 @@
>
> # Non-Linux support (Android options) must remain OFF:
> OPENCV_CONF_OPTS += \
> - -DWITH_ANDROID_CAMERA=OFF \
> + -DWITH_ANDROID_CAMERA=OFF \
> -DBUILD_ANDROID_CAMERA_WRAPPER=OFF \
> - -DBUILD_ANDROID_EXAMPLES=OFF \
> - -DINSTALL_ANDROID_EXAMPLES=OFF \
> - -DBUILD_FAT_JAVA_LIB=OFF \
> + -DBUILD_ANDROID_EXAMPLES=OFF \
> + -DINSTALL_ANDROID_EXAMPLES=OFF \
> + -DBUILD_FAT_JAVA_LIB=OFF \
> -DBUILD_JAVA_SUPPORT=OFF
>
> # Non-Linux support (Mac OSX options) must remain OFF:
> OPENCV_CONF_OPTS += \
> - -DWITH_AVFOUNDATION=OFF \
> - -DWITH_CARBON=OFF \
> + -DWITH_AVFOUNDATION=OFF \
> + -DWITH_CARBON=OFF \
> -DWITH_QUICKTIME=OFF
>
> # Non-Linux support (Windows options) must remain OFF:
> OPENCV_CONF_OPTS += \
> - -DWITH_VFW=OFF \
> - -DWITH_WIN32UI=OFF \
> + -DWITH_VFW=OFF \
> + -DWITH_WIN32UI=OFF \
> -DWITH_CSTRIPES=OFF \
> - -DWITH_DSHOW=OFF \
> - -DWITH_MSMF=OFF \
> + -DWITH_DSHOW=OFF \
> + -DWITH_MSMF=OFF \
> -DWITH_VIDEOINPUT=OFF
>
> # Software/3rd-party support options.
> OPENCV_CONF_OPTS += \
> - -DBUILD_JASPER=OFF \
> - -DBUILD_JPEG=OFF \
> + -DBUILD_JASPER=OFF \
> + -DBUILD_JPEG=OFF \
> -DBUILD_OPENEXR=OFF \
> - -DBUILD_PNG=OFF \
> - -DBUILD_TIFF=OFF \
> - -DBUILD_ZLIB=OFF \
> + -DBUILD_PNG=OFF \
> + -DBUILD_TIFF=OFF \
> + -DBUILD_ZLIB=OFF \
> -DBUILD_NEW_PYTHON_SUPPORT=OFF \
> - -DINSTALL_C_EXAMPLES=OFF \
> - -DINSTALL_PYTHON_EXAMPLES=OFF \
> + -DINSTALL_C_EXAMPLES=OFF \
> + -DINSTALL_PYTHON_EXAMPLES=OFF \
> -DINSTALL_TO_MANGLED_PATHS=OFF
>
> # Disabled features (mostly because they are not available in Buildroot), but
> # - eigen: OpenCV does not use it, not take any benefit from it.
> OPENCV_CONF_OPTS += \
> - -DWITH_1394=OFF \
> - -DWITH_EIGEN=OFF \
> + -DWITH_1394=OFF \
> + -DWITH_EIGEN=OFF \
> -DWITH_IMAGEIO=OFF \
> - -DWITH_OPENCL=OFF \
> + -DWITH_OPENCL=OFF \
> -DWITH_OPENEXR=OFF \
> - -DWITH_OPENGL=OFF \
> - -DWITH_OPENMP=OFF \
> - -DWITH_OPENNI=OFF \
> - -DWITH_UNICAP=OFF \
> + -DWITH_OPENGL=OFF \
> + -DWITH_OPENMP=OFF \
> + -DWITH_OPENNI=OFF \
> + -DWITH_UNICAP=OFF \
> -DWITH_XINE=OFF
>
> OPENCV_DEPENDENCIES += zlib
> diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
> --- a/package/openocd/openocd.mk
> +++ b/package/openocd/openocd.mk
> @@ -35,11 +35,11 @@
>
> HOST_OPENOCD_DEPENDENCIES = host-libusb-compat host-libftdi
>
> -HOST_OPENOCD_CONF_OPTS = \
> - --disable-doxygen-html \
> - --enable-dummy \
> +HOST_OPENOCD_CONF_OPTS = \
> + --disable-doxygen-html \
> + --enable-dummy \
> --enable-ft2232_libftdi \
> - --enable-jlink \
> + --enable-jlink \
> --enable-vsllink
>
> $(eval $(autotools-package))
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -49,8 +49,8 @@
>
> # Time steps
> define step_time
> - printf "%s:%-5.5s:%-20.20s: %s\n" \
> - "$$(date +%s)" "$(1)" "$(2)" "$(3)" \
> + printf "%s:%-5.5s:%-20.20s: %s\n" \
> + "$$(date +%s)" "$(1)" "$(2)" "$(3)" \
> >>"$(BUILD_DIR)/build-time.log"
> endef
> GLOBAL_INSTRUMENTATION_HOOKS += step_time
> diff --git a/package/poco/poco.mk b/package/poco/poco.mk
> --- a/package/poco/poco.mk
> +++ b/package/poco/poco.mk
> @@ -12,22 +12,22 @@
> POCO_LICENSE_FILES = LICENSE
> POCO_INSTALL_STAGING = YES
>
> -POCO_DEPENDENCIES = zlib pcre \
> - $(if $(BR2_PACKAGE_POCO_XML),expat) \
> - $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
> - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
> - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
> +POCO_DEPENDENCIES = zlib pcre \
> + $(if $(BR2_PACKAGE_POCO_XML),expat) \
> + $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
> + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
> + $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
> $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql)
>
> -POCO_OMIT = Data/ODBC PageCompiler \
> - $(if $(BR2_PACKAGE_POCO_XML),,XML) \
> - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
> - $(if $(BR2_PACKAGE_POCO_NET),,Net) \
> - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \
> - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \
> - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \
> - $(if $(BR2_PACKAGE_POCO_DATA),,Data) \
> - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
> +POCO_OMIT = Data/ODBC PageCompiler \
> + $(if $(BR2_PACKAGE_POCO_XML),,XML) \
> + $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
> + $(if $(BR2_PACKAGE_POCO_NET),,Net) \
> + $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \
> + $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \
> + $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \
> + $(if $(BR2_PACKAGE_POCO_DATA),,Data) \
> + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
> $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
>
> ifeq ($(LIBC),uclibc)
> @@ -41,12 +41,12 @@
>
> define POCO_CONFIGURE_CMDS
> (cd $(@D); ./configure \
> - --config=Linux-CrossEnv \
> - --prefix=/usr \
> - --omit="$(POCO_OMIT)" \
> - $(POCO_CONF_OPTS) \
> - --unbundled \
> - --no-tests \
> + --config=Linux-CrossEnv \
> + --prefix=/usr \
> + --omit="$(POCO_OMIT)" \
> + $(POCO_CONF_OPTS) \
> + --unbundled \
> + --no-tests \
> --no-samples)
> endef
>
> diff --git a/package/python/python.mk b/package/python/python.mk
> --- a/package/python/python.mk
> +++ b/package/python/python.mk
> @@ -16,22 +16,22 @@
> # also installed in $(HOST_DIR), as it is needed when cross-compiling
> # third-party Python modules.
>
> -HOST_PYTHON_CONF_OPTS += \
> - --enable-static \
> - --without-cxx-main \
> - --disable-sqlite3 \
> - --disable-tk \
> - --with-expat=system \
> - --disable-curses \
> - --disable-codecs-cjk \
> - --disable-nis \
> - --enable-unicodedata \
> - --disable-dbm \
> - --disable-gdbm \
> - --disable-bsddb \
> - --disable-test-modules \
> - --disable-bz2 \
> - --disable-ssl \
> +HOST_PYTHON_CONF_OPTS += \
> + --enable-static \
> + --without-cxx-main \
> + --disable-sqlite3 \
> + --disable-tk \
> + --with-expat=system \
> + --disable-curses \
> + --disable-codecs-cjk \
> + --disable-nis \
> + --enable-unicodedata \
> + --disable-dbm \
> + --disable-gdbm \
> + --disable-bsddb \
> + --disable-test-modules \
> + --disable-bz2 \
> + --disable-ssl \
> --disable-pyo-build
>
> # Make sure that LD_LIBRARY_PATH overrides -rpath.
> @@ -125,16 +125,16 @@
> ac_cv_working_tzset=yes
>
> PYTHON_CONF_OPTS += \
> - --without-cxx-main \
> - --without-doc-strings \
> - --with-system-ffi \
> - --disable-pydoc \
> - --disable-test-modules \
> - --disable-lib2to3 \
> - --disable-gdbm \
> - --disable-tk \
> - --disable-nis \
> - --disable-dbm \
> + --without-cxx-main \
> + --without-doc-strings \
> + --with-system-ffi \
> + --disable-pydoc \
> + --disable-test-modules \
> + --disable-lib2to3 \
> + --disable-gdbm \
> + --disable-tk \
> + --disable-nis \
> + --disable-dbm \
> --disable-pyo-build
>
> # This is needed to make sure the Python build process doesn't try to
> diff --git a/package/python3/python3.mk b/package/python3/python3.mk
> --- a/package/python3/python3.mk
> +++ b/package/python3/python3.mk
> @@ -17,18 +17,18 @@
> # installed in $(HOST_DIR), as it is needed when cross-compiling
> # third-party Python modules.
>
> -HOST_PYTHON3_CONF_OPTS += \
> - --without-ensurepip \
> - --without-cxx-main \
> - --disable-sqlite3 \
> - --disable-tk \
> - --with-expat=system \
> - --disable-curses \
> - --disable-codecs-cjk \
> - --disable-nis \
> - --enable-unicodedata \
> - --disable-test-modules \
> - --disable-idle3 \
> +HOST_PYTHON3_CONF_OPTS += \
> + --without-ensurepip \
> + --without-cxx-main \
> + --disable-sqlite3 \
> + --disable-tk \
> + --with-expat=system \
> + --disable-curses \
> + --disable-codecs-cjk \
> + --disable-nis \
> + --enable-unicodedata \
> + --disable-test-modules \
> + --disable-idle3 \
> --disable-pyo-build
>
> # Make sure that LD_LIBRARY_PATH overrides -rpath.
> @@ -108,15 +108,15 @@
> ac_cv_working_tzset=yes
>
> PYTHON3_CONF_OPTS += \
> - --without-ensurepip \
> - --without-cxx-main \
> - --with-system-ffi \
> - --disable-pydoc \
> - --disable-test-modules \
> - --disable-lib2to3 \
> - --disable-tk \
> - --disable-nis \
> - --disable-idle3 \
> + --without-ensurepip \
> + --without-cxx-main \
> + --with-system-ffi \
> + --disable-pydoc \
> + --disable-test-modules \
> + --disable-lib2to3 \
> + --disable-tk \
> + --disable-nis \
> + --disable-idle3 \
> --disable-pyo-build
>
> # This is needed to make sure the Python build process doesn't try to
> diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
> --- a/package/qemu/qemu.mk
> +++ b/package/qemu/qemu.mk
> @@ -63,14 +63,14 @@
> # package, and ./configure chokes on options such as --host or --target.
> # So, provide out own _CONFIGURE_CMDS to override the defaults.
> define HOST_QEMU_CONFIGURE_CMDS
> - (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \
> - --target-list="$(HOST_QEMU_TARGETS)" \
> - --prefix="$(HOST_DIR)/usr" \
> - --interp-prefix=$(STAGING_DIR) \
> - --cc="$(HOSTCC)" \
> - --host-cc="$(HOSTCC)" \
> - --extra-cflags="$(HOST_CFLAGS)" \
> - --extra-ldflags="$(HOST_LDFLAGS)" \
> + (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure \
> + --target-list="$(HOST_QEMU_TARGETS)" \
> + --prefix="$(HOST_DIR)/usr" \
> + --interp-prefix=$(STAGING_DIR) \
> + --cc="$(HOSTCC)" \
> + --host-cc="$(HOSTCC)" \
> + --extra-cflags="$(HOST_CFLAGS)" \
> + --extra-ldflags="$(HOST_LDFLAGS)" \
> )
> endef
>
> diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
> --- a/package/rt-tests/rt-tests.mk
> +++ b/package/rt-tests/rt-tests.mk
> @@ -15,16 +15,16 @@
> endif
>
> define RT_TESTS_BUILD_CMDS
> - $(MAKE) -C $(@D) \
> - CC="$(TARGET_CC)" \
> - CFLAGS="$(TARGET_CFLAGS)" \
> + $(MAKE) -C $(@D) \
> + CC="$(TARGET_CC)" \
> + CFLAGS="$(TARGET_CFLAGS)" \
> prefix=/usr
> endef
>
> define RT_TESTS_INSTALL_TARGET_CMDS
> - $(MAKE) -C $(@D) \
> - DESTDIR="$(TARGET_DIR)" \
> - prefix=/usr \
> + $(MAKE) -C $(@D) \
> + DESTDIR="$(TARGET_DIR)" \
> + prefix=/usr \
> $(if $(BR2_PACKAGE_PYTHON),HASPYTHON=1 PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/) \
> install
> endef
> diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
> --- a/package/rtai/rtai.mk
> +++ b/package/rtai/rtai.mk
> @@ -20,9 +20,9 @@
>
> RTAI_CONF_OPTS = \
> --includedir=/usr/include/rtai \
> - --with-linux-dir=$(LINUX_DIR) \
> - --disable-leds \
> - --disable-rtailab \
> + --with-linux-dir=$(LINUX_DIR) \
> + --disable-leds \
> + --disable-rtailab \
> --with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/rtai
>
> RTAI_MAKE = $(MAKE1)
> diff --git a/package/samba/samba.mk b/package/samba/samba.mk
> --- a/package/samba/samba.mk
> +++ b/package/samba/samba.mk
> @@ -38,24 +38,24 @@
> --with-logfilebase=/var/log \
> --with-configdir=/etc/samba \
> --with-privatedir=/etc/samba \
> - \
> + \
> --disable-cups \
> --enable-shared-libs \
> --disable-pie \
> --disable-relro \
> --disable-dnssd \
> - \
> + \
> $(if $(BR2_PACKAGE_SAMBA_AVAHI),--enable-avahi,--disable-avahi) \
> $(if $(BR2_PACKAGE_SAMBA_GAMIN),--enable-fam,--disable-fam) \
> $(if $(BR2_PACKAGE_SAMBA_SWAT),--enable-swat,--disable-swat) \
> - \
> + \
> --without-cluster-support \
> --without-dnsupdate \
> --with-sys-quotas \
> --without-ads \
> --without-ldap \
> --with-included-iniparser \
> - \
> + \
> $(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),--with-readline=$(STAGING_DIR)) \
> $(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),--with-readline=$(STAGING_DIR)) \
> $(if $(BR2_PACKAGE_SAMBA_WINBINDD),--with-winbind,--without-winbind)
> diff --git a/package/spice/spice.mk b/package/spice/spice.mk
> --- a/package/spice/spice.mk
> +++ b/package/spice/spice.mk
> @@ -11,21 +11,21 @@
> SPICE_LICENSE_FILES = COPYING
> SPICE_INSTALL_STAGING = YES
> SPICE_DEPENDENCIES = \
> - alsa-lib \
> - celt051 \
> - jpeg \
> - openssl \
> - pixman \
> - python-pyparsing \
> - spice-protocol \
> + alsa-lib \
> + celt051 \
> + jpeg \
> + openssl \
> + pixman \
> + python-pyparsing \
> + spice-protocol \
>
> # We disable everything for now, because the dependency tree can become
> # quite deep if we try to enable some features, and I have not tested that.
> -SPICE_CONF_OPTS = \
> - --disable-opengl \
> - --disable-smartcard \
> +SPICE_CONF_OPTS = \
> + --disable-opengl \
> + --disable-smartcard \
> --disable-automated-tests \
> - --without-sasl \
> + --without-sasl \
>
> SPICE_DEPENDENCIES += host-pkgconf
>
> @@ -57,7 +57,7 @@
> # it should link against libz and libjpeg. libz is pkg-config-aware, while
> # libjpeg isn't, hence the two-line tweak
> define SPICE_POST_INSTALL_STAGING_FIX_PC
> - $(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
> + $(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
> "$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
> endef
> SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
> diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
> --- a/package/squashfs/squashfs.mk
> +++ b/package/squashfs/squashfs.mk
> @@ -53,16 +53,16 @@
> # no libattr/xz in BR
> HOST_SQUASHFS_MAKE_ARGS = \
> XATTR_SUPPORT=0 \
> - XZ_SUPPORT=1 \
> - GZIP_SUPPORT=1 \
> - LZ4_SUPPORT=1 \
> - LZO_SUPPORT=1 \
> + XZ_SUPPORT=1 \
> + GZIP_SUPPORT=1 \
> + LZ4_SUPPORT=1 \
> + LZO_SUPPORT=1 \
> LZMA_XZ_SUPPORT=1
>
> define SQUASHFS_BUILD_CMDS
> - $(TARGET_MAKE_ENV) $(MAKE) \
> - CC="$(TARGET_CC)" \
> - EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
> + $(TARGET_MAKE_ENV) $(MAKE) \
> + CC="$(TARGET_CC)" \
> + EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
> EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
> $(SQUASHFS_MAKE_ARGS) \
> -C $(@D)/squashfs-tools/
> @@ -76,7 +76,7 @@
> define HOST_SQUASHFS_BUILD_CMDS
> $(HOST_MAKE_ENV) $(MAKE) \
> CC="$(HOSTCC)" \
> - EXTRA_CFLAGS="$(HOST_CFLAGS)" \
> + EXTRA_CFLAGS="$(HOST_CFLAGS)" \
> EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
> $(HOST_SQUASHFS_MAKE_ARGS) \
> -C $(@D)/squashfs-tools/
> diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
> --- a/package/strongswan/strongswan.mk
> +++ b/package/strongswan/strongswan.mk
> @@ -10,60 +10,60 @@
> STRONGSWAN_LICENSE = GPLv2+
> STRONGSWAN_LICENSE_FILES = COPYING LICENSE
> STRONGSWAN_DEPENDENCIES = host-pkgconf
> -STRONGSWAN_CONF_OPTS += \
> - --without-lib-prefix \
> - --enable-pkcs11=yes \
> - --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
> - --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
> - --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
> - --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
> - --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
> - --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
> - --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \
> - --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
> - --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \
> - --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \
> - --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \
> - --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \
> - --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \
> - --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \
> - --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \
> - --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no) \
> +STRONGSWAN_CONF_OPTS += \
> + --without-lib-prefix \
> + --enable-pkcs11=yes \
> + --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
> + --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
> + --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
> + --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
> + --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \
> + --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
> + --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \
> + --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
> + --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \
> + --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \
> + --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \
> + --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \
> + --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \
> + --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \
> + --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \
> + --enable-tools=$(if $(BR2_PACKAGE_STRONGSWAN_TOOLS),yes,no) \
> --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no)
>
> ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y)
> -STRONGSWAN_CONF_OPTS += \
> - --enable-eap-sim \
> - --enable-eap-sim-file \
> - --enable-eap-aka \
> - --enable-eap-aka-3gpp2 \
> - --enable-eap-simaka-sql \
> +STRONGSWAN_CONF_OPTS += \
> + --enable-eap-sim \
> + --enable-eap-sim-file \
> + --enable-eap-aka \
> + --enable-eap-aka-3gpp2 \
> + --enable-eap-simaka-sql \
> --enable-eap-simaka-pseudonym \
> - --enable-eap-simaka-reauth \
> - --enable-eap-identity \
> - --enable-eap-md5 \
> - --enable-eap-gtc \
> - --enable-eap-mschapv2 \
> - --enable-eap-tls \
> - --enable-eap-ttls \
> - --enable-eap-peap \
> - --enable-eap-tnc \
> - --enable-eap-dynamic \
> + --enable-eap-simaka-reauth \
> + --enable-eap-identity \
> + --enable-eap-md5 \
> + --enable-eap-gtc \
> + --enable-eap-mschapv2 \
> + --enable-eap-tls \
> + --enable-eap-ttls \
> + --enable-eap-peap \
> + --enable-eap-tnc \
> + --enable-eap-dynamic \
> --enable-eap-radius
> STRONGSWAN_DEPENDENCIES += gmp
> endif
>
> -STRONGSWAN_DEPENDENCIES += \
> - $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \
> - $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \
> - $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \
> - $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \
> - $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \
> +STRONGSWAN_DEPENDENCIES += \
> + $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \
> + $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \
> + $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \
> + $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \
> + $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \
> $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite)
>
> ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y)
> -STRONGSWAN_DEPENDENCIES += \
> - $(if $(BR2_PACKAGE_SQLITE),sqlite) \
> +STRONGSWAN_DEPENDENCIES += \
> + $(if $(BR2_PACKAGE_SQLITE),sqlite) \
> $(if $(BR2_PACKAGE_MYSQL),mysql)
> endif
>
> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> --- a/package/systemd/systemd.mk
> +++ b/package/systemd/systemd.mk
> @@ -85,15 +85,15 @@
>
> ifeq ($(BR2_PACKAGE_SYSTEMD_ALL_EXTRAS),y)
> SYSTEMD_DEPENDENCIES += \
> - xz \
> + xz \
> libgcrypt
> -SYSTEMD_CONF_OPTS += \
> - --enable-xz \
> - --enable-gcrypt \
> +SYSTEMD_CONF_OPTS += \
> + --enable-xz \
> + --enable-gcrypt \
> --with-libgcrypt-prefix=$(STAGING_DIR)/usr
> else
> -SYSTEMD_CONF_OPTS += \
> - --disable-xz \
> +SYSTEMD_CONF_OPTS += \
> + --disable-xz \
> --disable-gcrypt
> endif
>
> diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
> --- a/package/tvheadend/tvheadend.mk
> +++ b/package/tvheadend/tvheadend.mk
> @@ -21,15 +21,15 @@
> TVHEADEND_DEPENDENCIES += dtv-scan-tables
>
> define TVHEADEND_CONFIGURE_CMDS
> - (cd $(@D); \
> - $(TARGET_CONFIGURE_OPTS) \
> - $(TARGET_CONFIGURE_ARGS) \
> - ./configure \
> - --prefix=/usr \
> - --arch="$(ARCH)" \
> - --cpu="$(BR2_GCC_TARGET_CPU)" \
> - --python="$(HOST_DIR)/usr/bin/python" \
> - --disable-dvbscan \
> + (cd $(@D); \
> + $(TARGET_CONFIGURE_OPTS) \
> + $(TARGET_CONFIGURE_ARGS) \
> + ./configure \
> + --prefix=/usr \
> + --arch="$(ARCH)" \
> + --cpu="$(BR2_GCC_TARGET_CPU)" \
> + --python="$(HOST_DIR)/usr/bin/python" \
> + --disable-dvbscan \
> )
> endef
>
> @@ -47,7 +47,7 @@
> # - a default DB with a tvheadend admin
> # - a non-root user to run as
> define TVHEADEND_INSTALL_DB
> - $(INSTALL) -D -m 0600 package/tvheadend/accesscontrol.1 \
> + $(INSTALL) -D -m 0600 package/tvheadend/accesscontrol.1 \
> $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
> chmod -R go-rwx $(TARGET_DIR)/home/tvheadend
> endef
> diff --git a/package/tz/tz.mk b/package/tz/tz.mk
> --- a/package/tz/tz.mk
> +++ b/package/tz/tz.mk
> @@ -11,11 +11,11 @@
> TZ_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME))
>
> define TZ_BUILD_CMDS
> - (cd $(HOST_DIR)/usr/share/zoneinfo/posix/; \
> - for i in $$(find . -type f); do \
> - mkdir -p $(@D)/output/$$(dirname $$i); \
> + (cd $(HOST_DIR)/usr/share/zoneinfo/posix/; \
> + for i in $$(find . -type f); do \
> + mkdir -p $(@D)/output/$$(dirname $$i); \
> $(TZDUMP) -p . -q $${i#./} > $(@D)/output/$$i; \
> - done \
> + done \
> )
> endef
>
> @@ -26,13 +26,13 @@
> $(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
> mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
> cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
> - if [ -n "$(TZ_LOCALTIME)" ]; then \
> + if [ -n "$(TZ_LOCALTIME)" ]; then \
> if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \
> printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
> - "$(TZDATA_LOCALTIME)"; \
> - exit 1; \
> - fi; \
> - cd $(TARGET_DIR)/etc; \
> + "$(TZDATA_LOCALTIME)"; \
> + exit 1; \
> + fi; \
> + cd $(TARGET_DIR)/etc; \
> ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \
> fi
> endef
> diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk
> --- a/package/tzdata/tzdata.mk
> +++ b/package/tzdata/tzdata.mk
> @@ -28,19 +28,19 @@
> define TZDATA_INSTALL_TARGET_CMDS
> $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share
> cp -a $(HOST_DIR)/usr/share/zoneinfo $(TARGET_DIR)/usr/share/zoneinfo
> - cd $(TARGET_DIR)/usr/share/zoneinfo; \
> - for zone in posix/*; do \
> - ln -sfn "$${zone}" "$${zone##*/}"; \
> + cd $(TARGET_DIR)/usr/share/zoneinfo; \
> + for zone in posix/*; do \
> + ln -sfn "$${zone}" "$${zone##*/}"; \
> done
> - if [ -n "$(TZDATA_LOCALTIME)" ]; then \
> + if [ -n "$(TZDATA_LOCALTIME)" ]; then \
> if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \
> printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
> - "$(TZDATA_LOCALTIME)"; \
> - exit 1; \
> - fi; \
> - cd $(TARGET_DIR)/etc; \
> + "$(TZDATA_LOCALTIME)"; \
> + exit 1; \
> + fi; \
> + cd $(TARGET_DIR)/etc; \
> ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) localtime; \
> - echo "$(TZDATA_LOCALTIME)" >timezone; \
> + echo "$(TZDATA_LOCALTIME)" >timezone; \
> fi
> endef
>
> diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
> --- a/package/uboot-tools/uboot-tools.mk
> +++ b/package/uboot-tools/uboot-tools.mk
> @@ -11,16 +11,16 @@
> UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
>
> define UBOOT_TOOLS_BUILD_CMDS
> - $(MAKE) -C $(@D) \
> - CROSS_COMPILE="$(TARGET_CROSS)" \
> - CFLAGS="$(TARGET_CFLAGS)" \
> - LDFLAGS="$(TARGET_LDFLAGS)" \
> - CROSS_BUILD_TOOLS=y \
> + $(MAKE) -C $(@D) \
> + CROSS_COMPILE="$(TARGET_CROSS)" \
> + CFLAGS="$(TARGET_CFLAGS)" \
> + LDFLAGS="$(TARGET_LDFLAGS)" \
> + CROSS_BUILD_TOOLS=y \
> tools-only
> - $(MAKE) -C $(@D) \
> - CROSS_COMPILE="$(TARGET_CROSS)" \
> - CFLAGS="$(TARGET_CFLAGS)" \
> - LDFLAGS="$(TARGET_LDFLAGS)" \
> + $(MAKE) -C $(@D) \
> + CROSS_COMPILE="$(TARGET_CROSS)" \
> + CFLAGS="$(TARGET_CFLAGS)" \
> + LDFLAGS="$(TARGET_LDFLAGS)" \
> env no-dot-config-targets=env
> endef
>
> @@ -50,10 +50,10 @@
> endef
>
> define HOST_UBOOT_TOOLS_BUILD_CMDS
> - $(MAKE1) -C $(@D) \
> - HOSTCC="$(HOSTCC)" \
> - HOSTCFLAGS="$(HOST_CFLAGS)" \
> - HOSTLDFLAGS="$(HOST_LDFLAGS)" \
> + $(MAKE1) -C $(@D) \
> + HOSTCC="$(HOSTCC)" \
> + HOSTCFLAGS="$(HOST_CFLAGS)" \
> + HOSTLDFLAGS="$(HOST_LDFLAGS)" \
> tools-only
> endef
>
> diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
> --- a/package/udisks/udisks.mk
> +++ b/package/udisks/udisks.mk
> @@ -9,15 +9,15 @@
> UDISKS_LICENSE = GPLv2+
> UDISKS_LICENSE_FILES = COPYING
>
> -UDISKS_DEPENDENCIES = \
> - sg3_utils \
> - host-pkgconf \
> - udev \
> - dbus \
> - dbus-glib \
> - polkit \
> - parted \
> - lvm2 \
> +UDISKS_DEPENDENCIES = \
> + sg3_utils \
> + host-pkgconf \
> + udev \
> + dbus \
> + dbus-glib \
> + polkit \
> + parted \
> + lvm2 \
> libatasmart
>
> UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
> diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
> --- a/package/usbmount/usbmount.mk
> +++ b/package/usbmount/usbmount.mk
> @@ -14,9 +14,9 @@
> define USBMOUNT_INSTALL_TARGET_CMDS
> $(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
>
> - $(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink \
> + $(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink \
> $(TARGET_DIR)/etc/usbmount/usbmount.d/00_create_model_symlink
> - $(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink \
> + $(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink \
> $(TARGET_DIR)/etc/usbmount/usbmount.d/00_remove_model_symlink
>
> $(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
> diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
> --- a/package/vde2/vde2.mk
> +++ b/package/vde2/vde2.mk
> @@ -25,13 +25,13 @@
> #
> # 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 \
> +VDE2_CONF_OPTS = --disable-experimental \
> + --disable-cryptcab \
> + --disable-pcap \
> + --disable-python \
> + --disable-profile \
> --disable-kernel-switch \
> - --enable-tuntap \
> + --enable-tuntap \
>
> #?Package does not build in parallel due to improper make rules
> VDE2_MAKE = $(MAKE1)
> diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
> --- a/package/wpa_supplicant/wpa_supplicant.mk
> +++ b/package/wpa_supplicant/wpa_supplicant.mk
> @@ -20,10 +20,10 @@
> WPA_SUPPLICANT_CONFIG_SET =
>
> WPA_SUPPLICANT_CONFIG_ENABLE = \
> - CONFIG_ELOOP_EPOLL \
> - CONFIG_IEEE80211AC \
> - CONFIG_IEEE80211N \
> - CONFIG_IEEE80211R \
> + CONFIG_ELOOP_EPOLL \
> + CONFIG_IEEE80211AC \
> + CONFIG_IEEE80211N \
> + CONFIG_IEEE80211R \
> CONFIG_INTERNAL_LIBTOMMATH
>
> WPA_SUPPLICANT_CONFIG_DISABLE = \
> @@ -77,7 +77,7 @@
> ifeq ($(BR2_PACKAGE_DBUS),y)
> WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus
> WPA_SUPPLICANT_MAKE_ENV = \
> - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
> + PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
> PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
>
> ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y)
> diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> @@ -10,48 +10,48 @@
> XSERVER_XORG_SERVER_LICENSE = MIT
> XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
> XSERVER_XORG_SERVER_INSTALL_STAGING = YES
> -XSERVER_XORG_SERVER_DEPENDENCIES = \
> - xutil_util-macros \
> - xlib_libXfont \
> - xlib_libX11 \
> - xlib_libXau \
> - xlib_libXdmcp \
> - xlib_libXext \
> - xlib_libXfixes \
> - xlib_libXi \
> - xlib_libXrender \
> - xlib_libXres \
> - xlib_libXft \
> - xlib_libXcursor \
> - xlib_libXinerama \
> - xlib_libXrandr \
> - xlib_libXdamage \
> - xlib_libXxf86vm \
> - xlib_libxkbfile \
> - xlib_xtrans \
> - xdata_xbitmaps \
> - xproto_bigreqsproto \
> - xproto_compositeproto \
> - xproto_damageproto \
> - xproto_fixesproto \
> - xproto_fontsproto \
> - xproto_glproto \
> - xproto_inputproto \
> - xproto_kbproto \
> - xproto_presentproto \
> - xproto_randrproto \
> - xproto_renderproto \
> - xproto_resourceproto \
> - xproto_videoproto \
> - xproto_xcmiscproto \
> - xproto_xextproto \
> - xproto_xf86bigfontproto \
> - xproto_xf86dgaproto \
> - xproto_xf86vidmodeproto \
> - xproto_xproto \
> - xkeyboard-config \
> - pixman \
> - mcookie \
> +XSERVER_XORG_SERVER_DEPENDENCIES = \
> + xutil_util-macros \
> + xlib_libXfont \
> + xlib_libX11 \
> + xlib_libXau \
> + xlib_libXdmcp \
> + xlib_libXext \
> + xlib_libXfixes \
> + xlib_libXi \
> + xlib_libXrender \
> + xlib_libXres \
> + xlib_libXft \
> + xlib_libXcursor \
> + xlib_libXinerama \
> + xlib_libXrandr \
> + xlib_libXdamage \
> + xlib_libXxf86vm \
> + xlib_libxkbfile \
> + xlib_xtrans \
> + xdata_xbitmaps \
> + xproto_bigreqsproto \
> + xproto_compositeproto \
> + xproto_damageproto \
> + xproto_fixesproto \
> + xproto_fontsproto \
> + xproto_glproto \
> + xproto_inputproto \
> + xproto_kbproto \
> + xproto_presentproto \
> + xproto_randrproto \
> + xproto_renderproto \
> + xproto_resourceproto \
> + xproto_videoproto \
> + xproto_xcmiscproto \
> + xproto_xextproto \
> + xproto_xf86bigfontproto \
> + xproto_xf86dgaproto \
> + xproto_xf86vidmodeproto \
> + xproto_xproto \
> + xkeyboard-config \
> + pixman \
> + mcookie \
> host-pkgconf
>
> XSERVER_XORG_SERVER_CONF_OPTS = --disable-config-hal \
> diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
> --- a/package/xbmc/xbmc.mk
> +++ b/package/xbmc/xbmc.mk
> @@ -39,7 +39,7 @@
> USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \
> TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
>
> -XBMC_CONF_OPTS += \
> +XBMC_CONF_OPTS += \
> --with-arch=$(BR2_ARCH) \
> --disable-crystalhd \
> --disable-debug \
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 15 of 15] .mk files: remove alignment of assignments
2014-09-27 19:32 ` [Buildroot] [PATCH 15 of 15] .mk files: remove alignment of assignments Thomas De Schampheleire
@ 2014-09-28 12:12 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-09-28 12:12 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-09-27 21:32 +0200, Thomas De Schampheleire spake thusly:
> The Buildroot coding style does not align assignments nor line continuation
> characters (\). This patch updates the .mk files to reflect this.
>
> Command used:
> find * -name "*.mk" | xargs sed -i 's/\s\+\(.\?=\)\s\+/ \1 /g'
>
> Manual fixup:
> pkg-utils.mk: fix alignment of FROM/TO variables in caseconvert-helper
>
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Casual visual inspection, plus:
git difftool -y -x 'diff -dub' CSET^..CSET
Regards,
Yann E. MORIN.
> ---
> v2: new patch
>
> boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 10 +-
> boot/grub/grub.mk | 4 +-
> boot/mxs-bootlets/mxs-bootlets.mk | 2 +-
> boot/syslinux/syslinux.mk | 4 +-
> boot/uboot/uboot.mk | 42 ++--
> boot/xloader/xloader.mk | 4 +-
> fs/ext2/ext2.mk | 2 +-
> package/atftp/atftp.mk | 2 +-
> package/atk/atk.mk | 2 +-
> package/bcusdk/bcusdk.mk | 2 +-
> package/bind/bind.mk | 2 +-
> package/ccache/ccache.mk | 4 +-
> package/cegui06/cegui06.mk | 14 +-
> package/celt051/celt051.mk | 12 +-
> package/cjson/cjson.mk | 10 +-
> package/copas/copas.mk | 2 +-
> package/coxpcall/coxpcall.mk | 2 +-
> package/dhcpdump/dhcpdump.mk | 2 +-
> package/dmidecode/dmidecode.mk | 2 +-
> package/dropbear/dropbear.mk | 2 +-
> package/dtc/dtc.mk | 18 +-
> package/dvbsnoop/dvbsnoop.mk | 8 +-
> package/ecryptfs-utils/ecryptfs-utils.mk | 14 +-
> package/efl/libedje/libedje.mk | 2 +-
> package/eigen/eigen.mk | 2 +-
> package/freescale-imx/freescale-imx.mk | 2 +-
> package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk | 4 +-
> package/freescale-imx/imx-lib/imx-lib.mk | 2 +-
> package/freescale-imx/imx-vpu/imx-vpu.mk | 2 +-
> package/gcc/gcc-final/gcc-final.mk | 6 +-
> package/gcc/gcc-initial/gcc-initial.mk | 4 +-
> package/gd/gd.mk | 24 +-
> package/gdb/gdb.mk | 2 +-
> package/genimage/genimage.mk | 10 +-
> package/genpart/genpart.mk | 8 +-
> package/git/git.mk | 10 +-
> package/grantlee/grantlee.mk | 2 +-
> package/heirloom-mailx/heirloom-mailx.mk | 4 +-
> package/igh-ethercat/igh-ethercat.mk | 6 +-
> package/input-tools/input-tools.mk | 4 +-
> package/irda-utils/irda-utils.mk | 2 +-
> package/keyutils/keyutils.mk | 10 +-
> package/lbase64/lbase64.mk | 2 +-
> package/lftp/lftp.mk | 2 +-
> package/libatasmart/libatasmart.mk | 2 +-
> package/libffi/libffi.mk | 2 +-
> package/libmbim/libmbim.mk | 4 +-
> package/libnspr/libnspr.mk | 2 +-
> package/libqmi/libqmi.mk | 4 +-
> package/libreplaygain/libreplaygain.mk | 2 +-
> package/libseccomp/libseccomp.mk | 16 +-
> package/libsvg-cairo/libsvg-cairo.mk | 10 +-
> package/libsvg/libsvg.mk | 10 +-
> package/liburcu/liburcu.mk | 4 +-
> package/linux-fusion/linux-fusion.mk | 2 +-
> package/ljlinenoise/ljlinenoise.mk | 2 +-
> package/lmbench/lmbench.mk | 2 +-
> package/localedef/localedef.mk | 4 +-
> package/lpty/lpty.mk | 2 +-
> package/lrandom/lrandom.mk | 2 +-
> package/lsqlite3/lsqlite3.mk | 2 +-
> package/ltp-testsuite/ltp-testsuite.mk | 4 +-
> package/lttng-babeltrace/lttng-babeltrace.mk | 4 +-
> package/lttng-libust/lttng-libust.mk | 6 +-
> package/lttng-modules/lttng-modules.mk | 4 +-
> package/lttng-tools/lttng-tools.mk | 4 +-
> package/lua-coat/lua-coat.mk | 2 +-
> package/lua-coatpersistent/lua-coatpersistent.mk | 2 +-
> package/lua-csnappy/lua-csnappy.mk | 2 +-
> package/lua-messagepack/lua-messagepack.mk | 2 +-
> package/lua-testmore/lua-testmore.mk | 2 +-
> package/luabitop/luabitop.mk | 2 +-
> package/luajit/luajit.mk | 4 +-
> package/luajson/luajson.mk | 2 +-
> package/lualogging/lualogging.mk | 2 +-
> package/luarocks/luarocks.mk | 2 +-
> package/luasec/luasec.mk | 2 +-
> package/luasocket/luasocket.mk | 2 +-
> package/luasql-sqlite3/luasql-sqlite3.mk | 2 +-
> package/lunit/lunit.mk | 2 +-
> package/lzlib/lzlib.mk | 2 +-
> package/mesa3d/mesa3d.mk | 10 +-
> package/mii-diag/mii-diag.mk | 6 +-
> package/mmc-utils/mmc-utils.mk | 2 +-
> package/mplayer/mplayer.mk | 4 +-
> package/mtd/mtd.mk | 76 +++++-----
> package/musepack/musepack.mk | 2 +-
> package/on2-8170-modules/on2-8170-modules.mk | 2 +-
> package/open2300/open2300.mk | 6 +-
> package/orbit/orbit.mk | 2 +-
> package/perl/perl.mk | 4 +-
> package/php/php.mk | 2 +-
> package/picocom/picocom.mk | 2 +-
> package/pinentry/pinentry.mk | 2 +-
> package/pkg-autotools.mk | 6 +-
> package/pkg-cmake.mk | 12 +-
> package/pkg-generic.mk | 56 +++---
> package/pkg-luarocks.mk | 10 +-
> package/pkg-perl.mk | 2 +-
> package/pkg-python.mk | 26 +-
> package/pkg-utils.mk | 22 +-
> package/python-dialog/python-dialog.mk | 4 +-
> package/python-ipy/python-ipy.mk | 2 +-
> package/python-netifaces/python-netifaces.mk | 4 +-
> package/python-protobuf/python-protobuf.mk | 4 +-
> package/python-pyparsing/python-pyparsing.mk | 12 +-
> package/python-pyro/python-pyro.mk | 4 +-
> package/python-serial/python-serial.mk | 4 +-
> package/python-setuptools/python-setuptools.mk | 4 +-
> package/python/python.mk | 10 +-
> package/python3/python3.mk | 2 +-
> package/qextserialport/qextserialport.mk | 4 +-
> package/qjson/qjson.mk | 2 +-
> package/qt/qt.mk | 76 +++++-----
> package/qt5/qt5base/qt5base.mk | 50 +++---
> package/qwt/qwt.mk | 2 +-
> package/rings/rings.mk | 2 +-
> package/rpcbind/rpcbind.mk | 4 +-
> package/rtai/rtai.mk | 4 +-
> package/sam-ba/sam-ba.mk | 4 +-
> package/sg3_utils/sg3_utils.mk | 2 +-
> package/slirp/slirp.mk | 8 +-
> package/spice-protocol/spice-protocol.mk | 10 +-
> package/spice/spice.mk | 12 +-
> package/squid/squid.mk | 4 +-
> package/sysvinit/sysvinit.mk | 6 +-
> package/tcllib/tcllib.mk | 12 +-
> package/tftpd/tftpd.mk | 6 +-
> package/tstools/tstools.mk | 4 +-
> package/tvheadend/tvheadend.mk | 2 +-
> package/uboot-tools/uboot-tools.mk | 4 +-
> package/udisks/udisks.mk | 2 +-
> package/usbredir/usbredir.mk | 16 +-
> package/valgrind/valgrind.mk | 4 +-
> package/vde2/vde2.mk | 12 +-
> package/vpnc/vpnc.mk | 10 +-
> package/xinetd/xinetd.mk | 6 +-
> toolchain/toolchain-external/toolchain-external.mk | 6 +-
> 138 files changed, 490 insertions(+), 490 deletions(-)
>
> diff --git a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
> --- a/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
> +++ b/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
> @@ -4,11 +4,11 @@
> #
> ################################################################################
>
> -BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
> -BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
> -BOOT_WRAPPER_AARCH64_LICENSE = BSD3c
> -BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
> -BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux
> +BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
> +BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/boot-wrapper-aarch64.git
> +BOOT_WRAPPER_AARCH64_LICENSE = BSD3c
> +BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
> +BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux
> BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES
>
> # The Git repository does not have the generated configure script and
> diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
> --- a/boot/grub/grub.mk
> +++ b/boot/grub/grub.mk
> @@ -6,8 +6,8 @@
>
> GRUB_VERSION = 0.97
> GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
> -GRUB_PATCH = grub_$(GRUB_VERSION)-67.diff.gz
> -GRUB_SITE = http://snapshot.debian.org/archive/debian/20130129T225227Z/pool/main/g/grub
> +GRUB_PATCH = grub_$(GRUB_VERSION)-67.diff.gz
> +GRUB_SITE = http://snapshot.debian.org/archive/debian/20130129T225227Z/pool/main/g/grub
>
> GRUB_LICENSE = GPLv2+
> GRUB_LICENSE_FILES = COPYING
> diff --git a/boot/mxs-bootlets/mxs-bootlets.mk b/boot/mxs-bootlets/mxs-bootlets.mk
> --- a/boot/mxs-bootlets/mxs-bootlets.mk
> +++ b/boot/mxs-bootlets/mxs-bootlets.mk
> @@ -7,7 +7,7 @@
> ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL),y)
> MXS_BOOTLETS_TARBALL = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_TARBALL_URL))
> MXS_BOOTLETS_SITE = $(patsubst %/,%,$(dir $(MXS_BOOTLETS_TARBALL)))
> - MXS_BOOTLETS_SOURCE = $(notdir $(MXS_BOOTLETS_TARBALL))
> + MXS_BOOTLETS_SOURCE = $(notdir $(MXS_BOOTLETS_TARBALL))
> else ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT),y)
> MXS_BOOTLETS_SITE = $(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL)
> MXS_BOOTLETS_SITE_METHOD = git
> diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
> --- a/boot/syslinux/syslinux.mk
> +++ b/boot/syslinux/syslinux.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> SYSLINUX_VERSION = 6.02
> -SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
> -SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
> +SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
> +SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
>
> SYSLINUX_LICENSE = GPLv2+
> SYSLINUX_LICENSE_FILES = COPYING
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
> +UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
> UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
>
> UBOOT_LICENSE = GPLv2+
> @@ -15,45 +15,45 @@
> ifeq ($(UBOOT_VERSION),custom)
> # Handle custom U-Boot tarballs as specified by the configuration
> UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
> -UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
> -UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
> +UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
> +UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
> else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
> -UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
> +UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
> UBOOT_SITE_METHOD = git
> else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_HG),y)
> -UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
> +UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
> UBOOT_SITE_METHOD = hg
> else
> # Handle stable official U-Boot versions
> -UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot
> -UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2
> +UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot
> +UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2
> endif
>
> ifeq ($(BR2_TARGET_UBOOT_FORMAT_ELF),y)
> -UBOOT_BIN = u-boot
> +UBOOT_BIN = u-boot
> else ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y)
> -UBOOT_BIN = u-boot.kwb
> -UBOOT_MAKE_TARGET = $(UBOOT_BIN)
> +UBOOT_BIN = u-boot.kwb
> +UBOOT_MAKE_TARGET = $(UBOOT_BIN)
> else ifeq ($(BR2_TARGET_UBOOT_FORMAT_AIS),y)
> -UBOOT_BIN = u-boot.ais
> -UBOOT_MAKE_TARGET = $(UBOOT_BIN)
> +UBOOT_BIN = u-boot.ais
> +UBOOT_MAKE_TARGET = $(UBOOT_BIN)
> else ifeq ($(BR2_TARGET_UBOOT_FORMAT_LDR),y)
> -UBOOT_BIN = u-boot.ldr
> +UBOOT_BIN = u-boot.ldr
> else ifeq ($(BR2_TARGET_UBOOT_FORMAT_NAND_BIN),y)
> -UBOOT_BIN = u-boot-nand.bin
> +UBOOT_BIN = u-boot-nand.bin
> else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
> -UBOOT_BIN = u-boot.img
> +UBOOT_BIN = u-boot.img
> else ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMX),y)
> -UBOOT_BIN = u-boot.imx
> +UBOOT_BIN = u-boot.imx
> else ifeq ($(BR2_TARGET_UBOOT_FORMAT_SB),y)
> -UBOOT_BIN = u-boot.sb
> -UBOOT_MAKE_TARGET = $(UBOOT_BIN)
> +UBOOT_BIN = u-boot.sb
> +UBOOT_MAKE_TARGET = $(UBOOT_BIN)
> UBOOT_DEPENDENCIES += host-elftosb
> else ifeq ($(BR2_TARGET_UBOOT_FORMAT_CUSTOM),y)
> -UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
> +UBOOT_BIN = $(call qstrip,$(BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME))
> else
> -UBOOT_BIN = u-boot.bin
> -UBOOT_BIN_IFT = $(UBOOT_BIN).ift
> +UBOOT_BIN = u-boot.bin
> +UBOOT_BIN_IFT = $(UBOOT_BIN).ift
> endif
>
> UBOOT_ARCH=$(KERNEL_ARCH)
> diff --git a/boot/xloader/xloader.mk b/boot/xloader/xloader.mk
> --- a/boot/xloader/xloader.mk
> +++ b/boot/xloader/xloader.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -XLOADER_VERSION = 6f3a26101303051e0f91b6213735b68ce804e94e
> -XLOADER_SITE = git://gitorious.org/x-loader/x-loader.git
> +XLOADER_VERSION = 6f3a26101303051e0f91b6213735b68ce804e94e
> +XLOADER_SITE = git://gitorious.org/x-loader/x-loader.git
> XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME))
>
> XLOADER_LICENSE = GPLv2+
> diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
> --- a/fs/ext2/ext2.mk
> +++ b/fs/ext2/ext2.mk
> @@ -20,7 +20,7 @@
>
> ROOTFS_EXT2_DEPENDENCIES = host-genext2fs host-e2fsprogs
>
> -EXT2_ENV = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
> +EXT2_ENV = GEN=$(BR2_TARGET_ROOTFS_EXT2_GEN)
> EXT2_ENV += REV=$(BR2_TARGET_ROOTFS_EXT2_REV)
>
> define ROOTFS_EXT2_CMD
> diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk
> --- a/package/atftp/atftp.mk
> +++ b/package/atftp/atftp.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -ATFTP_VERSION = 0.7.1
> +ATFTP_VERSION = 0.7.1
> ATFTP_SITE = http://sourceforge.net/projects/atftp/files
> ATFTP_LICENSE = GPLv2+
> ATFTP_LICENSE_FILES = LICENSE
> diff --git a/package/atk/atk.mk b/package/atk/atk.mk
> --- a/package/atk/atk.mk
> +++ b/package/atk/atk.mk
> @@ -41,7 +41,7 @@
> jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
> gl_cv_c_restrict=no ac_cv_prog_F77=no
>
> -ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no \
> +ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no \
> --disable-debug
>
> ATK_DEPENDENCIES = libglib2 host-pkgconf
> diff --git a/package/bcusdk/bcusdk.mk b/package/bcusdk/bcusdk.mk
> --- a/package/bcusdk/bcusdk.mk
> +++ b/package/bcusdk/bcusdk.mk
> @@ -10,7 +10,7 @@
> BCUSDK_LICENSE = GPLv2+
> BCUSDK_LICENSE_FILES = COPYING
> BCUSDK_INSTALL_STAGING = YES
> -BCUSDK_CONF_OPTS = --enable-onlyeibd --enable-ft12 --enable-pei16 \
> +BCUSDK_CONF_OPTS = --enable-onlyeibd --enable-ft12 --enable-pei16 \
> --enable-eibnetip --enable-eibnetipserver \
> --enable-eibnetiptunnel --without-pth-test \
> --with-pth=$(STAGING_DIR)/usr
> diff --git a/package/bind/bind.mk b/package/bind/bind.mk
> --- a/package/bind/bind.mk
> +++ b/package/bind/bind.mk
> @@ -18,7 +18,7 @@
> BIND_TARGET_SERVER_SBIN += named-compilezone rndc rndc-confgen dnssec-dsfromkey
> BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone
> BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate
> -BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
> +BIND_CONF_ENV = BUILD_CC="$(TARGET_CC)" \
> BUILD_CFLAGS="$(TARGET_CFLAGS)"
> BIND_CONF_OPTS = --localstatedir=/var \
> --with-randomdev=/dev/urandom \
> diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
> --- a/package/ccache/ccache.mk
> +++ b/package/ccache/ccache.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> CCACHE_VERSION = 3.1.8
> -CCACHE_SITE = http://samba.org/ftp/ccache
> -CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
> +CCACHE_SITE = http://samba.org/ftp/ccache
> +CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
> CCACHE_LICENSE = GPLv3+, others
> CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
>
> diff --git a/package/cegui06/cegui06.mk b/package/cegui06/cegui06.mk
> --- a/package/cegui06/cegui06.mk
> +++ b/package/cegui06/cegui06.mk
> @@ -5,15 +5,15 @@
> ################################################################################
>
> # Do not update the version, we need exactly that one for Spice.
> -CEGUI06_VERSION_MAJOR = 0.6.2
> -CEGUI06_VERSION = $(CEGUI06_VERSION_MAJOR)b
> -CEGUI06_SOURCE = CEGUI-$(CEGUI06_VERSION).tar.gz
> -CEGUI06_SITE = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR)
> -CEGUI06_LICENSE = MIT
> -CEGUI06_LICENSE_FILES = COPYING
> +CEGUI06_VERSION_MAJOR = 0.6.2
> +CEGUI06_VERSION = $(CEGUI06_VERSION_MAJOR)b
> +CEGUI06_SOURCE = CEGUI-$(CEGUI06_VERSION).tar.gz
> +CEGUI06_SITE = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR)
> +CEGUI06_LICENSE = MIT
> +CEGUI06_LICENSE_FILES = COPYING
> CEGUI06_INSTALL_STAGING = YES
>
> -CEGUI06_DEPENDENCIES = \
> +CEGUI06_DEPENDENCIES = \
> expat \
> freetype \
> pcre \
> diff --git a/package/celt051/celt051.mk b/package/celt051/celt051.mk
> --- a/package/celt051/celt051.mk
> +++ b/package/celt051/celt051.mk
> @@ -6,13 +6,13 @@
>
> # Although version newer than 0.5.1.3 exists, we're
> # stuck with 0.5.1.3 for use by Spice (coming later)
> -CELT051_VERSION = 0.5.1.3
> -CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz
> -CELT051_SITE = http://downloads.xiph.org/releases/celt
> -CELT051_LICENSE = BSD-2c
> -CELT051_LICENSE_FILES = COPYING
> +CELT051_VERSION = 0.5.1.3
> +CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz
> +CELT051_SITE = http://downloads.xiph.org/releases/celt
> +CELT051_LICENSE = BSD-2c
> +CELT051_LICENSE_FILES = COPYING
> CELT051_INSTALL_STAGING = YES
> -CELT051_DEPENDENCIES = libogg
> +CELT051_DEPENDENCIES = libogg
>
> # Need to specify --with-ogg, otherwise /usr/lib may be searched for
> # if target is the same kind as host (ie. same arch, same bitness,
> diff --git a/package/cjson/cjson.mk b/package/cjson/cjson.mk
> --- a/package/cjson/cjson.mk
> +++ b/package/cjson/cjson.mk
> @@ -4,12 +4,12 @@
> #
> ################################################################################
>
> -CJSON_VERSION = 58
> -CJSON_SITE_METHOD = svn
> -CJSON_SITE = http://svn.code.sf.net/p/cjson/code
> +CJSON_VERSION = 58
> +CJSON_SITE_METHOD = svn
> +CJSON_SITE = http://svn.code.sf.net/p/cjson/code
> CJSON_INSTALL_STAGING = YES
> -CJSON_LICENSE = MIT
> -CJSON_LICENSE_FILES = LICENSE
> +CJSON_LICENSE = MIT
> +CJSON_LICENSE_FILES = LICENSE
>
> define CJSON_BUILD_CMDS
> cd $(@D) && $(TARGET_CC) $(TARGET_CFLAGS) -shared -fPIC -lm \
> diff --git a/package/copas/copas.mk b/package/copas/copas.mk
> --- a/package/copas/copas.mk
> +++ b/package/copas/copas.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> COPAS_VERSION = 1.2.1-1
> -COPAS_SUBDIR = copas-1_2_1
> +COPAS_SUBDIR = copas-1_2_1
> COPAS_LICENSE = MIT
>
> $(eval $(luarocks-package))
> diff --git a/package/coxpcall/coxpcall.mk b/package/coxpcall/coxpcall.mk
> --- a/package/coxpcall/coxpcall.mk
> +++ b/package/coxpcall/coxpcall.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> COXPCALL_VERSION = 1.15.0-1
> -COXPCALL_SUBDIR = coxpcall
> +COXPCALL_SUBDIR = coxpcall
> COXPCALL_LICENSE = MIT
>
> $(eval $(luarocks-package))
> diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk
> --- a/package/dhcpdump/dhcpdump.mk
> +++ b/package/dhcpdump/dhcpdump.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> DHCPDUMP_VERSION = 1.8
> -DHCPDUMP_SITE = http://www.mavetju.org/download
> +DHCPDUMP_SITE = http://www.mavetju.org/download
> DHCPDUMP_DEPENDENCIES = libpcap
> DHCPDUMP_LICENSE = BSD-2c
> DHCPDUMP_LICENSE_FILES = LICENSE
> diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk
> --- a/package/dmidecode/dmidecode.mk
> +++ b/package/dmidecode/dmidecode.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> DMIDECODE_VERSION = 2.12
> -DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
> +DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
> DMIDECODE_LICENSE = GPLv2+
> DMIDECODE_LICENSE_FILES = LICENSE
>
> diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
> --- a/package/dropbear/dropbear.mk
> +++ b/package/dropbear/dropbear.mk
> @@ -8,7 +8,7 @@
> DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
> DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
> DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
> -DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
> +DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
> PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
>
> DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c
> diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
> --- a/package/dtc/dtc.mk
> +++ b/package/dtc/dtc.mk
> @@ -4,12 +4,12 @@
> #
> ################################################################################
>
> -DTC_VERSION = v1.4.0
> -DTC_SITE = git://git.jdl.com/software/dtc.git
> -DTC_LICENSE = GPLv2+/BSD-2c
> -DTC_LICENSE_FILES = README.license GPL
> +DTC_VERSION = v1.4.0
> +DTC_SITE = git://git.jdl.com/software/dtc.git
> +DTC_LICENSE = GPLv2+/BSD-2c
> +DTC_LICENSE_FILES = README.license GPL
> DTC_INSTALL_STAGING = YES
> -DTC_DEPENDENCIES = host-bison host-flex
> +DTC_DEPENDENCIES = host-bison host-flex
>
> define DTC_POST_INSTALL_TARGET_RM_DTDIFF
> rm -f $(TARGET_DIR)/usr/bin/dtdiff
> @@ -17,19 +17,19 @@
>
> ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y)
>
> -DTC_LICENSE += (for the library), GPLv2+ (for the executables)
> +DTC_LICENSE += (for the library), GPLv2+ (for the executables)
> # Use default goal to build everything
> DTC_BUILD_GOAL =
> -DTC_INSTALL_GOAL = install
> +DTC_INSTALL_GOAL = install
> ifeq ($(BR2_PACKAGE_BASH),)
> DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF
> endif
>
> else # $(BR2_PACKAGE_DTC_PROGRAMS) != y
>
> -DTC_BUILD_GOAL = libfdt
> +DTC_BUILD_GOAL = libfdt
> #?libfdt_install is our own install rule added by our patch
> -DTC_INSTALL_GOAL = libfdt_install
> +DTC_INSTALL_GOAL = libfdt_install
>
> endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y
>
> diff --git a/package/dvbsnoop/dvbsnoop.mk b/package/dvbsnoop/dvbsnoop.mk
> --- a/package/dvbsnoop/dvbsnoop.mk
> +++ b/package/dvbsnoop/dvbsnoop.mk
> @@ -4,9 +4,9 @@
> #
> ################################################################################
>
> -DVBSNOOP_VERSION = 1.4.50
> -DVBSNOOP_SITE = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
> -DVBSNOOP_LICENSE = GPLv2
> -DVBSNOOP_LICENSE_FILES = COPYING
> +DVBSNOOP_VERSION = 1.4.50
> +DVBSNOOP_SITE = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
> +DVBSNOOP_LICENSE = GPLv2
> +DVBSNOOP_LICENSE_FILES = COPYING
>
> $(eval $(autotools-package))
> diff --git a/package/ecryptfs-utils/ecryptfs-utils.mk b/package/ecryptfs-utils/ecryptfs-utils.mk
> --- a/package/ecryptfs-utils/ecryptfs-utils.mk
> +++ b/package/ecryptfs-utils/ecryptfs-utils.mk
> @@ -4,14 +4,14 @@
> #
> ################################################################################
>
> -ECRYPTFS_UTILS_VERSION = 104
> -ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
> -ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download
> -ECRYPTFS_UTILS_LICENSE = GPLv2+
> -ECRYPTFS_UTILS_LICENSE_FILES = COPYING
> +ECRYPTFS_UTILS_VERSION = 104
> +ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
> +ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download
> +ECRYPTFS_UTILS_LICENSE = GPLv2+
> +ECRYPTFS_UTILS_LICENSE_FILES = COPYING
>
> -ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool
> -ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam
> +ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool
> +ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam
>
> #Needed for build system to find pk11func.h and libnss3.so
> ECRYPTFS_UTILS_CONF_ENV = \
> diff --git a/package/efl/libedje/libedje.mk b/package/efl/libedje/libedje.mk
> --- a/package/efl/libedje/libedje.mk
> +++ b/package/efl/libedje/libedje.mk
> @@ -6,7 +6,7 @@
>
> LIBEDJE_VERSION = $(EFL_VERSION)
> LIBEDJE_SOURCE = edje-$(LIBEDJE_VERSION).tar.bz2
> -LIBEDJE_SITE = http://download.enlightenment.org/releases
> +LIBEDJE_SITE = http://download.enlightenment.org/releases
> LIBEDJE_LICENSE = GPLv2+ (epp binary), BSD-2c (everything else)
> LIBEDJE_LICENSE_FILES = COPYING
>
> diff --git a/package/eigen/eigen.mk b/package/eigen/eigen.mk
> --- a/package/eigen/eigen.mk
> +++ b/package/eigen/eigen.mk
> @@ -6,7 +6,7 @@
>
> # version 3.2
> EIGEN_VERSION = ffa86ffb5570
> -EIGEN_SITE = https://bitbucket.org/eigen/eigen
> +EIGEN_SITE = https://bitbucket.org/eigen/eigen
> EIGEN_SITE_METHOD = hg
> EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1
> EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README
> diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
> --- a/package/freescale-imx/freescale-imx.mk
> +++ b/package/freescale-imx/freescale-imx.mk
> @@ -5,6 +5,6 @@
> ################################################################################
>
> FREESCALE_IMX_VERSION = 3.10.17-1.0.0
> -FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
> +FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
>
> include $(sort $(wildcard package/freescale-imx/*/*.mk))
> diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
> --- a/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
> +++ b/package/freescale-imx/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.mk
> @@ -9,8 +9,8 @@
> else
> GPU_VIV_BIN_MX6Q_VERSION = $(FREESCALE_IMX_VERSION)-sfp
> endif
> -GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)
> -GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
> +GPU_VIV_BIN_MX6Q_SITE = $(FREESCALE_IMX_SITE)
> +GPU_VIV_BIN_MX6Q_SOURCE = gpu-viv-bin-mx6q-$(GPU_VIV_BIN_MX6Q_VERSION).bin
>
> GPU_VIV_BIN_MX6Q_INSTALL_STAGING = YES
>
> diff --git a/package/freescale-imx/imx-lib/imx-lib.mk b/package/freescale-imx/imx-lib/imx-lib.mk
> --- a/package/freescale-imx/imx-lib/imx-lib.mk
> +++ b/package/freescale-imx/imx-lib/imx-lib.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> IMX_LIB_VERSION = $(FREESCALE_IMX_VERSION)
> -IMX_LIB_SITE = $(FREESCALE_IMX_SITE)
> +IMX_LIB_SITE = $(FREESCALE_IMX_SITE)
> IMX_LIB_LICENSE = LGPLv2.1+
> IMX_LIB_LICENSE_FILES = EULA
>
> diff --git a/package/freescale-imx/imx-vpu/imx-vpu.mk b/package/freescale-imx/imx-vpu/imx-vpu.mk
> --- a/package/freescale-imx/imx-vpu/imx-vpu.mk
> +++ b/package/freescale-imx/imx-vpu/imx-vpu.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> IMX_VPU_VERSION = $(FREESCALE_IMX_VERSION)
> -IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
> +IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
> IMX_VPU_LICENSE = Freescale License
> IMX_VPU_LICENSE_FILES = EULA vpu/EULA.txt
> IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
> diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
> --- a/package/gcc/gcc-final/gcc-final.mk
> +++ b/package/gcc/gcc-final/gcc-final.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> GCC_FINAL_VERSION = $(GCC_VERSION)
> -GCC_FINAL_SITE = $(GCC_SITE)
> -GCC_FINAL_SOURCE = $(GCC_SOURCE)
> +GCC_FINAL_SITE = $(GCC_SITE)
> +GCC_FINAL_SOURCE = $(GCC_SOURCE)
>
> HOST_GCC_FINAL_DEPENDENCIES = \
> $(HOST_GCC_COMMON_DEPENDENCIES) \
> @@ -45,7 +45,7 @@
> GCC_FINAL_CROSS_LANGUAGES-y = c
> GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++
> GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_FORTRAN) += fortran
> -GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_OBJC) += objc
> +GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_OBJC) += objc
> GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y))
>
> HOST_GCC_FINAL_CONF_OPTS = \
> diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
> --- a/package/gcc/gcc-initial/gcc-initial.mk
> +++ b/package/gcc/gcc-initial/gcc-initial.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> GCC_INITIAL_VERSION = $(GCC_VERSION)
> -GCC_INITIAL_SITE = $(GCC_SITE)
> -GCC_INITIAL_SOURCE = $(GCC_SOURCE)
> +GCC_INITIAL_SITE = $(GCC_SITE)
> +GCC_INITIAL_SOURCE = $(GCC_SOURCE)
>
> HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
>
> diff --git a/package/gd/gd.mk b/package/gd/gd.mk
> --- a/package/gd/gd.mk
> +++ b/package/gd/gd.mk
> @@ -47,18 +47,18 @@
> GD_DEPENDENCIES += zlib
> endif
>
> -GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE) += annotate
> -GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD) += bdftogd
> -GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL) += gd2copypal
> -GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOGIF) += gd2togif
> -GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOPNG) += gd2topng
> -GD_TOOLS_$(BR2_PACKAGE_GD_GDCMPGIF) += gdcmpgif
> -GD_TOOLS_$(BR2_PACKAGE_GD_GDPARTTOPNG) += gdparttopng
> -GD_TOOLS_$(BR2_PACKAGE_GD_GDTOPNG) += gdtopng
> -GD_TOOLS_$(BR2_PACKAGE_GD_GIFTOGD2) += giftogd2
> -GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD) += pngtogd
> -GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD2) += pngtogd2
> -GD_TOOLS_$(BR2_PACKAGE_GD_WEBPNG) += webpng
> +GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE) += annotate
> +GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD) += bdftogd
> +GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL) += gd2copypal
> +GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOGIF) += gd2togif
> +GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOPNG) += gd2topng
> +GD_TOOLS_$(BR2_PACKAGE_GD_GDCMPGIF) += gdcmpgif
> +GD_TOOLS_$(BR2_PACKAGE_GD_GDPARTTOPNG) += gdparttopng
> +GD_TOOLS_$(BR2_PACKAGE_GD_GDTOPNG) += gdtopng
> +GD_TOOLS_$(BR2_PACKAGE_GD_GIFTOGD2) += giftogd2
> +GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD) += pngtogd
> +GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD2) += pngtogd2
> +GD_TOOLS_$(BR2_PACKAGE_GD_WEBPNG) += webpng
>
> define GD_REMOVE_TOOLS
> rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GD_TOOLS_))
> diff --git a/package/gdb/gdb.mk b/package/gdb/gdb.mk
> --- a/package/gdb/gdb.mk
> +++ b/package/gdb/gdb.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION))
> -GDB_SITE = $(BR2_GNU_MIRROR)/gdb
> +GDB_SITE = $(BR2_GNU_MIRROR)/gdb
>
> ifeq ($(BR2_arc),y)
> GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION))
> diff --git a/package/genimage/genimage.mk b/package/genimage/genimage.mk
> --- a/package/genimage/genimage.mk
> +++ b/package/genimage/genimage.mk
> @@ -4,10 +4,10 @@
> #
> ################################################################################
>
> -GENIMAGE_VERSION = 7
> -GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
> -GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download
> -GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
> -GENIMAGE_LICENSE = GPLv2
> +GENIMAGE_VERSION = 7
> +GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
> +GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download
> +GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
> +GENIMAGE_LICENSE = GPLv2
>
> $(eval $(host-autotools-package))
> diff --git a/package/genpart/genpart.mk b/package/genpart/genpart.mk
> --- a/package/genpart/genpart.mk
> +++ b/package/genpart/genpart.mk
> @@ -4,16 +4,16 @@
> #
> ################################################################################
>
> -GENPART_VERSION = 1.0.2
> -GENPART_SOURCE = genpart-$(GENPART_VERSION).tar.bz2
> -GENPART_SITE = http://www.pengutronix.de/software/genpart/download
> +GENPART_VERSION = 1.0.2
> +GENPART_SOURCE = genpart-$(GENPART_VERSION).tar.bz2
> +GENPART_SITE = http://www.pengutronix.de/software/genpart/download
> # genpart has no license embedded in its source release.
> # However, their project page mentions:
> # > This community portal offers an overview about our own OSS
> # > projects and projects Pengutronix is or was involved with.
> # We can thus assume genpart is under a FLOSS license.
> # So, until the authors have clarified the licensing terms:
> -GENPART_LICENSE = Unknown (clarification has been asked to the authors)
> +GENPART_LICENSE = Unknown (clarification has been asked to the authors)
>
> $(eval $(autotools-package))
> $(eval $(host-autotools-package))
> diff --git a/package/git/git.mk b/package/git/git.mk
> --- a/package/git/git.mk
> +++ b/package/git/git.mk
> @@ -4,11 +4,11 @@
> #
> ################################################################################
>
> -GIT_VERSION = 1.8.5.4
> -GIT_SITE = http://git-core.googlecode.com/files
> -GIT_LICENSE = GPLv2 LGPLv2.1+
> -GIT_LICENSE_FILES = COPYING LGPL-2.1
> -GIT_DEPENDENCIES = zlib host-gettext
> +GIT_VERSION = 1.8.5.4
> +GIT_SITE = http://git-core.googlecode.com/files
> +GIT_LICENSE = GPLv2 LGPLv2.1+
> +GIT_LICENSE_FILES = COPYING LGPL-2.1
> +GIT_DEPENDENCIES = zlib host-gettext
>
> ifeq ($(BR2_PACKAGE_OPENSSL),y)
> GIT_DEPENDENCIES += openssl
> diff --git a/package/grantlee/grantlee.mk b/package/grantlee/grantlee.mk
> --- a/package/grantlee/grantlee.mk
> +++ b/package/grantlee/grantlee.mk
> @@ -7,7 +7,7 @@
> GRANTLEE_VERSION = 0.2.0
> GRANTLEE_SITE = http://downloads.grantlee.org
> GRANTLEE_INSTALL_STAGING = YES
> -GRANTLEE_DEPENDENCIES = qt
> +GRANTLEE_DEPENDENCIES = qt
> GRANTLEE_LICENSE = LGPLv2.1+
> GRANTLEE_LICENSE_FILES = COPYING.LIB
>
> diff --git a/package/heirloom-mailx/heirloom-mailx.mk b/package/heirloom-mailx/heirloom-mailx.mk
> --- a/package/heirloom-mailx/heirloom-mailx.mk
> +++ b/package/heirloom-mailx/heirloom-mailx.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> HEIRLOOM_MAILX_VERSION = 12.5
> -HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
> -HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/h/heirloom-mailx
> +HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
> +HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/h/heirloom-mailx
> HEIRLOOM_MAILX_LICENSE = BSD-4c, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPLv1.1 (nss)
> HEIRLOOM_MAILX_LICENSE_FILES = COPYING
>
> diff --git a/package/igh-ethercat/igh-ethercat.mk b/package/igh-ethercat/igh-ethercat.mk
> --- a/package/igh-ethercat/igh-ethercat.mk
> +++ b/package/igh-ethercat/igh-ethercat.mk
> @@ -5,12 +5,12 @@
> ################################################################################
>
> IGH_ETHERCAT_VERSION = 1.5.2
> -IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat
> -IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
> +IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat
> +IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
> IGH_ETHERCAT_LICENSE = GPLv2 (IgH EtherCAT master), LGPLv2.1 (libraries)
> IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER
>
> -IGH_ETHERCAT_DEPENDENCIES = linux
> +IGH_ETHERCAT_DEPENDENCIES = linux
> IGH_ETHERCAT_INSTALL_STAGING = YES
>
> IGH_ETHERCAT_CONF_OPTS = \
> diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk
> --- a/package/input-tools/input-tools.mk
> +++ b/package/input-tools/input-tools.mk
> @@ -12,8 +12,8 @@
> INPUT_TOOLS_LICENSE_FILES = utils/Makefile
>
> INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
> -INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL) += jscal
> -INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest
> +INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL) += jscal
> +INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest
>
> define INPUT_TOOLS_DEBIAN_PATCHES
> if [ -d $(@D)/debian/patches ]; then \
> diff --git a/package/irda-utils/irda-utils.mk b/package/irda-utils/irda-utils.mk
> --- a/package/irda-utils/irda-utils.mk
> +++ b/package/irda-utils/irda-utils.mk
> @@ -27,7 +27,7 @@
> IRDA_UTILS_SBINS-y =
> IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRATTACH) += irattach
> IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRDAPING) += irdaping
> -IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRNETD) += irnetd
> +IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRNETD) += irnetd
> IRDA_UTILS_SBINS- += $(IRDA_UTILS_SBINS-y)
>
> define IRDA_UTILS_INSTALL_TARGET_CMDS
> diff --git a/package/keyutils/keyutils.mk b/package/keyutils/keyutils.mk
> --- a/package/keyutils/keyutils.mk
> +++ b/package/keyutils/keyutils.mk
> @@ -4,11 +4,11 @@
> #
> ################################################################################
>
> -KEYUTILS_VERSION = 1.5.5
> -KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
> -KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
> -KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+
> -KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
> +KEYUTILS_VERSION = 1.5.5
> +KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
> +KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
> +KEYUTILS_LICENSE = GPLv2+ LGPLv2.1+
> +KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
> KEYUTILS_INSTALL_STAGING = YES
>
> KEYUTILS_MAKE_ENV = \
> diff --git a/package/lbase64/lbase64.mk b/package/lbase64/lbase64.mk
> --- a/package/lbase64/lbase64.mk
> +++ b/package/lbase64/lbase64.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> LBASE64_VERSION = 20120820-1
> -LBASE64_SUBDIR = base64
> +LBASE64_SUBDIR = base64
> LBASE64_LICENSE = Public domain
> LBASE64_LICENSE_FILES = $(LBASE64_SUBDIR)/README
>
> diff --git a/package/lftp/lftp.mk b/package/lftp/lftp.mk
> --- a/package/lftp/lftp.mk
> +++ b/package/lftp/lftp.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> LFTP_VERSION = 4.5.5
> -LFTP_SITE = http://lftp.yar.ru/ftp
> +LFTP_SITE = http://lftp.yar.ru/ftp
> LFTP_LICENSE = GPLv3+
> LFTP_LICENSE_FILES = COPYING
> LFTP_AUTORECONF = YES
> diff --git a/package/libatasmart/libatasmart.mk b/package/libatasmart/libatasmart.mk
> --- a/package/libatasmart/libatasmart.mk
> +++ b/package/libatasmart/libatasmart.mk
> @@ -6,7 +6,7 @@
>
> LIBATASMART_VERSION = 0.19
> LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz
> -LIBATASMART_SITE = http://0pointer.de/public
> +LIBATASMART_SITE = http://0pointer.de/public
> LIBATASMART_LICENSE = LGPLv2.1
> LIBATASMART_LICENSE_FILES = LGPL
> LIBATASMART_INSTALL_STAGING = YES
> diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk
> --- a/package/libffi/libffi.mk
> +++ b/package/libffi/libffi.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> LIBFFI_VERSION = 3.1
> -LIBFFI_SITE = ftp://sourceware.org/pub/libffi
> +LIBFFI_SITE = ftp://sourceware.org/pub/libffi
> LIBFFI_LICENSE = MIT
> LIBFFI_LICENSE_FILES = LICENSE
> LIBFFI_INSTALL_STAGING = YES
> diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk
> --- a/package/libmbim/libmbim.mk
> +++ b/package/libmbim/libmbim.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> LIBMBIM_VERSION = 1.10.0
> -LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
> -LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
> +LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
> +LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
> LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
> LIBMBIM_LICENSE_FILES = COPYING
> LIBMBIM_INSTALL_STAGING = YES
> diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
> --- a/package/libnspr/libnspr.mk
> +++ b/package/libnspr/libnspr.mk
> @@ -17,7 +17,7 @@
> LIBNSPR_CONF_ENV = HOST_CFLAGS="-g -O2" \
> HOST_LDFLAGS="-lc"
> # NSPR mixes up --build and --host
> -LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME)
> +LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME)
> LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
> LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
>
> diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk
> --- a/package/libqmi/libqmi.mk
> +++ b/package/libqmi/libqmi.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> LIBQMI_VERSION = 1.10.2
> -LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
> -LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
> +LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
> +LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
> LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
> LIBQMI_LICENSE_FILES = COPYING
> LIBQMI_INSTALL_STAGING = YES
> diff --git a/package/libreplaygain/libreplaygain.mk b/package/libreplaygain/libreplaygain.mk
> --- a/package/libreplaygain/libreplaygain.mk
> +++ b/package/libreplaygain/libreplaygain.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -LIBREPLAYGAIN_VERSION = r475
> +LIBREPLAYGAIN_VERSION = r475
> LIBREPLAYGAIN_SITE = http://files.musepack.net/source
> LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
> # upstream doesn't ship configure
> diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk
> --- a/package/libseccomp/libseccomp.mk
> +++ b/package/libseccomp/libseccomp.mk
> @@ -4,18 +4,18 @@
> #
> ################################################################################
>
> -LIBSECCOMP_VERSION = 2.1.1
> -LIBSECCOMP_SITE = http://downloads.sourceforge.net/project/libseccomp/libseccomp-$(LIBSECCOMP_VERSION)/
> -LIBSECCOMP_LICENSE = LGPLv2.1
> -LIBSECCOMP_LICENSE_FILES = LICENSE
> +LIBSECCOMP_VERSION = 2.1.1
> +LIBSECCOMP_SITE = http://downloads.sourceforge.net/project/libseccomp/libseccomp-$(LIBSECCOMP_VERSION)/
> +LIBSECCOMP_LICENSE = LGPLv2.1
> +LIBSECCOMP_LICENSE_FILES = LICENSE
> LIBSECCOMP_INSTALL_STAGING = YES
>
> # Needed for configure to find our system headers:
> -LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
> -LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
> -LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
> +LIBSECCOMP_CONF_ENV = SYSROOT=$(STAGING_DIR)
> +LIBSECCOMP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
> +LIBSECCOMP_MAKE_OPTS = SUBDIRS_BUILD=src
> LIBSECCOMP_INSTALL_STAGING_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(STAGING_DIR) install
> -LIBSECCOMP_INSTALL_TARGET_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
> +LIBSECCOMP_INSTALL_TARGET_OPTS = SUBDIRS_BUILD=src SUBDIRS_INSTALL="src include" DESTDIR=$(TARGET_DIR) install
>
> # Not a real autotools package, but works quite OK nonetheless
> $(eval $(autotools-package))
> diff --git a/package/libsvg-cairo/libsvg-cairo.mk b/package/libsvg-cairo/libsvg-cairo.mk
> --- a/package/libsvg-cairo/libsvg-cairo.mk
> +++ b/package/libsvg-cairo/libsvg-cairo.mk
> @@ -4,12 +4,12 @@
> #
> ################################################################################
>
> -LIBSVG_CAIRO_VERSION = 0.1.6
> -LIBSVG_CAIRO_SITE = http://cairographics.org/snapshots
> -LIBSVG_CAIRO_DEPENDENCIES = cairo libsvg
> +LIBSVG_CAIRO_VERSION = 0.1.6
> +LIBSVG_CAIRO_SITE = http://cairographics.org/snapshots
> +LIBSVG_CAIRO_DEPENDENCIES = cairo libsvg
> LIBSVG_CAIRO_INSTALL_STAGING = YES
> -LIBSVG_CAIRO_LICENSE = LGPLv2.1+
> -LIBSVG_CAIRO_LICENSE_FILES = COPYING
> +LIBSVG_CAIRO_LICENSE = LGPLv2.1+
> +LIBSVG_CAIRO_LICENSE_FILES = COPYING
>
> LIBSVG_CAIRO_CONF_OPTS = --without-x
>
> diff --git a/package/libsvg/libsvg.mk b/package/libsvg/libsvg.mk
> --- a/package/libsvg/libsvg.mk
> +++ b/package/libsvg/libsvg.mk
> @@ -4,12 +4,12 @@
> #
> ################################################################################
>
> -LIBSVG_VERSION = 0.1.4
> -LIBSVG_SITE = http://cairographics.org/snapshots
> -LIBSVG_DEPENDENCIES = host-pkgconf libpng libjpeg
> +LIBSVG_VERSION = 0.1.4
> +LIBSVG_SITE = http://cairographics.org/snapshots
> +LIBSVG_DEPENDENCIES = host-pkgconf libpng libjpeg
> LIBSVG_INSTALL_STAGING = YES
> -LIBSVG_LICENSE = LGPLv2+
> -LIBSVG_LICENSE_FILES = COPYING
> +LIBSVG_LICENSE = LGPLv2+
> +LIBSVG_LICENSE_FILES = COPYING
>
> # libsvg needs at last a XML parser
> ifeq ($(BR2_PACKAGE_EXPAT),y)
> diff --git a/package/liburcu/liburcu.mk b/package/liburcu/liburcu.mk
> --- a/package/liburcu/liburcu.mk
> +++ b/package/liburcu/liburcu.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> LIBURCU_VERSION = 0.8.4
> -LIBURCU_SITE = http://lttng.org/files/urcu
> -LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
> +LIBURCU_SITE = http://lttng.org/files/urcu
> +LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
> LIBURCU_LICENSE = LGPLv2.1+ for the library; MIT-like license for few source files listed in LICENSE; GPLv2+ for test; GPLv3 for few *.m4 files
> LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
>
> diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk
> --- a/package/linux-fusion/linux-fusion.mk
> +++ b/package/linux-fusion/linux-fusion.mk
> @@ -14,7 +14,7 @@
> LINUX_FOR_FUSION=$(LINUX_VERSION_PROBED)
> LINUX_FUSION_ETC_DIR=$(TARGET_DIR)/etc/udev/rules.d
>
> -LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION)
> +LINUX_FUSION_MAKE_OPTS = KERNEL_VERSION=$(LINUX_FOR_FUSION)
> LINUX_FUSION_MAKE_OPTS += KERNEL_BUILD=$(LINUX_DIR)
> LINUX_FUSION_MAKE_OPTS += KERNEL_SOURCE=$(LINUX_DIR)
>
> diff --git a/package/ljlinenoise/ljlinenoise.mk b/package/ljlinenoise/ljlinenoise.mk
> --- a/package/ljlinenoise/ljlinenoise.mk
> +++ b/package/ljlinenoise/ljlinenoise.mk
> @@ -6,7 +6,7 @@
>
> LJLINENOISE_VERSION_UPSTREAM = 0.1.1
> LJLINENOISE_VERSION = $(LJLINENOISE_VERSION_UPSTREAM)-1
> -LJLINENOISE_SUBDIR = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM)
> +LJLINENOISE_SUBDIR = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM)
> LJLINENOISE_LICENSE = MIT
> LJLINENOISE_LICENSE_FILES = $(LJLINENOISE_SUBDIR)/COPYRIGHT
>
> diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk
> --- a/package/lmbench/lmbench.mk
> +++ b/package/lmbench/lmbench.mk
> @@ -7,7 +7,7 @@
> LMBENCH_VERSION = 3.0-a9
> LMBENCH_SOURCE = lmbench-$(LMBENCH_VERSION).tgz
> LMBENCH_SITE = http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION)
> -LMBENCH_LICENSE = lmbench license (based on GPLv2)
> +LMBENCH_LICENSE = lmbench license (based on GPLv2)
> LMBENCH_LICENSE_FILES = COPYING COPYING-2
>
> LMBENCH_CFLAGS = $(TARGET_CFLAGS)
> diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk
> --- a/package/localedef/localedef.mk
> +++ b/package/localedef/localedef.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> LOCALEDEF_VERSION = 2.14.1-r17443-ptx1
> -LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
> -LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src
> +LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2
> +LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src
>
> HOST_LOCALEDEF_CONF_OPTS += \
> --prefix=/usr \
> diff --git a/package/lpty/lpty.mk b/package/lpty/lpty.mk
> --- a/package/lpty/lpty.mk
> +++ b/package/lpty/lpty.mk
> @@ -6,7 +6,7 @@
>
> LPTY_VERSION_UPSTREAM = 1.0.1
> LPTY_VERSION = $(LPTY_VERSION_UPSTREAM)-1
> -LPTY_SUBDIR = lpty-$(LPTY_VERSION)
> +LPTY_SUBDIR = lpty-$(LPTY_VERSION)
> LPTY_LICENSE = MIT
> LPTY_LICENSE_FILES = $(LPTY_SUBDIR)/doc/LICENSE
>
> diff --git a/package/lrandom/lrandom.mk b/package/lrandom/lrandom.mk
> --- a/package/lrandom/lrandom.mk
> +++ b/package/lrandom/lrandom.mk
> @@ -9,7 +9,7 @@
> else
> LRANDOM_VERSION = 20120430.51-1
> endif
> -LRANDOM_SUBDIR = random
> +LRANDOM_SUBDIR = random
> LRANDOM_LICENSE = Public domain
>
> $(eval $(luarocks-package))
> diff --git a/package/lsqlite3/lsqlite3.mk b/package/lsqlite3/lsqlite3.mk
> --- a/package/lsqlite3/lsqlite3.mk
> +++ b/package/lsqlite3/lsqlite3.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> LSQLITE3_VERSION = 0.9.1-2
> -LSQLITE3_SUBDIR = lsqlite3_fsl09t
> +LSQLITE3_SUBDIR = lsqlite3_fsl09t
> LSQLITE3_DEPENDENCIES = sqlite
> LSQLITE3_LICENSE = MIT
>
> diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk
> --- a/package/ltp-testsuite/ltp-testsuite.mk
> +++ b/package/ltp-testsuite/ltp-testsuite.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> LTP_TESTSUITE_VERSION = 20140115
> -LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
> -LTP_TESTSUITE_SITE = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
> +LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
> +LTP_TESTSUITE_SITE = http://downloads.sourceforge.net/project/ltp/LTP%20Source/ltp-$(LTP_TESTSUITE_VERSION)
> LTP_TESTSUITE_LICENSE = GPLv2 GPLv2+
> LTP_TESTSUITE_LICENSE_FILES = COPYING
>
> diff --git a/package/lttng-babeltrace/lttng-babeltrace.mk b/package/lttng-babeltrace/lttng-babeltrace.mk
> --- a/package/lttng-babeltrace/lttng-babeltrace.mk
> +++ b/package/lttng-babeltrace/lttng-babeltrace.mk
> @@ -4,9 +4,9 @@
> #
> ################################################################################
>
> -LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace
> +LTTNG_BABELTRACE_SITE = http://lttng.org/files/babeltrace
> LTTNG_BABELTRACE_VERSION = 1.2.2
> -LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
> +LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
> LTTNG_BABELTRACE_LICENSE = MIT; LGPL2.1 for include/babeltrace/list.h; GPLv2+ for test code
> LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
>
> diff --git a/package/lttng-libust/lttng-libust.mk b/package/lttng-libust/lttng-libust.mk
> --- a/package/lttng-libust/lttng-libust.mk
> +++ b/package/lttng-libust/lttng-libust.mk
> @@ -4,14 +4,14 @@
> #
> ################################################################################
>
> -LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
> +LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
> LTTNG_LIBUST_VERSION = 2.5.0
> -LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
> +LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
> LTTNG_LIBUST_LICENSE = LGPLv2.1; MIT for system headers; GPLv2 for liblttng-ust-ctl/ustctl.c (used by lttng-sessiond)
> LTTNG_LIBUST_LICENSE_FILES = COPYING
>
> LTTNG_LIBUST_INSTALL_STAGING = YES
> -LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
> +LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
>
> ifeq ($(BR2_PACKAGE_PYTHON),y)
> LTTNG_LIBUST_DEPENDENCIES += python
> diff --git a/package/lttng-modules/lttng-modules.mk b/package/lttng-modules/lttng-modules.mk
> --- a/package/lttng-modules/lttng-modules.mk
> +++ b/package/lttng-modules/lttng-modules.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> LTTNG_MODULES_VERSION = 2.5.0
> -LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
> -LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
> +LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
> +LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
> LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/*
> LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE
>
> diff --git a/package/lttng-tools/lttng-tools.mk b/package/lttng-tools/lttng-tools.mk
> --- a/package/lttng-tools/lttng-tools.mk
> +++ b/package/lttng-tools/lttng-tools.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> LTTNG_TOOLS_VERSION = 2.5.0
> -LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
> -LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
> +LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
> +LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
> LTTNG_TOOLS_LICENSE = GPLv2+; LGPLv2.1+ for include/lttng/* and src/lib/lttng-ctl/*
> LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
> LTTNG_TOOLS_CONF_OPTS += --with-xml-prefix=$(STAGING_DIR)/usr
> diff --git a/package/lua-coat/lua-coat.mk b/package/lua-coat/lua-coat.mk
> --- a/package/lua-coat/lua-coat.mk
> +++ b/package/lua-coat/lua-coat.mk
> @@ -6,7 +6,7 @@
>
> LUA_COAT_VERSION_UPSTREAM = 0.9.0
> LUA_COAT_VERSION = $(LUA_COAT_VERSION_UPSTREAM)-1
> -LUA_COAT_SUBDIR = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM)
> +LUA_COAT_SUBDIR = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM)
> LUA_COAT_LICENSE = MIT
> LUA_COAT_LICENSE_FILES = $(LUA_COAT_SUBDIR)/COPYRIGHT
>
> diff --git a/package/lua-coatpersistent/lua-coatpersistent.mk b/package/lua-coatpersistent/lua-coatpersistent.mk
> --- a/package/lua-coatpersistent/lua-coatpersistent.mk
> +++ b/package/lua-coatpersistent/lua-coatpersistent.mk
> @@ -6,7 +6,7 @@
>
> LUA_COATPERSISTENT_VERSION_UPSTREAM = 0.2.0
> LUA_COATPERSISTENT_VERSION = $(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1
> -LUA_COATPERSISTENT_SUBDIR = lua-CoatPersistent-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)
> +LUA_COATPERSISTENT_SUBDIR = lua-CoatPersistent-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)
> LUA_COATPERSISTENT_LICENSE = MIT
> LUA_COATPERSISTENT_LICENSE_FILES = $(LUA_COATPERSISTENT_SUBDIR)/COPYRIGHT
>
> diff --git a/package/lua-csnappy/lua-csnappy.mk b/package/lua-csnappy/lua-csnappy.mk
> --- a/package/lua-csnappy/lua-csnappy.mk
> +++ b/package/lua-csnappy/lua-csnappy.mk
> @@ -6,7 +6,7 @@
>
> LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.1
> LUA_CSNAPPY_VERSION = $(LUA_CSNAPPY_VERSION_UPSTREAM)-1
> -LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM)
> +LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM)
> LUA_CSNAPPY_LICENSE = BSD-3c
> LUA_CSNAPPY_LICENSE_FILES = $(LUA_CSNAPPY_SUBDIR)/COPYRIGHT
>
> diff --git a/package/lua-messagepack/lua-messagepack.mk b/package/lua-messagepack/lua-messagepack.mk
> --- a/package/lua-messagepack/lua-messagepack.mk
> +++ b/package/lua-messagepack/lua-messagepack.mk
> @@ -6,7 +6,7 @@
>
> LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.3.1
> LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1
> -LUA_MESSAGEPACK_SUBDIR = lua-MessagePack-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)
> +LUA_MESSAGEPACK_SUBDIR = lua-MessagePack-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)
> LUA_MESSAGEPACK_LICENSE = MIT
> LUA_MESSAGEPACK_LICENSE_FILES = $(LUA_MESSAGEPACK_SUBDIR)/COPYRIGHT
>
> diff --git a/package/lua-testmore/lua-testmore.mk b/package/lua-testmore/lua-testmore.mk
> --- a/package/lua-testmore/lua-testmore.mk
> +++ b/package/lua-testmore/lua-testmore.mk
> @@ -6,7 +6,7 @@
>
> LUA_TESTMORE_VERSION_UPSTREAM = 0.3.1
> LUA_TESTMORE_VERSION = $(LUA_TESTMORE_VERSION_UPSTREAM)-1
> -LUA_TESTMORE_SUBDIR = lua-TestMore-$(LUA_TESTMORE_VERSION_UPSTREAM)
> +LUA_TESTMORE_SUBDIR = lua-TestMore-$(LUA_TESTMORE_VERSION_UPSTREAM)
> LUA_TESTMORE_LICENSE = MIT
> LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT
>
> diff --git a/package/luabitop/luabitop.mk b/package/luabitop/luabitop.mk
> --- a/package/luabitop/luabitop.mk
> +++ b/package/luabitop/luabitop.mk
> @@ -6,7 +6,7 @@
>
> LUABITOP_VERSION_UPSTREAM = 1.0.2
> LUABITOP_VERSION = $(LUABITOP_VERSION_UPSTREAM)-1
> -LUABITOP_SUBDIR = LuaBitOp-$(LUABITOP_VERSION_UPSTREAM)
> +LUABITOP_SUBDIR = LuaBitOp-$(LUABITOP_VERSION_UPSTREAM)
> LUABITOP_LICENSE = MIT
> LUABITOP_LICENSE_FILES = $(LUABITOP_SUBDIR)/README
>
> diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
> --- a/package/luajit/luajit.mk
> +++ b/package/luajit/luajit.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> LUAJIT_VERSION = 2.0.3
> -LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
> -LUAJIT_SITE = http://luajit.org/download
> +LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
> +LUAJIT_SITE = http://luajit.org/download
> LUAJIT_LICENSE = MIT
> LUAJIT_LICENSE_FILES = COPYRIGHT
>
> diff --git a/package/luajson/luajson.mk b/package/luajson/luajson.mk
> --- a/package/luajson/luajson.mk
> +++ b/package/luajson/luajson.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> LUAJSON_VERSION = 1.3.3-1
> -LUAJSON_SUBDIR = luajson
> +LUAJSON_SUBDIR = luajson
> LUAJSON_LICENSE = MIT
> LUAJSON_LICENSE_FILES = $(LUAJSON_SUBDIR)/LICENSE
>
> diff --git a/package/lualogging/lualogging.mk b/package/lualogging/lualogging.mk
> --- a/package/lualogging/lualogging.mk
> +++ b/package/lualogging/lualogging.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> LUALOGGING_VERSION = 1.3.0-1
> -LUALOGGING_SUBDIR = lualogging
> +LUALOGGING_SUBDIR = lualogging
> LUALOGGING_LICENSE = MIT
> LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT
>
> diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
> --- a/package/luarocks/luarocks.mk
> +++ b/package/luarocks/luarocks.mk
> @@ -11,7 +11,7 @@
>
> HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter
>
> -LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks
> +LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks
> LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
>
> HOST_LUAROCKS_CONF_OPTS = \
> diff --git a/package/luasec/luasec.mk b/package/luasec/luasec.mk
> --- a/package/luasec/luasec.mk
> +++ b/package/luasec/luasec.mk
> @@ -6,7 +6,7 @@
>
> LUASEC_VERSION_UPSTREAM = 0.5
> LUASEC_VERSION = $(LUASEC_VERSION_UPSTREAM)-2
> -LUASEC_SUBDIR = luasec
> +LUASEC_SUBDIR = luasec
> LUASEC_LICENSE = MIT
> LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE
> LUASEC_DEPENDENCIES = openssl
> diff --git a/package/luasocket/luasocket.mk b/package/luasocket/luasocket.mk
> --- a/package/luasocket/luasocket.mk
> +++ b/package/luasocket/luasocket.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> LUASOCKET_VERSION = 3.0rc1-1
> -LUASOCKET_SUBDIR = luasocket-3.0-rc1
> +LUASOCKET_SUBDIR = luasocket-3.0-rc1
> LUASOCKET_LICENSE = MIT
> LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE
>
> diff --git a/package/luasql-sqlite3/luasql-sqlite3.mk b/package/luasql-sqlite3/luasql-sqlite3.mk
> --- a/package/luasql-sqlite3/luasql-sqlite3.mk
> +++ b/package/luasql-sqlite3/luasql-sqlite3.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> LUASQL_SQLITE3_VERSION = 2.3.0-1
> -LUASQL_SQLITE3_SUBDIR = luasql
> +LUASQL_SQLITE3_SUBDIR = luasql
> LUASQL_SQLITE3_LICENSE = MIT
> LUASQL_SQLITE3_LICENSE_FILES = $(LUASQL_SQLITE3_SUBDIR)/README
> LUASQL_SQLITE3_DEPENDENCIES = sqlite
> diff --git a/package/lunit/lunit.mk b/package/lunit/lunit.mk
> --- a/package/lunit/lunit.mk
> +++ b/package/lunit/lunit.mk
> @@ -6,7 +6,7 @@
>
> LUNIT_VERSION_UPSTREAM = 0.5
> LUNIT_VERSION = $(LUNIT_VERSION_UPSTREAM)-2
> -LUNIT_SUBDIR = lunit-$(LUNIT_VERSION_UPSTREAM)
> +LUNIT_SUBDIR = lunit-$(LUNIT_VERSION_UPSTREAM)
> LUNIT_LICENSE = MIT
> LUNIT_LICENSE_FILES = $(LUNIT_SUBDIR)/LICENSE
>
> diff --git a/package/lzlib/lzlib.mk b/package/lzlib/lzlib.mk
> --- a/package/lzlib/lzlib.mk
> +++ b/package/lzlib/lzlib.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> LZLIB_VERSION = 0.4.work3-1
> -LZLIB_SUBDIR = lzlib-0.4-work3
> +LZLIB_SUBDIR = lzlib-0.4-work3
> LZLIB_DEPENDENCIES = zlib
> LZLIB_LICENSE = MIT
>
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -55,13 +55,13 @@
> # Drivers
>
> #Gallium Drivers
> -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau
> -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga
> -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast
> +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau
> +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga
> +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast
> # DRI Drivers
> MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
> -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915
> -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
> +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915
> +MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
> MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
>
> ifeq ($(MESA3D_GALLIUM_DRIVERS-y),)
> diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk
> --- a/package/mii-diag/mii-diag.mk
> +++ b/package/mii-diag/mii-diag.mk
> @@ -5,9 +5,9 @@
> ################################################################################
>
> MII_DIAG_VERSION = 2.11
> -MII_DIAG_SOURCE = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
> -MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
> -MII_DIAG_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
> +MII_DIAG_SOURCE = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz
> +MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz
> +MII_DIAG_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
> MII_DIAG_LICENSE = GPL # No version specified
> MII_DIAG_LICENSE_FILES = mii-diag.c
>
> diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk
> --- a/package/mmc-utils/mmc-utils.mk
> +++ b/package/mmc-utils/mmc-utils.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> MMC_UTILS_VERSION = 11f2ceabc4ad3f0dd568e0ce68166e4803e0615b
> -MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
> +MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
> MMC_UTILS_LICENSE = GPLv2
>
> define MMC_UTILS_BUILD_CMDS
> diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
> --- a/package/mplayer/mplayer.mk
> +++ b/package/mplayer/mplayer.mk
> @@ -14,9 +14,9 @@
> # mplayer needs pcm+mixer support, but configure fails to check for it
> ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
> MPLAYER_DEPENDENCIES += alsa-lib
> -MPLAYER_CONF_OPTS += --enable-alsa
> +MPLAYER_CONF_OPTS += --enable-alsa
> else
> -MPLAYER_CONF_OPTS += --disable-alsa
> +MPLAYER_CONF_OPTS += --disable-alsa
> endif
>
> ifeq ($(BR2_ENDIAN),"BIG")
> diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
> --- a/package/mtd/mtd.mk
> +++ b/package/mtd/mtd.mk
> @@ -36,45 +36,45 @@
> MKFS_JFFS2 = $(HOST_DIR)/usr/sbin/mkfs.jffs2
> SUMTOOL = $(HOST_DIR)/usr/sbin/sumtool
>
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP) += flash_otp_dump
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO) += flash_otp_info
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK) += flash_otp_lock
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE) += flash_otp_write
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_RECV_IMAGE) += recv_image
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDDUMP) += rfddump
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDFORMAT) += rfdformat
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_SERVE_IMAGE) += serve_image
> -MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP) += flash_otp_dump
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO) += flash_otp_info
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK) += flash_otp_lock
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE) += flash_otp_write
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_RECV_IMAGE) += recv_image
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDDUMP) += rfddump
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDFORMAT) += rfdformat
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_SERVE_IMAGE) += serve_image
> +MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool
>
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_MTDINFO) += mtdinfo
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIFORMAT) += ubiformat
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINIZE) += ubinize
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRENAME) += ubirename
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol
> -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK) += ubiblock
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_MTDINFO) += mtdinfo
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIFORMAT) += ubiformat
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINIZE) += ubinize
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRENAME) += ubirename
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol
> +MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK) += ubiblock
>
> MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
> MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS) += mkfs.ubifs/mkfs.ubifs
> diff --git a/package/musepack/musepack.mk b/package/musepack/musepack.mk
> --- a/package/musepack/musepack.mk
> +++ b/package/musepack/musepack.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -MUSEPACK_VERSION = r475
> +MUSEPACK_VERSION = r475
> MUSEPACK_SITE = http://files.musepack.net/source
> MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
> MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
> diff --git a/package/on2-8170-modules/on2-8170-modules.mk b/package/on2-8170-modules/on2-8170-modules.mk
> --- a/package/on2-8170-modules/on2-8170-modules.mk
> +++ b/package/on2-8170-modules/on2-8170-modules.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39
> -ON2_8170_MODULES_SITE = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
> +ON2_8170_MODULES_SITE = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
>
> ON2_8170_MODULES_DEPENDENCIES = linux
>
> diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk
> --- a/package/open2300/open2300.mk
> +++ b/package/open2300/open2300.mk
> @@ -17,9 +17,9 @@
>
> ifeq ($(BR2_PACKAGE_MYSQL),y)
> OPEN2300_DEPENDENCIES += mysql
> - OPEN2300_BINS += mysql2300 mysqlhistlog2300
> - OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql
> - OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient
> + OPEN2300_BINS += mysql2300 mysqlhistlog2300
> + OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql
> + OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient
> endif
>
> define OPEN2300_BUILD_CMDS
> diff --git a/package/orbit/orbit.mk b/package/orbit/orbit.mk
> --- a/package/orbit/orbit.mk
> +++ b/package/orbit/orbit.mk
> @@ -6,7 +6,7 @@
>
> ORBIT_VERSION_UPSTREAM = 2.2.1
> ORBIT_VERSION = $(ORBIT_VERSION_UPSTREAM)-1
> -ORBIT_SUBDIR = orbit
> +ORBIT_SUBDIR = orbit
> ORBIT_LICENSE = MIT
> ORBIT_LICENSE_FILES = $(ORBIT_SUBDIR)/doc/us/license.md
>
> diff --git a/package/perl/perl.mk b/package/perl/perl.mk
> --- a/package/perl/perl.mk
> +++ b/package/perl/perl.mk
> @@ -15,8 +15,8 @@
> PERL_CROSS_VERSION = 0.8.5
> PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).2
> # DO NOT refactor with the github helper (the result is not the same)
> -PERL_CROSS_SITE = http://raw.github.com/arsv/perl-cross/releases
> -PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
> +PERL_CROSS_SITE = http://raw.github.com/arsv/perl-cross/releases
> +PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
> PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod
> PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod
>
> diff --git a/package/php/php.mk b/package/php/php.mk
> --- a/package/php/php.mk
> +++ b/package/php/php.mk
> @@ -13,7 +13,7 @@
> PHP_DEPENDENCIES = host-pkgconf
> PHP_LICENSE = PHP
> PHP_LICENSE_FILES = LICENSE
> -PHP_CONF_OPTS = --mandir=/usr/share/man \
> +PHP_CONF_OPTS = --mandir=/usr/share/man \
> --infodir=/usr/share/info \
> --disable-all \
> --without-pear \
> diff --git a/package/picocom/picocom.mk b/package/picocom/picocom.mk
> --- a/package/picocom/picocom.mk
> +++ b/package/picocom/picocom.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> PICOCOM_VERSION = 1.7
> -PICOCOM_SITE = http://picocom.googlecode.com/files
> +PICOCOM_SITE = http://picocom.googlecode.com/files
> PICOCOM_LICENSE = GPLv2+
> PICOCOM_LICENSE_FILES = LICENSE.txt
>
> diff --git a/package/pinentry/pinentry.mk b/package/pinentry/pinentry.mk
> --- a/package/pinentry/pinentry.mk
> +++ b/package/pinentry/pinentry.mk
> @@ -10,7 +10,7 @@
> PINENTRY_LICENSE = GPLv2+
> PINENTRY_LICENSE_FILES = COPYING
> PINENTRY_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
> -PINENTRY_CONF_OPTS = --disable-pinentry-gtk # gtk1
> +PINENTRY_CONF_OPTS = --disable-pinentry-gtk # gtk1
> PINENTRY_CONF_OPTS += --disable-pinentry-qt # qt3
> PINENTRY_CONF_OPTS += --without-libcap # requires PAM
>
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -107,9 +107,9 @@
> $(2)_CONF_OPTS ?=
> $(2)_MAKE_ENV ?=
> $(2)_MAKE_OPTS ?=
> -$(2)_INSTALL_OPTS ?= install
> -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
> -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
> +$(2)_INSTALL_OPTS ?= install
> +$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
> +$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
>
>
> #
> diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> --- a/package/pkg-cmake.mk
> +++ b/package/pkg-cmake.mk
> @@ -38,15 +38,15 @@
>
> $(2)_CONF_ENV ?=
> $(2)_CONF_OPTS ?=
> -$(2)_MAKE ?= $$(MAKE)
> +$(2)_MAKE ?= $$(MAKE)
> $(2)_MAKE_ENV ?=
> $(2)_MAKE_OPTS ?=
> -$(2)_INSTALL_HOST_OPTS ?= install
> -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
> -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
> +$(2)_INSTALL_HOST_OPTS ?= install
> +$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install
> +$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install
>
> -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
> -$(2)_BUILDDIR = $$($(2)_SRCDIR)
> +$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
> +$(2)_BUILDDIR = $$($(2)_SRCDIR)
>
> #
> # Configure step. Only define it if not already defined by the package
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -140,7 +140,7 @@
> #
> # For BR2_GLOBAL_PATCH_DIR, only generate if it is defined
> $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
> -$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $(PKGDIR)
> +$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $(PKGDIR)
> $(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS += $(addsuffix /$(RAWNAME),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)))
> $(BUILD_DIR)/%/.stamp_patched:
> @$(call step_start,patch)
> @@ -322,9 +322,9 @@
> # this information has only to be specified once, for both the
> # target and host packages of a given .mk file.
>
> -$(2)_TYPE = $(4)
> -$(2)_NAME = $(1)
> -$(2)_RAWNAME = $$(patsubst host-%,%,$(1))
> +$(2)_TYPE = $(4)
> +$(2)_NAME = $(1)
> +$(2)_RAWNAME = $$(patsubst host-%,%,$(1))
>
> # Keep the package version that may contain forward slashes in the _DL_VERSION
> # variable, then replace all forward slashes ('/') by underscores ('_') to
> @@ -344,9 +344,9 @@
> $(2)_VERSION := $$(subst /,_,$$($(2)_VERSION))
> endif
>
> -$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
> -$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME)
> -$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME)
> +$(2)_BASE_NAME = $(1)-$$($(2)_VERSION)
> +$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME)
> +$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME)
>
> ifndef $(2)_SUBDIR
> ifdef $(3)_SUBDIR
> @@ -356,8 +356,8 @@
> endif
> endif
>
> -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
> -$(2)_BUILDDIR ?= $$($(2)_SRCDIR)
> +$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
> +$(2)_BUILDDIR ?= $$($(2)_SRCDIR)
>
> ifneq ($$($(2)_OVERRIDE_SRCDIR),)
> $(2)_VERSION = custom
> @@ -367,7 +367,7 @@
> ifdef $(3)_SOURCE
> $(2)_SOURCE = $$($(3)_SOURCE)
> else
> - $(2)_SOURCE ?= $$($(2)_RAWNAME)-$$($(2)_VERSION).tar.gz
> + $(2)_SOURCE ?= $$($(2)_RAWNAME)-$$($(2)_VERSION).tar.gz
> endif
> endif
>
> @@ -404,7 +404,7 @@
> endif
> endif
>
> -$(2)_LICENSE ?= unknown
> +$(2)_LICENSE ?= unknown
>
> ifndef $(2)_LICENSE_FILES
> ifdef $(3)_LICENSE_FILES
> @@ -418,12 +418,12 @@
> endif
> endif
>
> -$(2)_REDISTRIBUTE ?= YES
> +$(2)_REDISTRIBUTE ?= YES
>
> # When a target package is a toolchain dependency set this variable to
> # 'NO' so the 'toolchain' dependency is not added to prevent a circular
> # dependency
> -$(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES
> +$(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES
>
> ifeq ($(4),host)
> $(2)_DEPENDENCIES ?= $$(filter-out host-toolchain $(1),\
> @@ -438,23 +438,23 @@
> # Eliminate duplicates in dependencies
> $(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES))
>
> -$(2)_INSTALL_STAGING ?= NO
> -$(2)_INSTALL_IMAGES ?= NO
> -$(2)_INSTALL_TARGET ?= YES
> +$(2)_INSTALL_STAGING ?= NO
> +$(2)_INSTALL_IMAGES ?= NO
> +$(2)_INSTALL_TARGET ?= YES
>
> # define sub-target stamps
> -$(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed
> -$(2)_TARGET_INSTALL_STAGING = $$($(2)_DIR)/.stamp_staging_installed
> -$(2)_TARGET_INSTALL_IMAGES = $$($(2)_DIR)/.stamp_images_installed
> -$(2)_TARGET_INSTALL_HOST = $$($(2)_DIR)/.stamp_host_installed
> -$(2)_TARGET_BUILD = $$($(2)_DIR)/.stamp_built
> -$(2)_TARGET_CONFIGURE = $$($(2)_DIR)/.stamp_configured
> -$(2)_TARGET_RSYNC = $$($(2)_DIR)/.stamp_rsynced
> -$(2)_TARGET_RSYNC_SOURCE = $$($(2)_DIR)/.stamp_rsync_sourced
> -$(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched
> -$(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted
> -$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded
> -$(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned
> +$(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed
> +$(2)_TARGET_INSTALL_STAGING = $$($(2)_DIR)/.stamp_staging_installed
> +$(2)_TARGET_INSTALL_IMAGES = $$($(2)_DIR)/.stamp_images_installed
> +$(2)_TARGET_INSTALL_HOST = $$($(2)_DIR)/.stamp_host_installed
> +$(2)_TARGET_BUILD = $$($(2)_DIR)/.stamp_built
> +$(2)_TARGET_CONFIGURE = $$($(2)_DIR)/.stamp_configured
> +$(2)_TARGET_RSYNC = $$($(2)_DIR)/.stamp_rsynced
> +$(2)_TARGET_RSYNC_SOURCE = $$($(2)_DIR)/.stamp_rsync_sourced
> +$(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched
> +$(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted
> +$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded
> +$(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned
>
> # default extract command
> $(2)_EXTRACT_CMDS ?= \
> diff --git a/package/pkg-luarocks.mk b/package/pkg-luarocks.mk
> --- a/package/pkg-luarocks.mk
> +++ b/package/pkg-luarocks.mk
> @@ -34,14 +34,14 @@
> define inner-luarocks-package
>
> $(2)_BUILD_OPTS ?=
> -$(2)_SUBDIR ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
> -$(2)_ROCKSPEC ?= $(1)-$$($(3)_VERSION).rockspec
> -$(2)_SOURCE ?= $(1)-$$($(3)_VERSION).src.rock
> -$(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
> +$(2)_SUBDIR ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
> +$(2)_ROCKSPEC ?= $(1)-$$($(3)_VERSION).rockspec
> +$(2)_SOURCE ?= $(1)-$$($(3)_VERSION).src.rock
> +$(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
>
> # Since we do not support host-luarocks-package, we know this is
> # a target package, and can just add the required dependencies
> -$(2)_DEPENDENCIES += host-luarocks luainterpreter
> +$(2)_DEPENDENCIES += host-luarocks luainterpreter
>
> #
> # Extract step
> diff --git a/package/pkg-perl.mk b/package/pkg-perl.mk
> --- a/package/pkg-perl.mk
> +++ b/package/pkg-perl.mk
> @@ -19,7 +19,7 @@
> #
> ################################################################################
>
> -PERL_ARCHNAME = $(ARCH)-linux
> +PERL_ARCHNAME = $(ARCH)-linux
>
> ################################################################################
> # inner-perl-package -- defines how the configuration, compilation and
> diff --git a/package/pkg-python.mk b/package/pkg-python.mk
> --- a/package/pkg-python.mk
> +++ b/package/pkg-python.mk
> @@ -91,8 +91,8 @@
>
> define inner-python-package
>
> -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
> -$(2)_BUILDDIR = $$($(2)_SRCDIR)
> +$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR)
> +$(2)_BUILDDIR = $$($(2)_SRCDIR)
>
> $(2)_ENV ?=
> $(2)_BUILD_OPTS ?=
> @@ -109,28 +109,28 @@
> # Distutils
> ifeq ($$($(2)_SETUP_TYPE),distutils)
> ifeq ($(4),target)
> -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
> -$(2)_BASE_BUILD_TGT = build
> -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
> -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
> +$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV)
> +$(2)_BASE_BUILD_TGT = build
> +$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS)
> +$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)
> $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS)
> else
> -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
> -$(2)_BASE_BUILD_TGT = build
> +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV)
> +$(2)_BASE_BUILD_TGT = build
> $(2)_BASE_BUILD_OPTS =
> $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)
> endif
> # Setuptools
> else ifeq ($$($(2)_SETUP_TYPE),setuptools)
> ifeq ($(4),target)
> -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
> -$(2)_BASE_BUILD_TGT = build
> +$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV)
> +$(2)_BASE_BUILD_TGT = build
> $(2)_BASE_BUILD_OPTS =
> -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
> +$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS)
> $(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS)
> else
> -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
> -$(2)_BASE_BUILD_TGT = build
> +$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV)
> +$(2)_BASE_BUILD_TGT = build
> $(2)_BASE_BUILD_OPTS =
> $(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS)
> endif
> diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
> --- a/package/pkg-utils.mk
> +++ b/package/pkg-utils.mk
> @@ -52,30 +52,30 @@
> # directory from its makefile directory, using the $(MAKEFILE_LIST)
> # variable provided by make. This is used by the *TARGETS macros to
> # automagically find where the package is located.
> -pkgdir = $(dir $(lastword $(MAKEFILE_LIST)))
> -pkgname = $(lastword $(subst /, ,$(pkgdir)))
> +pkgdir = $(dir $(lastword $(MAKEFILE_LIST)))
> +pkgname = $(lastword $(subst /, ,$(pkgdir)))
>
> # Define extractors for different archive suffixes
> -INFLATE.bz2 = $(BZCAT)
> -INFLATE.gz = $(ZCAT)
> -INFLATE.tbz = $(BZCAT)
> +INFLATE.bz2 = $(BZCAT)
> +INFLATE.gz = $(ZCAT)
> +INFLATE.tbz = $(BZCAT)
> INFLATE.tbz2 = $(BZCAT)
> -INFLATE.tgz = $(ZCAT)
> -INFLATE.xz = $(XZCAT)
> -INFLATE.tar = cat
> +INFLATE.tgz = $(ZCAT)
> +INFLATE.xz = $(XZCAT)
> +INFLATE.tar = cat
> # suitable-extractor(filename): returns extractor based on suffix
> suitable-extractor = $(INFLATE$(suffix $(1)))
>
> # MESSAGE Macro -- display a message in bold type
> -MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
> -TERM_BOLD := $(shell tput smso)
> +MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESET)"
> +TERM_BOLD := $(shell tput smso)
> TERM_RESET := $(shell tput rmso)
>
> # Utility functions for 'find'
> # findfileclauses(filelist) => -name 'X' -o -name 'Y'
> findfileclauses = $(call notfirstword,$(patsubst %,-o -name '%',$(1)))
> # finddirclauses(base, dirlist) => -path 'base/dirX' -o -path 'base/dirY'
> -finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
> +finddirclauses = $(call notfirstword,$(patsubst %,-o -path '$(1)/%',$(2)))
>
> # Miscellaneous utility functions
> # notfirstword(wordlist): returns all but the first word in wordlist
> diff --git a/package/python-dialog/python-dialog.mk b/package/python-dialog/python-dialog.mk
> --- a/package/python-dialog/python-dialog.mk
> +++ b/package/python-dialog/python-dialog.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> PYTHON_DIALOG_VERSION = 3.0.1
> -PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
> -PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
> +PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
> +PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
> PYTHON_DIALOG_LICENSE = LGPLv2.1+
> PYTHON_DIALOG_LICENSE_FILES = COPYING
> PYTHON_DIALOG_SETUP_TYPE = distutils
> diff --git a/package/python-ipy/python-ipy.mk b/package/python-ipy/python-ipy.mk
> --- a/package/python-ipy/python-ipy.mk
> +++ b/package/python-ipy/python-ipy.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> PYTHON_IPY_VERSION = IPy-0.75
> -PYTHON_IPY_SITE = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION))
> +PYTHON_IPY_SITE = $(call github,haypo,python-ipy,$(PYTHON_IPY_VERSION))
> PYTHON_IPY_LICENSE = BSD-3c
> PYTHON_IPY_LICENSE_FILES = COPYING
> PYTHON_IPY_SETUP_TYPE = distutils
> diff --git a/package/python-netifaces/python-netifaces.mk b/package/python-netifaces/python-netifaces.mk
> --- a/package/python-netifaces/python-netifaces.mk
> +++ b/package/python-netifaces/python-netifaces.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> PYTHON_NETIFACES_VERSION = 0.7
> -PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
> -PYTHON_NETIFACES_SITE = http://alastairs-place.net/projects/netifaces
> +PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
> +PYTHON_NETIFACES_SITE = http://alastairs-place.net/projects/netifaces
> PYTHON_NETIFACES_LICENSE = MIT
> PYTHON_NETIFACES_LICENSE_FILES = README
> PYTHON_NETIFACES_SETUP_TYPE = setuptools
> diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk
> --- a/package/python-protobuf/python-protobuf.mk
> +++ b/package/python-protobuf/python-protobuf.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
> -PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE)
> -PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
> +PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE)
> +PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
> PYTHON_PROTOBUF_LICENSE = BSD-3c
> PYTHON_PROTOBUF_LICENSE_FILES = COPYING.txt
> PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf
> diff --git a/package/python-pyparsing/python-pyparsing.mk b/package/python-pyparsing/python-pyparsing.mk
> --- a/package/python-pyparsing/python-pyparsing.mk
> +++ b/package/python-pyparsing/python-pyparsing.mk
> @@ -4,11 +4,11 @@
> #
> ################################################################################
>
> -PYTHON_PYPARSING_VERSION = 1.5.6
> -PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
> -PYTHON_PYPARSING_SITE = http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-$(PYTHON_PYPARSING_VERSION)
> -PYTHON_PYPARSING_LICENSE = MIT
> -PYTHON_PYPARSING_LICENSE_FILES = LICENSE
> -PYTHON_PYPARSING_SETUP_TYPE = distutils
> +PYTHON_PYPARSING_VERSION = 1.5.6
> +PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
> +PYTHON_PYPARSING_SITE = http://downloads.sourceforge.net/project/pyparsing/pyparsing/pyparsing-$(PYTHON_PYPARSING_VERSION)
> +PYTHON_PYPARSING_LICENSE = MIT
> +PYTHON_PYPARSING_LICENSE_FILES = LICENSE
> +PYTHON_PYPARSING_SETUP_TYPE = distutils
>
> $(eval $(python-package))
> diff --git a/package/python-pyro/python-pyro.mk b/package/python-pyro/python-pyro.mk
> --- a/package/python-pyro/python-pyro.mk
> +++ b/package/python-pyro/python-pyro.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> PYTHON_PYRO_VERSION = 3.14
> -PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
> -PYTHON_PYRO_SITE = https://pypi.python.org/packages/source/P/Pyro
> +PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
> +PYTHON_PYRO_SITE = https://pypi.python.org/packages/source/P/Pyro
> PYTHON_PYRO_LICENSE = MIT
> PYTHON_PYRO_LICENSE_FILES = LICENSE
> PYTHON_PYRO_SETUP_TYPE = distutils
> diff --git a/package/python-serial/python-serial.mk b/package/python-serial/python-serial.mk
> --- a/package/python-serial/python-serial.mk
> +++ b/package/python-serial/python-serial.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> PYTHON_SERIAL_VERSION = 2.6
> -PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
> -PYTHON_SERIAL_SITE = http://pypi.python.org/packages/source/p/pyserial
> +PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
> +PYTHON_SERIAL_SITE = http://pypi.python.org/packages/source/p/pyserial
> PYTHON_SERIAL_LICENSE = Python Software Foundation License
> PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt
> PYTHON_SERIAL_SETUP_TYPE = distutils
> diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk
> --- a/package/python-setuptools/python-setuptools.mk
> +++ b/package/python-setuptools/python-setuptools.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> PYTHON_SETUPTOOLS_VERSION = 2.1.2
> -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
> -PYTHON_SETUPTOOLS_SITE = http://pypi.python.org/packages/source/s/setuptools
> +PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
> +PYTHON_SETUPTOOLS_SITE = http://pypi.python.org/packages/source/s/setuptools
> PYTHON_SETUPTOOLS_LICENSE = Python Software Foundation or Zope Public License
> PYTHON_SETUPTOOLS_LICENSE_FILES = PKG-INFO
> PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
> diff --git a/package/python/python.mk b/package/python/python.mk
> --- a/package/python/python.mk
> +++ b/package/python/python.mk
> @@ -5,10 +5,10 @@
> ################################################################################
>
> PYTHON_VERSION_MAJOR = 2.7
> -PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).8
> -PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
> -PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
> -PYTHON_LICENSE = Python software foundation license v2, others
> +PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).8
> +PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
> +PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
> +PYTHON_LICENSE = Python software foundation license v2, others
> PYTHON_LICENSE_FILES = LICENSE
>
> # Python needs itself to be built, so in order to cross-compile
> @@ -48,7 +48,7 @@
> # MAKE1 has shown to workaround the problem.
> HOST_PYTHON_MAKE = $(MAKE1)
>
> -PYTHON_DEPENDENCIES = host-python libffi
> +PYTHON_DEPENDENCIES = host-python libffi
>
> HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
>
> diff --git a/package/python3/python3.mk b/package/python3/python3.mk
> --- a/package/python3/python3.mk
> +++ b/package/python3/python3.mk
> @@ -37,7 +37,7 @@
> HOST_PYTHON3_CONF_ENV += \
> LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags"
>
> -PYTHON3_DEPENDENCIES = host-python3 libffi
> +PYTHON3_DEPENDENCIES = host-python3 libffi
>
> HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib
>
> diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
> --- a/package/qextserialport/qextserialport.mk
> +++ b/package/qextserialport/qextserialport.mk
> @@ -4,8 +4,8 @@
> #
> ################################################################################
>
> -QEXTSERIALPORT_VERSION = 6c47244de4ce6db43c2f05caee957666c951dae1
> -QEXTSERIALPORT_SITE = https://qextserialport.googlecode.com/git
> +QEXTSERIALPORT_VERSION = 6c47244de4ce6db43c2f05caee957666c951dae1
> +QEXTSERIALPORT_SITE = https://qextserialport.googlecode.com/git
> QEXTSERIALPORT_SITE_METHOD = git
>
> QEXTSERIALPORT_LICENSE = MIT
> diff --git a/package/qjson/qjson.mk b/package/qjson/qjson.mk
> --- a/package/qjson/qjson.mk
> +++ b/package/qjson/qjson.mk
> @@ -8,7 +8,7 @@
>
> QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION))
> QJSON_INSTALL_STAGING = YES
> -QJSON_DEPENDENCIES = qt
> +QJSON_DEPENDENCIES = qt
> QJSON_LICENSE = LGPLv2.1
> QJSON_LICENSE_FILES = COPYING.lib
>
> diff --git a/package/qt/qt.mk b/package/qt/qt.mk
> --- a/package/qt/qt.mk
> +++ b/package/qt/qt.mk
> @@ -13,8 +13,8 @@
>
> QT_VERSION_MAJOR = 4.8
> QT_VERSION = $(QT_VERSION_MAJOR).6
> -QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
> -QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
> +QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
> +QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
> QT_DEPENDENCIES = host-pkgconf
> QT_INSTALL_STAGING = YES
>
> @@ -252,7 +252,7 @@
> else
> ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y)
> QT_CONFIGURE_OPTS += -system-zlib
> -QT_DEPENDENCIES += zlib
> +QT_DEPENDENCIES += zlib
> endif
> endif
>
> @@ -261,7 +261,7 @@
> else
> ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y)
> QT_CONFIGURE_OPTS += -system-libjpeg
> -QT_DEPENDENCIES += jpeg
> +QT_DEPENDENCIES += jpeg
> else
> QT_CONFIGURE_OPTS += -no-libjpeg
> endif
> @@ -272,7 +272,7 @@
> else
> ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y)
> QT_CONFIGURE_OPTS += -system-libpng
> -QT_DEPENDENCIES += libpng
> +QT_DEPENDENCIES += libpng
> else
> QT_CONFIGURE_OPTS += -no-libpng
> endif
> @@ -283,7 +283,7 @@
> else
> ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y)
> QT_CONFIGURE_OPTS += -system-libtiff
> -QT_DEPENDENCIES += tiff
> +QT_DEPENDENCIES += tiff
> else
> QT_CONFIGURE_OPTS += -no-libtiff
> endif
> @@ -302,29 +302,29 @@
> ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
> QT_CONFIGURE_OPTS += -system-freetype
> QT_CONFIGURE_OPTS += -I $(STAGING_DIR)/usr/include/freetype2/
> -QT_DEPENDENCIES += freetype
> +QT_DEPENDENCIES += freetype
> else
> QT_CONFIGURE_OPTS += -no-freetype
> endif
> endif
>
> ifeq ($(BR2_PACKAGE_QT_DBUS),y)
> -QT_DEPENDENCIES += dbus
> +QT_DEPENDENCIES += dbus
> endif
>
> ifeq ($(BR2_PACKAGE_QT_OPENSSL),y)
> QT_CONFIGURE_OPTS += -openssl
> -QT_DEPENDENCIES += openssl
> +QT_DEPENDENCIES += openssl
> else
> QT_CONFIGURE_OPTS += -no-openssl
> endif
>
> ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
> QT_CONFIGURE_OPTS += -opengl es2 -egl
> -QT_DEPENDENCIES += libgles libegl
> -QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
> +QT_DEPENDENCIES += libgles libegl
> +QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
> QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
> -QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)
> +QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)
> else
> QT_CONFIGURE_OPTS += -no-opengl
> endif
> @@ -336,22 +336,22 @@
> endif
> ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
> QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
> -QT_DEPENDENCIES += mysql
> +QT_DEPENDENCIES += mysql
> endif
> ifeq ($(BR2_PACKAGE_QT_ODBC),y)
> QT_CONFIGURE_OPTS += -qt-sql-odbc
> endif
> ifeq ($(BR2_PACKAGE_QT_PSQL),y)
> QT_CONFIGURE_OPTS += -qt-sql-psql
> -QT_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
> -QT_DEPENDENCIES += postgresql
> +QT_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
> +QT_DEPENDENCIES += postgresql
> endif
> ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
> QT_CONFIGURE_OPTS += -qt-sql-sqlite
> else
> ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
> QT_CONFIGURE_OPTS += -system-sqlite
> -QT_DEPENDENCIES += sqlite
> +QT_DEPENDENCIES += sqlite
> else
> QT_CONFIGURE_OPTS += -no-sql-sqlite
> endif
> @@ -380,14 +380,14 @@
>
> ifeq ($(BR2_PACKAGE_QT_AUDIO_BACKEND),y)
> QT_CONFIGURE_OPTS += -audio-backend
> -QT_DEPENDENCIES += alsa-lib
> +QT_DEPENDENCIES += alsa-lib
> else
> QT_CONFIGURE_OPTS += -no-audio-backend
> endif
>
> ifeq ($(BR2_PACKAGE_QT_PHONON),y)
> QT_CONFIGURE_OPTS += -phonon
> -QT_DEPENDENCIES += gstreamer gst-plugins-base
> +QT_DEPENDENCIES += gstreamer gst-plugins-base
> else
> QT_CONFIGURE_OPTS += -no-phonon
> endif
> @@ -532,60 +532,60 @@
>
> # Build the list of libraries and plugins to install to the target
>
> -QT_INSTALL_LIBS += QtCore
> -QT_HOST_PROGRAMS += moc rcc qmake lrelease
> +QT_INSTALL_LIBS += QtCore
> +QT_HOST_PROGRAMS += moc rcc qmake lrelease
>
> ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
> -QT_INSTALL_LIBS += QtGui
> -QT_HOST_PROGRAMS += uic
> +QT_INSTALL_LIBS += QtGui
> +QT_HOST_PROGRAMS += uic
> endif
> ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
> -QT_INSTALL_LIBS += QtSql
> +QT_INSTALL_LIBS += QtSql
> endif
> ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
> -QT_INSTALL_LIBS += QtMultimedia
> +QT_INSTALL_LIBS += QtMultimedia
> endif
> ifeq ($(BR2_PACKAGE_QT_PHONON),y)
> -QT_INSTALL_LIBS += phonon
> +QT_INSTALL_LIBS += phonon
> endif
> ifeq ($(BR2_PACKAGE_QT_SVG),y)
> -QT_INSTALL_LIBS += QtSvg
> +QT_INSTALL_LIBS += QtSvg
> endif
> ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
> -QT_INSTALL_LIBS += QtNetwork
> +QT_INSTALL_LIBS += QtNetwork
> endif
> ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
> -QT_INSTALL_LIBS += QtWebKit
> +QT_INSTALL_LIBS += QtWebKit
> endif
> ifeq ($(BR2_PACKAGE_QT_XML),y)
> -QT_INSTALL_LIBS += QtXml
> +QT_INSTALL_LIBS += QtXml
> endif
> ifeq ($(BR2_PACKAGE_QT_DBUS),y)
> -QT_INSTALL_LIBS += QtDBus
> +QT_INSTALL_LIBS += QtDBus
> endif
> ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
> -QT_INSTALL_LIBS += QtXmlPatterns
> +QT_INSTALL_LIBS += QtXmlPatterns
> endif
> ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
> -QT_INSTALL_LIBS += QtScript
> +QT_INSTALL_LIBS += QtScript
> endif
> ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
> -QT_INSTALL_LIBS += QtScriptTools
> +QT_INSTALL_LIBS += QtScriptTools
> endif
> ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
> -QT_INSTALL_LIBS += QtDeclarative
> +QT_INSTALL_LIBS += QtDeclarative
> endif
> ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
> -QT_INSTALL_LIBS += Qt3Support
> +QT_INSTALL_LIBS += Qt3Support
> endif
> ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
> -QT_INSTALL_LIBS += QtOpenGL
> +QT_INSTALL_LIBS += QtOpenGL
> endif
> ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
> -QT_INSTALL_LIBS += pvrQWSWSEGL
> +QT_INSTALL_LIBS += pvrQWSWSEGL
> endif
> ifeq ($(BR2_PACKAGE_QT_TEST),y)
> -QT_INSTALL_LIBS += QtTest
> +QT_INSTALL_LIBS += QtTest
> endif
>
> QT_CONF_FILE=$(HOST_DIR)/usr/bin/qt.conf
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -61,22 +61,22 @@
> ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
> ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y)
> QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
> -QT5BASE_DEPENDENCIES += mysql
> +QT5BASE_DEPENDENCIES += mysql
> else
> QT5BASE_CONFIGURE_OPTS += -no-sql-mysql
> endif
>
> ifeq ($(BR2_PACKAGE_QT5BASE_PSQL),y)
> QT5BASE_CONFIGURE_OPTS += -plugin-sql-psql
> -QT5BASE_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
> -QT5BASE_DEPENDENCIES += postgresql
> +QT5BASE_CONFIGURE_ENV += PSQL_LIBS=-L$(STAGING_DIR)/usr/lib
> +QT5BASE_DEPENDENCIES += postgresql
> else
> QT5BASE_CONFIGURE_OPTS += -no-sql-psql
> endif
>
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite)
> endif
>
> @@ -86,11 +86,11 @@
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb)
>
> ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
> QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon
> -QT5BASE_DEPENDENCIES += \
> +QT5BASE_DEPENDENCIES += \
> libxcb \
> xcb-util-wm \
> xcb-util-image \
> @@ -98,7 +98,7 @@
> xlib_libX11 \
> libxkbcommon
> ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
> -QT5BASE_DEPENDENCIES += xlib_libXext
> +QT5BASE_DEPENDENCIES += xlib_libXext
> endif
> else
> QT5BASE_CONFIGURE_OPTS += -no-xcb
> @@ -106,10 +106,10 @@
>
> ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),y)
> QT5BASE_CONFIGURE_OPTS += -opengl desktop
> -QT5BASE_DEPENDENCIES += libgl
> +QT5BASE_DEPENDENCIES += libgl
> else ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_ES2),y)
> QT5BASE_CONFIGURE_OPTS += -opengl es2
> -QT5BASE_DEPENDENCIES += libgles
> +QT5BASE_DEPENDENCIES += libgles
> else
> QT5BASE_CONFIGURE_OPTS += -no-opengl
> endif
> @@ -119,7 +119,7 @@
>
> ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
> QT5BASE_CONFIGURE_OPTS += -eglfs
> -QT5BASE_DEPENDENCIES += libegl
> +QT5BASE_DEPENDENCIES += libegl
> ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
> QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
> $(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
> @@ -133,41 +133,41 @@
> endif
>
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
>
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GIF),,-no-gif)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_JPEG),-system-libjpeg,-no-libjpeg)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg)
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng)
>
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus)
>
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),-tslib,-no-tslib)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),tslib)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),tslib)
>
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2)
>
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_ICU),-icu,-no-icu)
> -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
> +QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu)
>
> QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples
>
> # Build the list of libraries to be installed on the target
> -QT5BASE_INSTALL_LIBS_y += Qt5Core
> -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
> +QT5BASE_INSTALL_LIBS_y += Qt5Core
> +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network
> QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent
> -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql
> -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test
> -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml
> +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql
> +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test
> +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml
> QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL
>
> -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui
> -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
> +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui
> +QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets
> QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
>
> QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
> diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
> --- a/package/qwt/qwt.mk
> +++ b/package/qwt/qwt.mk
> @@ -10,7 +10,7 @@
> QWT_INSTALL_STAGING = YES
> QWT_DEPENDENCIES = qt
>
> -QWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
> +QWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
> QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDesigner.*$$/\# QWT_CONFIG += QwtDesigner/'
> QWT_CONFIG += -e 's%/features%/mkspecs/features%'
>
> diff --git a/package/rings/rings.mk b/package/rings/rings.mk
> --- a/package/rings/rings.mk
> +++ b/package/rings/rings.mk
> @@ -6,7 +6,7 @@
>
> RINGS_VERSION_MAJOR = 1.3.0
> RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1
> -RINGS_SUBDIR = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR))
> +RINGS_SUBDIR = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR))
> RINGS_LICENSE = MIT
>
> $(eval $(luarocks-package))
> diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk
> --- a/package/rpcbind/rpcbind.mk
> +++ b/package/rpcbind/rpcbind.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> RPCBIND_VERSION = 0.2.1
> -RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
> -RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
> +RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
> +RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
> RPCBIND_LICENSE = BSD-3c
> RPCBIND_LICENSE_FILES = COPYING
> RPCBIND_AUTORECONF = YES
> diff --git a/package/rtai/rtai.mk b/package/rtai/rtai.mk
> --- a/package/rtai/rtai.mk
> +++ b/package/rtai/rtai.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> RTAI_VERSION = 3.8.1
> -RTAI_SOURCE = rtai-$(RTAI_VERSION).tar.bz2
> -RTAI_SITE = https://www.rtai.org/userfiles/downloads/RTAI
> +RTAI_SOURCE = rtai-$(RTAI_VERSION).tar.bz2
> +RTAI_SITE = https://www.rtai.org/userfiles/downloads/RTAI
> RTAI_INSTALL_STAGING = YES
>
> # The <pkg>_CONFIG_SCRIPTS cannot apply here to the specificities of rtai-config
> diff --git a/package/sam-ba/sam-ba.mk b/package/sam-ba/sam-ba.mk
> --- a/package/sam-ba/sam-ba.mk
> +++ b/package/sam-ba/sam-ba.mk
> @@ -4,9 +4,9 @@
> #
> ################################################################################
>
> -SAM_BA_SITE = http://www.atmel.com/dyn/resources/prod_documents
> +SAM_BA_SITE = http://www.atmel.com/dyn/resources/prod_documents
> SAM_BA_VERSION = 2.12
> -SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION).zip
> +SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION).zip
> SAM_BA_PATCH = sam-ba_$(SAM_BA_VERSION)_patch5.gz
> SAM_BA_LICENSE = BSD-like (partly binary-only)
> SAM_BA_LICENSE_FILES = doc/readme.txt
> diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk
> --- a/package/sg3_utils/sg3_utils.mk
> +++ b/package/sg3_utils/sg3_utils.mk
> @@ -6,7 +6,7 @@
>
> SG3_UTILS_VERSION = 1.39
> SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
> -SG3_UTILS_SITE = http://sg.danny.cz/sg/p
> +SG3_UTILS_SITE = http://sg.danny.cz/sg/p
> SG3_UTILS_LICENSE = BSD-3c
> # utils progs are GPLv2+ licenced
> ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y)
> diff --git a/package/slirp/slirp.mk b/package/slirp/slirp.mk
> --- a/package/slirp/slirp.mk
> +++ b/package/slirp/slirp.mk
> @@ -7,15 +7,15 @@
> # There's no tarball releases of slirp, so we use the git repo
> # Also, there's no tag, so we use a random SHA1 (master's HEAD
> # of today)
> -SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550
> -SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp
> -SLIRP_LICENSE = BSD-4c BSD-2c
> +SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550
> +SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp
> +SLIRP_LICENSE = BSD-4c BSD-2c
> # Note: The license file 'COPYRIGHT' is missing from the sources,
> # although some files refer to it.
> SLIRP_INSTALL_STAGING = YES
>
> # As we're using the git tree, there's no ./configure,
> # so we need to autoreconf.
> -SLIRP_AUTORECONF = YES
> +SLIRP_AUTORECONF = YES
>
> $(eval $(autotools-package))
> diff --git a/package/spice-protocol/spice-protocol.mk b/package/spice-protocol/spice-protocol.mk
> --- a/package/spice-protocol/spice-protocol.mk
> +++ b/package/spice-protocol/spice-protocol.mk
> @@ -4,11 +4,11 @@
> #
> ################################################################################
>
> -SPICE_PROTOCOL_VERSION = 0.12.6
> -SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
> -SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases
> -SPICE_PROTOCOL_LICENSE = BSD-3c
> -SPICE_PROTOCOL_LICENSE_FILES = COPYING
> +SPICE_PROTOCOL_VERSION = 0.12.6
> +SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
> +SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases
> +SPICE_PROTOCOL_LICENSE = BSD-3c
> +SPICE_PROTOCOL_LICENSE_FILES = COPYING
> SPICE_PROTOCOL_INSTALL_STAGING = YES
>
> $(eval $(autotools-package))
> diff --git a/package/spice/spice.mk b/package/spice/spice.mk
> --- a/package/spice/spice.mk
> +++ b/package/spice/spice.mk
> @@ -4,13 +4,13 @@
> #
> ################################################################################
>
> -SPICE_VERSION = 0.12.4
> -SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
> -SPICE_SITE = http://www.spice-space.org/download/releases
> -SPICE_LICENSE = LGPLv2.1+
> -SPICE_LICENSE_FILES = COPYING
> +SPICE_VERSION = 0.12.4
> +SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
> +SPICE_SITE = http://www.spice-space.org/download/releases
> +SPICE_LICENSE = LGPLv2.1+
> +SPICE_LICENSE_FILES = COPYING
> SPICE_INSTALL_STAGING = YES
> -SPICE_DEPENDENCIES = \
> +SPICE_DEPENDENCIES = \
> alsa-lib \
> celt051 \
> jpeg \
> diff --git a/package/squid/squid.mk b/package/squid/squid.mk
> --- a/package/squid/squid.mk
> +++ b/package/squid/squid.mk
> @@ -14,10 +14,10 @@
> 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 \
> +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 \
> +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 \
> diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
> --- a/package/sysvinit/sysvinit.mk
> +++ b/package/sysvinit/sysvinit.mk
> @@ -5,9 +5,9 @@
> ################################################################################
>
> SYSVINIT_VERSION = 2.88
> -SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
> -SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-13.1.diff.gz
> -SYSVINIT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit
> +SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
> +SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-13.1.diff.gz
> +SYSVINIT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/s/sysvinit
> SYSVINIT_LICENSE = GPLv2+
> SYSVINIT_LICENSE_FILES = COPYING
>
> diff --git a/package/tcllib/tcllib.mk b/package/tcllib/tcllib.mk
> --- a/package/tcllib/tcllib.mk
> +++ b/package/tcllib/tcllib.mk
> @@ -4,12 +4,12 @@
> #
> ################################################################################
>
> -TCLLIB_VERSION = 1.13
> -TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.bz2
> -TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
> -TCLLIB_LICENSE = tcl license
> +TCLLIB_VERSION = 1.13
> +TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.bz2
> +TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
> +TCLLIB_LICENSE = tcl license
> TCLLIB_LICENSE_FILES = license.terms
> -TCLLIB_DEPENDENCIES = host-tcl
> -TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)"
> +TCLLIB_DEPENDENCIES = host-tcl
> +TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)"
>
> $(eval $(autotools-package))
> diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
> --- a/package/tftpd/tftpd.mk
> +++ b/package/tftpd/tftpd.mk
> @@ -4,9 +4,9 @@
> #
> ################################################################################
>
> -TFTPD_VERSION = 5.2
> -TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
> -TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
> +TFTPD_VERSION = 5.2
> +TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
> +TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
> TFTPD_CONF_OPTS = --without-tcpwrappers
>
> ifneq ($(BR2_INET_IPV6),y)
> diff --git a/package/tstools/tstools.mk b/package/tstools/tstools.mk
> --- a/package/tstools/tstools.mk
> +++ b/package/tstools/tstools.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> TSTOOLS_VERSION = 1_11
> -TSTOOLS_SITE = https://tstools.googlecode.com/files
> -TSTOOLS_SOURCE = tstools-$(TSTOOLS_VERSION).tgz
> +TSTOOLS_SITE = https://tstools.googlecode.com/files
> +TSTOOLS_SOURCE = tstools-$(TSTOOLS_VERSION).tgz
> TSTOOLS_LICENSE = MPL v1.1
>
> define TSTOOLS_BUILD_CMDS
> diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
> --- a/package/tvheadend/tvheadend.mk
> +++ b/package/tvheadend/tvheadend.mk
> @@ -51,7 +51,7 @@
> $(TARGET_DIR)/home/tvheadend/.hts/tvheadend/accesscontrol/1
> chmod -R go-rwx $(TARGET_DIR)/home/tvheadend
> endef
> -TVHEADEND_POST_INSTALL_TARGET_HOOKS = TVHEADEND_INSTALL_DB
> +TVHEADEND_POST_INSTALL_TARGET_HOOKS = TVHEADEND_INSTALL_DB
>
> define TVHEADEND_INSTALL_INIT_SYSV
> $(INSTALL) -D package/tvheadend/etc.default.tvheadend $(TARGET_DIR)/etc/default/tvheadend
> diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk
> --- a/package/uboot-tools/uboot-tools.mk
> +++ b/package/uboot-tools/uboot-tools.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> UBOOT_TOOLS_VERSION = 2014.07
> -UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
> -UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
> +UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
> +UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
> UBOOT_TOOLS_LICENSE = GPLv2+
> UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
>
> diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
> --- a/package/udisks/udisks.mk
> +++ b/package/udisks/udisks.mk
> @@ -5,7 +5,7 @@
> ################################################################################
>
> UDISKS_VERSION = 1.0.4
> -UDISKS_SITE = http://hal.freedesktop.org/releases
> +UDISKS_SITE = http://hal.freedesktop.org/releases
> UDISKS_LICENSE = GPLv2+
> UDISKS_LICENSE_FILES = COPYING
>
> diff --git a/package/usbredir/usbredir.mk b/package/usbredir/usbredir.mk
> --- a/package/usbredir/usbredir.mk
> +++ b/package/usbredir/usbredir.mk
> @@ -4,18 +4,18 @@
> #
> ################################################################################
>
> -USBREDIR_VERSION = 0.6
> -USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2
> -USBREDIR_SITE = http://spice-space.org/download/usbredir
> -USBREDIR_LICENSE = LGPLv2.1+
> -USBREDIR_LICENSE_FILES = COPYING.LIB
> +USBREDIR_VERSION = 0.6
> +USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2
> +USBREDIR_SITE = http://spice-space.org/download/usbredir
> +USBREDIR_LICENSE = LGPLv2.1+
> +USBREDIR_LICENSE_FILES = COPYING.LIB
> USBREDIR_INSTALL_STAGING = YES
> -USBREDIR_DEPENDENCIES = host-pkgconf libusb
> +USBREDIR_DEPENDENCIES = host-pkgconf libusb
>
> ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y)
>
> -USBREDIR_LICENSE += (for the library), GPLv2+ (for the server)
> -USBREDIR_LICENSE_FILES += COPYING
> +USBREDIR_LICENSE += (for the library), GPLv2+ (for the server)
> +USBREDIR_LICENSE_FILES += COPYING
>
> else # BR2_PACKAGE_USBREDIR_SERVER != y
>
> diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
> --- a/package/valgrind/valgrind.mk
> +++ b/package/valgrind/valgrind.mk
> @@ -5,8 +5,8 @@
> ################################################################################
>
> VALGRIND_VERSION = 3.10.0
> -VALGRIND_SITE = http://valgrind.org/downloads
> -VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
> +VALGRIND_SITE = http://valgrind.org/downloads
> +VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
> VALGRIND_LICENSE = GPLv2 GFDLv1.2
> VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
> VALGRIND_CONF_OPTS = --disable-tls
> diff --git a/package/vde2/vde2.mk b/package/vde2/vde2.mk
> --- a/package/vde2/vde2.mk
> +++ b/package/vde2/vde2.mk
> @@ -4,15 +4,15 @@
> #
> ################################################################################
>
> -VDE2_VERSION = 2.3.2
> -VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
> -VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
> -VDE2_LICENSE = GPLv2+ LGPLv2.1+ BSD-3c
> -VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
> +VDE2_VERSION = 2.3.2
> +VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
> +VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
> +VDE2_LICENSE = GPLv2+ LGPLv2.1+ BSD-3c
> +VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
> VDE2_INSTALL_STAGING = YES
>
> # We touch configure.ac, so we need to autoreconf
> -VDE2_AUTORECONF = YES
> +VDE2_AUTORECONF = YES
>
> # Reasons for enabling/disabling stuff:
> #?- tuntap is enabled in the hope we're using a recent-enough toolchain
> diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk
> --- a/package/vpnc/vpnc.mk
> +++ b/package/vpnc/vpnc.mk
> @@ -4,14 +4,14 @@
> #
> ################################################################################
>
> -VPNC_VERSION = 0.5.3
> -VPNC_SITE = http://www.unix-ag.uni-kl.de/~massar/vpnc
> -VPNC_LICENSE = GPLv2+
> +VPNC_VERSION = 0.5.3
> +VPNC_SITE = http://www.unix-ag.uni-kl.de/~massar/vpnc
> +VPNC_LICENSE = GPLv2+
> VPNC_LICENSE_FILES = COPYING
>
> -VPNC_DEPENDENCIES = libgcrypt libgpg-error
> +VPNC_DEPENDENCIES = libgcrypt libgpg-error
>
> -VPNC_LDFLAGS = $(TARGET_LDFLAGS) -lgcrypt -lgpg-error
> +VPNC_LDFLAGS = $(TARGET_LDFLAGS) -lgcrypt -lgpg-error
> VPNC_CPPFLAGS = -DVERSION=\\\"$(VPNC_VERSION)\\\"
>
> define VPNC_BUILD_CMDS
> diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk
> --- a/package/xinetd/xinetd.mk
> +++ b/package/xinetd/xinetd.mk
> @@ -4,9 +4,9 @@
> #
> ################################################################################
>
> -XINETD_VERSION = 2.3.15
> -XINETD_SITE = http://www.xinetd.org
> -XINETD_LICENSE = xinetd license
> +XINETD_VERSION = 2.3.15
> +XINETD_SITE = http://www.xinetd.org
> +XINETD_LICENSE = xinetd license
> XINETD_LICENSE_FILES = COPYRIGHT
>
> XINETD_CFLAGS = $(TARGET_CFLAGS)
> diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
> --- a/toolchain/toolchain-external/toolchain-external.mk
> +++ b/toolchain/toolchain-external/toolchain-external.mk
> @@ -333,15 +333,15 @@
> TOOLCHAIN_EXTERNAL_SITE = https://sourcery.mentor.com/public/gnu_toolchain/i686-pc-linux-gnu/
> TOOLCHAIN_EXTERNAL_SOURCE = ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
> else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2),y)
> -TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2012R2/2012R2-RC2/i386/
> +TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2012R2/2012R2-RC2/i386/
> TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2012R2-RC2.i386.tar.bz2
> TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2012R2-RC2.i386.tar.bz2
> else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1),y)
> -TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2013R1/2013R1-RC1/i386/
> +TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2013R1/2013R1-RC1/i386/
> TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2013R1-RC1.i386.tar.bz2
> TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2013R1-RC1.i386.tar.bz2
> else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1),y)
> -TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2014R1/2014R1-RC2/i386/
> +TOOLCHAIN_EXTERNAL_SITE = http://downloads.sourceforge.net/project/adi-toolchain/2014R1/2014R1-RC2/i386/
> TOOLCHAIN_EXTERNAL_SOURCE = blackfin-toolchain-2014R1-RC2.i386.tar.bz2
> TOOLCHAIN_EXTERNAL_EXTRA_DOWNLOADS = blackfin-toolchain-uclibc-full-2014R1-RC2.i386.tar.bz2
> else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_14_3),y)
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
2014-09-27 22:15 ` Yann E. MORIN
@ 2014-10-04 16:52 ` Thomas Petazzoni
2014-10-04 17:07 ` Samuel Martin
2014-10-04 17:13 ` Yann E. MORIN
0 siblings, 2 replies; 47+ messages in thread
From: Thomas Petazzoni @ 2014-10-04 16:52 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Sun, 28 Sep 2014 00:15:06 +0200, Yann E. MORIN wrote:
> > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> > --- a/package/pkg-cmake.mk
> > +++ b/package/pkg-cmake.mk
> > @@ -41,7 +41,7 @@
> > $(2)_MAKE ?= $$(MAKE)
> > $(2)_MAKE_ENV ?=
> > $(2)_MAKE_OPTS ?=
> > -$(2)_INSTALL_HOST_OPT ?= install
> > +$(2)_INSTALL_HOST_OPTS ?= install
>
> The other infras do not use a 'HOST_' in the middle of host-variant
> variables; 'HOST_' is only present at the beginning.
>
> For example, we have HOST_LIBFOO_INSTALL_CMDS that contrasts to
> LIBFOO_INSTALL_{TARGET,STAGING,IMAGES}_CMDS.
>
> So, I find there is a bit of discrepancy in this variable naming. Plus,
> it is not documented in the manual.
>
> Samuel, is there a reason for the naming of this variable?
I fully agree with Yann comments here. Samuel, could you answer Yann's
question?
Is anyone willing to cook a patch to fix this?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
2014-10-04 16:52 ` Thomas Petazzoni
@ 2014-10-04 17:07 ` Samuel Martin
2014-10-04 17:13 ` Yann E. MORIN
1 sibling, 0 replies; 47+ messages in thread
From: Samuel Martin @ 2014-10-04 17:07 UTC (permalink / raw)
To: buildroot
Hi all,
On Sat, Oct 4, 2014 at 6:52 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Yann E. MORIN,
>
> On Sun, 28 Sep 2014 00:15:06 +0200, Yann E. MORIN wrote:
>
>> > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
>> > --- a/package/pkg-cmake.mk
>> > +++ b/package/pkg-cmake.mk
>> > @@ -41,7 +41,7 @@
>> > $(2)_MAKE ?= $$(MAKE)
>> > $(2)_MAKE_ENV ?=
>> > $(2)_MAKE_OPTS ?=
>> > -$(2)_INSTALL_HOST_OPT ?= install
>> > +$(2)_INSTALL_HOST_OPTS ?= install
>>
>> The other infras do not use a 'HOST_' in the middle of host-variant
>> variables; 'HOST_' is only present at the beginning.
>>
>> For example, we have HOST_LIBFOO_INSTALL_CMDS that contrasts to
>> LIBFOO_INSTALL_{TARGET,STAGING,IMAGES}_CMDS.
>>
>> So, I find there is a bit of discrepancy in this variable naming. Plus,
>> it is not documented in the manual.
>>
>> Samuel, is there a reason for the naming of this variable?
Oops, sorry guys I missed this one :-s
>
> I fully agree with Yann comments here. Samuel, could you answer Yann's
> question?
I agree, it is not consistent with the other infras.
Afaics, it's here since the original introduction of the cmake infra;
we missed this at that time :-/
>
> Is anyone willing to cook a patch to fix this?
I can do it.
Fortunately no host-cmake package needs/uses install opts ;-)
Regards,
--
Samuel
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
` (15 preceding siblings ...)
2014-09-27 21:15 ` [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Yann E. MORIN
@ 2014-10-04 17:07 ` Thomas Petazzoni
2014-10-05 9:17 ` Yann E. MORIN
16 siblings, 1 reply; 47+ messages in thread
From: Thomas Petazzoni @ 2014-10-04 17:07 UTC (permalink / raw)
To: buildroot
Dear Thomas De Schampheleire,
On Sat, 27 Sep 2014 21:32:37 +0200, Thomas De Schampheleire wrote:
> Thomas De Schampheleire (15)
> packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
> packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
> packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
> packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
> packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
> packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
> packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
> packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS
> packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS
> packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS
> pkg-generic: introduce helper function to check for a deprecated variable
> pkg-generic: add checks on deprecated variables FOO_BAR_OPT
> packages: rename misc. occurrences of _OPT into _OPTS
I've applied those 13 first patches. I only have a comment about
"pkg-generic: introduce helper function to check for a deprecated
variable" and "pkg-generic: add checks on deprecated variables
FOO_BAR_OPT", which I'll make on the relevant patches. My comments can
be handled as followup patches now that those patches have been merged.
> .mk files: remove alignment of line continuation characters
> .mk files: remove alignment of assignments
On those ones, I must say I'm not sure. Do we really have a coding
style for line continuation characters? In some cases, I found the
original code (i.e before your patch) to actually be nicer than after
your change.
For the alignment of assignments, I generally agree, but:
1/ I believe there should be exceptions to the rules. Especially
inside the package infrastructure themselves, aligning = signs is
sometimes good for readability
2/ Your regex doesn't handle cases such as:
FOO ?=
BAR ?= $(SOMETHING)
The second assignment gets changed, but not the first one.
So on those last two patches, I'd like to have more community feedback.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 11 of 15] pkg-generic: introduce helper function to check for a deprecated variable
2014-09-27 19:32 ` [Buildroot] [PATCH 11 of 15] pkg-generic: introduce helper function to check for a deprecated variable Thomas De Schampheleire
@ 2014-10-04 17:13 ` Thomas Petazzoni
0 siblings, 0 replies; 47+ messages in thread
From: Thomas Petazzoni @ 2014-10-04 17:13 UTC (permalink / raw)
To: buildroot
Dear Thomas De Schampheleire,
On Sat, 27 Sep 2014 21:32:48 +0200, Thomas De Schampheleire wrote:
> ################################################################################
> +# check-deprecated-variable -- throw an error on deprecated variables
> +#
> +# argument 1 is the deprecated variable
> +# argument 2 is the new variable to use
> +#
> +# example:
> +# $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS))
> +################################################################################
> +define check-deprecated-variable
> +ifneq ($$(origin $(1)),undefined)
> +$$(error Package error: use $(2) instead of $(1). Please fix your .mk file)
> +endif
> +endef
This helper should rather go in pkg-utils.mk. See my comment on PATCH
12 for explanations.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
2014-10-04 16:52 ` Thomas Petazzoni
2014-10-04 17:07 ` Samuel Martin
@ 2014-10-04 17:13 ` Yann E. MORIN
1 sibling, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-10-04 17:13 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2014-10-04 18:52 +0200, Thomas Petazzoni spake thusly:
> On Sun, 28 Sep 2014 00:15:06 +0200, Yann E. MORIN wrote:
>
> > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
> > > --- a/package/pkg-cmake.mk
> > > +++ b/package/pkg-cmake.mk
> > > @@ -41,7 +41,7 @@
> > > $(2)_MAKE ?= $$(MAKE)
> > > $(2)_MAKE_ENV ?=
> > > $(2)_MAKE_OPTS ?=
> > > -$(2)_INSTALL_HOST_OPT ?= install
> > > +$(2)_INSTALL_HOST_OPTS ?= install
> >
> > The other infras do not use a 'HOST_' in the middle of host-variant
> > variables; 'HOST_' is only present at the beginning.
> >
> > For example, we have HOST_LIBFOO_INSTALL_CMDS that contrasts to
> > LIBFOO_INSTALL_{TARGET,STAGING,IMAGES}_CMDS.
> >
> > So, I find there is a bit of discrepancy in this variable naming. Plus,
> > it is not documented in the manual.
> >
> > Samuel, is there a reason for the naming of this variable?
>
> I fully agree with Yann comments here. Samuel, could you answer Yann's
> question?
>
> Is anyone willing to cook a patch to fix this?
I'll do, but not before this patch is applied ;-), otherwise it will
again be a nightmare to rebase...
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT
2014-09-27 19:32 ` [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT Thomas De Schampheleire
2014-09-27 21:49 ` Yann E. MORIN
@ 2014-10-04 17:14 ` Thomas Petazzoni
2014-10-04 22:15 ` Yann E. MORIN
1 sibling, 1 reply; 47+ messages in thread
From: Thomas Petazzoni @ 2014-10-04 17:14 UTC (permalink / raw)
To: buildroot
Dear Thomas De Schampheleire,
On Sat, 27 Sep 2014 21:32:49 +0200, Thomas De Schampheleire wrote:
> +# Ensure unified variable name conventions between all packages
> +$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
> +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
I think the legacy variable checking should go to the respective
package infrastructure they belong to: AUTORECONF_OPT and
GETTEXTIZE_OPT should go to pkg-autotools.mk, KCONFIG_OPT to
pkg-kconfig.mk, etc.
The pkg-generic.mk infrastructure doesn't know anything about those
variables, so there's no reason to have those checks at this level.
Care to cook a followup patch fixing that?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT
2014-10-04 17:14 ` Thomas Petazzoni
@ 2014-10-04 22:15 ` Yann E. MORIN
2014-10-05 7:34 ` Thomas De Schampheleire
0 siblings, 1 reply; 47+ messages in thread
From: Yann E. MORIN @ 2014-10-04 22:15 UTC (permalink / raw)
To: buildroot
Thomas?, All,
On 2014-10-04 19:14 +0200, Thomas Petazzoni spake thusly:
> On Sat, 27 Sep 2014 21:32:49 +0200, Thomas De Schampheleire wrote:
>
> > +# Ensure unified variable name conventions between all packages
> > +$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
> > +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
> > +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
> > +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
> > +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
> > +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
>
> I think the legacy variable checking should go to the respective
> package infrastructure they belong to: AUTORECONF_OPT and
> GETTEXTIZE_OPT should go to pkg-autotools.mk, KCONFIG_OPT to
> pkg-kconfig.mk, etc.
>
> The pkg-generic.mk infrastructure doesn't know anything about those
> variables, so there's no reason to have those checks at this level.
I agree on principle.
However, having all of them right here avoids duplication. For example:
- $(2)_BUILD_OPT was valid for lua, perl and python packages,
- $(2)_CONF_OPT was valid for autotools, cmake and perl packages,
- ...
Would you find appropriate that the checks be duplicated in all of the
impacted infras?
Note: I don't mind either way, just inquiring.
> Care to cook a followup patch fixing that?
I can have a spin at it tomorrow, unless Thomas DS is not completely fed
up with this series! ;-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT
2014-10-04 22:15 ` Yann E. MORIN
@ 2014-10-05 7:34 ` Thomas De Schampheleire
2014-10-05 7:54 ` Thomas Petazzoni
0 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-10-05 7:34 UTC (permalink / raw)
To: buildroot
Hi Thomas, Yann,
On Sun, Oct 5, 2014 at 12:15 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Thomas?, All,
>
> On 2014-10-04 19:14 +0200, Thomas Petazzoni spake thusly:
>> On Sat, 27 Sep 2014 21:32:49 +0200, Thomas De Schampheleire wrote:
>>
>> > +# Ensure unified variable name conventions between all packages
>> > +$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
>>
>> I think the legacy variable checking should go to the respective
>> package infrastructure they belong to: AUTORECONF_OPT and
>> GETTEXTIZE_OPT should go to pkg-autotools.mk, KCONFIG_OPT to
>> pkg-kconfig.mk, etc.
>>
>> The pkg-generic.mk infrastructure doesn't know anything about those
>> variables, so there's no reason to have those checks at this level.
>
> I agree on principle.
>
> However, having all of them right here avoids duplication. For example:
> - $(2)_BUILD_OPT was valid for lua, perl and python packages,
> - $(2)_CONF_OPT was valid for autotools, cmake and perl packages,
> - ...
>
> Would you find appropriate that the checks be duplicated in all of the
> impacted infras?
>
> Note: I don't mind either way, just inquiring.
>
>> Care to cook a followup patch fixing that?
>
> I can have a spin at it tomorrow, unless Thomas DS is not completely fed
> up with this series! ;-)
For such small changes I make an exception :)
I more or less feel the same as Yann: for some variables we can indeed
move, but for others I'm not sure.
Here is the list:
>> > +$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
Such variables are used by several infras, like autotools and cmake.
So moving them to one in particular is odd. Duplicating them would be
equally undesirable.
So in this case pkg-generic.mk seems the better place to me.
Moreover, even if only one specialized infra would use such a
variable, generic packages sometimes use the same common names like
FOO_MAKE_OPTS for variables, even though their name is really
arbitrary.
>> > +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
>> > +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
This can be moved to pkg-autotools.mk, it makes more sense there.
>> > +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
This variable serves basically the same function as FOO_MAKE_OPTS, but
I guess it's not called '_MAKE_' because these infras (perl, python,
...) do not pass them to make.
Since they are re-used in several ones I tend to place them in pkg-generic too.
>> > +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
This can be moved to package/pkg-kconfig indeed.
Best regards,
Thomas
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT
2014-10-05 7:34 ` Thomas De Schampheleire
@ 2014-10-05 7:54 ` Thomas Petazzoni
2014-10-05 7:58 ` Thomas De Schampheleire
0 siblings, 1 reply; 47+ messages in thread
From: Thomas Petazzoni @ 2014-10-05 7:54 UTC (permalink / raw)
To: buildroot
Dear Thomas De Schampheleire,
On Sun, 5 Oct 2014 09:34:07 +0200, Thomas De Schampheleire wrote:
> >> > +$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
> >> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
> >> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
> >> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
> >> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
> >> > +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
>
> Such variables are used by several infras, like autotools and cmake.
> So moving them to one in particular is odd. Duplicating them would be
> equally undesirable.
> So in this case pkg-generic.mk seems the better place to me.
Hum, right, I didn't realize that.
> Moreover, even if only one specialized infra would use such a
> variable, generic packages sometimes use the same common names like
> FOO_MAKE_OPTS for variables, even though their name is really
> arbitrary.
Yes. Though it's kind of weird to "enforce" the non-usage of
<foo>_MAKE_OPT for generic-package, since such a variable is not
defined by the package infrastructure, and its naming left to the
choice of the package writer. But since we indeed want to see
<foo>_MAKE_OPTS being used instead, probably it makes sense.
> >> > +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
> >> > +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
>
> This can be moved to pkg-autotools.mk, it makes more sense there.
>
> >> > +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
>
> This variable serves basically the same function as FOO_MAKE_OPTS, but
> I guess it's not called '_MAKE_' because these infras (perl, python,
> ...) do not pass them to make.
> Since they are re-used in several ones I tend to place them in pkg-generic too.
>
> >> > +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
>
> This can be moved to package/pkg-kconfig indeed.
Yeah, well, with this duplication thing, I'm no longer sure it's really
worth the effort. Maybe for clarity it's better to just duplicate what
needs to be duplicated, instead of having some variables handled in
each individual package infra, and some others at the pkg-generic level
even though they are specific to some package infrastructures?
No strong feeling here.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT
2014-10-05 7:54 ` Thomas Petazzoni
@ 2014-10-05 7:58 ` Thomas De Schampheleire
0 siblings, 0 replies; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-10-05 7:58 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Sun, Oct 5, 2014 at 9:54 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Thomas De Schampheleire,
>
> On Sun, 5 Oct 2014 09:34:07 +0200, Thomas De Schampheleire wrote:
>
>> >> > +$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS))
>> >> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS))
>> >> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS))
>> >> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS))
>> >> > +$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS))
>> >> > +$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS))
>>
>> Such variables are used by several infras, like autotools and cmake.
>> So moving them to one in particular is odd. Duplicating them would be
>> equally undesirable.
>> So in this case pkg-generic.mk seems the better place to me.
>
> Hum, right, I didn't realize that.
>
>> Moreover, even if only one specialized infra would use such a
>> variable, generic packages sometimes use the same common names like
>> FOO_MAKE_OPTS for variables, even though their name is really
>> arbitrary.
>
> Yes. Though it's kind of weird to "enforce" the non-usage of
> <foo>_MAKE_OPT for generic-package, since such a variable is not
> defined by the package infrastructure, and its naming left to the
> choice of the package writer. But since we indeed want to see
> <foo>_MAKE_OPTS being used instead, probably it makes sense.
>
>> >> > +$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS))
>> >> > +$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS))
>>
>> This can be moved to pkg-autotools.mk, it makes more sense there.
>>
>> >> > +$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS))
>>
>> This variable serves basically the same function as FOO_MAKE_OPTS, but
>> I guess it's not called '_MAKE_' because these infras (perl, python,
>> ...) do not pass them to make.
>> Since they are re-used in several ones I tend to place them in pkg-generic too.
>>
>> >> > +$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS))
>>
>> This can be moved to package/pkg-kconfig indeed.
>
> Yeah, well, with this duplication thing, I'm no longer sure it's really
> worth the effort. Maybe for clarity it's better to just duplicate what
> needs to be duplicated, instead of having some variables handled in
> each individual package infra, and some others at the pkg-generic level
> even though they are specific to some package infrastructures?
>
> No strong feeling here.
I'm not sure what you mean here.
There doesn't need to be any duplication, unless you prefer to check
for, say, FOO_MAKE_OPT in several infras instead of in generic.
I did the moving around, I'll send the patches now so you can see and
we can decide the final solution.
Best regards,
Thomas
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS
2014-10-04 17:07 ` Thomas Petazzoni
@ 2014-10-05 9:17 ` Yann E. MORIN
2014-10-05 11:07 ` Thomas Petazzoni
2014-10-05 12:31 ` Thomas De Schampheleire
0 siblings, 2 replies; 47+ messages in thread
From: Yann E. MORIN @ 2014-10-05 9:17 UTC (permalink / raw)
To: buildroot
Thomas2, All,
On 2014-10-04 19:07 +0200, Thomas Petazzoni spake thusly:
> On Sat, 27 Sep 2014 21:32:37 +0200, Thomas De Schampheleire wrote:
> > .mk files: remove alignment of line continuation characters
> > .mk files: remove alignment of assignments
>
> On those ones, I must say I'm not sure. Do we really have a coding
> style for line continuation characters? In some cases, I found the
> original code (i.e before your patch) to actually be nicer than after
> your change.
Well, I do like alignment of \, because it is easier to see the lines
are a single block.
But I prefer consistency.
> For the alignment of assignments, I generally agree, but:
>
> 1/ I believe there should be exceptions to the rules. Especially
> inside the package infrastructure themselves, aligning = signs is
> sometimes good for readability
>
> 2/ Your regex doesn't handle cases such as:
>
> FOO ?=
> BAR ?= $(SOMETHING)
>
> The second assignment gets changed, but not the first one.
>
> So on those last two patches, I'd like to have more community feedback.
Being consistent is nice. However, I find a bulk clean-up is very
complex to do:
- as you found, some assignments were not cleaned-up; it is difficult
to find a pattern that matches all cases, and has no false-positives;
- it is difficult to review, because of the sheer amount of changes in
a single patch.
So I would prefer we fix offenders whenever there is another patch being
done for it. For example, when a version is bumped, a preliminary patch
would introduce the cleanup (with the first two changes possibly being
conflated in a single patch if it is easy to review):
foo: remove backslash alignment
foo: remove assignments alignment
foo: bump version
This is something very easy to do, and review.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS
2014-10-05 9:17 ` Yann E. MORIN
@ 2014-10-05 11:07 ` Thomas Petazzoni
2014-10-05 12:22 ` Thomas De Schampheleire
2014-10-05 12:31 ` Thomas De Schampheleire
1 sibling, 1 reply; 47+ messages in thread
From: Thomas Petazzoni @ 2014-10-05 11:07 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Sun, 5 Oct 2014 11:17:35 +0200, Yann E. MORIN wrote:
> > On those ones, I must say I'm not sure. Do we really have a coding
> > style for line continuation characters? In some cases, I found the
> > original code (i.e before your patch) to actually be nicer than after
> > your change.
>
> Well, I do like alignment of \, because it is easier to see the lines
> are a single block.
I also personally like the alignment of \, so I tend to disagree a bit
with the patch removing this.
Regarding the alignment of =, my point of view is that there are
different cases. Within packages, I agree it probably doesn't make much
sense to align = signs. However, within the core infrastructure, there
are situations where it really make seems more "beautiful" to read.
> Being consistent is nice. However, I find a bulk clean-up is very
> complex to do:
>
> - as you found, some assignments were not cleaned-up; it is difficult
> to find a pattern that matches all cases, and has no false-positives;
>
> - it is difficult to review, because of the sheer amount of changes in
> a single patch.
>
> So I would prefer we fix offenders whenever there is another patch being
> done for it. For example, when a version is bumped, a preliminary patch
> would introduce the cleanup (with the first two changes possibly being
> conflated in a single patch if it is easy to review):
>
> foo: remove backslash alignment
> foo: remove assignments alignment
> foo: bump version
>
> This is something very easy to do, and review.
I agree.
Summary: I mark as rejected those two patches?
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS
2014-10-05 11:07 ` Thomas Petazzoni
@ 2014-10-05 12:22 ` Thomas De Schampheleire
2014-10-05 12:30 ` Thomas Petazzoni
0 siblings, 1 reply; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-10-05 12:22 UTC (permalink / raw)
To: buildroot
Hi Thomas, Yann,
On Sun, Oct 5, 2014 at 1:07 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Yann E. MORIN,
>
> On Sun, 5 Oct 2014 11:17:35 +0200, Yann E. MORIN wrote:
>
>> > On those ones, I must say I'm not sure. Do we really have a coding
>> > style for line continuation characters? In some cases, I found the
>> > original code (i.e before your patch) to actually be nicer than after
>> > your change.
>>
>> Well, I do like alignment of \, because it is easier to see the lines
>> are a single block.
>
> I also personally like the alignment of \, so I tend to disagree a bit
> with the patch removing this.
>
> Regarding the alignment of =, my point of view is that there are
> different cases. Within packages, I agree it probably doesn't make much
> sense to align = signs. However, within the core infrastructure, there
> are situations where it really make seems more "beautiful" to read.
>
>
>> Being consistent is nice. However, I find a bulk clean-up is very
>> complex to do:
>>
>> - as you found, some assignments were not cleaned-up; it is difficult
>> to find a pattern that matches all cases, and has no false-positives;
>>
>> - it is difficult to review, because of the sheer amount of changes in
>> a single patch.
>>
>> So I would prefer we fix offenders whenever there is another patch being
>> done for it. For example, when a version is bumped, a preliminary patch
>> would introduce the cleanup (with the first two changes possibly being
>> conflated in a single patch if it is easy to review):
>>
>> foo: remove backslash alignment
>> foo: remove assignments alignment
>> foo: bump version
>>
>> This is something very easy to do, and review.
>
> I agree.
>
> Summary: I mark as rejected those two patches?
The reason these patches were part of the _OPT series was that due to
the introduction of an extra letter, some alignment was broken. If we
do not removal all alignment consistently, then how do you propose to
handle this?
a. do nothing, and thus let the alignment be broken
b. expect the submitter of such renaming changes to fix the specific
alignment issues he/she introduced? (which is painful (but not
impossible) since the renaming typically happens with an automated
command or script)
c. remove all fragile alignment in one go, so that such problems do not occur.
In my original patches I went for reasoning c.
How would you handle the alignment issue instead?
Thanks,
Thomas
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS
2014-10-05 12:22 ` Thomas De Schampheleire
@ 2014-10-05 12:30 ` Thomas Petazzoni
0 siblings, 0 replies; 47+ messages in thread
From: Thomas Petazzoni @ 2014-10-05 12:30 UTC (permalink / raw)
To: buildroot
Dear Thomas De Schampheleire,
On Sun, 5 Oct 2014 14:22:12 +0200, Thomas De Schampheleire wrote:
> The reason these patches were part of the _OPT series was that due to
> the introduction of an extra letter, some alignment was broken. If we
> do not removal all alignment consistently, then how do you propose to
> handle this?
>
> a. do nothing, and thus let the alignment be broken
> b. expect the submitter of such renaming changes to fix the specific
> alignment issues he/she introduced? (which is painful (but not
> impossible) since the renaming typically happens with an automated
> command or script)
> c. remove all fragile alignment in one go, so that such problems do not occur.
>
> In my original patches I went for reasoning c.
> How would you handle the alignment issue instead?
Good question. For now, I'm tempted to say (a) :-)
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS
2014-10-05 9:17 ` Yann E. MORIN
2014-10-05 11:07 ` Thomas Petazzoni
@ 2014-10-05 12:31 ` Thomas De Schampheleire
1 sibling, 0 replies; 47+ messages in thread
From: Thomas De Schampheleire @ 2014-10-05 12:31 UTC (permalink / raw)
To: buildroot
Hi Yann, Thomas,
On Sun, Oct 5, 2014 at 11:17 AM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Thomas2, All,
>
> On 2014-10-04 19:07 +0200, Thomas Petazzoni spake thusly:
>> On Sat, 27 Sep 2014 21:32:37 +0200, Thomas De Schampheleire wrote:
>> > .mk files: remove alignment of line continuation characters
>> > .mk files: remove alignment of assignments
>>
>> On those ones, I must say I'm not sure. Do we really have a coding
>> style for line continuation characters? In some cases, I found the
>> original code (i.e before your patch) to actually be nicer than after
>> your change.
>
> Well, I do like alignment of \, because it is easier to see the lines
> are a single block.
>
> But I prefer consistency.
>
>> For the alignment of assignments, I generally agree, but:
>>
>> 1/ I believe there should be exceptions to the rules. Especially
>> inside the package infrastructure themselves, aligning = signs is
>> sometimes good for readability
>>
>> 2/ Your regex doesn't handle cases such as:
>>
>> FOO ?=
>> BAR ?= $(SOMETHING)
>>
>> The second assignment gets changed, but not the first one.
>>
>> So on those last two patches, I'd like to have more community feedback.
>
> Being consistent is nice. However, I find a bulk clean-up is very
> complex to do:
>
> - as you found, some assignments were not cleaned-up; it is difficult
> to find a pattern that matches all cases, and has no false-positives;
In this case I think it's not that hard. The issue pointed to by
Thomas is indeed an oversight, but one that can be fixed quite easily.
>
> - it is difficult to review, because of the sheer amount of changes in
> a single patch.
>
> So I would prefer we fix offenders whenever there is another patch being
> done for it. For example, when a version is bumped, a preliminary patch
> would introduce the cleanup (with the first two changes possibly being
> conflated in a single patch if it is easy to review):
>
> foo: remove backslash alignment
> foo: remove assignments alignment
> foo: bump version
>
> This is something very easy to do, and review.
You mentioned above that reviewing a bulk change in one patch is
difficult. I understand, but rather I'd call it 'boring' and
'time-intensive' rather than 'difficult' because the changes are
trivial.
Regarding your suggested alternative, doing the same changes but split
per package and 'when the time is right' (i.e. someone needs to make a
change to that same package), my opinion is:
a. making the change 'when the time is right' has as disadvantages that:
- not every developer will notice this issue and does do the alignment fixes
- it causes a long timeframe of inconsistency: some packages have
alignment, some don't, and given that many people copy/paste from
other examples it leaks the 'wrong' behavior to new developments.
Review is a solution to both issues, but it is easy to miss some
things (for the first one especially since the change in the package
may not touch any of the misaligned lines).
b. the split-patch approach could also be done in bulk, i.e. I could
just as easily do a bulk replacement now and make patches per package.
Of course it would be many patches (138 for the assignment alignment,
58 for the line continuation) at once which all need to be reviewed.
However, since they're split per package it is more easy to review at
several moments (spread over a few days for example) and to spread the
effort over several developers.
In summary, I tend to prefer a bulk change (in one or multiple
patches, I don't mind) to have consistency in one go. The same
approach was taken for the Config.in comments I once changed
(toolchain options etc.)
Best regards,
Thomas
^ permalink raw reply [flat|nested] 47+ messages in thread
end of thread, other threads:[~2014-10-05 12:31 UTC | newest]
Thread overview: 47+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-27 19:32 [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Thomas De Schampheleire
2014-09-27 19:32 ` [Buildroot] [PATCH 01 of 15] packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS Thomas De Schampheleire
2014-09-27 22:04 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 02 of 15] packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS Thomas De Schampheleire
2014-09-27 22:05 ` Yann E. MORIN
2014-09-27 22:07 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 03 of 15] packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS Thomas De Schampheleire
2014-09-27 22:06 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 04 of 15] packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS Thomas De Schampheleire
2014-09-27 22:08 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 05 of 15] packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS Thomas De Schampheleire
2014-09-27 22:15 ` Yann E. MORIN
2014-10-04 16:52 ` Thomas Petazzoni
2014-10-04 17:07 ` Samuel Martin
2014-10-04 17:13 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 06 of 15] packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS Thomas De Schampheleire
2014-09-27 22:17 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 07 of 15] packages: rename FOO_CONF_OPT into FOO_CONF_OPTS Thomas De Schampheleire
2014-09-27 22:18 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 08 of 15] packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS Thomas De Schampheleire
2014-09-27 22:20 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 09 of 15] packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS Thomas De Schampheleire
2014-09-27 22:26 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 10 of 15] packages: rename FOO_KCONFIG_OPT into FOO_KCONFIG_OPTS Thomas De Schampheleire
2014-09-27 22:29 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 11 of 15] pkg-generic: introduce helper function to check for a deprecated variable Thomas De Schampheleire
2014-10-04 17:13 ` Thomas Petazzoni
2014-09-27 19:32 ` [Buildroot] [PATCH 12 of 15] pkg-generic: add checks on deprecated variables FOO_BAR_OPT Thomas De Schampheleire
2014-09-27 21:49 ` Yann E. MORIN
2014-10-04 17:14 ` Thomas Petazzoni
2014-10-04 22:15 ` Yann E. MORIN
2014-10-05 7:34 ` Thomas De Schampheleire
2014-10-05 7:54 ` Thomas Petazzoni
2014-10-05 7:58 ` Thomas De Schampheleire
2014-09-27 19:32 ` [Buildroot] [PATCH 13 of 15] packages: rename misc. occurrences of _OPT into _OPTS Thomas De Schampheleire
2014-09-27 22:35 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 14 of 15] .mk files: remove alignment of line continuation characters Thomas De Schampheleire
2014-09-28 12:10 ` Yann E. MORIN
2014-09-27 19:32 ` [Buildroot] [PATCH 15 of 15] .mk files: remove alignment of assignments Thomas De Schampheleire
2014-09-28 12:12 ` Yann E. MORIN
2014-09-27 21:15 ` [Buildroot] [PATCH 00 of 15] packages: rename FOO_BAR_OPT into FOO_BAR_OPTS Yann E. MORIN
2014-10-04 17:07 ` Thomas Petazzoni
2014-10-05 9:17 ` Yann E. MORIN
2014-10-05 11:07 ` Thomas Petazzoni
2014-10-05 12:22 ` Thomas De Schampheleire
2014-10-05 12:30 ` Thomas Petazzoni
2014-10-05 12:31 ` Thomas De Schampheleire
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.