packages: rename _OPT into _OPTS
PATCH 1/1 packages: rename _OPT into _OPTS
This patch series renames the various FOO_XXX_OPT variables into FOO_XXX_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.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- boot/at91bootstrap3/at91bootstrap3.mk | 4 +- boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk | 2 +- boot/grub/grub.mk | 2 +- boot/grub2/grub2.mk | 4 +- boot/gummiboot/gummiboot.mk | 2 +- docs/manual/adding-packages-autotools.txt | 14 +- docs/manual/adding-packages-cmake.txt | 10 +- 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 +- linux/linux-ext-xenomai.mk | 6 +- package/acl/acl.mk | 6 +- 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 | 4 +- package/attr/attr.mk | 6 +- package/audiofile/audiofile.mk | 6 +- package/aumix/aumix.mk | 2 +- package/avahi/avahi.mk | 20 +- package/bash/bash.mk | 4 +- package/bcusdk/bcusdk.mk | 2 +- package/beecrypt/beecrypt.mk | 4 +- package/bind/bind.mk | 22 +- package/binutils/binutils.mk | 4 +- package/blackbox/blackbox.mk | 2 +- package/bluez_utils/bluez_utils.mk | 16 +- package/bmon/bmon.mk | 4 +- package/boost/boost.mk | 14 +- 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 | 14 +- package/cegui06/cegui06.mk | 2 +- package/celt051/celt.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 | 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/dialog/dialog.mk | 2 +- package/dillo/dillo.mk | 16 +- package/directfb/directfb.mk | 50 +- package/distcc/distcc.mk | 2 +- package/dmalloc/dmalloc.mk | 10 +- package/dmraid/dmraid.mk | 2 +- package/dnsmasq/dnsmasq.mk | 12 +- package/dropbear/dropbear.mk | 6 +- package/e2fsprogs/e2fsprogs.mk | 6 +- 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/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 | 142 +- 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 | 18 +- package/gamin/gamin.mk | 4 +- package/gcc/gcc-final/gcc-final.mk | 12 +- package/gcc/gcc-initial/gcc-initial.mk | 8 +- package/gcc/gcc-intermediate/gcc-intermediate.mk | 12 +- package/gcc/gcc.mk | 52 +- package/gd/gd.mk | 16 +- package/gdb/gdb.mk | 4 +- 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/glibc/glibc.mk | 2 +- 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 | 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 | 386 +++++----- 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/httping/httping.mk | 6 +- package/icu/icu.mk | 4 +- package/ifplugd/ifplugd.mk | 4 +- package/igh-ethercat/igh-ethercat.mk | 12 +- package/imagemagick/imagemagick.mk | 42 +- package/imlib2/imlib2.mk | 26 +- package/iperf/iperf.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/iw/iw.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/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 | 4 +- 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 | 10 +- package/libdrm/libdrm.mk | 36 +- package/libdvdnav/libdvdnav.mk | 2 +- package/libeXosip2/libeXosip2.mk | 6 +- package/libedit/libedit.mk | 2 +- package/libelf/libelf.mk | 6 +- 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 | 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 | 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 | 12 +- package/libplayer/libplayer.mk | 12 +- package/libpng/libpng.mk | 2 +- package/libpthsem/libpthsem.mk | 4 +- package/libqmi/libqmi.mk | 2 +- package/libqrencode/libqrencode.mk | 4 +- 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/libseccomp/libseccomp.mk | 6 +- 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/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 | 4 +- package/linux-zigbee/linux-zigbee.mk | 8 +- package/lite/lite.mk | 2 +- package/lm-sensors/lm-sensors.mk | 12 +- package/localedef/localedef.mk | 2 +- package/log4cxx/log4cxx.mk | 2 +- package/lrzsz/lrzsz.mk | 2 +- package/lshw/lshw.mk | 6 +- package/ltrace/ltrace.mk | 6 +- package/ltris/ltris.mk | 4 +- package/lttng-tools/lttng-tools.mk | 4 +- package/lua-ev/lua-ev.mk | 2 +- package/luaposix/luaposix.mk | 2 +- package/luarocks/luarocks.mk | 6 +- package/lvm2/lvm2.mk | 14 +- 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/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 | 32 +- package/metacity/metacity.mk | 2 +- package/mii-diag/mii-diag.mk | 4 +- package/minidlna/minidlna.mk | 2 +- package/modem-manager/modem-manager.mk | 8 +- package/monit/monit.mk | 10 +- package/mpd/mpd.mk | 50 +- package/mpdecimal/mpdecimal.mk | 2 +- package/mpfr/mpfr.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/mxml/mxml.mk | 4 +- package/mysql/mysql.mk | 12 +- package/nano/nano.mk | 4 +- package/nbd/nbd.mk | 2 +- package/ncurses/ncurses.mk | 6 +- 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/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 | 4 +- package/openswan/openswan.mk | 12 +- 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 | 66 +- package/pinentry/pinentry.mk | 24 +- package/pixman/pixman.mk | 4 +- package/pkg-autotools.mk | 32 +- package/pkg-cmake.mk | 24 +- package/pkg-generic.mk | 26 + package/pkg-luarocks.mk | 4 +- package/pkg-perl.mk | 24 +- package/pkg-python.mk | 50 +- package/poco/poco.mk | 6 +- 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 | 2 +- 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 | 2 +- package/pulseaudio/pulseaudio.mk | 18 +- package/pv/pv.mk | 2 +- package/python-numpy/python-numpy.mk | 2 +- package/python/python.mk | 26 +- package/python3/python3.mk | 24 +- package/quagga/quagga.mk | 28 +- package/quota/quota.mk | 4 +- package/rdesktop/rdesktop.mk | 4 +- package/rp-pppoe/rp-pppoe.mk | 4 +- package/rpcbind/rpcbind.mk | 2 +- 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/rtai/rtai.mk | 2 +- package/rubix/rubix.mk | 4 +- package/ruby/ruby.mk | 4 +- package/samba/samba.mk | 10 +- package/samba4/samba4.mk | 28 +- 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 | 20 +- 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/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 | 8 +- 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 | 6 +- 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 | 6 +- package/torsmo/torsmo.mk | 2 +- package/transmission/transmission.mk | 22 +- package/tslib/tslib.mk | 2 +- 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 | 16 +- 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 | 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/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 | 2 +- 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 | 70 +- package/x11vnc/x11vnc.mk | 20 +- package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 6 +- package/xbmc/xbmc.mk | 48 +- package/xenomai/xenomai.mk | 6 +- package/xerces/xerces.mk | 6 +- package/xfsprogs/xfsprogs.mk | 4 +- package/xinetd/xinetd.mk | 2 +- package/xmlstarlet/xmlstarlet.mk | 2 +- 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 +- 561 files changed, 3107 insertions(+), 3081 deletions(-)
PATCH 1/1 pkg-generic: introduce helper function to check for a deprecated variable
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 <[email protected]>
--- package/pkg-generic.mk | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
package/pkg-generic.mk +15 -0
@@ -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 #
PATCH 1/1 pkg-generic: introduce helper function to check for a deprecated variable
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 6 lines
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 <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 29 lines
--- package/pkg-generic.mk | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)diff -r
6ff0cfa8a802-r 677354152366package/pkg-generic.mkpackage/pkg-generic.mk +15
-0@@ -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 #
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
In reply to Thomas De SchampheleireWhile 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.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- boot/at91bootstrap3/at91bootstrap3.mk | 4 ++-- docs/manual/adding-packages-autotools.txt | 2 +- docs/manual/adding-packages-cmake.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/gcc/gcc-intermediate/gcc-intermediate.mk | 4 ++-- 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/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/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 ++-- 43 files changed, 94 insertions(+), 94 deletions(-)
boot/at91bootstrap3/at91bootstrap3.mk +2 -2
@@ -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
docs/manual/adding-packages-autotools.txt +1 -1
@@ -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.
docs/manual/adding-packages-cmake.txt +1 -1
@@ -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.
package/avahi/avahi.mk +1 -1
@@ -134,7 +134,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 * - - -
package/dnsmasq/dnsmasq.mk +6 -6
@@ -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 += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" + DNSMASQ_MAKE_OPTS += LDFLAGS+="-lidn $(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
package/e2fsprogs/e2fsprogs.mk +1 -1
@@ -31,7 +31,7 @@ E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux -E2FSPROGS_MAKE_OPT = \ +E2FSPROGS_MAKE_OPTS = \ LDCONFIG=true define HOST_E2FSPROGS_INSTALL_CMDS
package/faifa/faifa.mk +1 -1
@@ -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
package/freetype/freetype.mk +1 -1
@@ -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
package/gcc/gcc-initial/gcc-initial.mk +1 -1
@@ -37,7 +37,7 @@ HOST_GCC_INITIAL_CONF_ENV = \ $(HOST_GCC_COMMON_CONF_ENV) -HOST_GCC_INITIAL_MAKE_OPT = all-gcc +HOST_GCC_INITIAL_MAKE_OPTS = all-gcc HOST_GCC_INITIAL_INSTALL_OPT = install-gcc $(eval $(host-autotools-package))
package/gcc/gcc-intermediate/gcc-intermediate.mk +2 -2
@@ -36,9 +36,9 @@ HOST_GCC_INTERMEDIATE_CONF_ENV = \ $(HOST_GCC_COMMON_CONF_ENV) -HOST_GCC_INTERMEDIATE_MAKE_OPT = all-gcc +HOST_GCC_INTERMEDIATE_MAKE_OPTS = all-gcc ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) -HOST_GCC_INTERMEDIATE_MAKE_OPT += all-target-libgcc +HOST_GCC_INTERMEDIATE_MAKE_OPTS += all-target-libgcc endif HOST_GCC_INTERMEDIATE_INSTALL_OPT = install-gcc
package/httping/httping.mk +3 -3
@@ -17,19 +17,19 @@ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(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=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))
package/ipsec-tools/ipsec-tools.mk +1 -1
@@ -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)
package/iputils/iputils.mk +3 -3
@@ -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
package/iw/iw.mk +3 -3
@@ -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
package/libdnet/libdnet.mk +3 -3
@@ -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
package/libjson/libjson.mk +6 -6
@@ -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))
package/libseccomp/libseccomp.mk +1 -1
@@ -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
package/linux-pam/linux-pam.mk +1 -1
@@ -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)
package/lm-sensors/lm-sensors.mk +6 -6
@@ -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
package/lshw/lshw.mk +3 -3
@@ -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))
package/lvm2/lvm2.mk +1 -1
@@ -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
package/mdadm/mdadm.mk +1 -1
@@ -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 = \
package/mii-diag/mii-diag.mk +2 -2
@@ -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
package/mpfr/mpfr.mk +1 -1
@@ -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))
package/openswan/openswan.mk +6 -6
@@ -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))
package/pkg-autotools.mk +3 -3
@@ -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
@@ -266,11 +266,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
package/pkg-cmake.mk +6 -6
@@ -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
package/pppd/pppd.mk +4 -4
@@ -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))
package/pv/pv.mk +1 -1
@@ -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"
package/quota/quota.mk +1 -1
@@ -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)"
package/rp-pppoe/rp-pppoe.mk +1 -1
@@ -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 \
package/rubix/rubix.mk +1 -1
@@ -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
package/schifra/schifra.mk +2 -2
@@ -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
package/sdl_ttf/sdl_ttf.mk +1 -1
@@ -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))
package/speex/speex.mk +1 -1
@@ -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))
package/sysstat/sysstat.mk +1 -1
@@ -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
package/systemd/systemd.mk +2 -2
@@ -128,8 +128,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
package/tn5250/tn5250.mk +1 -1
@@ -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
package/util-linux/util-linux.mk +1 -1
@@ -40,7 +40,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)
package/whois/whois.mk +3 -3
@@ -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
package/xinetd/xinetd.mk +1 -1
@@ -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))
package/zmqpp/zmqpp.mk +4 -4
@@ -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))
package/zxing/zxing.mk +2 -2
@@ -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
PATCH 1/1 packages: rename FOO_MAKE_OPT into FOO_MAKE_OPTS
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 9 lines
While the autotools infrastructure was using
FOO_MAKE_OPT, generic packages were typically usingFOO_MAKE_OPTS. This inconsistency becomes a problem when a new infrastructure is introduced that wants to make use ofFOO_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.
Quoted 5 lines
The OPTS variant is more logical, as there are typically multiple options.
This patch renames all occurrences of
FOO_MAKE_OPTinFOO_MAKE_OPTS.Signed-off-by Thomas De Schampheleire <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Pfeww... That's not easy to review... :-p
Regards,
Yann E. MORIN.
Quoted 893 lines
--- boot/at91bootstrap3/at91bootstrap3.mk | 4 ++-- docs/manual/adding-packages-autotools.txt | 2 +- docs/manual/adding-packages-cmake.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/gcc/gcc-intermediate/gcc-intermediate.mk | 4 ++-- 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/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/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 ++-- 43 files changed, 94 insertions(+), 94 deletions(-)diff -r 677354152366 -r
7372c704f6a9boot/at91bootstrap3/at91bootstrap3.mkboot/at91bootstrap3/at91bootstrap3.mk +2
-2@@ -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_CMDSdiff -r 677354152366 -r
7372c704f6a9docs/manual/adding-packages-autotools.txtdocs/manual/adding-packages-autotools.txt +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9docs/manual/adding-packages-cmake.txtdocs/manual/adding-packages-cmake.txt +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/avahi/avahi.mkpackage/avahi/avahi.mk +1
-1@@ -134,7 +134,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 -r 677354152366 -r
7372c704f6a9package/dnsmasq/dnsmasq.mkpackage/dnsmasq/dnsmasq.mk +6
-6@@ -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 += LDFLAGS+="-lidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" + DNSMASQ_MAKE_OPTS += LDFLAGS+="-lidn $(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/ endefdiff -r 677354152366 -r
7372c704f6a9package/e2fsprogs/e2fsprogs.mkpackage/e2fsprogs/e2fsprogs.mk +1
-1@@ -31,7 +31,7 @@ E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux -E2FSPROGS_MAKE_OPT = \ +E2FSPROGS_MAKE_OPTS = \ LDCONFIG=true define HOST_E2FSPROGS_INSTALL_CMDSdiff -r 677354152366 -r
7372c704f6a9package/faifa/faifa.mkpackage/faifa/faifa.mk +1
-1@@ -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 stagingdiff -r 677354152366 -r
7372c704f6a9package/freetype/freetype.mkpackage/freetype/freetype.mk +1
-1@@ -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-pkgconfdiff -r 677354152366 -r
7372c704f6a9package/gcc/gcc-initial/gcc-initial.mkpackage/gcc/gcc-initial/gcc-initial.mk +1
-1@@ -37,7 +37,7 @@ HOST_GCC_INITIAL_CONF_ENV = \ $(HOST_GCC_COMMON_CONF_ENV) -HOST_GCC_INITIAL_MAKE_OPT = all-gcc +HOST_GCC_INITIAL_MAKE_OPTS = all-gcc HOST_GCC_INITIAL_INSTALL_OPT = install-gcc $(eval $(host-autotools-package))diff -r 677354152366 -r
7372c704f6a9package/gcc/gcc-intermediate/gcc-intermediate.mkpackage/gcc/gcc-intermediate/gcc-intermediate.mk +2
-2@@ -36,9 +36,9 @@ HOST_GCC_INTERMEDIATE_CONF_ENV = \ $(HOST_GCC_COMMON_CONF_ENV) -HOST_GCC_INTERMEDIATE_MAKE_OPT = all-gcc +HOST_GCC_INTERMEDIATE_MAKE_OPTS = all-gcc ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) -HOST_GCC_INTERMEDIATE_MAKE_OPT += all-target-libgcc +HOST_GCC_INTERMEDIATE_MAKE_OPTS += all-target-libgcc endif HOST_GCC_INTERMEDIATE_INSTALL_OPT = install-gccdiff -r 677354152366 -r
7372c704f6a9package/httping/httping.mkpackage/httping/httping.mk +3
-3@@ -17,19 +17,19 @@ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(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=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 -r 677354152366 -r
7372c704f6a9package/ipsec-tools/ipsec-tools.mkpackage/ipsec-tools/ipsec-tools.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/iputils/iputils.mkpackage/iputils/iputils.mk +3
-3@@ -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_CMDSdiff -r 677354152366 -r
7372c704f6a9package/iw/iw.mkpackage/iw/iw.mk +3
-3@@ -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_CMDSdiff -r 677354152366 -r
7372c704f6a9package/libdnet/libdnet.mkpackage/libdnet/libdnet.mk +3
-3@@ -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 properlydiff -r 677354152366 -r
7372c704f6a9package/libjson/libjson.mkpackage/libjson/libjson.mk +6
-6@@ -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 -r 677354152366 -r
7372c704f6a9package/libseccomp/libseccomp.mkpackage/libseccomp/libseccomp.mk +1
-1@@ -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) installdiff -r 677354152366 -r
7372c704f6a9package/linux-pam/linux-pam.mkpackage/linux-pam/linux-pam.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/lm-sensors/lm-sensors.mkpackage/lm-sensors/lm-sensors.mk +6
-6@@ -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_)) endefdiff -r 677354152366 -r
7372c704f6a9package/lshw/lshw.mkpackage/lshw/lshw.mk +3
-3@@ -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 -r 677354152366 -r
7372c704f6a9package/lvm2/lvm2.mkpackage/lvm2/lvm2.mk +1
-1@@ -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 endifdiff -r 677354152366 -r
7372c704f6a9package/mdadm/mdadm.mkpackage/mdadm/mdadm.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/mii-diag/mii-diag.mkpackage/mii-diag/mii-diag.mk +2
-2@@ -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_CMDSdiff -r 677354152366 -r
7372c704f6a9package/mpfr/mpfr.mkpackage/mpfr/mpfr.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/openswan/openswan.mkpackage/openswan/openswan.mk +6
-6@@ -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 -r 677354152366 -r
7372c704f6a9package/pkg-autotools.mkpackage/pkg-autotools.mk +3
-3@@ -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@@ -266,11 +266,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 endifdiff -r 677354152366 -r
7372c704f6a9package/pkg-cmake.mkpackage/pkg-cmake.mk +6
-6@@ -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 endifdiff -r 677354152366 -r
7372c704f6a9package/pppd/pppd.mkpackage/pppd/pppd.mk +4
-4@@ -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 -r 677354152366 -r
7372c704f6a9package/pv/pv.mkpackage/pv/pv.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/quota/quota.mkpackage/quota/quota.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/rp-pppoe/rp-pppoe.mkpackage/rp-pppoe/rp-pppoe.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/rubix/rubix.mkpackage/rubix/rubix.mk +1
-1@@ -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_libX11diff -r 677354152366 -r
7372c704f6a9package/schifra/schifra.mkpackage/schifra/schifra.mk +2
-2@@ -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_EXAMPLESdiff -r 677354152366 -r
7372c704f6a9package/sdl_ttf/sdl_ttf.mkpackage/sdl_ttf/sdl_ttf.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/speex/speex.mkpackage/speex/speex.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/sysstat/sysstat.mkpackage/sysstat/sysstat.mk +1
-1@@ -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/tkdiff -r 677354152366 -r
7372c704f6a9package/systemd/systemd.mkpackage/systemd/systemd.mk +2
-2@@ -128,8 +128,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/initdiff -r 677354152366 -r
7372c704f6a9package/tn5250/tn5250.mkpackage/tn5250/tn5250.mk +1
-1@@ -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 = COPYINGdiff -r 677354152366 -r
7372c704f6a9package/util-linux/util-linux.mkpackage/util-linux/util-linux.mk +1
-1@@ -40,7 +40,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 -r 677354152366 -r
7372c704f6a9package/whois/whois.mkpackage/whois/whois.mk +3
-3@@ -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) endefdiff -r 677354152366 -r
7372c704f6a9package/xinetd/xinetd.mkpackage/xinetd/xinetd.mk +1
-1@@ -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 -r 677354152366 -r
7372c704f6a9package/zmqpp/zmqpp.mkpackage/zmqpp/zmqpp.mk +4
-4@@ -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 -r 677354152366 -r
7372c704f6a9package/zxing/zxing.mkpackage/zxing/zxing.mk +2
-2@@ -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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkg-generic: add check on deprecated variable FOO_MAKE_OPT
In reply to Thomas De SchampheleireThis patch introduces a check for the usage of deprecated variable FOO_MAKE_OPT, and suggests to use FOO_MAKE_OPTS instead.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-generic.mk | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
package/pkg-generic.mk +3 -0
@@ -717,6 +717,9 @@ $$(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)) + TARGETS += $(1) ifneq ($$($(2)_PERMISSIONS),)
PATCH 1/1 packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
In reply to Thomas De SchampheleireTo be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_OPT.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- docs/manual/adding-packages-perl.txt | 2 +- docs/manual/adding-packages-python.txt | 6 +++--- package/gcc/gcc-initial/gcc-initial.mk | 2 +- package/gcc/gcc-intermediate/gcc-intermediate.mk | 4 ++-- package/pkg-autotools.mk | 4 ++-- package/pkg-python.mk | 12 ++++++------ package/scons/scons.mk | 2 +- package/util-linux/util-linux.mk | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-)
docs/manual/adding-packages-perl.txt +1 -1
@@ -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.
docs/manual/adding-packages-python.txt +3 -3
@@ -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
package/gcc/gcc-initial/gcc-initial.mk +1 -1
@@ -38,6 +38,6 @@ $(HOST_GCC_COMMON_CONF_ENV) HOST_GCC_INITIAL_MAKE_OPTS = all-gcc -HOST_GCC_INITIAL_INSTALL_OPT = install-gcc +HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc $(eval $(host-autotools-package))
package/gcc/gcc-intermediate/gcc-intermediate.mk +2 -2
@@ -41,9 +41,9 @@ HOST_GCC_INTERMEDIATE_MAKE_OPTS += all-target-libgcc endif -HOST_GCC_INTERMEDIATE_INSTALL_OPT = install-gcc +HOST_GCC_INTERMEDIATE_INSTALL_OPTS = install-gcc ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) -HOST_GCC_INTERMEDIATE_INSTALL_OPT += install-target-libgcc +HOST_GCC_INTERMEDIATE_INSTALL_OPTS += install-target-libgcc endif $(eval $(host-autotools-package))
package/pkg-autotools.mk +2 -2
@@ -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
@@ -281,7 +281,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
package/pkg-python.mk +6 -6
@@ -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
package/scons/scons.mk +1 -1
@@ -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))
package/util-linux/util-linux.mk +1 -1
@@ -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
PATCH 1/1 packages: rename FOO_INSTALL_OPT into FOO_INSTALL_OPTS
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 4 lines
To be consistent with the recent change of
FOO_MAKE_OPTintoFOO_MAKE_OPTS, make the same change forFOO_INSTALL_OPT.Signed-off-by Thomas De Schampheleire <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 170 lines
--- docs/manual/adding-packages-perl.txt | 2 +- docs/manual/adding-packages-python.txt | 6 +++--- package/gcc/gcc-initial/gcc-initial.mk | 2 +- package/gcc/gcc-intermediate/gcc-intermediate.mk | 4 ++-- package/pkg-autotools.mk | 4 ++-- package/pkg-python.mk | 12 ++++++------ package/scons/scons.mk | 2 +- package/util-linux/util-linux.mk | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-)diff -r
9b89581eb95a-r350c3078ccd9docs/manual/adding-packages-perl.txtdocs/manual/adding-packages-perl.txt +1
-1@@ -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 -r
9b89581eb95a-r350c3078ccd9docs/manual/adding-packages-python.txtdocs/manual/adding-packages-python.txt +3
-3@@ -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 pythondiff -r
9b89581eb95a-r350c3078ccd9package/gcc/gcc-initial/gcc-initial.mkpackage/gcc/gcc-initial/gcc-initial.mk +1
-1@@ -38,6 +38,6 @@ $(HOST_GCC_COMMON_CONF_ENV) HOST_GCC_INITIAL_MAKE_OPTS = all-gcc -HOST_GCC_INITIAL_INSTALL_OPT = install-gcc +HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc $(eval $(host-autotools-package))diff -r
9b89581eb95a-r350c3078ccd9package/gcc/gcc-intermediate/gcc-intermediate.mkpackage/gcc/gcc-intermediate/gcc-intermediate.mk +2
-2@@ -41,9 +41,9 @@ HOST_GCC_INTERMEDIATE_MAKE_OPTS += all-target-libgcc endif -HOST_GCC_INTERMEDIATE_INSTALL_OPT = install-gcc +HOST_GCC_INTERMEDIATE_INSTALL_OPTS = install-gcc ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) -HOST_GCC_INTERMEDIATE_INSTALL_OPT += install-target-libgcc +HOST_GCC_INTERMEDIATE_INSTALL_OPTS += install-target-libgcc endif $(eval $(host-autotools-package))diff -r
9b89581eb95a-r350c3078ccd9package/pkg-autotools.mkpackage/pkg-autotools.mk +2
-2@@ -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@@ -281,7 +281,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 endifdiff -r
9b89581eb95a-r350c3078ccd9package/pkg-python.mkpackage/pkg-python.mk +6
-6@@ -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 endifdiff -r
9b89581eb95a-r350c3078ccd9package/scons/scons.mkpackage/scons/scons.mk +1
-1@@ -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 -r
9b89581eb95a-r350c3078ccd9package/util-linux/util-linux.mkpackage/util-linux/util-linux.mk +1
-1@@ -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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkg-generic: add check on deprecated variable FOO_INSTALL_OPT
In reply to Thomas De SchampheleireThis patch introduces a check for the usage of deprecated variable FOO_INSTALL_OPT, and suggests to use FOO_INSTALL_OPTS instead.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-generic.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-generic.mk +1 -0
@@ -719,6 +719,7 @@ # 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)) TARGETS += $(1)
PATCH 1/1 packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
In reply to Thomas De SchampheleireTo be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_TARGET_OPT.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- 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/libelf/libelf.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 +- 72 files changed, 84 insertions(+), 84 deletions(-)
boot/grub2/grub2.mk +1 -1
@@ -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))
docs/manual/adding-packages-autotools.txt +1 -1
@@ -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
docs/manual/adding-packages-cmake.txt +1 -1
@@ -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
docs/manual/adding-packages-perl.txt +1 -1
@@ -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.
docs/manual/adding-packages-python.txt +3 -3
@@ -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).
package/acl/acl.mk +1 -1
@@ -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
package/attr/attr.mk +1 -1
@@ -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
package/cups/cups.mk +1 -1
@@ -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 \
package/dmraid/dmraid.mk +1 -1
@@ -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
package/expat/expat.mk +1 -1
@@ -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
package/expect/expect.mk +1 -1
@@ -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))
package/ifplugd/ifplugd.mk +1 -1
@@ -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
package/libdnet/libdnet.mk +1 -1
@@ -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
package/libelf/libelf.mk +1 -1
@@ -8,7 +8,7 @@ LIBELF_SITE = http://www.mr511.de/software/ LIBELF_INSTALL_STAGING = YES LIBELF_INSTALL_STAGING_OPT = instroot=$(STAGING_DIR) install -LIBELF_INSTALL_TARGET_OPT = instroot=$(TARGET_DIR) install +LIBELF_INSTALL_TARGET_OPTS = instroot=$(TARGET_DIR) install LIBELF_LICENSE = LGPLv2+ LIBELF_LICENSE_FILES = COPYING.LIB
package/libseccomp/libseccomp.mk +1 -1
@@ -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))
package/lvm2/lvm2.mk +1 -1
@@ -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)
package/mdadm/mdadm.mk +1 -1
@@ -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
package/mxml/mxml.mk +1 -1
@@ -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))
package/netsnmp/netsnmp.mk +1 -1
@@ -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
package/php/php.mk +1 -1
@@ -8,7 +8,7 @@ PHP_SITE = http://www.php.net/distributions 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
package/pkg-autotools.mk +2 -2
@@ -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 #
@@ -321,7 +321,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
package/pkg-cmake.mk +2 -2
@@ -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
package/pkg-perl.mk +4 -4
@@ -154,9 +154,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
@@ -168,9 +168,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
package/pkg-python.mk +6 -6
@@ -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
package/quota/quota.mk +1 -1
@@ -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
package/rpm/rpm.mk +1 -1
@@ -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))
package/rubix/rubix.mk +1 -1
@@ -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
package/samba/samba.mk +1 -1
@@ -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)
package/screen/screen.mk +1 -1
@@ -12,7 +12,7 @@ SCREEN_CONF_ENV = ac_cv_header_elf_h=no ac_cv_header_dwarf_h=no \ CFLAGS="$(TARGET_CFLAGS) -DTERMINFO" 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 \
package/sysstat/sysstat.mk +1 -1
@@ -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))
package/util-linux/util-linux.mk +1 -1
@@ -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
package/webkit/webkit.mk +1 -1
@@ -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
package/x11r7/xapp_xcalc/xapp_xcalc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +1 -1
@@ -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))
package/x11r7/xfont_font-alias/xfont_font-alias.mk +1 -1
@@ -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))
package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +1 -1
@@ -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))
package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +1 -1
@@ -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))
package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +1 -1
@@ -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))
package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +1 -1
@@ -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))
package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +1 -1
@@ -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))
package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +1 -1
@@ -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))
package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +1 -1
@@ -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))
package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +1 -1
@@ -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))
package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +1 -1
@@ -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))
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +1 -1
@@ -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))
package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +1 -1
@@ -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))
package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +1 -1
@@ -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))
package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +1 -1
@@ -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))
package/xenomai/xenomai.mk +1 -1
@@ -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
package/xfsprogs/xfsprogs.mk +1 -1
@@ -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))
package/xscreensaver/xscreensaver.mk +1 -1
@@ -22,6 +22,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))
package/xterm/xterm.mk +1 -1
@@ -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
PATCH 1/1 packages: rename FOO_INSTALL_TARGET_OPT into FOO_INSTALL_TARGET_OPTS
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 4 lines
To be consistent with the recent change of
FOO_MAKE_OPTintoFOO_MAKE_OPTS, make the same change forFOO_INSTALL_TARGET_OPT.Signed-off-by Thomas De Schampheleire <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 1,012 lines
--- 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/libelf/libelf.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 +- 72 files changed, 84 insertions(+), 84 deletions(-)diff -r
565580d243a8-r625dd5f23fa4boot/grub2/grub2.mkboot/grub2/grub2.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4docs/manual/adding-packages-autotools.txtdocs/manual/adding-packages-autotools.txt +1
-1@@ -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 possiblediff -r
565580d243a8-r625dd5f23fa4docs/manual/adding-packages-cmake.txtdocs/manual/adding-packages-cmake.txt +1
-1@@ -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 ifdiff -r
565580d243a8-r625dd5f23fa4docs/manual/adding-packages-perl.txtdocs/manual/adding-packages-perl.txt +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4docs/manual/adding-packages-python.txtdocs/manual/adding-packages-python.txt +3
-3@@ -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 -r
565580d243a8-r625dd5f23fa4package/acl/acl.mkpackage/acl/acl.mk +1
-1@@ -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-libdiff -r
565580d243a8-r625dd5f23fa4package/attr/attr.mkpackage/attr/attr.mk +1
-1@@ -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-libdiff -r
565580d243a8-r625dd5f23fa4package/cups/cups.mkpackage/cups/cups.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/dmraid/dmraid.mkpackage/dmraid/dmraid.mk +1
-1@@ -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)/LICENSEdiff -r
565580d243a8-r625dd5f23fa4package/expat/expat.mkpackage/expat/expat.mk +1
-1@@ -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 = COPYINGdiff -r
565580d243a8-r625dd5f23fa4package/expect/expect.mkpackage/expect/expect.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/ifplugd/ifplugd.mkpackage/ifplugd/ifplugd.mk +1
-1@@ -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 = libdaemondiff -r
565580d243a8-r625dd5f23fa4package/libdnet/libdnet.mkpackage/libdnet/libdnet.mk +1
-1@@ -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 endifdiff -r
565580d243a8-r625dd5f23fa4package/libelf/libelf.mkpackage/libelf/libelf.mk +1
-1@@ -8,7 +8,7 @@ LIBELF_SITE = http://www.mr511.de/software/ LIBELF_INSTALL_STAGING = YES LIBELF_INSTALL_STAGING_OPT = instroot=$(STAGING_DIR) install -LIBELF_INSTALL_TARGET_OPT = instroot=$(TARGET_DIR) install +LIBELF_INSTALL_TARGET_OPTS = instroot=$(TARGET_DIR) install LIBELF_LICENSE = LGPLv2+ LIBELF_LICENSE_FILES = COPYING.LIBdiff -r
565580d243a8-r625dd5f23fa4package/libseccomp/libseccomp.mkpackage/libseccomp/libseccomp.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/lvm2/lvm2.mkpackage/lvm2/lvm2.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/mdadm/mdadm.mkpackage/mdadm/mdadm.mk +1
-1@@ -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_CMDSdiff -r
565580d243a8-r625dd5f23fa4package/mxml/mxml.mkpackage/mxml/mxml.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/netsnmp/netsnmp.mkpackage/netsnmp/netsnmp.mk +1
-1@@ -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-configdiff -r
565580d243a8-r625dd5f23fa4package/php/php.mkpackage/php/php.mk +1
-1@@ -8,7 +8,7 @@ PHP_SITE = http://www.php.net/distributions 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 = LICENSEdiff -r
565580d243a8-r625dd5f23fa4package/pkg-autotools.mkpackage/pkg-autotools.mk +2
-2@@ -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 #@@ -321,7 +321,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 endifdiff -r
565580d243a8-r625dd5f23fa4package/pkg-cmake.mkpackage/pkg-cmake.mk +2
-2@@ -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 endifdiff -r
565580d243a8-r625dd5f23fa4package/pkg-perl.mkpackage/pkg-perl.mk +4
-4@@ -154,9 +154,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@@ -168,9 +168,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 endifdiff -r
565580d243a8-r625dd5f23fa4package/pkg-python.mkpackage/pkg-python.mk +6
-6@@ -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 endifdiff -r
565580d243a8-r625dd5f23fa4package/quota/quota.mkpackage/quota/quota.mk +1
-1@@ -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) \ installdiff -r
565580d243a8-r625dd5f23fa4package/rpm/rpm.mkpackage/rpm/rpm.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/rubix/rubix.mkpackage/rubix/rubix.mk +1
-1@@ -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 = LICENCEdiff -r
565580d243a8-r625dd5f23fa4package/samba/samba.mkpackage/samba/samba.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/screen/screen.mkpackage/screen/screen.mk +1
-1@@ -12,7 +12,7 @@ SCREEN_CONF_ENV = ac_cv_header_elf_h=no ac_cv_header_dwarf_h=no \ CFLAGS="$(TARGET_CFLAGS) -DTERMINFO" 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 -r
565580d243a8-r625dd5f23fa4package/sysstat/sysstat.mkpackage/sysstat/sysstat.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/util-linux/util-linux.mkpackage/util-linux/util-linux.mk +1
-1@@ -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/mkinstalldirsdiff -r
565580d243a8-r625dd5f23fa4package/webkit/webkit.mkpackage/webkit/webkit.mk +1
-1@@ -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 releasesdiff -r
565580d243a8-r625dd5f23fa4package/x11r7/xapp_xcalc/xapp_xcalc.mkpackage/x11r7/xapp_xcalc/xapp_xcalc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mkpackage/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mkpackage/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mkpackage/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mkpackage/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mkpackage/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-alias/xfont_font-alias.mkpackage/x11r7/xfont_font-alias/xfont_font-alias.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mkpackage/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mkpackage/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mkpackage/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mkpackage/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mkpackage/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mkpackage/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mkpackage/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mkpackage/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mkpackage/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mkpackage/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mkpackage/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mkpackage/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mkpackage/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mkpackage/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mkpackage/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mkpackage/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mkpackage/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mkpackage/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mkpackage/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mkpackage/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mkpackage/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mkpackage/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mkpackage/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mkpackage/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mkpackage/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mkpackage/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mkpackage/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mkpackage/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mkpackage/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/xenomai/xenomai.mkpackage/xenomai/xenomai.mk +1
-1@@ -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-installdiff -r
565580d243a8-r625dd5f23fa4package/xfsprogs/xfsprogs.mkpackage/xfsprogs/xfsprogs.mk +1
-1@@ -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 -r
565580d243a8-r625dd5f23fa4package/xscreensaver/xscreensaver.mkpackage/xscreensaver/xscreensaver.mk +1
-1@@ -22,6 +22,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 -r
565580d243a8-r625dd5f23fa4package/xterm/xterm.mkpackage/xterm/xterm.mk +1
-1@@ -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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkg-generic: add check on deprecated variable FOO_INSTALL_TARGET_OPT
In reply to Thomas De SchampheleireThis patch introduces a check for the usage of deprecated variable FOO_INSTALL_TARGET_OPT, and suggests to use FOO_INSTALL_TARGET_OPTS instead.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-generic.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-generic.mk +1 -0
@@ -720,6 +720,7 @@ # 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)) TARGETS += $(1)
PATCH 1/1 packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
In reply to Thomas De SchampheleireTo be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_STAGING_OPT.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- 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/libelf/libelf.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 +- 61 files changed, 70 insertions(+), 70 deletions(-)
docs/manual/adding-packages-autotools.txt +1 -1
@@ -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
docs/manual/adding-packages-cmake.txt +1 -1
@@ -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.
docs/manual/adding-packages-python.txt +3 -3
@@ -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).
package/acl/acl.mk +1 -1
@@ -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 \
package/atk/atk.mk +1 -1
@@ -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 \
package/attr/attr.mk +1 -1
@@ -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 \
package/cups/cups.mk +1 -1
@@ -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 \
package/e2fsprogs/e2fsprogs.mk +1 -1
@@ -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) \
package/expat/expat.mk +1 -1
@@ -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
package/glibc/glibc.mk +1 -1
@@ -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)
package/libdnet/libdnet.mk +1 -1
@@ -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
package/libelf/libelf.mk +1 -1
@@ -7,7 +7,7 @@ LIBELF_VERSION = 0.8.12 LIBELF_SITE = http://www.mr511.de/software/ LIBELF_INSTALL_STAGING = YES -LIBELF_INSTALL_STAGING_OPT = instroot=$(STAGING_DIR) install +LIBELF_INSTALL_STAGING_OPTS = instroot=$(STAGING_DIR) install LIBELF_INSTALL_TARGET_OPTS = instroot=$(TARGET_DIR) install LIBELF_LICENSE = LGPLv2+ LIBELF_LICENSE_FILES = COPYING.LIB
package/libglib2/libglib2.mk +1 -1
@@ -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 \
package/libseccomp/libseccomp.mk +1 -1
@@ -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
package/lite/lite.mk +1 -1
@@ -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+
package/lvm2/lvm2.mk +1 -1
@@ -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
package/mxml/mxml.mk +1 -1
@@ -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))
package/netsnmp/netsnmp.mk +1 -1
@@ -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
package/php/php.mk +1 -1
@@ -7,7 +7,7 @@ PHP_VERSION = 5.5.15 PHP_SITE = http://www.php.net/distributions 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
package/pkg-autotools.mk +2 -2
@@ -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
@@ -305,7 +305,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" \
package/pkg-cmake.mk +2 -2
@@ -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
package/pkg-python.mk +6 -6
@@ -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
package/tslib/tslib.mk +1 -1
@@ -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))
package/util-linux/util-linux.mk +1 -1
@@ -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
package/webkit/webkit.mk +1 -1
@@ -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
package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +1 -1
@@ -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
package/x11r7/xfont_font-alias/xfont_font-alias.mk +1 -1
@@ -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
package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +1 -1
@@ -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
package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +1 -1
@@ -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
package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +1 -1
@@ -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
package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +1 -1
@@ -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
package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +1 -1
@@ -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
package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +1 -1
@@ -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
package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +1 -1
@@ -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
package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +1 -1
@@ -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
package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +1 -1
@@ -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
package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +1 -1
@@ -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
package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +1 -1
@@ -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
package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +1 -1
@@ -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
package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +1 -1
@@ -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
package/xenomai/xenomai.mk +1 -1
@@ -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
PATCH 1/1 packages: rename FOO_INSTALL_STAGING_OPT into FOO_INSTALL_STAGING_OPTS
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 4 lines
To be consistent with the recent change of
FOO_MAKE_OPTintoFOO_MAKE_OPTS, make the same change forFOO_INSTALL_STAGING_OPT.Signed-off-by Thomas De Schampheleire <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 861 lines
--- 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/libelf/libelf.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 +- 61 files changed, 70 insertions(+), 70 deletions(-)diff -r
25036d8ae80f-r15f42758f952docs/manual/adding-packages-autotools.txtdocs/manual/adding-packages-autotools.txt +1
-1@@ -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 overridediff -r
25036d8ae80f-r15f42758f952docs/manual/adding-packages-cmake.txtdocs/manual/adding-packages-cmake.txt +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952docs/manual/adding-packages-python.txtdocs/manual/adding-packages-python.txt +3
-3@@ -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 -r
25036d8ae80f-r15f42758f952package/acl/acl.mkpackage/acl/acl.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/atk/atk.mkpackage/atk/atk.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/attr/attr.mkpackage/attr/attr.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/cups/cups.mkpackage/cups/cups.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/e2fsprogs/e2fsprogs.mkpackage/e2fsprogs/e2fsprogs.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/expat/expat.mkpackage/expat/expat.mk +1
-1@@ -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 = MITdiff -r
25036d8ae80f-r15f42758f952package/glibc/glibc.mkpackage/glibc/glibc.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/libdnet/libdnet.mkpackage/libdnet/libdnet.mk +1
-1@@ -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 properlydiff -r
25036d8ae80f-r15f42758f952package/libelf/libelf.mkpackage/libelf/libelf.mk +1
-1@@ -7,7 +7,7 @@ LIBELF_VERSION = 0.8.12 LIBELF_SITE = http://www.mr511.de/software/ LIBELF_INSTALL_STAGING = YES -LIBELF_INSTALL_STAGING_OPT = instroot=$(STAGING_DIR) install +LIBELF_INSTALL_STAGING_OPTS = instroot=$(STAGING_DIR) install LIBELF_INSTALL_TARGET_OPTS = instroot=$(TARGET_DIR) install LIBELF_LICENSE = LGPLv2+ LIBELF_LICENSE_FILES = COPYING.LIBdiff -r
25036d8ae80f-r15f42758f952package/libglib2/libglib2.mkpackage/libglib2/libglib2.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/libseccomp/libseccomp.mkpackage/libseccomp/libseccomp.mk +1
-1@@ -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 nonethelessdiff -r
25036d8ae80f-r15f42758f952package/lite/lite.mkpackage/lite/lite.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/lvm2/lvm2.mkpackage/lvm2/lvm2.mk +1
-1@@ -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 endifdiff -r
25036d8ae80f-r15f42758f952package/mxml/mxml.mkpackage/mxml/mxml.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/netsnmp/netsnmp.mkpackage/netsnmp/netsnmp.mk +1
-1@@ -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-configdiff -r
25036d8ae80f-r15f42758f952package/php/php.mkpackage/php/php.mk +1
-1@@ -7,7 +7,7 @@ PHP_VERSION = 5.5.15 PHP_SITE = http://www.php.net/distributions 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 = PHPdiff -r
25036d8ae80f-r15f42758f952package/pkg-autotools.mkpackage/pkg-autotools.mk +2
-2@@ -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@@ -305,7 +305,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 -r
25036d8ae80f-r15f42758f952package/pkg-cmake.mkpackage/pkg-cmake.mk +2
-2@@ -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 endifdiff -r
25036d8ae80f-r15f42758f952package/pkg-python.mkpackage/pkg-python.mk +6
-6@@ -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 endifdiff -r
25036d8ae80f-r15f42758f952package/tslib/tslib.mkpackage/tslib/tslib.mk +1
-1@@ -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 -r
25036d8ae80f-r15f42758f952package/util-linux/util-linux.mkpackage/util-linux/util-linux.mk +1
-1@@ -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/mkinstalldirsdiff -r
25036d8ae80f-r15f42758f952package/webkit/webkit.mkpackage/webkit/webkit.mk +1
-1@@ -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 defaultdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mkpackage/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mkpackage/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mkpackage/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mkpackage/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mkpackage/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-alias/xfont_font-alias.mkpackage/x11r7/xfont_font-alias/xfont_font-alias.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mkpackage/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mkpackage/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mkpackage/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mkpackage/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mkpackage/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mkpackage/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mkpackage/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mkpackage/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mkpackage/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mkpackage/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mkpackage/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mkpackage/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mkpackage/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mkpackage/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mkpackage/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mkpackage/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mkpackage/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mkpackage/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mkpackage/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mkpackage/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mkpackage/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mkpackage/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mkpackage/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mkpackage/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mkpackage/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mkpackage/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mkpackage/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mkpackage/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mkpackage/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +1
-1@@ -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_bdftopcfdiff -r
25036d8ae80f-r15f42758f952package/xenomai/xenomai.mkpackage/xenomai/xenomai.mk +1
-1@@ -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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkg-generic: add check on deprecated variable FOO_INSTALL_STAGING_OPT
In reply to Thomas De SchampheleireThis patch introduces a check for the usage of deprecated variable FOO_INSTALL_STAGING_OPT, and suggests to use FOO_INSTALL_STAGING_OPTS instead.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-generic.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-generic.mk +1 -0
@@ -721,6 +721,7 @@ $(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)) TARGETS += $(1)
PATCH 1/1 packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
In reply to Thomas De SchampheleireTo be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_INSTALL_HOST_OPT.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-cmake.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
package/pkg-cmake.mk +2 -2
@@ -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
PATCH 1/1 packages: rename FOO_INSTALL_HOST_OPT into FOO_INSTALL_HOST_OPTS
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 4 lines
To be consistent with the recent change of
FOO_MAKE_OPTintoFOO_MAKE_OPTS, make the same change forFOO_INSTALL_HOST_OPT.Signed-off-by Thomas De Schampheleire <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Weird, I was expecting this one to be a bit bigger than that. But that's because the other package infras do not use the _INSTALL_HOST_OPT variables, but just _INSTALL_OPT.
I think for consistency, we should rename this variable from the cmake infra, so it is like the other package infras. But that can be a separate patch. Thoughts?
Regards,
Yann E. MORIN.
Quoted 25 lines
--- package/pkg-cmake.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)diff -r
26c25594f920-r9e1787054648package/pkg-cmake.mkpackage/pkg-cmake.mk +2
-2@@ -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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkg-generic: add check on deprecated variable FOO_INSTALL_HOST_OPT
In reply to Thomas De SchampheleireThis patch introduces a check for the usage of deprecated variable FOO_INSTALL_HOST_OPT, and suggests to use FOO_INSTALL_HOST_OPTS instead.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-generic.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-generic.mk +1 -0
@@ -722,6 +722,7 @@ $(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)) TARGETS += $(1)
PATCH 1/1 packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
In reply to Thomas De SchampheleireTo be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_AUTORECONF_OPT.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- 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(-)
docs/manual/adding-packages-autotools.txt +1 -1
@@ -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.
package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk +1 -1
@@ -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))
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1 -1
@@ -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 = \
package/pkg-autotools.mk +2 -2
@@ -100,7 +100,7 @@ endif ifeq ($(4),host) - $(2)_AUTORECONF_OPT ?= $$($(3)_AUTORECONF_OPT) + $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) endif $(2)_CONF_ENV ?=
@@ -224,7 +224,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 | \
package/webkit/webkit.mk +1 -1
@@ -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
PATCH 1/1 packages: rename FOO_AUTORECONF_OPT into FOO_AUTORECONF_OPTS
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 4 lines
To be consistent with the recent change of
FOO_MAKE_OPTintoFOO_MAKE_OPTS, make the same change forFOO_AUTORECONF_OPT.Signed-off-by Thomas De Schampheleire <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
However, I noticed some inconsistencies, unrelated to your patch. See below...
[--SNIP--]
package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk line 15
Quoted 9 lines
diff -r
f0daa0c9e40d-r7671d1a5bdb5package/gstreamer/gst-plugin-x170/gst-plugin-x170.mkpackage/gstreamer/gst-plugin-x170/gst-plugin-x170.mk +1
-1@@ -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/
Here, we use a relative include path...
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk line 16
Quoted 12 lines
package/gstreamer/gst-plugin-x170/gst-plugin-x170.mk +0
-0GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs $(eval $(autotools-package))diff -r
f0daa0c9e40d-r7671d1a5bdb5package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mkpackage/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1
-1@@ -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
... but here...
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk line 19
Quoted 3 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0
-0GST1_PLUGINS_BAD_GETTEXTIZE = YES GST1_PLUGINS_BAD_CONF_OPT = \
[--SNIP--]
package/webkit/webkit.mk line 20
Quoted 9 lines
diff -r
f0daa0c9e40d-r7671d1a5bdb5package/webkit/webkit.mkpackage/webkit/webkit.mk +1
-1@@ -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
... and here, we use an absolute path.
Can we make this consistent, i.e. always use a relative (or absolute) path for all packages?
What should be the rule?
Anyway, if we want to do something about it, this should be in a separate patch.
Regards,
Yann E. MORIN.
Quoted 2 lines
package/webkit/webkit.mk +0
-0# parallel make install deadlocks with make 3.81 WEBKIT_INSTALL_STAGING_OPTS = -j1 DESTDIR=$(STAGING_DIR) install
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkg-generic: add check on deprecated variable FOO_AUTORECONF_OPT
In reply to Thomas De SchampheleireThis patch introduces a check for the usage of deprecated variable FOO_AUTORECONF_OPT, and suggests to use FOO_AUTORECONF_OPTS instead.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-generic.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-generic.mk +1 -0
@@ -723,6 +723,7 @@ $(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)) TARGETS += $(1)
PATCH 1/1 packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
In reply to Thomas De SchampheleireTo be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- 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 | 18 +- package/bash/bash.mk | 4 +- package/bcusdk/bcusdk.mk | 2 +- package/beecrypt/beecrypt.mk | 4 +- package/bind/bind.mk | 22 +- package/binutils/binutils.mk | 4 +- package/blackbox/blackbox.mk | 2 +- 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 | 10 +- package/cegui06/cegui06.mk | 2 +- package/celt051/celt.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 | 2 +- package/dillo/dillo.mk | 16 +- package/directfb/directfb.mk | 50 +- 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 | 142 +- 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 | 12 +- package/gcc/gcc-initial/gcc-initial.mk | 4 +- package/gcc/gcc-intermediate/gcc-intermediate.mk | 4 +- package/gcc/gcc.mk | 52 +- package/gd/gd.mk | 16 +- package/gdb/gdb.mk | 4 +- 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 | 384 +++++----- 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/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 | 4 +- 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/libelf/libelf.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 | 12 +- package/libplayer/libplayer.mk | 12 +- package/libpng/libpng.mk | 2 +- package/libpthsem/libpthsem.mk | 4 +- package/libqmi/libqmi.mk | 2 +- package/libqrencode/libqrencode.mk | 4 +- 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/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 | 4 +- 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 | 50 +- 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 | 6 +- 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 | 4 +- 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 | 62 +- 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 +- 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/prboom/prboom.mk | 2 +- package/procps-ng/procps-ng.mk | 2 +- 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 | 2 +- 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 | 4 +- package/samba/samba.mk | 8 +- package/samba4/samba4.mk | 28 +- package/sane-backends/sane-backends.mk | 8 +- package/sconeserver/sconeserver.mk | 56 +- package/sdl/sdl.mk | 20 +- 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 | 32 +- 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 | 8 +- 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 | 2 +- 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 | 70 +- package/x11vnc/x11vnc.mk | 20 +- package/xbmc-pvr-addons/xbmc-pvr-addons.mk | 6 +- package/xbmc/xbmc.mk | 48 +- package/xenomai/xenomai.mk | 2 +- package/xerces/xerces.mk | 6 +- package/xfsprogs/xfsprogs.mk | 2 +- package/xmlstarlet/xmlstarlet.mk | 2 +- package/xscreensaver/xscreensaver.mk | 2 +- package/zeromq/zeromq.mk | 4 +- package/znc/znc.mk | 18 +- 483 files changed, 2733 insertions(+), 2733 deletions(-)
boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk +1 -1
@@ -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)
boot/grub/grub.mk +1 -1
@@ -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)
boot/grub2/grub2.mk +1 -1
@@ -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 \
boot/gummiboot/gummiboot.mk +1 -1
@@ -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 \
docs/manual/adding-packages-autotools.txt +2 -2
@@ -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+
docs/manual/adding-packages-cmake.txt +2 -2
@@ -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
docs/manual/adding-packages-perl.txt +1 -1
@@ -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.
docs/manual/writing-rules.txt +4 -4
@@ -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,) ---------------------
package/acl/acl.mk +1 -1
@@ -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
package/agentpp/agentpp.mk +1 -1
@@ -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 \
package/alsa-lib/alsa-lib.mk +15 -15
@@ -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)
package/alsa-utils/alsa-utils.mk +2 -2
@@ -16,12 +16,12 @@ ALSA_UTILS_CONF_ENV = \ ac_cv_prog_ncurses5_config=$(STAGING_DIR)/bin/ncurses5-config -ALSA_UTILS_CONF_OPT = \ +ALSA_UTILS_CONF_OPTS = \ --disable-xmlto \ --with-curses=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
package/apitrace/apitrace.mk +1 -1
@@ -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))
package/apr-util/apr-util.mk +1 -1
@@ -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
package/at/at.mk +1 -1
@@ -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 \
package/atftp/atftp.mk +5 -5
@@ -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))
package/atk/atk.mk +1 -1
@@ -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
package/attr/attr.mk +1 -1
@@ -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
package/audiofile/audiofile.mk +3 -3
@@ -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))
package/aumix/aumix.mk +1 -1
@@ -11,7 +11,7 @@ AUMIX_LICENSE = GPLv2+ AUMIX_LICENSE_FILES = COPYING -AUMIX_CONF_OPT = \ +AUMIX_CONF_OPTS = \ --without-gtk \ --without-gtk1 \ --without-alsa \
package/avahi/avahi.mk +9 -9
@@ -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,32 +91,32 @@ 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_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)
@@ -129,9 +129,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)
package/bash/bash.mk +2 -2
@@ -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
package/bcusdk/bcusdk.mk +1 -1
@@ -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
package/beecrypt/beecrypt.mk +2 -2
@@ -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.
package/bind/bind.mk +11 -11
@@ -20,48 +20,48 @@ 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_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
package/binutils/binutils.mk +2 -2
@@ -43,7 +43,7 @@ endif # 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 \
@@ -61,7 +61,7 @@ # "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) \
package/blackbox/blackbox.mk +1 -1
@@ -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
package/bluez_utils/bluez_utils.mk +8 -8
@@ -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
package/bmon/bmon.mk +2 -2
@@ -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))
package/bootutils/bootutils.mk +1 -1
@@ -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
package/bridge-utils/bridge-utils.mk +1 -1
@@ -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
package/bwm-ng/bwm-ng.mk +2 -2
@@ -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
package/cairo/cairo.mk +29 -29
133 lines not on this page · raw message
package/ccache/ccache.mk +1 -1
@@ -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
package/cdrkit/cdrkit.mk +5 -5
@@ -16,14 +16,14 @@ CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=0 endif -CDRKIT_CONF_OPT += $(CMAKE_ENDIAN_OPT) +CDRKIT_CONF_OPTS += $(CMAKE_ENDIAN_OPT) ## 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))
package/cegui06/cegui06.mk +1 -1
@@ -18,7 +18,7 @@ freetype \ pcre \ -CEGUI06_CONF_OPT = \ +CEGUI06_CONF_OPTS = \ --enable-expat \ --disable-external-tinyxml \ --disable-xerces-c \
package/celt051/celt.mk +1 -1
@@ -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 \
package/chrony/chrony.mk +5 -5
@@ -9,26 +9,26 @@ 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 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
package/cifs-utils/cifs-utils.mk +1 -1
@@ -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
package/civetweb/civetweb.mk +5 -5
@@ -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
package/clapack/clapack.mk +2 -2
@@ -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))
package/classpath/classpath.mk +12 -12
@@ -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))
package/cloog/cloog.mk +1 -1
@@ -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))
package/collectd/collectd.mk +6 -6
@@ -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
package/connman/connman.mk +3 -3
@@ -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))
package/coreutils/coreutils.mk +1 -1
@@ -60,7 +60,7 @@ utils_cv_localtime_cache=no \ PERL=missing -COREUTILS_CONF_OPT = --disable-rpath \ +COREUTILS_CONF_OPTS = --disable-rpath \ --disable-dependency-tracking \ --enable-install-program=hostname
package/cppcms/cppcms.mk +2 -2
@@ -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
package/cppdb/cppdb.mk +1 -1
@@ -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))
package/ctorrent/ctorrent.mk +2 -2
@@ -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))
package/cups/cups.mk +7 -7
@@ -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
package/cvs/cvs.mk +1 -1
@@ -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) -
package/cwiid/cwiid.mk +3 -3
@@ -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))
package/dbus-cpp/dbus-cpp.mk +6 -6
@@ -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))
package/dbus-glib/dbus-glib.mk +2 -2
@@ -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 \
package/dbus-python/dbus-python.mk +1 -1
@@ -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
package/dbus/dbus.mk +8 -8
@@ -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 \
package/dhcp/dhcp.mk +3 -3
@@ -10,7 +10,7 @@ DHCP_LICENSE = ISC DHCP_LICENSE_FILES = LICENSE DHCP_CONF_ENV = 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-cli-lease-file=/var/lib/dhcp/dhclient.leases \
@@ -19,11 +19,11 @@ --with-relay-pid-file=/var/run/dhcrelay.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)
package/dialog/dialog.mk +1 -1
@@ -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
package/dillo/dillo.mk +8 -8
@@ -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))
package/directfb/directfb.mk +25 -25
129 lines not on this page · raw message
package/distcc/distcc.mk +1 -1
@@ -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
package/dmalloc/dmalloc.mk +5 -5
@@ -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
package/dropbear/dropbear.mk +3 -3
@@ -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
package/e2fsprogs/e2fsprogs.mk +1 -1
@@ -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) \
package/ecryptfs-utils/ecryptfs-utils.mk +3 -3
@@ -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))
package/ed/ed.mk +1 -1
@@ -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
package/efl/libecore/libecore.mk +18 -18
@@ -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))
package/efl/libedbus/libedbus.mk +6 -6
@@ -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))
package/efl/libedje/libedje.mk +3 -3
@@ -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))
package/efl/libeet/libeet.mk +2 -2
@@ -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))
package/efl/libelementary/libelementary.mk +3 -3
@@ -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))
package/efl/libethumb/libethumb.mk +1 -1
@@ -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
package/efl/libevas-generic-loaders/libevas-generic-loaders.mk +3 -3
@@ -15,7 +15,7 @@ LIBEVAS_GENERIC_LOADERS_DEPENDENCIES = libeina # 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))
package/efl/libevas/libevas.mk +45 -45
220 lines not on this page · raw message
package/elf2flt/elf2flt.mk +1 -1
@@ -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 \
package/elfutils/elfutils.mk +9 -9
@@ -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))
package/enlightenment/enlightenment.mk +1 -1
@@ -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
package/enscript/enscript.mk +2 -2
@@ -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))
package/erlang/erlang.mk +8 -8
@@ -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
package/eudev/eudev.mk +4 -4
@@ -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
package/evemu/evemu.mk +3 -3
@@ -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
package/expect/expect.mk +1 -1
@@ -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
package/fbdump/fbdump.mk +2 -2
@@ -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))
package/fetchmail/fetchmail.mk +1 -1
@@ -15,7 +15,7 @@ FETCHMAIL_CONF_ENV += LIBS="-lz" -FETCHMAIL_CONF_OPT = \ +FETCHMAIL_CONF_OPTS = \ --with-ssl=$(STAGING_DIR)/usr FETCHMAIL_DEPENDENCIES = \
package/ffmpeg/ffmpeg.mk +71 -71
334 lines not on this page · raw message
package/flac/flac.mk +5 -5
@@ -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))
package/flann/flann.mk +1 -1
@@ -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 \
package/flickcurl/flickcurl.mk +1 -1
@@ -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),)
package/flite/flite.mk +2 -2
@@ -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))
package/fltk/fltk.mk +4 -4
@@ -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))
package/fluxbox/fluxbox.mk +3 -3
@@ -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
package/fontconfig/fontconfig.mk +2 -2
@@ -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))
package/foomatic-filters/foomatic-filters.mk +3 -3
@@ -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))
package/freerdp/freerdp.mk +14 -14
@@ -12,52 +12,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))
package/freetype/freetype.mk +7 -7
@@ -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
package/gamin/gamin.mk +2 -2
@@ -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
package/gcc/gcc-final/gcc-final.mk +6 -6
@@ -36,7 +36,7 @@ --prefix="$(HOST_DIR)/usr" \ --sysconfdir="$(HOST_DIR)/etc" \ --enable-shared --enable-static \ - $(QUIET) $(HOST_GCC_FINAL_CONF_OPT) \ + $(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \ ) endef
@@ -48,21 +48,21 @@ 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 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 = \
package/gcc/gcc-initial/gcc-initial.mk +2 -2
@@ -24,8 +24,8 @@ HOST_GCC_INITIAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK -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 \
package/gcc/gcc-intermediate/gcc-intermediate.mk +2 -2
@@ -26,8 +26,8 @@ HOST_GCC_INTERMEDIATE_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK -HOST_GCC_INTERMEDIATE_CONF_OPT = \ - $(HOST_GCC_COMMON_CONF_OPT) \ +HOST_GCC_INTERMEDIATE_CONF_OPTS = \ + $(HOST_GCC_COMMON_CONF_OPTS) \ --enable-languages=c \ --disable-largefile \ --disable-nls \
package/gcc/gcc.mk +26 -26
147 lines not on this page · raw message
package/gd/gd.mk +8 -8
@@ -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)
package/gdb/gdb.mk +2 -2
@@ -61,7 +61,7 @@ bash_cv_have_mbstate_t=yes \ gdb_cv_func_sigsetjmp=yes -GDB_CONF_OPT = \ +GDB_CONF_OPTS = \ --without-uiout \ --disable-tui \ --disable-gdbtk \
@@ -101,7 +101,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 \
package/gdk-pixbuf/gdk-pixbuf.mk +6 -6
@@ -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
package/gettext/gettext.mk +3 -3
@@ -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
package/giblib/giblib.mk +1 -1
@@ -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
package/git/git.mk +12 -12
@@ -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
Lines of this file are not shown. View the raw message.
package/glib-networking/glib-networking.mk +2 -2
Lines of this file are not shown. View the raw message.
package/google-breakpad/google-breakpad.mk +1 -1
Lines of this file are not shown. View the raw message.
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +1 -1
Lines of this file are not shown. View the raw message.
package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +2 -2
Lines of this file are not shown. View the raw message.
package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk +183 -183
366 lines not on this page · raw message
package/gstreamer/gst-plugins-base/gst-plugins-base.mk +49 -49
98 lines not on this page · raw message
package/gstreamer/gst-plugins-good/gst-plugins-good.mk +117 -117
234 lines not on this page · raw message
package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk +23 -23
46 lines not on this page · raw message
package/gstreamer/gstreamer/gstreamer.mk +1 -1
Lines of this file are not shown. View the raw message.
package/gstreamer1/gst1-libav/gst1-libav.mk +1 -1
Lines of this file are not shown. View the raw message.
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +192 -192
384 lines not on this page · raw message
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +51 -51
102 lines not on this page · raw message
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +123 -123
246 lines not on this page · raw message
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +21 -21
42 lines not on this page · raw message
package/gstreamer1/gstreamer1/gstreamer1.mk +1 -1
Lines of this file are not shown. View the raw message.
package/imagemagick/imagemagick.mk +21 -21
42 lines not on this page · raw message
package/liblog4c-localtime/liblog4c-localtime.mk +1 -1
Lines of this file are not shown. View the raw message.
package/libva-intel-driver/libva-intel-driver.mk +4 -4
Lines of this file are not shown. View the raw message.
package/matchbox/matchbox-common/matchbox-common.mk +1 -1
Lines of this file are not shown. View the raw message.
package/matchbox/matchbox-desktop/matchbox-desktop.mk +3 -3
Lines of this file are not shown. View the raw message.
package/matchbox/matchbox-fakekey/matchbox-fakekey.mk +1 -1
Lines of this file are not shown. View the raw message.
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +1 -1
Lines of this file are not shown. View the raw message.
package/matchbox/matchbox-lib/matchbox-lib.mk +9 -9
Lines of this file are not shown. View the raw message.
package/matchbox/matchbox-panel/matchbox-panel.mk +3 -3
Lines of this file are not shown. View the raw message.
package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk +1 -1
Lines of this file are not shown. View the raw message.
package/matchbox/matchbox-wm/matchbox-wm.mk +4 -4
Lines of this file are not shown. View the raw message.
package/mediastreamer/mediastreamer.mk +21 -21
42 lines not on this page · raw message
package/mpd/mpd.mk +25 -25
50 lines not on this page · raw message
package/network-manager/network-manager.mk +10 -10
Lines of this file are not shown. View the raw message.
package/ola/ola.mk +37 -37
74 lines not on this page · raw message
package/opencv/opencv.mk +36 -36
72 lines not on this page · raw message
package/openpowerlink/openpowerlink.mk +19 -19
Lines of this file are not shown. View the raw message.
package/perl-xml-libxml/perl-xml-libxml.mk +1 -1
Lines of this file are not shown. View the raw message.
package/perl-xml-parser/perl-xml-parser.mk +1 -1
Lines of this file are not shown. View the raw message.
package/php/php.mk +31 -31
62 lines not on this page · raw message
package/sconeserver/sconeserver.mk +28 -28
56 lines not on this page · raw message
package/shared-mime-info/shared-mime-info.mk +2 -2
Lines of this file are not shown. View the raw message.
package/startup-notification/startup-notification.mk +1 -1
Lines of this file are not shown. View the raw message.
package/vlc/vlc.mk +70 -70
140 lines not on this page · raw message
package/webrtc-audio-processing/webrtc-audio-processing.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +4 -4
Lines of this file are not shown. View the raw message.
package/x11r7/xapp_xrandr/xapp_xrandr.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xkeyboard-config/xkeyboard-config.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libX11/xlib_libX11.mk +2 -2
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXaw/xlib_libXaw.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXext/xlib_libXext.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXfont/xlib_libXfont.mk +2 -2
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXinerama/xlib_libXinerama.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXrandr/xlib_libXrandr.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXrender/xlib_libXrender.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXres/xlib_libXres.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXvMC/xlib_libXvMC.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xlib_libdmx/xlib_libdmx.mk +1 -1
Lines of this file are not shown. View the raw message.
package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk +2 -2
Lines of this file are not shown. View the raw message.
package/x11r7/xproto_xextproto/xproto_xextproto.mk +2 -2
Lines of this file are not shown. View the raw message.
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +35 -35
70 lines not on this page · raw message
package/xbmc-pvr-addons/xbmc-pvr-addons.mk +3 -3
Lines of this file are not shown. View the raw message.
package/xbmc/xbmc.mk +24 -24
48 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
PATCH 1/1 packages: rename FOO_CONF_OPT into FOO_CONF_OPTS
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 4 lines
To be consistent with the recent change of
FOO_MAKE_OPTintoFOO_MAKE_OPTS, make the same change forFOO_CONF_OPT.Signed-off-by Thomas De Schampheleire <[email protected]>
[--SNIP--]
I'm not reviewing that patch, it's too big.
However, if you can provide the way you did the change (sed regexp?) I can try to reproduce here and see if I get the same results.
I will do so when you respin this series to account for changes (new packages and changed packaged) since you posted this v1.
Regards,
Yann E. MORIN.
PS. Thomas, sorry for the dupe, I forgot the previous would be held in
custody due to it being over-size.
YEM.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkg-generic: add check on deprecated variable FOO_CONF_OPT
In reply to Thomas De SchampheleireThis patch introduces a check for the usage of deprecated variable FOO_CONF_OPT, and suggests to use FOO_CONF_OPTS instead.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-generic.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-generic.mk +1 -0
@@ -724,6 +724,7 @@ $(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)) TARGETS += $(1)
PATCH 1/1 packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS
In reply to Thomas De SchampheleireTo be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_BUILD_OPT.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- 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(-)
docs/manual/adding-packages-luarocks.txt +3 -3
@@ -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.
docs/manual/adding-packages-perl.txt +1 -1
@@ -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.
docs/manual/adding-packages-python.txt +2 -2
@@ -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+,
package/pkg-luarocks.mk +2 -2
@@ -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
package/pkg-perl.mk +4 -4
@@ -127,11 +127,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
@@ -139,9 +139,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
package/pkg-python.mk +7 -7
@@ -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
package/python-numpy/python-numpy.mk +1 -1
@@ -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
PATCH 1/1 packages: rename FOO_BUILD_OPT into FOO_BUILD_OPTS
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 4 lines
To be consistent with the recent change of
FOO_MAKE_OPTintoFOO_MAKE_OPTS, make the same change forFOO_BUILD_OPT.Signed-off-by Thomas De Schampheleire <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 182 lines
--- 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 -r
d98d25de70f2-r2ca4e88d3634docs/manual/adding-packages-luarocks.txtdocs/manual/adding-packages-luarocks.txt +3
-3@@ -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 -r
d98d25de70f2-r2ca4e88d3634docs/manual/adding-packages-perl.txtdocs/manual/adding-packages-perl.txt +1
-1@@ -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 -r
d98d25de70f2-r2ca4e88d3634docs/manual/adding-packages-python.txtdocs/manual/adding-packages-python.txt +2
-2@@ -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 -r
d98d25de70f2-r2ca4e88d3634package/pkg-luarocks.mkpackage/pkg-luarocks.mk +2
-2@@ -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 endifdiff -r
d98d25de70f2-r2ca4e88d3634package/pkg-perl.mkpackage/pkg-perl.mk +4
-4@@ -127,11 +127,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@@ -139,9 +139,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 endifdiff -r
d98d25de70f2-r2ca4e88d3634package/pkg-python.mkpackage/pkg-python.mk +7
-7@@ -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 endifdiff -r
d98d25de70f2-r2ca4e88d3634package/python-numpy/python-numpy.mkpackage/python-numpy/python-numpy.mk +1
-1@@ -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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkg-generic: add check on deprecated variable FOO_BUILD_OPT
In reply to Thomas De SchampheleireThis patch introduces a check for the usage of deprecated variable FOO_BUILD_OPT, and suggests to use FOO_BUILD_OPTS instead.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-generic.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-generic.mk +1 -0
@@ -725,6 +725,7 @@ $(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)) TARGETS += $(1)
PATCH 1/1 packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS
In reply to Thomas De SchampheleireTo be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_GETTEXTIZE_OPT.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- docs/manual/adding-packages-autotools.txt | 2 +- package/pkg-autotools.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
docs/manual/adding-packages-autotools.txt +1 -1
@@ -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
package/pkg-autotools.mk +2 -2
@@ -96,7 +96,7 @@ endif ifeq ($(4),host) - $(2)_GETTEXTIZE_OPT ?= $$($(3)_GETTEXTIZE_OPT) + $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS) endif ifeq ($(4),host)
@@ -216,7 +216,7 @@ # define GETTEXTIZE_HOOK @$$(call MESSAGE,"Gettextizing") - $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPT) + $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPTS) endef #
PATCH 1/1 packages: rename FOO_GETTEXTIZE_OPT into FOO_GETTEXTIZE_OPTS
Thomas, All,
On 2014-07-29 23:12 +0200, Thomas De Schampheleire spake thusly:
Quoted 4 lines
To be consistent with the recent change of
FOO_MAKE_OPTintoFOO_MAKE_OPTS, make the same change forFOO_GETTEXTIZE_OPT.Signed-off-by Thomas De Schampheleire <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>
Regards,
Yann E. MORIN.
Quoted 38 lines
--- docs/manual/adding-packages-autotools.txt | 2 +- package/pkg-autotools.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)diff -r
9d23ec1bdf4c-r3d344da68b41docs/manual/adding-packages-autotools.txtdocs/manual/adding-packages-autotools.txt +1
-1@@ -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.) Bydiff -r
9d23ec1bdf4c-r3d344da68b41package/pkg-autotools.mkpackage/pkg-autotools.mk +2
-2@@ -96,7 +96,7 @@ endif ifeq ($(4),host) - $(2)_GETTEXTIZE_OPT ?= $$($(3)_GETTEXTIZE_OPT) + $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS) endif ifeq ($(4),host)@@ -216,7 +216,7 @@ # define GETTEXTIZE_HOOK @$$(call MESSAGE,"Gettextizing") - $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPT) + $(Q)cd $$($$(PKG)_SRCDIR) && $$(GETTEXTIZE) $$($$(PKG)_GETTEXTIZE_OPTS) endef #
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 pkg-generic: add check on deprecated variable FOO_GETTEXTIZE_OPT
In reply to Thomas De SchampheleireThis patch introduces a check for the usage of deprecated variable FOO_GETTEXTIZE_OPT, and suggests to use FOO_GETTEXTIZE_OPTS instead.
Signed-off-by Thomas De Schampheleire <[email protected]>
--- package/pkg-generic.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
package/pkg-generic.mk +1 -0
@@ -726,6 +726,7 @@ $(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)) TARGETS += $(1)
PATCH 1/1 packages: rename misc. occurrences of _OPT into _OPTS
In reply to Thomas De SchampheleireTo 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 <[email protected]>
--- linux/linux-ext-xenomai.mk | 6 +- package/boost/boost.mk | 14 +++--- package/cdrkit/cdrkit.mk | 6 +- 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 ++++++++++---------- 7 files changed, 60 insertions(+), 60 deletions(-)
linux/linux-ext-xenomai.mk +3 -3
@@ -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
package/boost/boost.mk +7 -7
@@ -77,10 +77,10 @@ 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 -BOOST_OPT += toolset=gcc \ +BOOST_OPTS += toolset=gcc \ threading=multi \ variant=$(if $(BR2_ENABLE_DEBUG),debug,release) \ link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) \
@@ -89,7 +89,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)
@@ -114,7 +114,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
@@ -122,14 +122,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
@@ -137,7 +137,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
package/cdrkit/cdrkit.mk +3 -3
@@ -11,12 +11,12 @@ CDRKIT_LICENSE_FILES = COPYING ifeq ($(BR2_ENDIAN),"BIG") -CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1 +CMAKE_ENDIAN_OPTS=-DBITFIELDS_HTOL=1 else -CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=0 +CMAKE_ENDIAN_OPTS=-DBITFIELDS_HTOL=0 endif -CDRKIT_CONF_OPTS += $(CMAKE_ENDIAN_OPT) +CDRKIT_CONF_OPTS += $(CMAKE_ENDIAN_OPTS) ## cdrkit isn't completely re-rooted by CMAKE_FIND_ROOT_PATH, so add ## some extra flags so it finds needed libs and headers.
package/dhcpcd/dhcpcd.mk +4 -4
@@ -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
package/freetype/freetype.mk +1 -1
@@ -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
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +20 -20
@@ -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))
package/gstreamer1/gst1-libav/gst1-libav.mk +22 -22
96 lines not on this page · raw message