From f6b6cab22970b9bd4676d5a363c8b28bdb094bd5 Mon Sep 17 00:00:00 2001 From: Maximilian Downey Twiss Date: Tue, 10 Sep 2024 09:21:58 +1000 Subject: [PATCH] Rename autotools constants to fall in line with the rest of crew (#10442) * Rename CREW_OPTIONS to CREW_CONFIGURE_OPTIONS * Rename build_extras and install_extras to configure_build_extras and configure_install_extras --- Manual.md | 4 ++-- lib/buildsystems/autotools.rb | 4 ++-- lib/const.rb | 2 +- packages/aalib.rb | 2 +- packages/acpi.rb | 2 +- packages/aircrack_ng.rb | 2 +- packages/alpine.rb | 2 +- packages/alsa_lib.rb | 2 +- packages/anagram.rb | 2 +- packages/aria2.rb | 2 +- packages/aribb25.rb | 2 +- packages/asciidoc.rb | 2 +- packages/autoconf213.rb | 2 +- packages/autoconf_archive.rb | 2 +- packages/automake.rb | 2 +- packages/autossh.rb | 2 +- packages/bash.rb | 2 +- packages/bdftopcf.rb | 2 +- packages/binutils.rb | 2 +- packages/bitmap.rb | 2 +- packages/bluefish.rb | 2 +- packages/bmon.rb | 2 +- packages/bridge_utils.rb | 2 +- packages/bubblewrap.rb | 2 +- packages/cadaver.rb | 2 +- packages/catatonit.rb | 2 +- packages/cdparanoia.rb | 2 +- packages/cfitsio.rb | 2 +- packages/chrpath.rb | 2 +- packages/consolekit.rb | 2 +- packages/coreutils.rb | 2 +- packages/cras.rb | 4 ++-- packages/crun.rb | 2 +- packages/cunit.rb | 2 +- packages/cups.rb | 2 +- packages/dash.rb | 2 +- packages/datamash.rb | 2 +- packages/dbus_glib.rb | 2 +- packages/ddrescue.rb | 2 +- packages/desktop_file_utils.rb | 2 +- packages/diffutils.rb | 2 +- packages/djvulibre.rb | 2 +- packages/docbook2x.rb | 2 +- packages/dosbox.rb | 2 +- packages/dosbox_x.rb | 2 +- packages/dosfstools.rb | 2 +- packages/e2fsprogs.rb | 2 +- packages/editres.rb | 2 +- packages/enchant.rb | 2 +- packages/encodings.rb | 2 +- packages/enet.rb | 2 +- packages/ethtool.rb | 2 +- packages/exfatprogs.rb | 2 +- packages/exo.rb | 2 +- packages/faac.rb | 2 +- packages/ffmpeg.rb | 2 +- packages/filecmd.rb | 4 ++-- packages/filezilla.rb | 2 +- packages/fossil.rb | 2 +- packages/freetds.rb | 2 +- packages/fswatch.rb | 2 +- packages/fuse2.rb | 2 +- packages/fuse_overlayfs.rb | 2 +- packages/garcon.rb | 2 +- packages/gawk.rb | 2 +- packages/gcc10.rb | 2 +- packages/gcc_build.rb | 2 +- packages/gccmakedep.rb | 2 +- packages/gdb.rb | 2 +- packages/gdbm.rb | 2 +- packages/ghostscript.rb | 2 +- packages/glibc_build223.rb | 2 +- packages/glibc_build227.rb | 4 ++-- packages/glpk.rb | 2 +- packages/gnu_time.rb | 2 +- packages/gnuchess.rb | 2 +- packages/gparted.rb | 2 +- packages/gpm.rb | 2 +- packages/graphicsmagick.rb | 2 +- packages/grep.rb | 2 +- packages/gtk2.rb | 2 +- packages/gtksharp2.rb | 2 +- packages/gutenprint.rb | 2 +- packages/handbrake.rb | 2 +- packages/haveged.rb | 2 +- packages/hello.rb | 2 +- packages/help2man.rb | 2 +- packages/homebank.rb | 2 +- packages/hplip.rb | 2 +- packages/htop.rb | 2 +- packages/httrack.rb | 2 +- packages/hwdata.rb | 2 +- packages/hwloc.rb | 2 +- packages/icoutils.rb | 2 +- packages/icu4c.rb | 2 +- packages/intltool.rb | 2 +- packages/iproute2.rb | 2 +- packages/iptables.rb | 2 +- packages/jack1.rb | 2 +- packages/jansson.rb | 2 +- packages/jbigkit.rb | 2 +- packages/jpegoptim.rb | 2 +- packages/krb5.rb | 2 +- packages/l_smash.rb | 2 +- packages/lcms.rb | 2 +- packages/ldb.rb | 2 +- packages/lftp.rb | 2 +- packages/lha.rb | 2 +- packages/liba52.rb | 2 +- packages/libappindicator_gtk3.rb | 2 +- packages/libassuan.rb | 2 +- packages/libatasmart.rb | 2 +- packages/libavc1394.rb | 2 +- packages/libblockdev.rb | 2 +- packages/libbluray.rb | 2 +- packages/libbytesize.rb | 2 +- packages/libcaca.rb | 2 +- packages/libcacard.rb | 2 +- packages/libcanberra.rb | 2 +- packages/libcddb.rb | 2 +- packages/libcdio.rb | 2 +- packages/libcdio_paranoia.rb | 2 +- packages/libdaemon.rb | 2 +- packages/libdb.rb | 2 +- packages/libdc1394.rb | 2 +- packages/libdca.rb | 2 +- packages/libdmraid.rb | 2 +- packages/libdnet.rb | 2 +- packages/libdsm.rb | 2 +- packages/libdv.rb | 2 +- packages/libdvbpsi.rb | 2 +- packages/libdvdcss.rb | 2 +- packages/libdvdnav.rb | 2 +- packages/libdvdread.rb | 2 +- packages/libedit.rb | 2 +- packages/libev.rb | 2 +- packages/libexif.rb | 2 +- packages/libfdk_aac.rb | 2 +- packages/libffi.rb | 2 +- packages/libfontenc.rb | 2 +- packages/libfs.rb | 2 +- packages/libgc.rb | 2 +- packages/libgdiplus.rb | 2 +- packages/libgphoto.rb | 2 +- packages/libice.rb | 2 +- packages/libiconv.rb | 2 +- packages/libiec61883.rb | 2 +- packages/libimagequant.rb | 2 +- packages/libimobiledevice.rb | 2 +- packages/libindicator_gtk3.rb | 2 +- packages/libkmod.rb | 2 +- packages/libksba.rb | 2 +- packages/libmad.rb | 2 +- packages/libmbim.rb | 2 +- packages/libmediainfo.rb | 2 +- packages/libmms.rb | 2 +- packages/libmnl.rb | 2 +- packages/libmodplug.rb | 2 +- packages/libmpc.rb | 2 +- packages/libmpeg2.rb | 2 +- packages/libmrss.rb | 2 +- packages/libmtp.rb | 2 +- packages/libmypaint.rb | 2 +- packages/libnewt.rb | 2 +- packages/libnfs.rb | 2 +- packages/libnxml.rb | 2 +- packages/libostree.rb | 2 +- packages/libotf.rb | 2 +- packages/libpciaccess.rb | 2 +- packages/libpipeline.rb | 2 +- packages/libplist.rb | 2 +- packages/libqmi.rb | 2 +- packages/libraw.rb | 2 +- packages/librevenge.rb | 2 +- packages/libsdl.rb | 2 +- packages/libseccomp.rb | 2 +- packages/libshine.rb | 2 +- packages/libspectre.rb | 2 +- packages/libssp.rb | 2 +- packages/libtiff.rb | 2 +- packages/libtinfo.rb | 8 ++++---- packages/libtool.rb | 2 +- packages/libusb.rb | 2 +- packages/libusbmuxd.rb | 2 +- packages/libvips.rb | 2 +- packages/libvorbis.rb | 2 +- packages/libvpx.rb | 2 +- packages/libwpd.rb | 2 +- packages/libwpg.rb | 2 +- packages/libx264.rb | 2 +- packages/libxau.rb | 2 +- packages/libxcb.rb | 2 +- packages/libxcomposite.rb | 2 +- packages/libxcrypt.rb | 2 +- packages/libxcursor.rb | 2 +- packages/libxdamage.rb | 2 +- packages/libxfce4ui.rb | 2 +- packages/libxfce4util.rb | 2 +- packages/libxfixes.rb | 2 +- packages/libxfont2.rb | 2 +- packages/libxft.rb | 2 +- packages/libxi.rb | 2 +- packages/libxinerama.rb | 2 +- packages/libxkbfile.rb | 2 +- packages/libxmu.rb | 2 +- packages/libxp.rb | 2 +- packages/libxpresent.rb | 2 +- packages/libxrandr.rb | 2 +- packages/libxrender.rb | 2 +- packages/libxshmfence.rb | 2 +- packages/libxss.rb | 2 +- packages/libxt.rb | 2 +- packages/libxtst.rb | 2 +- packages/libxv.rb | 2 +- packages/libxxf86dga.rb | 2 +- packages/libxxf86vm.rb | 2 +- packages/libyaml.rb | 2 +- packages/linux_pam.rb | 2 +- packages/log4c.rb | 2 +- packages/log4cplus.rb | 2 +- packages/ltrace.rb | 2 +- packages/luit.rb | 2 +- packages/lxappearance.rb | 2 +- packages/lzlib.rb | 2 +- packages/m4.rb | 2 +- packages/macchanger.rb | 2 +- packages/mailutils.rb | 2 +- packages/make.rb | 2 +- packages/makedepend.rb | 2 +- packages/man_db.rb | 2 +- packages/mawk.rb | 2 +- packages/mediainfo.rb | 2 +- packages/mediainfo_gui.rb | 2 +- packages/minizip.rb | 2 +- packages/miscfiles.rb | 2 +- packages/mjpegtools.rb | 2 +- packages/mkfontscale.rb | 2 +- packages/modemmanager.rb | 2 +- packages/mono.rb | 2 +- packages/most.rb | 2 +- packages/motif.rb | 2 +- packages/mp4v2.rb | 2 +- packages/mpc.rb | 2 +- packages/mpdecimal.rb | 2 +- packages/mpfr.rb | 2 +- packages/mypaint_brushes.rb | 2 +- packages/mypaint_brushes_1.rb | 2 +- packages/nano.rb | 2 +- packages/nasm.rb | 2 +- packages/ndctl.rb | 2 +- packages/ndisc6.rb | 2 +- packages/neo_matrix.rb | 2 +- packages/neon.rb | 2 +- packages/nitrogen.rb | 2 +- packages/nmap.rb | 2 +- packages/npth.rb | 2 +- packages/oniguruma.rb | 2 +- packages/opam.rb | 2 +- packages/openbox.rb | 2 +- packages/openconnect.rb | 2 +- packages/pavucontrol.rb | 2 +- packages/pcaudiolib.rb | 2 +- packages/pcre.rb | 2 +- packages/pcsc_lite.rb | 2 +- packages/pdfchain.rb | 2 +- packages/perl_stow.rb | 2 +- packages/pixz.rb | 2 +- packages/pkg_config.rb | 4 ++-- packages/popt.rb | 2 +- packages/postgresql.rb | 2 +- packages/potrace.rb | 2 +- packages/printproto.rb | 2 +- packages/procps.rb | 2 +- packages/proj.rb | 2 +- packages/protobuf_c.rb | 2 +- packages/psmisc.rb | 2 +- packages/py3_libxml2.rb | 2 +- packages/pyconfigure.rb | 2 +- packages/python3.rb | 2 +- packages/qemu.rb | 2 +- packages/qqwing.rb | 2 +- packages/rdfind.rb | 2 +- packages/readline.rb | 2 +- packages/rendercheck.rb | 2 +- packages/ruby.rb | 2 +- packages/rush.rb | 2 +- packages/rxvt_unicode.rb | 2 +- packages/sane_backends.rb | 2 +- packages/sane_frontends.rb | 2 +- packages/sassc.rb | 2 +- packages/scrot.rb | 2 +- packages/shadow.rb | 2 +- packages/slang.rb | 2 +- packages/smallbasic.rb | 2 +- packages/smartmontools.rb | 2 +- packages/smbclient.rb | 2 +- packages/snort.rb | 2 +- packages/spacefm.rb | 2 +- packages/squashfs_tools_ng.rb | 2 +- packages/squashfuse.rb | 2 +- packages/startup_notification.rb | 2 +- packages/t1lib.rb | 2 +- packages/talloc.rb | 2 +- packages/tcl.rb | 2 +- packages/tcpflow.rb | 2 +- packages/tcsh.rb | 2 +- packages/tdb.rb | 2 +- packages/telepathy_glib.rb | 2 +- packages/testdisk.rb | 2 +- packages/tevent.rb | 2 +- packages/thunar.rb | 2 +- packages/ticker.rb | 2 +- packages/tk.rb | 2 +- packages/trousers.rb | 2 +- packages/twm.rb | 2 +- packages/ucl.rb | 2 +- packages/udisks2.rb | 2 +- packages/unixodbc.rb | 2 +- packages/usbredir.rb | 2 +- packages/usbutils.rb | 2 +- packages/vala.rb | 2 +- packages/volume_key.rb | 2 +- packages/w3m.rb | 2 +- packages/webrtc_audio_processing.rb | 2 +- packages/which.rb | 2 +- packages/wine.rb | 2 +- packages/wmctrl.rb | 2 +- packages/wol.rb | 2 +- packages/wput.rb | 2 +- packages/wxwidgets.rb | 2 +- packages/wxwidgets30.rb | 2 +- packages/wxwidgets31.rb | 2 +- packages/xauth.rb | 2 +- packages/xcb_util_cursor.rb | 2 +- packages/xcb_util_xrm.rb | 2 +- packages/xclock.rb | 2 +- packages/xdg_dbus_proxy.rb | 2 +- packages/xdpyinfo.rb | 2 +- packages/xfce4_dev_tools.rb | 2 +- packages/xfce4_panel.rb | 2 +- packages/xfce4_terminal.rb | 2 +- packages/xfconf.rb | 2 +- packages/xfsprogs.rb | 2 +- packages/xhost.rb | 2 +- packages/xinit.rb | 2 +- packages/xkbcomp.rb | 2 +- packages/xmessage.rb | 2 +- packages/xmlcatmgr.rb | 2 +- packages/xorg_cf_files.rb | 2 +- packages/xorg_xeyes.rb | 2 +- packages/xorg_xlsfonts.rb | 2 +- packages/xorg_xset.rb | 2 +- packages/xprop.rb | 2 +- packages/xrdb.rb | 2 +- packages/xterm.rb | 2 +- packages/yara.rb | 2 +- packages/yasm.rb | 2 +- packages/zimg.rb | 2 +- packages/zsh.rb | 2 +- packages/zsync.rb | 2 +- packages/zzuf.rb | 2 +- 361 files changed, 370 insertions(+), 370 deletions(-) diff --git a/Manual.md b/Manual.md index 3e0be73bf..56fbae97c 100644 --- a/Manual.md +++ b/Manual.md @@ -55,7 +55,7 @@ Preset constants are shown below: - `#{CREW_LIB_PREFIX}` - The `LIB` prefix used by `crew` - Equal to `#{CREW_PREFIX}/lib` - `#{CREW_PREFIX}/lib64` on `amd64` - `#{CREW_DEST_DIR}` - The`DESTDIR` variable used by `crew` - Equal to `#{CREW_PREFIX}/tmp/crew/dest` - `#{CREW_DEST_PREFIX}` - The`DESTDIR` variable prefix used by `crew` - Equal to `#{CREW_DEST_DIR}/usr/local` -- `#{CREW_OPTIONS}` - The preset options for `./congifure` - [Equals](#eq) +- `#{CREW_CONFIGURE_OPTIONS}` - The preset options for `./congifure` - [Equals](#eq) - `#{CREW_MAN_PREFIX}` - Useful for building man pages - Equal to `#{CREW_PREFIX}/share/man` - `#{CREW_DEST_LIB_PREFIX}` - The `DESTDIR` `LIB` prefix - Equal to `#{CREW_DEST_PREFIX}/lib` - `#{CREW_DEST_PREFIX}/lib64` on `amd64` - `#{CREW_DEST_HOME}` - The `DESTDIR` home variable - Equal to `#{CREW_DEST}/#{HOME}` @@ -147,7 +147,7 @@ end NOTE: All rules can have exceptions, if ***REQUIRED***, exceptions to the rules should be avoided at all costs. -`CREW_OPTIONS`: Equal to `--prefix=/usr/local --libdir=/usr/local/lib --mandir=/usr/local/share/man --disable-dependency-tracking --build=armv7l-cros-linux-gnueabihf --host=armv7l-cros-linux-gnueabihf --target=armv7l-cros-linux-gnueabihf --program-prefix='' --program-suffix=''` +`CREW_CONFIGURE_OPTIONS`: Equal to `--prefix=/usr/local --libdir=/usr/local/lib --mandir=/usr/local/share/man --disable-dependency-tracking --program-prefix='' --program-suffix=''` Any additionally required resources for ChromeOS or ChromeBooks can be found [here](https://github.com/chromebrew/chromebrew/wiki/Links) diff --git a/lib/buildsystems/autotools.rb b/lib/buildsystems/autotools.rb index e4e770c75..7d933bbf9 100644 --- a/lib/buildsystems/autotools.rb +++ b/lib/buildsystems/autotools.rb @@ -2,7 +2,7 @@ require 'fileutils' require 'package' class Autotools < Package - property :configure_options, :pre_configure_options, :build_extras, :install_extras + property :configure_options, :pre_configure_options, :configure_build_extras, :configure_install_extras def self.build unless File.file?('Makefile') && CREW_CACHE_BUILD @@ -24,7 +24,7 @@ class Autotools < Package system 'filefix' end @mold_linker_prefix_cmd = CREW_LINKER == 'mold' ? 'mold -run ' : '' - system "#{@pre_configure_options} #{@mold_linker_prefix_cmd}./configure #{CREW_OPTIONS} #{@configure_options}" + system "#{@pre_configure_options} #{@mold_linker_prefix_cmd}./configure #{CREW_CONFIGURE_OPTIONS} #{@configure_options}" end system 'make' @build_extras&.call diff --git a/lib/const.rb b/lib/const.rb index 2b6a36190..584ab9a4f 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -238,7 +238,7 @@ CREW_ENV_FNO_LTO_OPTIONS_HASH ||= { # parse from hash to shell readable string CREW_ENV_FNO_LTO_OPTIONS ||= CREW_ENV_FNO_LTO_OPTIONS_HASH.map { |k, v| "#{k}=\"#{v}\"" }.join(' ') -CREW_OPTIONS ||= <<~OPT.chomp +CREW_CONFIGURE_OPTIONS ||= <<~OPT.chomp --prefix=#{CREW_PREFIX} \ --libdir=#{CREW_LIB_PREFIX} \ --mandir=#{CREW_MAN_PREFIX} \ diff --git a/packages/aalib.rb b/packages/aalib.rb index 4e912bccf..e09eaf26d 100644 --- a/packages/aalib.rb +++ b/packages/aalib.rb @@ -34,7 +34,7 @@ class Aalib < Package def self.build system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-x \ --with-x11-driver \ --with-slang-driver" diff --git a/packages/acpi.rb b/packages/acpi.rb index cf929eb84..dde651a81 100644 --- a/packages/acpi.rb +++ b/packages/acpi.rb @@ -18,7 +18,7 @@ class Acpi < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/aircrack_ng.rb b/packages/aircrack_ng.rb index 524f94d84..46cee6b0f 100644 --- a/packages/aircrack_ng.rb +++ b/packages/aircrack_ng.rb @@ -31,7 +31,7 @@ class Aircrack_ng < Package system "env CFLAGS='-flto=auto' CXXFLAGS='-flto=auto' \ LDFLAGS='-flto=auto' \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --program-prefix='' --program-suffix='' \ --with-lto \ --with-experimental=yes \ diff --git a/packages/alpine.rb b/packages/alpine.rb index c490a6d24..fade0532e 100644 --- a/packages/alpine.rb +++ b/packages/alpine.rb @@ -29,7 +29,7 @@ class Alpine < Package def self.build system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --with-ssl-dir=#{CREW_PREFIX}/etc/ssl \ --with-ssl-include-dir=#{CREW_PREFIX}/include \ --with-ssl-lib-dir=#{CREW_LIB_PREFIX} \ diff --git a/packages/alsa_lib.rb b/packages/alsa_lib.rb index 49b192411..7910bae22 100644 --- a/packages/alsa_lib.rb +++ b/packages/alsa_lib.rb @@ -23,7 +23,7 @@ class Alsa_lib < Autotools def self.build @py_ver = `python -c "import sys; version = '.'.join(map(str, sys.version_info[:2])) ; print(version)"`.chomp system 'autoreconf -fiv' - system "mold -run ./configure #{CREW_OPTIONS} \ + system "mold -run ./configure #{CREW_CONFIGURE_OPTIONS} \ --without-debug \ --disable-maintainer-mode \ --with-pythonlibs=-lpython#{@py_ver} \ diff --git a/packages/anagram.rb b/packages/anagram.rb index e62d8701b..97f9b490b 100644 --- a/packages/anagram.rb +++ b/packages/anagram.rb @@ -21,7 +21,7 @@ class Anagram < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' @_anagram_wrapper = <<~ANAGRAM_WRAPPER_EOF diff --git a/packages/aria2.rb b/packages/aria2.rb index a20e99284..4d0cb0988 100644 --- a/packages/aria2.rb +++ b/packages/aria2.rb @@ -24,7 +24,7 @@ class Aria2 < Package def self.build system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-libnettle \ --with-libgcrypt \ --without-libssh2 \ diff --git a/packages/aribb25.rb b/packages/aribb25.rb index cc351be8d..b5e507945 100644 --- a/packages/aribb25.rb +++ b/packages/aribb25.rb @@ -20,7 +20,7 @@ class Aribb25 < Package def self.build system 'autoreconf -fiv' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/asciidoc.rb b/packages/asciidoc.rb index f6ac92b01..7722a8f31 100644 --- a/packages/asciidoc.rb +++ b/packages/asciidoc.rb @@ -26,7 +26,7 @@ class Asciidoc < Package end def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/autoconf213.rb b/packages/autoconf213.rb index f8321e32e..98753f59e 100644 --- a/packages/autoconf213.rb +++ b/packages/autoconf213.rb @@ -21,7 +21,7 @@ class Autoconf213 < Package def self.build system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --infodir=#{CREW_PREFIX}/share/info \ --program-suffix=-2.13 \ --datadir=#{CREW_PREFIX}/share/autoconf213" diff --git a/packages/autoconf_archive.rb b/packages/autoconf_archive.rb index bdad9f7aa..9b525a45c 100644 --- a/packages/autoconf_archive.rb +++ b/packages/autoconf_archive.rb @@ -18,7 +18,7 @@ class Autoconf_archive < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/automake.rb b/packages/automake.rb index 085ef87fd..5081c821f 100644 --- a/packages/automake.rb +++ b/packages/automake.rb @@ -20,7 +20,7 @@ class Automake < Package depends_on 'autoconf' def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/autossh.rb b/packages/autossh.rb index 88744c530..6ef0d8569 100644 --- a/packages/autossh.rb +++ b/packages/autossh.rb @@ -20,7 +20,7 @@ class Autossh < Package depends_on 'openssh' def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-ssh=$(which ssh)" system 'make' end diff --git a/packages/bash.rb b/packages/bash.rb index 7669c3dc4..cb879c33f 100644 --- a/packages/bash.rb +++ b/packages/bash.rb @@ -29,7 +29,7 @@ class Bash < Autotools --without-bash-malloc \ --with-installed-readline' - install_extras do + configure_install_extras do FileUtils.ln_s "#{CREW_PREFIX}/bin/bash", "#{CREW_DEST_PREFIX}/bin/sh" end end diff --git a/packages/bdftopcf.rb b/packages/bdftopcf.rb index 2df6fdce2..6d83b8a1c 100644 --- a/packages/bdftopcf.rb +++ b/packages/bdftopcf.rb @@ -19,7 +19,7 @@ class Bdftopcf < Package depends_on 'libxfont' def self.build - system "./configure #{CREW_OPTIONS} " + system "./configure #{CREW_CONFIGURE_OPTIONS} " system "make -j#{CREW_NPROC}" end diff --git a/packages/binutils.rb b/packages/binutils.rb index f31e91bb5..f912f3e2a 100644 --- a/packages/binutils.rb +++ b/packages/binutils.rb @@ -44,7 +44,7 @@ class Binutils < Package # https://sourceware.org/bugzilla/show_bug.cgi?id=30006 Dir.mkdir 'build' Dir.chdir 'build' do - system "../configure #{CREW_OPTIONS} \ + system "../configure #{CREW_CONFIGURE_OPTIONS} \ --disable-bootstrap \ --disable-gdb \ --disable-gdbserver \ diff --git a/packages/bitmap.rb b/packages/bitmap.rb index 9799265ef..61c0a7a84 100644 --- a/packages/bitmap.rb +++ b/packages/bitmap.rb @@ -18,7 +18,7 @@ class Bitmap < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/bluefish.rb b/packages/bluefish.rb index 353ef6784..bb7cbe483 100644 --- a/packages/bluefish.rb +++ b/packages/bluefish.rb @@ -33,7 +33,7 @@ class Bluefish < Package def self.build system 'filefix' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' @bluefish = <<~EOF alias bluefish="WAYLAND_DISPLAY=wayland-0 DISPLAY='' GDK_BACKEND=wayland #{CREW_PREFIX}/bin/bluefish" diff --git a/packages/bmon.rb b/packages/bmon.rb index fa8bf6ce9..279f3b72d 100644 --- a/packages/bmon.rb +++ b/packages/bmon.rb @@ -13,7 +13,7 @@ class Bmon < Package def self.build system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --without-ncurses \ --with-ncursesw" system 'make' diff --git a/packages/bridge_utils.rb b/packages/bridge_utils.rb index 40040e5c6..179021de2 100644 --- a/packages/bridge_utils.rb +++ b/packages/bridge_utils.rb @@ -26,7 +26,7 @@ class Bridge_utils < Package def self.build system 'autoreconf -fvi' system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --sbindir=#{CREW_PREFIX}/bin \ --sysconfdir=#{CREW_PREFIX}/etc" system 'make' diff --git a/packages/bubblewrap.rb b/packages/bubblewrap.rb index dd5cfda47..74157ecda 100644 --- a/packages/bubblewrap.rb +++ b/packages/bubblewrap.rb @@ -28,7 +28,7 @@ class Bubblewrap < Package def self.build system './configure --help' system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode \ --with-priv-mode=setuid \ --enable-sudo" diff --git a/packages/cadaver.rb b/packages/cadaver.rb index 058043de1..6c90741d2 100644 --- a/packages/cadaver.rb +++ b/packages/cadaver.rb @@ -19,7 +19,7 @@ class Cadaver < Package depends_on 'neon' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/catatonit.rb b/packages/catatonit.rb index dbdd8a165..0a12ac372 100644 --- a/packages/catatonit.rb +++ b/packages/catatonit.rb @@ -31,7 +31,7 @@ class Catatonit < Package def self.build system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make V=1' end diff --git a/packages/cdparanoia.rb b/packages/cdparanoia.rb index fde9b0679..738cbbd1d 100644 --- a/packages/cdparanoia.rb +++ b/packages/cdparanoia.rb @@ -31,7 +31,7 @@ class Cdparanoia < Package end def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make -j1' end diff --git a/packages/cfitsio.rb b/packages/cfitsio.rb index 8175a88bc..9ac064722 100644 --- a/packages/cfitsio.rb +++ b/packages/cfitsio.rb @@ -26,7 +26,7 @@ class Cfitsio < Autotools system "CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS} --enable-reentrant" + ./configure #{CREW_CONFIGURE_OPTIONS} --enable-reentrant" system 'make shared' system 'make utils' end diff --git a/packages/chrpath.rb b/packages/chrpath.rb index 1c242cefc..9d62c478e 100644 --- a/packages/chrpath.rb +++ b/packages/chrpath.rb @@ -18,7 +18,7 @@ class Chrpath < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/consolekit.rb b/packages/consolekit.rb index 3ee71e342..0157f56ff 100644 --- a/packages/consolekit.rb +++ b/packages/consolekit.rb @@ -26,7 +26,7 @@ class Consolekit < Package def self.build system "env #{CREW_ENV_OPTIONS} \ ./autogen.sh \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --sysconfdir=#{CREW_PREFIX}/etc \ --sbindir=#{CREW_PREFIX}/usr/bin \ --with-rundir=/run \ diff --git a/packages/coreutils.rb b/packages/coreutils.rb index b34310470..9a3b0b3a0 100644 --- a/packages/coreutils.rb +++ b/packages/coreutils.rb @@ -36,7 +36,7 @@ class Coreutils < Autotools def self.build year2038 = ARCH == 'x86_64' ? '' : ' --disable-year2038' - options = CREW_OPTIONS + year2038 + options = CREW_CONFIGURE_OPTIONS + year2038 system "./configure #{options}" system 'make' arch = <<~EOF diff --git a/packages/cras.rb b/packages/cras.rb index 42faff4dc..21fa5e94f 100644 --- a/packages/cras.rb +++ b/packages/cras.rb @@ -55,7 +55,7 @@ ctl.!default { _EOF_' system './git_prepare.sh' if ARCH == 'i686' - system "CFLAGS='-fuse-ld=lld -msse2' ./configure #{CREW_OPTIONS} \ + system "CFLAGS='-fuse-ld=lld -msse2' ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-alsa-plugin \ --disable-webrtc-apm \ --enable-sse42 \ @@ -63,7 +63,7 @@ _EOF_' --enable-avx2 --enable-fma" else - system "CFLAGS='-fuse-ld=lld' ./configure #{CREW_OPTIONS} \ + system "CFLAGS='-fuse-ld=lld' ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-alsa-plugin \ --disable-webrtc-apm \ --enable-sse42 \ diff --git a/packages/crun.rb b/packages/crun.rb index ed53ba202..14eac9428 100644 --- a/packages/crun.rb +++ b/packages/crun.rb @@ -130,7 +130,7 @@ class Crun < Package def self.build @disable_criu = ARCH == 'x86_64' ? '' : '--disable-criu' system './autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ #{@disable_criu} \ --disable-systemd \ --enable-shared \ diff --git a/packages/cunit.rb b/packages/cunit.rb index eabac1f39..35cf054b2 100644 --- a/packages/cunit.rb +++ b/packages/cunit.rb @@ -33,7 +33,7 @@ class Cunit < Package def self.build system 'autoupdate' system 'autoreconf -fiv' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-automated \ --enable-basic \ --enable-console \ diff --git a/packages/cups.rb b/packages/cups.rb index ebc4dd616..95b9da182 100644 --- a/packages/cups.rb +++ b/packages/cups.rb @@ -32,7 +32,7 @@ class Cups < Package def self.build @buildoverride = %w[armv7l aarch64].include?(ARCH) ? 'CC=clang CXX=clang++ LD=mold CUPS_LINKER=mold' : '' - system "#{@buildoverride} ./configure #{CREW_OPTIONS} \ + system "#{@buildoverride} ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-libusb" system 'make' File.write 'startcupsd', <<~EOF diff --git a/packages/dash.rb b/packages/dash.rb index 48908b7ce..27de9b9f6 100644 --- a/packages/dash.rb +++ b/packages/dash.rb @@ -20,7 +20,7 @@ class Dash < Package depends_on 'libedit' def self.build - system "./configure #{CREW_OPTIONS} --with-libedit" + system "./configure #{CREW_CONFIGURE_OPTIONS} --with-libedit" system 'make' end diff --git a/packages/datamash.rb b/packages/datamash.rb index d8b23e3d7..e63e948ed 100644 --- a/packages/datamash.rb +++ b/packages/datamash.rb @@ -18,7 +18,7 @@ class Datamash < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/dbus_glib.rb b/packages/dbus_glib.rb index 04351e9a2..c032e99ae 100644 --- a/packages/dbus_glib.rb +++ b/packages/dbus_glib.rb @@ -20,7 +20,7 @@ class Dbus_glib < Package depends_on 'glib' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/ddrescue.rb b/packages/ddrescue.rb index a5852c23a..35f306214 100644 --- a/packages/ddrescue.rb +++ b/packages/ddrescue.rb @@ -18,7 +18,7 @@ class Ddrescue < Package }) def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-non-posix" system 'make' end diff --git a/packages/desktop_file_utils.rb b/packages/desktop_file_utils.rb index 3df6f9f71..67e282688 100644 --- a/packages/desktop_file_utils.rb +++ b/packages/desktop_file_utils.rb @@ -18,7 +18,7 @@ class Desktop_file_utils < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/diffutils.rb b/packages/diffutils.rb index 114cf0824..fc2124d5d 100644 --- a/packages/diffutils.rb +++ b/packages/diffutils.rb @@ -21,7 +21,7 @@ class Diffutils < Package depends_on 'libsigsegv' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/djvulibre.rb b/packages/djvulibre.rb index 0a1aa280f..97c605dfd 100644 --- a/packages/djvulibre.rb +++ b/packages/djvulibre.rb @@ -28,7 +28,7 @@ class Djvulibre < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-desktopfiles" system 'make' end diff --git a/packages/docbook2x.rb b/packages/docbook2x.rb index b0e1dd5c3..5bbbf86f6 100644 --- a/packages/docbook2x.rb +++ b/packages/docbook2x.rb @@ -21,7 +21,7 @@ class Docbook2x < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/dosbox.rb b/packages/dosbox.rb index cacee9eec..3d86fbc3a 100644 --- a/packages/dosbox.rb +++ b/packages/dosbox.rb @@ -21,7 +21,7 @@ class Dosbox < Package depends_on 'sommelier' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/dosbox_x.rb b/packages/dosbox_x.rb index 83ec53db9..e19645034 100644 --- a/packages/dosbox_x.rb +++ b/packages/dosbox_x.rb @@ -23,7 +23,7 @@ class Dosbox_x < Package def self.patch system 'filefix' - system "sed -i 's,--prefix=/usr,#{CREW_OPTIONS},' build" + system "sed -i 's,--prefix=/usr,#{CREW_CONFIGURE_OPTIONS},' build" end def self.build diff --git a/packages/dosfstools.rb b/packages/dosfstools.rb index d8774fa79..fc3149e77 100644 --- a/packages/dosfstools.rb +++ b/packages/dosfstools.rb @@ -18,7 +18,7 @@ class Dosfstools < Package }) def self.build - system "./configure #{CREW_OPTIONS} --enable-compat-symlinks" + system "./configure #{CREW_CONFIGURE_OPTIONS} --enable-compat-symlinks" system 'make' end diff --git a/packages/e2fsprogs.rb b/packages/e2fsprogs.rb index 03dba0c27..33cf5bb12 100644 --- a/packages/e2fsprogs.rb +++ b/packages/e2fsprogs.rb @@ -22,7 +22,7 @@ class E2fsprogs < Package depends_on 'util_linux' # R def self.build - system "./configure #{CREW_OPTIONS}\ + system "./configure #{CREW_CONFIGURE_OPTIONS}\ --enable-elf-shlibs \ --enable-lto \ --disable-libblkid \ diff --git a/packages/editres.rb b/packages/editres.rb index 7420330c0..e65293f5f 100644 --- a/packages/editres.rb +++ b/packages/editres.rb @@ -18,7 +18,7 @@ class Editres < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/enchant.rb b/packages/enchant.rb index c0d9d6db9..c87b54210 100644 --- a/packages/enchant.rb +++ b/packages/enchant.rb @@ -25,7 +25,7 @@ class Enchant < Package system './bootstrap' system "env CFLAGS='-flto=auto -ltinfo' CXXFLAGS='-flto=auto' \ LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-hunspell \ --with-aspell" system 'make' diff --git a/packages/encodings.rb b/packages/encodings.rb index c92db8999..c928ce862 100644 --- a/packages/encodings.rb +++ b/packages/encodings.rb @@ -19,7 +19,7 @@ class Encodings < Package depends_on 'mkfontscale' def self.build - system "./configure #{CREW_OPTIONS} --with-fontrootdir=#{CREW_PREFIX}/share/fonts" + system "./configure #{CREW_CONFIGURE_OPTIONS} --with-fontrootdir=#{CREW_PREFIX}/share/fonts" system "sed -e 's|^\(encodings_DATA = $(DATA_FILES)\).*|\1|' -i Makefile" # Found in xbps-src system 'make' end diff --git a/packages/enet.rb b/packages/enet.rb index 048541a05..65e8d561e 100644 --- a/packages/enet.rb +++ b/packages/enet.rb @@ -19,7 +19,7 @@ class Enet < Package def self.build system 'autoreconf -vfi' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/ethtool.rb b/packages/ethtool.rb index 6960c26aa..b4d0ca234 100644 --- a/packages/ethtool.rb +++ b/packages/ethtool.rb @@ -24,7 +24,7 @@ class Ethtool < Package def self.build system "#{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --mandir=#{CREW_MAN_PREFIX} \ --sbindir=#{CREW_PREFIX}/bin" system 'make' diff --git a/packages/exfatprogs.rb b/packages/exfatprogs.rb index 7f78899c0..8a3638817 100644 --- a/packages/exfatprogs.rb +++ b/packages/exfatprogs.rb @@ -21,7 +21,7 @@ class Exfatprogs < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/exo.rb b/packages/exo.rb index 31e3a923e..8381f6bba 100644 --- a/packages/exo.rb +++ b/packages/exo.rb @@ -27,7 +27,7 @@ class Exo < Package end def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/faac.rb b/packages/faac.rb index 23a021761..b5f2aa936 100644 --- a/packages/faac.rb +++ b/packages/faac.rb @@ -25,7 +25,7 @@ class Faac < Package def self.build system 'autoreconf -vfi' system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/ffmpeg.rb b/packages/ffmpeg.rb index 7483543ac..1b136e038 100644 --- a/packages/ffmpeg.rb +++ b/packages/ffmpeg.rb @@ -189,7 +189,7 @@ class Ffmpeg < Package --enable-version3 \ --host-cflags='#{CREW_ENV_OPTIONS_HASH['CFLAGS']} -flto=auto -fuse-ld=#{CREW_LINKER} #{@arch_cflags}' \ --host-ldflags='#{CREW_ENV_OPTIONS_HASH['LDFLAGS']} -flto=auto' \ - #{CREW_OPTIONS.sub(/--build=.*/, '').gsub('vfpv3-d16', 'neon').gsub('--disable-dependency-tracking', '')}" + #{CREW_CONFIGURE_OPTIONS.sub(/--build=.*/, '').gsub('vfpv3-d16', 'neon').gsub('--disable-dependency-tracking', '')}" system "env PATH=#{CREW_LIB_PREFIX}/ccache/bin:#{CREW_PREFIX}/bin:/usr/bin:/bin \ make -j#{CREW_NPROC}" system 'make tools/qt-faststart' diff --git a/packages/filecmd.rb b/packages/filecmd.rb index 040a1e4a8..eaf5e2f4d 100644 --- a/packages/filecmd.rb +++ b/packages/filecmd.rb @@ -61,7 +61,7 @@ class Filecmd < Package Dir.chdir 'builddir-static' do system "env LDFLAGS+=' -static' \ ../configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ #{@filecmd_config_opts}" system 'make' end @@ -70,7 +70,7 @@ class Filecmd < Package Dir.mkdir 'builddir-dynamic' Dir.chdir 'builddir-dynamic' do system "../configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ #{@filecmd_config_opts}" system 'make' end diff --git a/packages/filezilla.rb b/packages/filezilla.rb index f08f7353a..efe2351d7 100644 --- a/packages/filezilla.rb +++ b/packages/filezilla.rb @@ -49,7 +49,7 @@ class Filezilla < Package end def self.build - system "./configure #{CREW_OPTIONS} --disable-maintainer-mode --with-pugixml=builtin" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-maintainer-mode --with-pugixml=builtin" system 'make' end diff --git a/packages/fossil.rb b/packages/fossil.rb index 117be8d13..f5b5bc52b 100644 --- a/packages/fossil.rb +++ b/packages/fossil.rb @@ -29,7 +29,7 @@ class Fossil < Autotools system "./configure --prefix=#{CREW_PREFIX}" end - install_extras do + configure_install_extras do FileUtils.install 'fossil.1', "#{CREW_DEST_MAN_PREFIX}/man1/fossil.1", mode: 0o644 end end diff --git a/packages/freetds.rb b/packages/freetds.rb index 29a25b536..a6eeb3a96 100644 --- a/packages/freetds.rb +++ b/packages/freetds.rb @@ -23,7 +23,7 @@ class Freetds < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/fswatch.rb b/packages/fswatch.rb index f592da77d..a366a79a0 100644 --- a/packages/fswatch.rb +++ b/packages/fswatch.rb @@ -17,7 +17,7 @@ class Fswatch < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/fuse2.rb b/packages/fuse2.rb index ed33c8e09..f420722f5 100644 --- a/packages/fuse2.rb +++ b/packages/fuse2.rb @@ -20,7 +20,7 @@ class Fuse2 < Package depends_on 'util_linux' def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-example \ --disable-mtab \ --enable-util \ diff --git a/packages/fuse_overlayfs.rb b/packages/fuse_overlayfs.rb index 1e898182e..310a5af22 100644 --- a/packages/fuse_overlayfs.rb +++ b/packages/fuse_overlayfs.rb @@ -26,7 +26,7 @@ class Fuse_overlayfs < Package def self.build system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --sbindir=#{CREW_PREFIX}/bin" system 'make' end diff --git a/packages/garcon.rb b/packages/garcon.rb index 9d8302da2..e6a4dc723 100644 --- a/packages/garcon.rb +++ b/packages/garcon.rb @@ -20,7 +20,7 @@ class Garcon < Package depends_on 'libxfce4ui' def self.build - system "./configure #{CREW_OPTIONS} --disable-static --enable-gtk2 --enable-libxfce4ui" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-static --enable-gtk2 --enable-libxfce4ui" system "make -j#{CREW_NPROC}" end diff --git a/packages/gawk.rb b/packages/gawk.rb index fb30d1732..927e81a5b 100644 --- a/packages/gawk.rb +++ b/packages/gawk.rb @@ -25,7 +25,7 @@ class Gawk < Package depends_on 'readline' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --without-libsigsegv-prefix" system 'make' end diff --git a/packages/gcc10.rb b/packages/gcc10.rb index ba4ec1acc..bb26b49c3 100644 --- a/packages/gcc10.rb +++ b/packages/gcc10.rb @@ -119,7 +119,7 @@ class Gcc10 < Package unless File.file?('Makefile') system configure_env, <<~BUILD.chomp - ../configure #{CREW_OPTIONS} \ + ../configure #{CREW_CONFIGURE_OPTIONS} \ #{@gcc_global_opts} \ #{@archflags} \ --with-native-system-header-dir=#{CREW_PREFIX}/include \ diff --git a/packages/gcc_build.rb b/packages/gcc_build.rb index 27f2e4a11..dbd037d74 100644 --- a/packages/gcc_build.rb +++ b/packages/gcc_build.rb @@ -166,7 +166,7 @@ class Gcc_build < Package }.transform_keys(&:to_s) system configure_env, <<~BUILD.chomp - mold -run ../configure #{CREW_OPTIONS} \ + mold -run ../configure #{CREW_CONFIGURE_OPTIONS} \ #{@gcc_global_opts} \ #{@archflags} \ --with-native-system-header-dir=#{CREW_PREFIX}/include \ diff --git a/packages/gccmakedep.rb b/packages/gccmakedep.rb index 70427362c..5945f7eb4 100644 --- a/packages/gccmakedep.rb +++ b/packages/gccmakedep.rb @@ -18,7 +18,7 @@ class Gccmakedep < Package }) def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --sysconfdir=#{CREW_PREFIX}/etc" system 'make' end diff --git a/packages/gdb.rb b/packages/gdb.rb index 4b06083fa..a2c0bc322 100644 --- a/packages/gdb.rb +++ b/packages/gdb.rb @@ -45,7 +45,7 @@ class Gdb < Autotools FileUtils.mkdir_p 'build' Dir.chdir('build') do system "../configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --disable-binutils \ --disable-ld \ --disable-nls \ diff --git a/packages/gdbm.rb b/packages/gdbm.rb index 7911fbe1d..2e8e7dbc3 100644 --- a/packages/gdbm.rb +++ b/packages/gdbm.rb @@ -23,7 +23,7 @@ class Gdbm < Package def self.build system "mold -run ./configure \ - #{CREW_OPTIONS}" + #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/ghostscript.rb b/packages/ghostscript.rb index 4fc001e32..5171ae9ef 100644 --- a/packages/ghostscript.rb +++ b/packages/ghostscript.rb @@ -55,7 +55,7 @@ class Ghostscript < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' system 'filefix' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-hidden-visibility \ --disable-compile-inits \ --enable-dynamic \ diff --git a/packages/glibc_build223.rb b/packages/glibc_build223.rb index dda471e9f..7d0acea8b 100644 --- a/packages/glibc_build223.rb +++ b/packages/glibc_build223.rb @@ -231,7 +231,7 @@ class Glibc_build223 < Package end FileUtils.cp 'binutils/ld.bfd', 'binutils/ld' system "CFLAGS='-O2 -pipe -fno-stack-protector' ../configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --with-headers=#{CREW_PREFIX}/include \ --without-gd \ --disable-werror \ diff --git a/packages/glibc_build227.rb b/packages/glibc_build227.rb index eb0a877e9..1de3c02a3 100644 --- a/packages/glibc_build227.rb +++ b/packages/glibc_build227.rb @@ -239,7 +239,7 @@ class Glibc_build227 < Package # enable-obsolete-rpc will cause a conflict with libtirpc system "SYSROOT='' CFLAGS='-O2 -fno-strict-aliasing -fno-stack-protector -march=armv7-a+fp' \ LD=ld ../configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --with-headers=#{CREW_PREFIX}/include \ ac_cv_lib_cap_cap_init=no \ --disable-sanity-checks \ @@ -261,7 +261,7 @@ class Glibc_build227 < Package when 'x86_64' File.write('configparms', "slibdir=#{CREW_LIB_PREFIX}") system "CFLAGS='-O2 -pipe -fno-stack-protector' ../configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --with-headers=#{CREW_PREFIX}/include \ --without-gd \ --disable-werror \ diff --git a/packages/glpk.rb b/packages/glpk.rb index 574bb8f5d..de617225f 100644 --- a/packages/glpk.rb +++ b/packages/glpk.rb @@ -18,7 +18,7 @@ class Glpk < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/gnu_time.rb b/packages/gnu_time.rb index 069aa7eb0..cf070fc2c 100644 --- a/packages/gnu_time.rb +++ b/packages/gnu_time.rb @@ -28,7 +28,7 @@ class Gnu_time < Package def self.build system './bootstrap --no-git --gnulib-srcdir=./gnulib' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} --infodir=#{CREW_PREFIX}/share/info" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} --infodir=#{CREW_PREFIX}/share/info" system 'make' end diff --git a/packages/gnuchess.rb b/packages/gnuchess.rb index 8a9db2788..451c51898 100644 --- a/packages/gnuchess.rb +++ b/packages/gnuchess.rb @@ -18,7 +18,7 @@ class Gnuchess < Package }) def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-readline" system 'make' end diff --git a/packages/gparted.rb b/packages/gparted.rb index ef0025fe5..3de469bca 100644 --- a/packages/gparted.rb +++ b/packages/gparted.rb @@ -36,7 +36,7 @@ class Gparted < Package end def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --sbindir=#{CREW_PREFIX}/bin \ --enable-online-resize \ --enable-libparted-dmraid \ diff --git a/packages/gpm.rb b/packages/gpm.rb index a57c493d6..6b5b78e1c 100644 --- a/packages/gpm.rb +++ b/packages/gpm.rb @@ -24,7 +24,7 @@ class Gpm < Package system "env CFLAGS='-flto=auto' \ CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --sysconfdir=#{CREW_PREFIX}/etc \ --sbindir=#{CREW_PREFIX}/bin" system 'make' diff --git a/packages/graphicsmagick.rb b/packages/graphicsmagick.rb index 2d64a73c5..7eb2892a4 100644 --- a/packages/graphicsmagick.rb +++ b/packages/graphicsmagick.rb @@ -122,7 +122,7 @@ class Graphicsmagick < Package end def self.build - system "#{CREW_ENV_OPTIONS.gsub('-mfpu=vfpv3-d16', '-mfpu=neon-fp16')} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS.gsub('-mfpu=vfpv3-d16', '-mfpu=neon-fp16')} ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-windows-font-dir=#{CREW_PREFIX}/share/fonts/truetype/msttcorefonts \ --with-perl=#{CREW_PREFIX}/bin/perl \ --disable-maintainer-mode \ diff --git a/packages/grep.rb b/packages/grep.rb index 38c273909..d95c12d2c 100644 --- a/packages/grep.rb +++ b/packages/grep.rb @@ -26,7 +26,7 @@ class Grep < Package def self.build system "CPPFLAGS=-DHAVE_DYNAMIC_LIBPCRE \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --without-included-regex" system 'make' end diff --git a/packages/gtk2.rb b/packages/gtk2.rb index b691cf197..591915972 100644 --- a/packages/gtk2.rb +++ b/packages/gtk2.rb @@ -52,7 +52,7 @@ class Gtk2 < Package def self.build system "#{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS} --with-gdktarget=x11" + ./configure #{CREW_CONFIGURE_OPTIONS} --with-gdktarget=x11" system 'make' end diff --git a/packages/gtksharp2.rb b/packages/gtksharp2.rb index 50e3e6b39..296bdf0bd 100644 --- a/packages/gtksharp2.rb +++ b/packages/gtksharp2.rb @@ -47,7 +47,7 @@ class Gtksharp2 < Package def self.build system "CFLAGS='-flto=auto' CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode" system 'make' end diff --git a/packages/gutenprint.rb b/packages/gutenprint.rb index 49408837f..a8cd2c215 100644 --- a/packages/gutenprint.rb +++ b/packages/gutenprint.rb @@ -18,7 +18,7 @@ class Gutenprint < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/handbrake.rb b/packages/handbrake.rb index cae3857f9..0396553b4 100644 --- a/packages/handbrake.rb +++ b/packages/handbrake.rb @@ -72,7 +72,7 @@ class Handbrake < Package # with a libtool error. FileUtils.ln_sf "#{CREW_LIB_PREFIX}/libfribidi.la", "#{CREW_PREFIX}/lib/" - system "LDFLAGS+=' -L #{CREW_LIB_PREFIX}' ./configure #{CREW_OPTIONS} \ + system "LDFLAGS+=' -L #{CREW_LIB_PREFIX}' ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-x265 \ --enable-numa \ --enable-fdk-aac \ diff --git a/packages/haveged.rb b/packages/haveged.rb index 8f07ee6b9..67cd09225 100644 --- a/packages/haveged.rb +++ b/packages/haveged.rb @@ -18,7 +18,7 @@ class Haveged < Package }) def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-daemon \ --enable-nistest \ --enable-enttest \ diff --git a/packages/hello.rb b/packages/hello.rb index 36f3b3dec..7a129ab2b 100644 --- a/packages/hello.rb +++ b/packages/hello.rb @@ -20,7 +20,7 @@ class Hello < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/help2man.rb b/packages/help2man.rb index c0e849603..b73f0cc4e 100644 --- a/packages/help2man.rb +++ b/packages/help2man.rb @@ -18,7 +18,7 @@ class Help2man < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/homebank.rb b/packages/homebank.rb index 01bd03dcd..07b0d1789 100644 --- a/packages/homebank.rb +++ b/packages/homebank.rb @@ -25,7 +25,7 @@ class Homebank < Package depends_on 'xcb_util' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/hplip.rb b/packages/hplip.rb index a4313cbec..0b0ecf623 100644 --- a/packages/hplip.rb +++ b/packages/hplip.rb @@ -34,7 +34,7 @@ class Hplip < Package end def self.build - system "./configure #{CREW_OPTIONS} --disable-network-build" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-network-build" system 'make' end diff --git a/packages/htop.rb b/packages/htop.rb index 9591df33a..32ee6165c 100644 --- a/packages/htop.rb +++ b/packages/htop.rb @@ -26,7 +26,7 @@ class Htop < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' system "CPPFLAGS='-I#{CREW_PREFIX}/include/ncursesw' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-unicode" system 'make' end diff --git a/packages/httrack.rb b/packages/httrack.rb index 06fa0c190..de650a2ca 100644 --- a/packages/httrack.rb +++ b/packages/httrack.rb @@ -22,7 +22,7 @@ class Httrack < Package end def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/hwdata.rb b/packages/hwdata.rb index 8827608de..63eaba9bb 100644 --- a/packages/hwdata.rb +++ b/packages/hwdata.rb @@ -25,7 +25,7 @@ class Hwdata < Package end def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --datadir=#{CREW_PREFIX}/share \ --disable-blacklist" system 'make' diff --git a/packages/hwloc.rb b/packages/hwloc.rb index 4a6f4947f..02afc2a47 100644 --- a/packages/hwloc.rb +++ b/packages/hwloc.rb @@ -30,7 +30,7 @@ class Hwloc < Package system './autogen.sh' system 'filefix' system "#{CREW_ENV_OPTIONS} ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --enable-plugins \ --sysconfdir=#{CREW_PREFIX}/etc" system 'make' diff --git a/packages/icoutils.rb b/packages/icoutils.rb index 2b90f4404..4af7c1239 100644 --- a/packages/icoutils.rb +++ b/packages/icoutils.rb @@ -21,7 +21,7 @@ class Icoutils < Package depends_on 'perl' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/icu4c.rb b/packages/icu4c.rb index f59d3c80c..a7e278dd6 100644 --- a/packages/icu4c.rb +++ b/packages/icu4c.rb @@ -23,7 +23,7 @@ class Icu4c < Package def self.build Dir.chdir 'source' do system "mold -run ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --enable-shared \ --disable-samples \ --disable-tests" diff --git a/packages/intltool.rb b/packages/intltool.rb index 4fadf1945..6bcc1eb37 100644 --- a/packages/intltool.rb +++ b/packages/intltool.rb @@ -28,7 +28,7 @@ class Intltool < Package end def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/iproute2.rb b/packages/iproute2.rb index 6b9578129..a0a3c3e5b 100644 --- a/packages/iproute2.rb +++ b/packages/iproute2.rb @@ -37,7 +37,7 @@ class Iproute2 < Package end def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --include_dir=#{CREW_PREFIX}/include" system 'make' end diff --git a/packages/iptables.rb b/packages/iptables.rb index 551a2d6fd..656ddc9bb 100644 --- a/packages/iptables.rb +++ b/packages/iptables.rb @@ -24,7 +24,7 @@ class Iptables < Package def self.build system "#{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-static \ --disable-nftables" system 'make' diff --git a/packages/jack1.rb b/packages/jack1.rb index eb8ad243a..97de7e102 100644 --- a/packages/jack1.rb +++ b/packages/jack1.rb @@ -25,7 +25,7 @@ class Jack1 < Package system 'git submodule init' system 'git submodule update' system './autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end end diff --git a/packages/jansson.rb b/packages/jansson.rb index 421a7116e..f57a92c60 100644 --- a/packages/jansson.rb +++ b/packages/jansson.rb @@ -21,7 +21,7 @@ class Jansson < Package system 'autoreconf -i' system "env CFLAGS='-flto=auto' \ CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/jbigkit.rb b/packages/jbigkit.rb index 4f32baba1..d35299808 100644 --- a/packages/jbigkit.rb +++ b/packages/jbigkit.rb @@ -25,7 +25,7 @@ class Jbigkit < Package def self.build system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make all' end diff --git a/packages/jpegoptim.rb b/packages/jpegoptim.rb index 2633bf766..1b2f856b7 100644 --- a/packages/jpegoptim.rb +++ b/packages/jpegoptim.rb @@ -20,7 +20,7 @@ class Jpegoptim < Package depends_on 'libjpeg_turbo' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' system 'make', 'strip' end diff --git a/packages/krb5.rb b/packages/krb5.rb index d25eaff66..66b5c84a5 100644 --- a/packages/krb5.rb +++ b/packages/krb5.rb @@ -31,7 +31,7 @@ class Krb5 < Package @path = "#{CREW_PREFIX}/bin:" + ENV.fetch('PATH', nil) system "CPPFLAGS='#{@cppflags}' \ PATH=#{@path} \ - mold -run ./configure #{CREW_OPTIONS} \ + mold -run ./configure #{CREW_CONFIGURE_OPTIONS} \ --localstatedir=#{CREW_PREFIX}/var/krb5kdc \ --enable-shared \ --with-system-et \ diff --git a/packages/l_smash.rb b/packages/l_smash.rb index 7c7159476..74fb481e0 100644 --- a/packages/l_smash.rb +++ b/packages/l_smash.rb @@ -19,7 +19,7 @@ class L_smash < Package def self.build system '[ -x configure ] || ./autogen.sh' - system "./configure #{CREW_OPTIONS.sub(/--mandir=.*/, '')} \ + system "./configure #{CREW_CONFIGURE_OPTIONS.sub(/--mandir=.*/, '')} \ --enable-shared \ --extra-cflags='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ --extra-ldflags='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto'" diff --git a/packages/lcms.rb b/packages/lcms.rb index bb36a1e6b..f0a5305f6 100644 --- a/packages/lcms.rb +++ b/packages/lcms.rb @@ -21,7 +21,7 @@ class Lcms < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/ldb.rb b/packages/ldb.rb index a7380ec02..92d4b22c1 100644 --- a/packages/ldb.rb +++ b/packages/ldb.rb @@ -37,7 +37,7 @@ class Ldb < Package def self.build system "./configure \ - #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ + #{CREW_CONFIGURE_OPTIONS.sub(/--program-suffix.*/, '')} \ --localstatedir=#{CREW_PREFIX}/var \ --sysconfdir=#{CREW_PREFIX}/etc/samba \ --with-modulesdir=#{CREW_LIB_PREFIX}/ldb/modules \ diff --git a/packages/lftp.rb b/packages/lftp.rb index 2bc7ec99d..7e93fe61c 100644 --- a/packages/lftp.rb +++ b/packages/lftp.rb @@ -18,7 +18,7 @@ class Lftp < Package }) def self.build - system "./configure #{CREW_OPTIONS} --disable-nls --disable-dependency-tracking --with-linux-crypto" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-nls --disable-dependency-tracking --with-linux-crypto" system 'make' end diff --git a/packages/lha.rb b/packages/lha.rb index cd7eb154d..e22d7613b 100644 --- a/packages/lha.rb +++ b/packages/lha.rb @@ -21,7 +21,7 @@ class Lha < Package def self.build system 'autoreconf -sif' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/liba52.rb b/packages/liba52.rb index a5e2af14d..4aeec2bc4 100644 --- a/packages/liba52.rb +++ b/packages/liba52.rb @@ -24,7 +24,7 @@ class Liba52 < Package def self.build system './bootstrap' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libappindicator_gtk3.rb b/packages/libappindicator_gtk3.rb index 3a767226a..53a71d01d 100644 --- a/packages/libappindicator_gtk3.rb +++ b/packages/libappindicator_gtk3.rb @@ -37,7 +37,7 @@ class Libappindicator_gtk3 < Package def self.build system "#{CREW_ENV_OPTIONS.sub("CFLAGS='", "CFLAGS='-Wno-deprecated-declarations ")} \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --localstatedir=#{CREW_PREFIX}/var \ --sysconfdir=#{CREW_PREFIX}/etc \ --with-gtk=3 \ diff --git a/packages/libassuan.rb b/packages/libassuan.rb index e1b5ed0cd..a92ec5e67 100644 --- a/packages/libassuan.rb +++ b/packages/libassuan.rb @@ -25,7 +25,7 @@ class Libassuan < Package system "env CFLAGS='-flto=auto' \ CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libatasmart.rb b/packages/libatasmart.rb index c8698a53d..a40cc4f61 100644 --- a/packages/libatasmart.rb +++ b/packages/libatasmart.rb @@ -22,7 +22,7 @@ class Libatasmart < Package def self.build system './autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libavc1394.rb b/packages/libavc1394.rb index 65aa36b54..d1ff5730c 100644 --- a/packages/libavc1394.rb +++ b/packages/libavc1394.rb @@ -20,7 +20,7 @@ class Libavc1394 < Package depends_on 'libraw1394' def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libblockdev.rb b/packages/libblockdev.rb index 99a03eb74..d558f002e 100644 --- a/packages/libblockdev.rb +++ b/packages/libblockdev.rb @@ -33,7 +33,7 @@ class Libblockdev < Package def self.build system 'filefix' - system "./configure #{CREW_OPTIONS} --with-gtk-doc=no" + system "./configure #{CREW_CONFIGURE_OPTIONS} --with-gtk-doc=no" system 'make' end diff --git a/packages/libbluray.rb b/packages/libbluray.rb index 0f8959f22..ad7b73a2a 100644 --- a/packages/libbluray.rb +++ b/packages/libbluray.rb @@ -21,7 +21,7 @@ class Libbluray < Package depends_on 'fontconfig' def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-optimizations \ --disable-bdjava-jar" system 'make' diff --git a/packages/libbytesize.rb b/packages/libbytesize.rb index ffc719a2c..013787ef3 100644 --- a/packages/libbytesize.rb +++ b/packages/libbytesize.rb @@ -20,7 +20,7 @@ class Libbytesize < Package depends_on 'gawk' => :build def self.build - system "./configure #{CREW_OPTIONS} --with-gtk-doc=no" + system "./configure #{CREW_CONFIGURE_OPTIONS} --with-gtk-doc=no" system 'make' end diff --git a/packages/libcaca.rb b/packages/libcaca.rb index 80102a169..3379c7b84 100644 --- a/packages/libcaca.rb +++ b/packages/libcaca.rb @@ -50,7 +50,7 @@ class Libcaca < Package def self.build system '[ -x configure ] || ./bootstrap' system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --enable-gl \ --enable-ncurses \ --enable-network \ diff --git a/packages/libcacard.rb b/packages/libcacard.rb index 427127ef6..de7647fa9 100644 --- a/packages/libcacard.rb +++ b/packages/libcacard.rb @@ -25,7 +25,7 @@ class Libcacard < Package def self.build system 'filefix' system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libcanberra.rb b/packages/libcanberra.rb index 10c1d7ad5..151471b46 100644 --- a/packages/libcanberra.rb +++ b/packages/libcanberra.rb @@ -90,7 +90,7 @@ class Libcanberra < Package def self.build system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-alsa \ --enable-null \ --disable-lynx \ diff --git a/packages/libcddb.rb b/packages/libcddb.rb index 7879f8148..1a2532d76 100644 --- a/packages/libcddb.rb +++ b/packages/libcddb.rb @@ -31,7 +31,7 @@ class Libcddb < Package end def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libcdio.rb b/packages/libcdio.rb index ba9ac1959..0db43edcb 100644 --- a/packages/libcdio.rb +++ b/packages/libcdio.rb @@ -20,7 +20,7 @@ class Libcdio < Package depends_on 'libcddb' def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --without-cdda-player \ --enable-cxx \ --disable-cpp-progs \ diff --git a/packages/libcdio_paranoia.rb b/packages/libcdio_paranoia.rb index d9c12744b..e9ae6884f 100644 --- a/packages/libcdio_paranoia.rb +++ b/packages/libcdio_paranoia.rb @@ -24,7 +24,7 @@ class Libcdio_paranoia < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system " ./configure #{CREW_OPTIONS} \ + system " ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-cpp-progs \ --disable-example-progs" system 'make' diff --git a/packages/libdaemon.rb b/packages/libdaemon.rb index 54ffe1dbf..a2d89d36d 100644 --- a/packages/libdaemon.rb +++ b/packages/libdaemon.rb @@ -18,7 +18,7 @@ class Libdaemon < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libdb.rb b/packages/libdb.rb index ec8c8db3b..c67413cfa 100644 --- a/packages/libdb.rb +++ b/packages/libdb.rb @@ -26,7 +26,7 @@ class Libdb < Package def self.build Dir.chdir 'build_unix' do - system "mold -run ../dist/configure #{CREW_OPTIONS} \ + system "mold -run ../dist/configure #{CREW_CONFIGURE_OPTIONS} \ --enable-compat185 \ --enable-cxx \ --enable-dbm \ diff --git a/packages/libdc1394.rb b/packages/libdc1394.rb index 6da11bc80..e48811678 100644 --- a/packages/libdc1394.rb +++ b/packages/libdc1394.rb @@ -21,7 +21,7 @@ class Libdc1394 < Package depends_on 'libusb' def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libdca.rb b/packages/libdca.rb index 886e303c7..01fba2405 100644 --- a/packages/libdca.rb +++ b/packages/libdca.rb @@ -20,7 +20,7 @@ class Libdca < Package def self.build system 'autoupdate' system 'autoreconf -fiv' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libdmraid.rb b/packages/libdmraid.rb index 60ca8572f..a72351d3e 100644 --- a/packages/libdmraid.rb +++ b/packages/libdmraid.rb @@ -23,7 +23,7 @@ class Libdmraid < Package def self.build Dir.chdir '1.0.0.rc16-3/dmraid' do system 'autoreconf -fvi' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make || make' end end diff --git a/packages/libdnet.rb b/packages/libdnet.rb index 3c38b4988..1d323d39e 100644 --- a/packages/libdnet.rb +++ b/packages/libdnet.rb @@ -20,7 +20,7 @@ class Libdnet < Package depends_on 'check' => :build def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libdsm.rb b/packages/libdsm.rb index 30c1b6f94..21c1f08e5 100644 --- a/packages/libdsm.rb +++ b/packages/libdsm.rb @@ -21,7 +21,7 @@ class Libdsm < Package def self.build system './bootstrap' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-urandom=/dev/urandom" system 'make' end diff --git a/packages/libdv.rb b/packages/libdv.rb index 211c6cdfe..6401e5c82 100644 --- a/packages/libdv.rb +++ b/packages/libdv.rb @@ -21,7 +21,7 @@ class Libdv < Package def self.build system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libdvbpsi.rb b/packages/libdvbpsi.rb index 1e11dce55..4a47c4b10 100644 --- a/packages/libdvbpsi.rb +++ b/packages/libdvbpsi.rb @@ -18,7 +18,7 @@ class Libdvbpsi < Package }) def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-release" system 'make' end diff --git a/packages/libdvdcss.rb b/packages/libdvdcss.rb index 77f293a19..04e5969b3 100644 --- a/packages/libdvdcss.rb +++ b/packages/libdvdcss.rb @@ -23,7 +23,7 @@ class Libdvdcss < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libdvdnav.rb b/packages/libdvdnav.rb index 214f64c6b..ce3cb5866 100644 --- a/packages/libdvdnav.rb +++ b/packages/libdvdnav.rb @@ -20,7 +20,7 @@ class Libdvdnav < Package depends_on 'libdvdread' def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libdvdread.rb b/packages/libdvdread.rb index a3fda0bd1..8af15a226 100644 --- a/packages/libdvdread.rb +++ b/packages/libdvdread.rb @@ -18,7 +18,7 @@ class Libdvdread < Package }) def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libedit.rb b/packages/libedit.rb index a952e640c..da4eb075e 100644 --- a/packages/libedit.rb +++ b/packages/libedit.rb @@ -20,7 +20,7 @@ class Libedit < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ CPPFLAGS=\"-I#{CREW_PREFIX}/include/ncursesw\"" system 'make' end diff --git a/packages/libev.rb b/packages/libev.rb index c5fff67e3..ac3c1c0b3 100644 --- a/packages/libev.rb +++ b/packages/libev.rb @@ -18,7 +18,7 @@ class Libev < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system "make -j#{CREW_NPROC}" end diff --git a/packages/libexif.rb b/packages/libexif.rb index f0362966d..36fe2ce3e 100644 --- a/packages/libexif.rb +++ b/packages/libexif.rb @@ -23,7 +23,7 @@ class Libexif < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode" system 'make' end diff --git a/packages/libfdk_aac.rb b/packages/libfdk_aac.rb index 324bb10a5..2bdb266a0 100644 --- a/packages/libfdk_aac.rb +++ b/packages/libfdk_aac.rb @@ -21,7 +21,7 @@ class Libfdk_aac < Package def self.build system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libffi.rb b/packages/libffi.rb index e53da06df..1f5645d5b 100644 --- a/packages/libffi.rb +++ b/packages/libffi.rb @@ -21,7 +21,7 @@ class Libffi < Package def self.build system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libfontenc.rb b/packages/libfontenc.rb index aceeb8646..3efd3351d 100644 --- a/packages/libfontenc.rb +++ b/packages/libfontenc.rb @@ -23,7 +23,7 @@ class Libfontenc < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-fontrootdir=#{CREW_PREFIX}/share/fonts/X11" system 'make' end diff --git a/packages/libfs.rb b/packages/libfs.rb index 77c8b6ea0..18bb6a2bf 100644 --- a/packages/libfs.rb +++ b/packages/libfs.rb @@ -23,7 +23,7 @@ class Libfs < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libgc.rb b/packages/libgc.rb index 7986dbcf7..658d52713 100644 --- a/packages/libgc.rb +++ b/packages/libgc.rb @@ -18,7 +18,7 @@ class Libgc < Package }) def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-static \ --enable-shared \ --enable-docs" diff --git a/packages/libgdiplus.rb b/packages/libgdiplus.rb index d4a2e890b..463235410 100644 --- a/packages/libgdiplus.rb +++ b/packages/libgdiplus.rb @@ -39,7 +39,7 @@ class Libgdiplus < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-libexif \ --with-libtiff \ --with-jpeg \ diff --git a/packages/libgphoto.rb b/packages/libgphoto.rb index e5b9c55be..7d812e5c4 100644 --- a/packages/libgphoto.rb +++ b/packages/libgphoto.rb @@ -26,7 +26,7 @@ class Libgphoto < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-camlibs=all,outdated" system 'make' end diff --git a/packages/libice.rb b/packages/libice.rb index 5caf95913..5206d4c39 100644 --- a/packages/libice.rb +++ b/packages/libice.rb @@ -27,7 +27,7 @@ class Libice < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libiconv.rb b/packages/libiconv.rb index b7ffb87cb..32506f8b5 100644 --- a/packages/libiconv.rb +++ b/packages/libiconv.rb @@ -18,7 +18,7 @@ class Libiconv < Package }) def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --includedir=#{CREW_PREFIX}/include/gnu-libiconv \ --enable-static \ --enable-relocatable \ diff --git a/packages/libiec61883.rb b/packages/libiec61883.rb index 187ffce60..9f5845602 100644 --- a/packages/libiec61883.rb +++ b/packages/libiec61883.rb @@ -24,7 +24,7 @@ class Libiec61883 < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto -I#{CREW_PREFIX}/include/harfbuzz' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libimagequant.rb b/packages/libimagequant.rb index c0f8f618d..86576621d 100644 --- a/packages/libimagequant.rb +++ b/packages/libimagequant.rb @@ -22,7 +22,7 @@ class Libimagequant < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS} --with-openmp" + ./configure #{CREW_CONFIGURE_OPTIONS} --with-openmp" system 'make all imagequant.pc' end diff --git a/packages/libimobiledevice.rb b/packages/libimobiledevice.rb index f556a01e1..a0ee73590 100644 --- a/packages/libimobiledevice.rb +++ b/packages/libimobiledevice.rb @@ -27,7 +27,7 @@ class Libimobiledevice < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} --disable-openssl" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-openssl" system 'make' end diff --git a/packages/libindicator_gtk3.rb b/packages/libindicator_gtk3.rb index 1b9230d85..b7b91ae48 100644 --- a/packages/libindicator_gtk3.rb +++ b/packages/libindicator_gtk3.rb @@ -31,7 +31,7 @@ class Libindicator_gtk3 < Package system "#{CREW_ENV_OPTIONS.sub("CFLAGS='", "CFLAGS='-Wno-deprecated-declarations ").sub("LDFLAGS='", "LDFLAGS='-lm ")} \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --localstatedir=#{CREW_PREFIX}/var \ --libexecdir=#{CREW_LIB_PREFIX}/libindicator \ --sysconfdir=#{CREW_PREFIX}/etc \ diff --git a/packages/libkmod.rb b/packages/libkmod.rb index 2905b6aa7..71bc0f735 100644 --- a/packages/libkmod.rb +++ b/packages/libkmod.rb @@ -23,7 +23,7 @@ class Libkmod < Package def self.build system './autogen.sh' system 'filefix' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode \ --enable-python \ --with-openssl \ diff --git a/packages/libksba.rb b/packages/libksba.rb index e2e7fd3fc..b951bdf11 100644 --- a/packages/libksba.rb +++ b/packages/libksba.rb @@ -22,7 +22,7 @@ class Libksba < Package depends_on 'libgpg_error' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libmad.rb b/packages/libmad.rb index 6123c0359..830c3cac0 100644 --- a/packages/libmad.rb +++ b/packages/libmad.rb @@ -25,7 +25,7 @@ class Libmad < Package end def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-accuracy \ --disable-debugging" system 'make' diff --git a/packages/libmbim.rb b/packages/libmbim.rb index 2918173a7..3d2e530b2 100644 --- a/packages/libmbim.rb +++ b/packages/libmbim.rb @@ -23,7 +23,7 @@ class Libmbim < Package system "env CFLAGS='-pipe -flto=auto' CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode" system 'make' end diff --git a/packages/libmediainfo.rb b/packages/libmediainfo.rb index c2a30adfa..dcbc3a662 100644 --- a/packages/libmediainfo.rb +++ b/packages/libmediainfo.rb @@ -27,7 +27,7 @@ class Libmediainfo < Package end def self.build - system "mold -run ./SO_Compile.sh #{CREW_OPTIONS}" + system "mold -run ./SO_Compile.sh #{CREW_CONFIGURE_OPTIONS}" end def self.install diff --git a/packages/libmms.rb b/packages/libmms.rb index f08ac2094..2e0c52447 100644 --- a/packages/libmms.rb +++ b/packages/libmms.rb @@ -23,7 +23,7 @@ class Libmms < Package def self.build system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libmnl.rb b/packages/libmnl.rb index b8d02db76..1439d0344 100644 --- a/packages/libmnl.rb +++ b/packages/libmnl.rb @@ -20,7 +20,7 @@ class Libmnl < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libmodplug.rb b/packages/libmodplug.rb index 343a47b58..b50d3f80f 100644 --- a/packages/libmodplug.rb +++ b/packages/libmodplug.rb @@ -18,7 +18,7 @@ class Libmodplug < Package }) def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libmpc.rb b/packages/libmpc.rb index ff45e1514..f81f04f12 100644 --- a/packages/libmpc.rb +++ b/packages/libmpc.rb @@ -25,7 +25,7 @@ class Libmpc < Package def self.build system 'autoreconf -fiv' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libmpeg2.rb b/packages/libmpeg2.rb index 6137f2d18..8cc23126b 100644 --- a/packages/libmpeg2.rb +++ b/packages/libmpeg2.rb @@ -25,7 +25,7 @@ class Libmpeg2 < Package end def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-x" system 'make' end diff --git a/packages/libmrss.rb b/packages/libmrss.rb index 71e528ad5..c1aa267f0 100644 --- a/packages/libmrss.rb +++ b/packages/libmrss.rb @@ -24,7 +24,7 @@ class Libmrss < Package end def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libmtp.rb b/packages/libmtp.rb index 2c41fab96..87e021831 100644 --- a/packages/libmtp.rb +++ b/packages/libmtp.rb @@ -20,7 +20,7 @@ class Libmtp < Package def self.build system 'NOCONFIGURE=1 ./autogen.sh' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libmypaint.rb b/packages/libmypaint.rb index 720a50503..c8fc4e816 100644 --- a/packages/libmypaint.rb +++ b/packages/libmypaint.rb @@ -29,7 +29,7 @@ class Libmypaint < Package def self.build system 'env NOCONFIGURE=1 ./autogen.sh' system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode \ --enable-openmp \ --enable-gegl" diff --git a/packages/libnewt.rb b/packages/libnewt.rb index 7564e4dc1..60024978c 100644 --- a/packages/libnewt.rb +++ b/packages/libnewt.rb @@ -38,7 +38,7 @@ class Libnewt < Package def self.build system "env CFLAGS='-flto=auto' \ CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-gpm-support" system 'make' end diff --git a/packages/libnfs.rb b/packages/libnfs.rb index 69e94636e..62b56f082 100644 --- a/packages/libnfs.rb +++ b/packages/libnfs.rb @@ -20,7 +20,7 @@ class Libnfs < Package def self.build system 'autoreconf -fiv' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-utils" system 'make' end diff --git a/packages/libnxml.rb b/packages/libnxml.rb index 7acc06b2c..894abae1b 100644 --- a/packages/libnxml.rb +++ b/packages/libnxml.rb @@ -26,7 +26,7 @@ class Libnxml < Package end def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libostree.rb b/packages/libostree.rb index 8ba41264f..e0b75dee0 100644 --- a/packages/libostree.rb +++ b/packages/libostree.rb @@ -28,7 +28,7 @@ class Libostree < Package def self.build system 'env NOCONFIGURE=1 ./autogen.sh' system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-curl \ --without-libsystemd \ --with-avahi \ diff --git a/packages/libotf.rb b/packages/libotf.rb index b659a8ee4..d5ca13499 100644 --- a/packages/libotf.rb +++ b/packages/libotf.rb @@ -29,7 +29,7 @@ class Libotf < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libpciaccess.rb b/packages/libpciaccess.rb index 0e4bf03ad..94fab3405 100644 --- a/packages/libpciaccess.rb +++ b/packages/libpciaccess.rb @@ -21,7 +21,7 @@ class Libpciaccess < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libpipeline.rb b/packages/libpipeline.rb index dc92656b8..8f60d1f64 100644 --- a/packages/libpipeline.rb +++ b/packages/libpipeline.rb @@ -21,7 +21,7 @@ class Libpipeline < Package def self.build system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --enable-shared \ --with-pic" system 'make' diff --git a/packages/libplist.rb b/packages/libplist.rb index 1b9044093..41daf241b 100644 --- a/packages/libplist.rb +++ b/packages/libplist.rb @@ -24,7 +24,7 @@ class Libplist < Package CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ CC=gcc \ - ./autogen.sh #{CREW_OPTIONS}" + ./autogen.sh #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libqmi.rb b/packages/libqmi.rb index ee32a33e9..6e85edbcc 100644 --- a/packages/libqmi.rb +++ b/packages/libqmi.rb @@ -22,7 +22,7 @@ class Libqmi < Package system "env CFLAGS='-pipe -flto=auto' CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode" system 'make' end diff --git a/packages/libraw.rb b/packages/libraw.rb index ae42167ee..47ef6d9bb 100644 --- a/packages/libraw.rb +++ b/packages/libraw.rb @@ -27,7 +27,7 @@ class Libraw < Package def self.build system 'autoreconf -fiv' system 'filefix' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/librevenge.rb b/packages/librevenge.rb index 674fb31df..f69de5fb8 100644 --- a/packages/librevenge.rb +++ b/packages/librevenge.rb @@ -28,7 +28,7 @@ class Librevenge < Package depends_on 'zlib' # R def self.build - system "./configure #{CREW_OPTIONS} --disable-werror" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-werror" system 'make' end diff --git a/packages/libsdl.rb b/packages/libsdl.rb index cdb5f2071..995a95022 100644 --- a/packages/libsdl.rb +++ b/packages/libsdl.rb @@ -42,7 +42,7 @@ class Libsdl < Package def self.build system "./configure \ - #{CREW_OPTIONS}" + #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libseccomp.rb b/packages/libseccomp.rb index 7985a06f3..74506e90a 100644 --- a/packages/libseccomp.rb +++ b/packages/libseccomp.rb @@ -23,7 +23,7 @@ class Libseccomp < Package def self.build system './autogen.sh' system "./configure \ - #{CREW_OPTIONS}" + #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libshine.rb b/packages/libshine.rb index 36ae5969e..4fabddab1 100644 --- a/packages/libshine.rb +++ b/packages/libshine.rb @@ -11,7 +11,7 @@ class Libshine < Package def self.build system 'autoreconf -fiv' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libspectre.rb b/packages/libspectre.rb index 6753126d1..e2d9c345d 100644 --- a/packages/libspectre.rb +++ b/packages/libspectre.rb @@ -22,7 +22,7 @@ class Libspectre < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libssp.rb b/packages/libssp.rb index 2298493fc..97ca3193d 100644 --- a/packages/libssp.rb +++ b/packages/libssp.rb @@ -100,7 +100,7 @@ class Libssp < Package system "env NM=gcc-nm AR=gcc-ar RANLIB=gcc-ranlib \ CFLAGS='#{@cflags}' CXXFLAGS='#{@cxxflags}' \ PATH=#{@path} \ - ../#{@gcc_name}/configure #{CREW_OPTIONS} \ + ../#{@gcc_name}/configure #{CREW_CONFIGURE_OPTIONS} \ #{@gcc_global_opts} \ --enable-languages=#{@languages} \ --program-suffix=-#{gcc_version} \ diff --git a/packages/libtiff.rb b/packages/libtiff.rb index d9eba74b1..193121d9e 100644 --- a/packages/libtiff.rb +++ b/packages/libtiff.rb @@ -43,7 +43,7 @@ class Libtiff < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' @x = ARCH == 'i686' ? '' : '--with-x --enable-webp' - system "#{CREW_ENV_OPTIONS.gsub('-mfpu=vfpv3-d16', '-mfpu=neon-fp16')} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS.gsub('-mfpu=vfpv3-d16', '-mfpu=neon-fp16')} ./configure #{CREW_CONFIGURE_OPTIONS} \ #{@x} \ --enable-zlib \ --enable-mdi \ diff --git a/packages/libtinfo.rb b/packages/libtinfo.rb index a5f013913..f49939783 100644 --- a/packages/libtinfo.rb +++ b/packages/libtinfo.rb @@ -25,8 +25,8 @@ class Libtinfo < Package # build libncurses Dir.mkdir 'ncurses_build' Dir.chdir 'ncurses_build' do - # system "#{CREW_ENV_OPTIONS} ../configure #{CREW_OPTIONS} \ - system "../configure #{CREW_OPTIONS} \ + # system "#{CREW_ENV_OPTIONS} ../configure #{CREW_CONFIGURE_OPTIONS} \ + system "../configure #{CREW_CONFIGURE_OPTIONS} \ --program-prefix='' \ --program-suffix='' \ --with-shared \ @@ -43,8 +43,8 @@ class Libtinfo < Package # build libncursesw Dir.mkdir 'ncursesw_build' Dir.chdir 'ncursesw_build' do - # system "#{CREW_ENV_OPTIONS} ../configure #{CREW_OPTIONS} \ - system "../configure #{CREW_OPTIONS} \ + # system "#{CREW_ENV_OPTIONS} ../configure #{CREW_CONFIGURE_OPTIONS} \ + system "../configure #{CREW_CONFIGURE_OPTIONS} \ --program-prefix='' \ --program-suffix='' \ --with-shared \ diff --git a/packages/libtool.rb b/packages/libtool.rb index 3c93f7ae3..ee1dd51ad 100644 --- a/packages/libtool.rb +++ b/packages/libtool.rb @@ -20,7 +20,7 @@ class Libtool < Package depends_on 'm4' def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-ltdl-install" system 'make' end diff --git a/packages/libusb.rb b/packages/libusb.rb index 558a4d438..63db0f88c 100644 --- a/packages/libusb.rb +++ b/packages/libusb.rb @@ -21,7 +21,7 @@ class Libusb < Package def self.build system "./configure \ - #{CREW_OPTIONS}" + #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libusbmuxd.rb b/packages/libusbmuxd.rb index 7d2a8b755..617dcfcef 100644 --- a/packages/libusbmuxd.rb +++ b/packages/libusbmuxd.rb @@ -24,7 +24,7 @@ class Libusbmuxd < Package system "env CFLAGS='-flto=auto' \ CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ - ./autogen.sh #{CREW_OPTIONS}" + ./autogen.sh #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libvips.rb b/packages/libvips.rb index d6546f7b6..dea3f1d42 100644 --- a/packages/libvips.rb +++ b/packages/libvips.rb @@ -36,7 +36,7 @@ class Libvips < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libvorbis.rb b/packages/libvorbis.rb index c77c5211f..490c71e79 100644 --- a/packages/libvorbis.rb +++ b/packages/libvorbis.rb @@ -20,7 +20,7 @@ class Libvorbis < Package depends_on 'libogg' def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libvpx.rb b/packages/libvpx.rb index af24fd946..badb67d13 100644 --- a/packages/libvpx.rb +++ b/packages/libvpx.rb @@ -25,7 +25,7 @@ class Libvpx < Package def self.build Dir.chdir 'build' do - system "../configure #{CREW_OPTIONS.sub(/--mandir=.*/, '')} \ + system "../configure #{CREW_CONFIGURE_OPTIONS.sub(/--mandir=.*/, '')} \ --disable-debug-libs \ --disable-install-docs \ --enable-ccache \ diff --git a/packages/libwpd.rb b/packages/libwpd.rb index f74b2e3aa..7cc97b431 100644 --- a/packages/libwpd.rb +++ b/packages/libwpd.rb @@ -33,7 +33,7 @@ class Libwpd < Package end def self.build - system "./configure #{CREW_OPTIONS} --disable-static" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-static" system 'make' end diff --git a/packages/libwpg.rb b/packages/libwpg.rb index 368e98085..f1891326b 100644 --- a/packages/libwpg.rb +++ b/packages/libwpg.rb @@ -29,7 +29,7 @@ class Libwpg < Package depends_on 'zlib' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libx264.rb b/packages/libx264.rb index c55fe74e1..e17746b1e 100644 --- a/packages/libx264.rb +++ b/packages/libx264.rb @@ -28,7 +28,7 @@ class Libx264 < Package end def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-avs \ --enable-lto \ --enable-shared \ diff --git a/packages/libxau.rb b/packages/libxau.rb index d9e9e02fb..a5ffc0cac 100644 --- a/packages/libxau.rb +++ b/packages/libxau.rb @@ -22,7 +22,7 @@ class Libxau < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxcb.rb b/packages/libxcb.rb index 96097eda7..b204e11e7 100644 --- a/packages/libxcb.rb +++ b/packages/libxcb.rb @@ -27,7 +27,7 @@ class Libxcb < Package def self.build system 'filefix' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-dri3 \ --disable-xevie \ --disable-devel-docs" diff --git a/packages/libxcomposite.rb b/packages/libxcomposite.rb index 13e17c92e..7dc8be648 100644 --- a/packages/libxcomposite.rb +++ b/packages/libxcomposite.rb @@ -28,7 +28,7 @@ class Libxcomposite < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxcrypt.rb b/packages/libxcrypt.rb index 161f02ac7..a1fb73e9e 100644 --- a/packages/libxcrypt.rb +++ b/packages/libxcrypt.rb @@ -22,7 +22,7 @@ class Libxcrypt < Package system "env CFLAGS='-flto=auto' \ CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --disable-static \ --enable-hashes=strong,glibc \ --enable-obsolete-api=no \ diff --git a/packages/libxcursor.rb b/packages/libxcursor.rb index 0962e9f48..c8675a6bb 100644 --- a/packages/libxcursor.rb +++ b/packages/libxcursor.rb @@ -25,7 +25,7 @@ class Libxcursor < Package depends_on 'libxdmcp' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxdamage.rb b/packages/libxdamage.rb index f31956076..0b91f6e58 100644 --- a/packages/libxdamage.rb +++ b/packages/libxdamage.rb @@ -27,7 +27,7 @@ class Libxdamage < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxfce4ui.rb b/packages/libxfce4ui.rb index 73c0fb19e..e4ed1275e 100644 --- a/packages/libxfce4ui.rb +++ b/packages/libxfce4ui.rb @@ -22,7 +22,7 @@ class Libxfce4ui < Package depends_on 'xfconf' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system "make -j#{CREW_NPROC}" end diff --git a/packages/libxfce4util.rb b/packages/libxfce4util.rb index 3e6caf309..f0229245f 100644 --- a/packages/libxfce4util.rb +++ b/packages/libxfce4util.rb @@ -26,7 +26,7 @@ class Libxfce4util < Package def self.build system <<~BUILD [ -x autogen.sh ] && env NOCONFIGURE='1' ./autogen.sh - env #{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} + env #{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} make BUILD end diff --git a/packages/libxfixes.rb b/packages/libxfixes.rb index 33fb33aa3..4ef26454e 100644 --- a/packages/libxfixes.rb +++ b/packages/libxfixes.rb @@ -21,7 +21,7 @@ class Libxfixes < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxfont2.rb b/packages/libxfont2.rb index 27c25779d..e65a80f38 100644 --- a/packages/libxfont2.rb +++ b/packages/libxfont2.rb @@ -25,7 +25,7 @@ class Libxfont2 < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-selective-werror" system 'make' end diff --git a/packages/libxft.rb b/packages/libxft.rb index 099f48218..6d527792e 100644 --- a/packages/libxft.rb +++ b/packages/libxft.rb @@ -24,7 +24,7 @@ class Libxft < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxi.rb b/packages/libxi.rb index 01acd5001..88392ab9a 100644 --- a/packages/libxi.rb +++ b/packages/libxi.rb @@ -19,7 +19,7 @@ class Libxi < Package depends_on 'libx11' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxinerama.rb b/packages/libxinerama.rb index 4cc180794..e6182093b 100644 --- a/packages/libxinerama.rb +++ b/packages/libxinerama.rb @@ -21,7 +21,7 @@ class Libxinerama < Package depends_on 'libxext' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxkbfile.rb b/packages/libxkbfile.rb index 248d31725..26c599a86 100644 --- a/packages/libxkbfile.rb +++ b/packages/libxkbfile.rb @@ -26,7 +26,7 @@ class Libxkbfile < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxmu.rb b/packages/libxmu.rb index d303ebbf2..ba3c2bc52 100644 --- a/packages/libxmu.rb +++ b/packages/libxmu.rb @@ -32,7 +32,7 @@ class Libxmu < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxp.rb b/packages/libxp.rb index 4663e1831..485fe6866 100644 --- a/packages/libxp.rb +++ b/packages/libxp.rb @@ -27,7 +27,7 @@ class Libxp < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-malloc0returnsnull" system 'make' end diff --git a/packages/libxpresent.rb b/packages/libxpresent.rb index 4d01287fa..1fa58496a 100644 --- a/packages/libxpresent.rb +++ b/packages/libxpresent.rb @@ -30,7 +30,7 @@ class Libxpresent < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxrandr.rb b/packages/libxrandr.rb index c55eeb931..e2c1295c5 100644 --- a/packages/libxrandr.rb +++ b/packages/libxrandr.rb @@ -31,7 +31,7 @@ class Libxrandr < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxrender.rb b/packages/libxrender.rb index 44ef45283..fac4f1a81 100644 --- a/packages/libxrender.rb +++ b/packages/libxrender.rb @@ -26,7 +26,7 @@ class Libxrender < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxshmfence.rb b/packages/libxshmfence.rb index 89d509a89..bfe9d98bb 100644 --- a/packages/libxshmfence.rb +++ b/packages/libxshmfence.rb @@ -22,7 +22,7 @@ class Libxshmfence < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxss.rb b/packages/libxss.rb index 7be82d3f7..1108654aa 100644 --- a/packages/libxss.rb +++ b/packages/libxss.rb @@ -28,7 +28,7 @@ class Libxss < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --sysconfdir=#{CREW_PREFIX}/etc" system 'make' end diff --git a/packages/libxt.rb b/packages/libxt.rb index 5a7bfdb10..8dede59fb 100644 --- a/packages/libxt.rb +++ b/packages/libxt.rb @@ -21,7 +21,7 @@ class Libxt < Package patchelf def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxtst.rb b/packages/libxtst.rb index 6960d1417..3b38a960d 100644 --- a/packages/libxtst.rb +++ b/packages/libxtst.rb @@ -26,7 +26,7 @@ class Libxtst < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libxv.rb b/packages/libxv.rb index d1543ea05..3a5c0339c 100644 --- a/packages/libxv.rb +++ b/packages/libxv.rb @@ -27,7 +27,7 @@ class Libxv < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --sysconfdir=#{CREW_PREFIX}/etc" system 'make' end diff --git a/packages/libxxf86dga.rb b/packages/libxxf86dga.rb index f59753ccc..fe02eaf8d 100644 --- a/packages/libxxf86dga.rb +++ b/packages/libxxf86dga.rb @@ -27,7 +27,7 @@ class Libxxf86dga < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --sysconfdir=#{CREW_PREFIX}/etc" system 'make' end diff --git a/packages/libxxf86vm.rb b/packages/libxxf86vm.rb index de59ef9e8..3e2468597 100644 --- a/packages/libxxf86vm.rb +++ b/packages/libxxf86vm.rb @@ -25,7 +25,7 @@ class Libxxf86vm < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/libyaml.rb b/packages/libyaml.rb index 36adeb7eb..41faadf4a 100644 --- a/packages/libyaml.rb +++ b/packages/libyaml.rb @@ -21,7 +21,7 @@ class Libyaml < Package no_patchelf def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/linux_pam.rb b/packages/linux_pam.rb index 20f57a822..5143df160 100644 --- a/packages/linux_pam.rb +++ b/packages/linux_pam.rb @@ -22,7 +22,7 @@ class Linux_pam < Package depends_on 'libeconf' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-selinux \ --enable-static \ --disable-nis" diff --git a/packages/log4c.rb b/packages/log4c.rb index f55c6a772..83354d7c8 100644 --- a/packages/log4c.rb +++ b/packages/log4c.rb @@ -18,7 +18,7 @@ class Log4c < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/log4cplus.rb b/packages/log4cplus.rb index 491186493..e0600212b 100644 --- a/packages/log4cplus.rb +++ b/packages/log4cplus.rb @@ -18,7 +18,7 @@ class Log4cplus < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/ltrace.rb b/packages/ltrace.rb index 0553bf0fd..ea9895e8e 100644 --- a/packages/ltrace.rb +++ b/packages/ltrace.rb @@ -31,7 +31,7 @@ class Ltrace < Package def self.build system './autogen.sh' system 'filefix' - system "./configure #{CREW_OPTIONS} --disable-werror --without-elfutils --disable-maintainer-mode" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-werror --without-elfutils --disable-maintainer-mode" system 'make' end diff --git a/packages/luit.rb b/packages/luit.rb index 153e37467..f8bca7ff9 100644 --- a/packages/luit.rb +++ b/packages/luit.rb @@ -24,7 +24,7 @@ class Luit < Package depends_on 'libx11' => ':build' def self.build - system "./configure #{CREW_OPTIONS} --enable-fontenc" + system "./configure #{CREW_CONFIGURE_OPTIONS} --enable-fontenc" system 'make' end diff --git a/packages/lxappearance.rb b/packages/lxappearance.rb index 82c2cba77..e12339e6f 100644 --- a/packages/lxappearance.rb +++ b/packages/lxappearance.rb @@ -21,7 +21,7 @@ class Lxappearance < Package depends_on 'dbus_glib' def self.build - system "./configure #{CREW_OPTIONS} --enable-gtk3 --enable-dbus" + system "./configure #{CREW_CONFIGURE_OPTIONS} --enable-gtk3 --enable-dbus" system "make -j#{CREW_NPROC}" end diff --git a/packages/lzlib.rb b/packages/lzlib.rb index cfeeafb7c..b2169b29a 100644 --- a/packages/lzlib.rb +++ b/packages/lzlib.rb @@ -18,7 +18,7 @@ class Lzlib < Package }) def self.build - system "./configure #{CREW_OPTIONS} --enable-shared" + system "./configure #{CREW_CONFIGURE_OPTIONS} --enable-shared" system 'make' end diff --git a/packages/m4.rb b/packages/m4.rb index bd9e34099..92a4bbb30 100644 --- a/packages/m4.rb +++ b/packages/m4.rb @@ -21,7 +21,7 @@ class M4 < Package depends_on 'libsigsegv' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/macchanger.rb b/packages/macchanger.rb index 8686bbb69..c3496c53f 100644 --- a/packages/macchanger.rb +++ b/packages/macchanger.rb @@ -18,7 +18,7 @@ class Macchanger < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/mailutils.rb b/packages/mailutils.rb index 93cdb7c01..327b3d17e 100644 --- a/packages/mailutils.rb +++ b/packages/mailutils.rb @@ -21,7 +21,7 @@ class Mailutils < Package depends_on 'tcpwrappers' def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-ipv6 \ --with-gnutls \ --with-berkeley-db \ diff --git a/packages/make.rb b/packages/make.rb index 44774630a..98459e033 100644 --- a/packages/make.rb +++ b/packages/make.rb @@ -20,7 +20,7 @@ class Make < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-cross-guesses=conservative" system './build.sh' end diff --git a/packages/makedepend.rb b/packages/makedepend.rb index c64a25c65..6ab8e5fc0 100644 --- a/packages/makedepend.rb +++ b/packages/makedepend.rb @@ -19,7 +19,7 @@ class Makedepend < Package depends_on 'libx11' def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --without-lint" system 'make' end diff --git a/packages/man_db.rb b/packages/man_db.rb index 7a64d41aa..2466dfff4 100644 --- a/packages/man_db.rb +++ b/packages/man_db.rb @@ -38,7 +38,7 @@ class Man_db < Package # we can't create the user 'man' # the pager is not at the default location year2038 = ARCH == 'x86_64' ? '' : ' --disable-year2038' - options = CREW_OPTIONS + year2038 + options = CREW_CONFIGURE_OPTIONS + year2038 system "./configure #{options} \ --disable-cache-owner \ --disable-rpath \ diff --git a/packages/mawk.rb b/packages/mawk.rb index c9b007b65..ed7e7164b 100644 --- a/packages/mawk.rb +++ b/packages/mawk.rb @@ -20,7 +20,7 @@ class Mawk < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/mediainfo.rb b/packages/mediainfo.rb index 409f57702..b337e8924 100644 --- a/packages/mediainfo.rb +++ b/packages/mediainfo.rb @@ -23,7 +23,7 @@ class Mediainfo < Package end def self.build - system "mold -run ./CLI_Compile.sh #{CREW_OPTIONS}" + system "mold -run ./CLI_Compile.sh #{CREW_CONFIGURE_OPTIONS}" end def self.install diff --git a/packages/mediainfo_gui.rb b/packages/mediainfo_gui.rb index 5dda8fa8e..345f68753 100644 --- a/packages/mediainfo_gui.rb +++ b/packages/mediainfo_gui.rb @@ -25,7 +25,7 @@ class Mediainfo_gui < Package end def self.build - system "./GUI_Compile.sh #{CREW_OPTIONS}" + system "./GUI_Compile.sh #{CREW_CONFIGURE_OPTIONS}" end def self.install diff --git a/packages/minizip.rb b/packages/minizip.rb index 1e6f877a2..0418bd070 100644 --- a/packages/minizip.rb +++ b/packages/minizip.rb @@ -25,7 +25,7 @@ class Minizip < Package def self.build Dir.chdir 'contrib/minizip' do system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-demos" system 'make' end diff --git a/packages/miscfiles.rb b/packages/miscfiles.rb index 392f5897c..82987d466 100644 --- a/packages/miscfiles.rb +++ b/packages/miscfiles.rb @@ -18,7 +18,7 @@ class Miscfiles < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" end def self.install diff --git a/packages/mjpegtools.rb b/packages/mjpegtools.rb index a2b2c6cab..7c7eb1577 100644 --- a/packages/mjpegtools.rb +++ b/packages/mjpegtools.rb @@ -43,7 +43,7 @@ class Mjpegtools < Package def self.build system '[ -x configure ] || ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/mkfontscale.rb b/packages/mkfontscale.rb index d9bc64260..48d904490 100644 --- a/packages/mkfontscale.rb +++ b/packages/mkfontscale.rb @@ -21,7 +21,7 @@ class Mkfontscale < Package depends_on 'libfontenc' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/modemmanager.rb b/packages/modemmanager.rb index 33f7453ea..df3c3afdc 100644 --- a/packages/modemmanager.rb +++ b/packages/modemmanager.rb @@ -23,7 +23,7 @@ class Modemmanager < Package system "env CFLAGS='-pipe -flto=auto' CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --with-dbus-sys-dir=#{CREW_PREFIX}/share/dbus-1 \ --disable-maintainer-mode" system 'make' diff --git a/packages/mono.rb b/packages/mono.rb index b86371f9e..64bc5580f 100644 --- a/packages/mono.rb +++ b/packages/mono.rb @@ -33,7 +33,7 @@ class Mono < Package def self.build system "env XMKMF=#{CREW_PREFIX}/bin/xmkmf \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode \ --enable-llvm \ --enable-loadedllvm \ diff --git a/packages/most.rb b/packages/most.rb index 1ba1b5357..678c818eb 100644 --- a/packages/most.rb +++ b/packages/most.rb @@ -22,7 +22,7 @@ class Most < Package depends_on 'gcc_lib' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/motif.rb b/packages/motif.rb index ce9164e64..b029ac96f 100644 --- a/packages/motif.rb +++ b/packages/motif.rb @@ -41,7 +41,7 @@ class Motif < Package depends_on 'zlib' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-x \ --enable-xft \ --enable-png \ diff --git a/packages/mp4v2.rb b/packages/mp4v2.rb index 557a2bce1..ce9eef8ae 100644 --- a/packages/mp4v2.rb +++ b/packages/mp4v2.rb @@ -23,7 +23,7 @@ class Mp4v2 < Package end def self.build - system "./configure #{CREW_OPTIONS} --disable-dependency-tracking --disable-debug" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-dependency-tracking --disable-debug" system 'make' end diff --git a/packages/mpc.rb b/packages/mpc.rb index 576cccb81..071fb9d25 100644 --- a/packages/mpc.rb +++ b/packages/mpc.rb @@ -23,7 +23,7 @@ class Mpc < Package def self.build system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode \ --enable-shared" system 'make' diff --git a/packages/mpdecimal.rb b/packages/mpdecimal.rb index ce690f96f..b995f70aa 100644 --- a/packages/mpdecimal.rb +++ b/packages/mpdecimal.rb @@ -21,7 +21,7 @@ class Mpdecimal < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/mpfr.rb b/packages/mpfr.rb index 27d10cb27..d9a5d23ba 100644 --- a/packages/mpfr.rb +++ b/packages/mpfr.rb @@ -33,7 +33,7 @@ class Mpfr < Package system 'filefix' system 'autoreconf -fiv' system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --enable-shared" system 'make' end diff --git a/packages/mypaint_brushes.rb b/packages/mypaint_brushes.rb index fea0f86b1..3799d7b37 100644 --- a/packages/mypaint_brushes.rb +++ b/packages/mypaint_brushes.rb @@ -20,7 +20,7 @@ class Mypaint_brushes < Package def self.build system 'env NOCONFIGURE=1 ./autogen.sh' - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/mypaint_brushes_1.rb b/packages/mypaint_brushes_1.rb index c1d9a517c..0b1f55834 100644 --- a/packages/mypaint_brushes_1.rb +++ b/packages/mypaint_brushes_1.rb @@ -20,7 +20,7 @@ class Mypaint_brushes_1 < Package def self.build system 'env NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/nano.rb b/packages/nano.rb index 10ef39c38..272eddf88 100644 --- a/packages/nano.rb +++ b/packages/nano.rb @@ -24,7 +24,7 @@ class Nano < Package def self.build system "mold -run \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-browser \ --enable-color \ --enable-comment \ diff --git a/packages/nasm.rb b/packages/nasm.rb index 213edda9a..8c374c99d 100644 --- a/packages/nasm.rb +++ b/packages/nasm.rb @@ -21,7 +21,7 @@ class Nasm < Package system "env CFLAGS='-flto=auto' \ CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \ ./configure \ - #{CREW_OPTIONS}" + #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/ndctl.rb b/packages/ndctl.rb index 5c732511b..eec415838 100644 --- a/packages/ndctl.rb +++ b/packages/ndctl.rb @@ -27,7 +27,7 @@ class Ndctl < Package def self.build system './autogen.sh' system 'filefix' - system "./configure #{CREW_OPTIONS} --without-systemd" + system "./configure #{CREW_CONFIGURE_OPTIONS} --without-systemd" system 'make' end diff --git a/packages/ndisc6.rb b/packages/ndisc6.rb index 64897129b..86ed2d1d1 100644 --- a/packages/ndisc6.rb +++ b/packages/ndisc6.rb @@ -18,7 +18,7 @@ class Ndisc6 < Package }) def self.build - system "./configure #{CREW_OPTIONS} --disable-suid-install" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-suid-install" system 'make' end diff --git a/packages/neo_matrix.rb b/packages/neo_matrix.rb index 4498f81bc..54546175d 100644 --- a/packages/neo_matrix.rb +++ b/packages/neo_matrix.rb @@ -22,7 +22,7 @@ class Neo_matrix < Package system './autogen.sh' # The program name is neo-matrix for us # "neo" refers to different software that existed before this neo - system "./configure #{CREW_OPTIONS.sub '--program-suffix=\'\'', ''} \ + system "./configure #{CREW_CONFIGURE_OPTIONS.sub '--program-suffix=\'\'', ''} \ --program-suffix='-matrix'" system 'make' end diff --git a/packages/neon.rb b/packages/neon.rb index 7c98fc43d..a1663cbf6 100644 --- a/packages/neon.rb +++ b/packages/neon.rb @@ -28,7 +28,7 @@ class Neon < Package system './autogen.sh' system 'filefix' system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --enable-shared=yes \ --with-ssl=openssl" system 'make' diff --git a/packages/nitrogen.rb b/packages/nitrogen.rb index 0dc481270..6d0a2c723 100644 --- a/packages/nitrogen.rb +++ b/packages/nitrogen.rb @@ -18,7 +18,7 @@ class Nitrogen < Package def self.build system 'autoreconf -fi' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/nmap.rb b/packages/nmap.rb index 51e6c4129..19e0c4e85 100644 --- a/packages/nmap.rb +++ b/packages/nmap.rb @@ -33,7 +33,7 @@ class Nmap < Package end def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-libpcap=#{CREW_PREFIX} \ --with-libpcre=#{CREW_PREFIX} \ --with-zlib=#{CREW_PREFIX} \ diff --git a/packages/npth.rb b/packages/npth.rb index 72811b41a..1dbc13e25 100644 --- a/packages/npth.rb +++ b/packages/npth.rb @@ -18,7 +18,7 @@ class Npth < Package }) def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS}" + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/oniguruma.rb b/packages/oniguruma.rb index 0a72c5a91..2332f7213 100644 --- a/packages/oniguruma.rb +++ b/packages/oniguruma.rb @@ -21,7 +21,7 @@ class Oniguruma < Package system 'NOCONFIGURE=1 ./autogen.sh' system 'filefix' system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/opam.rb b/packages/opam.rb index 1947e8398..473285299 100644 --- a/packages/opam.rb +++ b/packages/opam.rb @@ -29,7 +29,7 @@ class Opam < Package @OPAMROOT = "#{CREW_PREFIX}/share/opam" def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system "make lib-ext all -j1 \ OCAMLC='ocamlc -unsafe-string' \ OCAMLOPT='ocamlopt -unsafe-string'" diff --git a/packages/openbox.rb b/packages/openbox.rb index 452a36167..84ed8356b 100644 --- a/packages/openbox.rb +++ b/packages/openbox.rb @@ -41,7 +41,7 @@ class Openbox < Package ENV['CFLAGS'] = '-lX11 -lXau' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/openconnect.rb b/packages/openconnect.rb index b92fcd5bb..7c1a6992b 100644 --- a/packages/openconnect.rb +++ b/packages/openconnect.rb @@ -24,7 +24,7 @@ class Openconnect < Package def self.build system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --with-vpnc-script=#{CREW_PREFIX}/etc/vpnc/vpnc-script" system 'make' end diff --git a/packages/pavucontrol.rb b/packages/pavucontrol.rb index 52883a5f8..bb21f6b41 100644 --- a/packages/pavucontrol.rb +++ b/packages/pavucontrol.rb @@ -27,7 +27,7 @@ class Pavucontrol < Package system 'NOCONFIGURE=1 ./bootstrap.sh' system "env #{CREW_ENV_OPTIONS} \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --disable-lynx" system 'make' end diff --git a/packages/pcaudiolib.rb b/packages/pcaudiolib.rb index ce8799e58..60eaa2d24 100644 --- a/packages/pcaudiolib.rb +++ b/packages/pcaudiolib.rb @@ -23,7 +23,7 @@ class Pcaudiolib < Package system './autogen.sh' system "env CFLAGS='-O2 -pipe -flto=auto -fuse-ld=gold' \ LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --without-pulseaudio \ --with-alsa \ --without-qsa \ diff --git a/packages/pcre.rb b/packages/pcre.rb index 40976506f..00c2c1885 100644 --- a/packages/pcre.rb +++ b/packages/pcre.rb @@ -22,7 +22,7 @@ class Pcre < Package depends_on 'readline' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-shared \ --with-pic \ --enable-unicode-properties \ diff --git a/packages/pcsc_lite.rb b/packages/pcsc_lite.rb index 0e667f3f4..bb586376e 100644 --- a/packages/pcsc_lite.rb +++ b/packages/pcsc_lite.rb @@ -26,7 +26,7 @@ class Pcsc_lite < Package end def self.build - system "#{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + system "#{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-libsystemd" system 'make' end diff --git a/packages/pdfchain.rb b/packages/pdfchain.rb index f44ec0874..046e139f0 100644 --- a/packages/pdfchain.rb +++ b/packages/pdfchain.rb @@ -23,7 +23,7 @@ class Pdfchain < Package depends_on 'sommelier' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/perl_stow.rb b/packages/perl_stow.rb index 6d31dac15..862a29010 100644 --- a/packages/perl_stow.rb +++ b/packages/perl_stow.rb @@ -20,7 +20,7 @@ class Perl_stow < Package depends_on 'perl_app_cpanminus' => :build def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-pmdir=#{CREW_PREFIX}/share/perl5/vendor_perl" system 'make' end diff --git a/packages/pixz.rb b/packages/pixz.rb index a08caa8ee..939df7592 100644 --- a/packages/pixz.rb +++ b/packages/pixz.rb @@ -33,7 +33,7 @@ class Pixz < Package CC=clang LD=ld.lld CFLAGS='-flto -pipe -O3 -fuse-ld=lld -static' \ CXXFLAGS='-flto -pipe -O3 -static' \ LDFLAGS='-flto -static' \ - #{CREW_OPTIONS}" + #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/pkg_config.rb b/packages/pkg_config.rb index ba8066320..b81506c1a 100644 --- a/packages/pkg_config.rb +++ b/packages/pkg_config.rb @@ -31,7 +31,7 @@ class Pkg_config < Package CXXFLAGS='-pipe -flto=auto' LDFLAGS='-flto=auto' \ GLIB_CFLAGS='-I#{CREW_PREFIX}/include/glib-2.0 -I#{CREW_LIB_PREFIX}/glib-2.0/include' \ GLIB_LIBS=-lglib-2.0 \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-pc-path=#{CREW_PREFIX}/lib/pkgconfig:#{CREW_PREFIX}/lib64/pkgconfig:#{CREW_PREFIX}/share/pkgconfig \ --with-system-include-path=/usr/include:#{CREW_PREFIX}/include \ --with-system-library-path=#{CREW_LIB_PREFIX} \ @@ -43,7 +43,7 @@ class Pkg_config < Package CXXFLAGS='-pipe -flto=auto' LDFLAGS='-flto=auto' \ GLIB_CFLAGS='-I#{CREW_PREFIX}/include/glib-2.0 -I#{CREW_LIB_PREFIX}/glib-2.0/include' \ GLIB_LIBS=-lglib-2.0 \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-pc-path=#{CREW_PREFIX}/lib/pkgconfig:#{CREW_PREFIX}/share/pkgconfig \ --with-system-include-path=/usr/include:#{CREW_PREFIX}/include \ --with-system-library-path=#{CREW_LIB_PREFIX} \ diff --git a/packages/popt.rb b/packages/popt.rb index ec4993267..cdb20d509 100644 --- a/packages/popt.rb +++ b/packages/popt.rb @@ -24,7 +24,7 @@ class Popt < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode" system 'make' end diff --git a/packages/postgresql.rb b/packages/postgresql.rb index 88e94bc9e..7e66025d4 100644 --- a/packages/postgresql.rb +++ b/packages/postgresql.rb @@ -46,7 +46,7 @@ class Postgresql < Package end def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-gssapi \ --with-icu \ --with-ldap \ diff --git a/packages/potrace.rb b/packages/potrace.rb index 7f59a8f65..238966551 100644 --- a/packages/potrace.rb +++ b/packages/potrace.rb @@ -21,7 +21,7 @@ class Potrace < Package depends_on 'zlib' # R def self.build - system "./configure #{CREW_OPTIONS} --with-libpotrace" + system "./configure #{CREW_CONFIGURE_OPTIONS} --with-libpotrace" system 'make' end diff --git a/packages/printproto.rb b/packages/printproto.rb index 3408c89b3..93e32fa5b 100644 --- a/packages/printproto.rb +++ b/packages/printproto.rb @@ -18,7 +18,7 @@ class Printproto < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/procps.rb b/packages/procps.rb index 65d4c5310..794cd1a22 100644 --- a/packages/procps.rb +++ b/packages/procps.rb @@ -19,7 +19,7 @@ class Procps < Package def self.build system './autogen.sh' - system "CFLAGS='-I#{CREW_PREFIX}/include/ncursesw' ./configure #{CREW_OPTIONS}" + system "CFLAGS='-I#{CREW_PREFIX}/include/ncursesw' ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/proj.rb b/packages/proj.rb index b5da26332..725c5a360 100644 --- a/packages/proj.rb +++ b/packages/proj.rb @@ -18,7 +18,7 @@ class Proj < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/protobuf_c.rb b/packages/protobuf_c.rb index 4a21804bc..90885d459 100644 --- a/packages/protobuf_c.rb +++ b/packages/protobuf_c.rb @@ -25,7 +25,7 @@ class Protobuf_c < Package depends_on 'gcc_lib' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/psmisc.rb b/packages/psmisc.rb index a4be1f2c1..60de981fc 100644 --- a/packages/psmisc.rb +++ b/packages/psmisc.rb @@ -23,7 +23,7 @@ class Psmisc < Package def self.build system './autogen.sh' - system "CFLAGS+=' -I#{CREW_PREFIX}/include/ncurses' ./configure #{CREW_OPTIONS}" + system "CFLAGS+=' -I#{CREW_PREFIX}/include/ncurses' ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/py3_libxml2.rb b/packages/py3_libxml2.rb index 46a374694..bae74ed0f 100644 --- a/packages/py3_libxml2.rb +++ b/packages/py3_libxml2.rb @@ -26,7 +26,7 @@ class Py3_libxml2 < Package def self.build system 'autoreconf -fiv' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" Dir.chdir('python') do system "python3 setup.py build #{PY3_SETUP_BUILD_OPTIONS}" end diff --git a/packages/pyconfigure.rb b/packages/pyconfigure.rb index 433e657d6..bf805ccb1 100644 --- a/packages/pyconfigure.rb +++ b/packages/pyconfigure.rb @@ -18,7 +18,7 @@ class Pyconfigure < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/python3.rb b/packages/python3.rb index 6a1bc9209..321e7d7ff 100644 --- a/packages/python3.rb +++ b/packages/python3.rb @@ -73,7 +73,7 @@ class Python3 < Package FileUtils.mkdir_p 'builddir' Dir.chdir 'builddir' do - system "../configure #{CREW_OPTIONS} \ + system "../configure #{CREW_CONFIGURE_OPTIONS} \ --with-lto \ --with-computed-gotos \ --enable-loadable-sqlite-extensions \ diff --git a/packages/qemu.rb b/packages/qemu.rb index 2ea8c9412..deb471c28 100644 --- a/packages/qemu.rb +++ b/packages/qemu.rb @@ -78,7 +78,7 @@ class Qemu < Package def self.build FileUtils.mkdir_p 'build' Dir.chdir 'build' do - system "mold -run ../configure #{CREW_OPTIONS.sub(/--target.*/, '')} \ + system "mold -run ../configure #{CREW_CONFIGURE_OPTIONS.sub(/--target.*/, '')} \ --enable-kvm \ --enable-lto" @counter = 1 diff --git a/packages/qqwing.rb b/packages/qqwing.rb index e2fc25e4e..f3fce1d1a 100644 --- a/packages/qqwing.rb +++ b/packages/qqwing.rb @@ -19,7 +19,7 @@ class Qqwing < Package def self.build system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/rdfind.rb b/packages/rdfind.rb index 325b54145..d8a86e2c7 100644 --- a/packages/rdfind.rb +++ b/packages/rdfind.rb @@ -32,7 +32,7 @@ class Rdfind < Package def self.build system '[ -x configure ] || autoreconf -fvi' - system "./configure #{CREW_OPTIONS} #{CREW_ENV_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS} #{CREW_ENV_OPTIONS}" system 'make -s' end diff --git a/packages/readline.rb b/packages/readline.rb index b4c9db84d..f9a9d3332 100644 --- a/packages/readline.rb +++ b/packages/readline.rb @@ -23,7 +23,7 @@ class Readline < Package def self.build system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --with-curses \ --enable-multibyte" system 'make', 'SHLIB_LIBS=-Wl,--as-needed -Wl,-ltinfow -Wl,--no-as-needed' diff --git a/packages/rendercheck.rb b/packages/rendercheck.rb index 2df25e284..a20fced10 100644 --- a/packages/rendercheck.rb +++ b/packages/rendercheck.rb @@ -18,7 +18,7 @@ class Rendercheck < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/ruby.rb b/packages/ruby.rb index 938640a89..c58b35aa1 100644 --- a/packages/ruby.rb +++ b/packages/ruby.rb @@ -37,7 +37,7 @@ class Ruby < Package system "RUBY_TRY_CFLAGS='stack_protector=no' \ RUBY_TRY_LDFLAGS='stack_protector=no' \ optflags='-flto=auto -fuse-ld=#{CREW_LINKER}' \ - mold -run ./configure #{CREW_OPTIONS} \ + mold -run ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-shared \ #{ARCH == 'x86_64' ? '--enable-yjit' : ''} \ --disable-fortify-source" diff --git a/packages/rush.rb b/packages/rush.rb index 181d895f7..362bc7929 100644 --- a/packages/rush.rb +++ b/packages/rush.rb @@ -18,7 +18,7 @@ class Rush < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/rxvt_unicode.rb b/packages/rxvt_unicode.rb index 755fa3247..c062d89ee 100644 --- a/packages/rxvt_unicode.rb +++ b/packages/rxvt_unicode.rb @@ -21,7 +21,7 @@ class Rxvt_unicode < Package depends_on 'sommelier' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/sane_backends.rb b/packages/sane_backends.rb index 7a9524a0b..676a8303b 100644 --- a/packages/sane_backends.rb +++ b/packages/sane_backends.rb @@ -21,7 +21,7 @@ class Sane_backends < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode" system 'make' end diff --git a/packages/sane_frontends.rb b/packages/sane_frontends.rb index 773418883..f4caa9e80 100644 --- a/packages/sane_frontends.rb +++ b/packages/sane_frontends.rb @@ -23,7 +23,7 @@ class Sane_frontends < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode" system 'make' end diff --git a/packages/sassc.rb b/packages/sassc.rb index 967be27e7..a55119041 100644 --- a/packages/sassc.rb +++ b/packages/sassc.rb @@ -23,7 +23,7 @@ class Sassc < Package def self.build system 'autoreconf -i' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'mold -run make' end diff --git a/packages/scrot.rb b/packages/scrot.rb index 2e5ae7dd3..f1545a683 100644 --- a/packages/scrot.rb +++ b/packages/scrot.rb @@ -23,7 +23,7 @@ class Scrot < Package depends_on 'optipng' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/shadow.rb b/packages/shadow.rb index d47bbad97..a55f79b8c 100644 --- a/packages/shadow.rb +++ b/packages/shadow.rb @@ -24,7 +24,7 @@ class Shadow < Package depends_on 'libeconf' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --bindir=#{CREW_PREFIX}/bin \ --sbindir=#{CREW_PREFIX}/bin \ --enable-shared \ diff --git a/packages/slang.rb b/packages/slang.rb index afc1711d4..596e79133 100644 --- a/packages/slang.rb +++ b/packages/slang.rb @@ -24,7 +24,7 @@ class Slang < Package depends_on 'gcc_lib' # R def self.build - system "mold -run ./configure #{CREW_OPTIONS} --without-x" + system "mold -run ./configure #{CREW_CONFIGURE_OPTIONS} --without-x" # force to compile in sequential since slang Makefile doesn't work in parallel system 'make', '-j1' diff --git a/packages/smallbasic.rb b/packages/smallbasic.rb index 5a66f152f..943e6efb2 100644 --- a/packages/smallbasic.rb +++ b/packages/smallbasic.rb @@ -23,7 +23,7 @@ class Smallbasic < Package def self.build system 'bash ./autogen.sh && filefix' - system "./configure #{CREW_OPTIONS} --enable-sdl" + system "./configure #{CREW_CONFIGURE_OPTIONS} --enable-sdl" system 'make' end diff --git a/packages/smartmontools.rb b/packages/smartmontools.rb index 20ea50350..68d292acf 100644 --- a/packages/smartmontools.rb +++ b/packages/smartmontools.rb @@ -21,7 +21,7 @@ class Smartmontools < Package def self.build system './autogen.sh' - system "./configure #{CREW_OPTIONS} --with-nvme-devicescan --disable-maintainer-mode" + system "./configure #{CREW_CONFIGURE_OPTIONS} --with-nvme-devicescan --disable-maintainer-mode" system 'make' end diff --git a/packages/smbclient.rb b/packages/smbclient.rb index f5a6c266e..22400b0c8 100644 --- a/packages/smbclient.rb +++ b/packages/smbclient.rb @@ -72,7 +72,7 @@ class Smbclient < Package def self.build system './configure --help' system "python_LDFLAGS='' ./configure --enable-fhs \ - #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ + #{CREW_CONFIGURE_OPTIONS.sub(/--program-suffix.*/, '')} \ --sysconfdir=#{CREW_PREFIX}/etc \ --sbindir=#{CREW_PREFIX}/bin \ --libdir=#{CREW_LIB_PREFIX} \ diff --git a/packages/snort.rb b/packages/snort.rb index 616bc226d..9e23bbb0d 100644 --- a/packages/snort.rb +++ b/packages/snort.rb @@ -30,7 +30,7 @@ class Snort < Package end def self.build - system "./configure #{CREW_OPTIONS} --enable-sourcefire \ + system "./configure #{CREW_CONFIGURE_OPTIONS} --enable-sourcefire \ --with-dnet-includes=#{CREW_PREFIX}/include/dnet \ --with-tirpc-includes=#{CREW_PREFIX}/include/tirpc" system 'make' diff --git a/packages/spacefm.rb b/packages/spacefm.rb index ab70bd061..dda1667e9 100644 --- a/packages/spacefm.rb +++ b/packages/spacefm.rb @@ -57,7 +57,7 @@ class Spacefm < Package end def self.build - system "mold -run ./configure #{CREW_OPTIONS} \ + system "mold -run ./configure #{CREW_CONFIGURE_OPTIONS} \ --with-gtk3 \ --disable-maintainer-mode" system 'make' diff --git a/packages/squashfs_tools_ng.rb b/packages/squashfs_tools_ng.rb index 25f812110..ed07dcecb 100644 --- a/packages/squashfs_tools_ng.rb +++ b/packages/squashfs_tools_ng.rb @@ -27,7 +27,7 @@ class Squashfs_tools_ng < Package system "env CFLAGS='-pipe -flto=auto' \ CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' system 'make doxygen-doc' end diff --git a/packages/squashfuse.rb b/packages/squashfuse.rb index 903fa343b..805f2b32b 100644 --- a/packages/squashfuse.rb +++ b/packages/squashfuse.rb @@ -27,7 +27,7 @@ class Squashfuse < Package system "env CFLAGS='-pipe -flto=auto' \ CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/startup_notification.rb b/packages/startup_notification.rb index 8d8b1c29b..f0d6402c4 100644 --- a/packages/startup_notification.rb +++ b/packages/startup_notification.rb @@ -28,7 +28,7 @@ class Startup_notification < Package system 'autoreconf --force --install' system "env CFLAGS='-flto=auto' \ CXXFLAGS='-flto=auto' LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --localstatedir=/var \ --sysconfdir=#{CREW_PREFIX}/etc" system 'make' diff --git a/packages/t1lib.rb b/packages/t1lib.rb index 2c4d8ee66..7f16d10b8 100644 --- a/packages/t1lib.rb +++ b/packages/t1lib.rb @@ -46,7 +46,7 @@ class T1lib < Package system "env CFLAGS='-pipe -flto=auto' \ CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make without_doc' end diff --git a/packages/talloc.rb b/packages/talloc.rb index 626e82939..a10c6e44e 100644 --- a/packages/talloc.rb +++ b/packages/talloc.rb @@ -28,7 +28,7 @@ class Talloc < Package depends_on 'python3' # R def self.build - system "./configure #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ + system "./configure #{CREW_CONFIGURE_OPTIONS.sub(/--program-suffix.*/, '')} \ --sysconfdir=#{CREW_PREFIX}/etc/samba \ --localstatedir=#{CREW_PREFIX}/var \ --bundled-libraries=NONE \ diff --git a/packages/tcl.rb b/packages/tcl.rb index e8344a82a..b2aca227d 100644 --- a/packages/tcl.rb +++ b/packages/tcl.rb @@ -25,7 +25,7 @@ class Tcl < Package def self.build FileUtils.chdir('unix') do @bit64 = ARCH == 'x86_64' ? 'enable' : 'disable' - system "./configure #{CREW_OPTIONS} --#{@bit64}-64bit" + system "./configure #{CREW_CONFIGURE_OPTIONS} --#{@bit64}-64bit" system 'make' end end diff --git a/packages/tcpflow.rb b/packages/tcpflow.rb index c67016635..71d225080 100644 --- a/packages/tcpflow.rb +++ b/packages/tcpflow.rb @@ -36,7 +36,7 @@ class Tcpflow < Package def self.build system 'bash bootstrap.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/tcsh.rb b/packages/tcsh.rb index 7408306ca..5bb9e1789 100644 --- a/packages/tcsh.rb +++ b/packages/tcsh.rb @@ -18,7 +18,7 @@ class Tcsh < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/tdb.rb b/packages/tdb.rb index 2938202bc..fc0f351de 100644 --- a/packages/tdb.rb +++ b/packages/tdb.rb @@ -26,7 +26,7 @@ class Tdb < Package depends_on 'python3' => :build def self.build - system "./configure #{CREW_OPTIONS.sub(/--program-suffix.*/, '')}" + system "./configure #{CREW_CONFIGURE_OPTIONS.sub(/--program-suffix.*/, '')}" system 'make' end diff --git a/packages/telepathy_glib.rb b/packages/telepathy_glib.rb index 3dcee03f8..c69ab8586 100644 --- a/packages/telepathy_glib.rb +++ b/packages/telepathy_glib.rb @@ -24,7 +24,7 @@ class Telepathy_glib < Package def self.build system "env #{CREW_ENV_OPTIONS} \ ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --libexecdir=#{CREW_LIB_PREFIX}/telepathy \ --enable-vala-bindings" system 'make' diff --git a/packages/testdisk.rb b/packages/testdisk.rb index c1f132d5d..053bbeb32 100644 --- a/packages/testdisk.rb +++ b/packages/testdisk.rb @@ -27,7 +27,7 @@ class Testdisk < Package depends_on 'util_linux' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/tevent.rb b/packages/tevent.rb index a1cbd8be7..97767b732 100644 --- a/packages/tevent.rb +++ b/packages/tevent.rb @@ -28,7 +28,7 @@ class Tevent < Package depends_on 'talloc' # R def self.build - system "./configure #{CREW_OPTIONS.sub(/--program-suffix.*/, '')} \ + system "./configure #{CREW_CONFIGURE_OPTIONS.sub(/--program-suffix.*/, '')} \ --sysconfdir=#{CREW_PREFIX}/etc/samba \ --localstatedir=#{CREW_PREFIX}/var \ --bundled-libraries=NONE \ diff --git a/packages/thunar.rb b/packages/thunar.rb index d782abbf5..cbb8e6693 100644 --- a/packages/thunar.rb +++ b/packages/thunar.rb @@ -29,7 +29,7 @@ class Thunar < Package def self.build system <<~CONFIGURE #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-gio-unix \ --enable-gudev \ --enable-exif \ diff --git a/packages/ticker.rb b/packages/ticker.rb index e18f729f3..a3d381d88 100644 --- a/packages/ticker.rb +++ b/packages/ticker.rb @@ -25,7 +25,7 @@ class Ticker < Package end def self.build - system "./configure #{CREW_OPTIONS} || true" # Configure will fail + system "./configure #{CREW_CONFIGURE_OPTIONS} || true" # Configure will fail system 'make' end diff --git a/packages/tk.rb b/packages/tk.rb index 872549372..3ab4c852c 100644 --- a/packages/tk.rb +++ b/packages/tk.rb @@ -32,7 +32,7 @@ class Tk < Package FileUtils.chdir('unix') do @bit64 = ARCH == 'x86_64' ? 'enable' : 'disable' system "./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --with-tcl=#{CREW_LIB_PREFIX} \ --enable-threads \ --#{@bit64}-64bit" diff --git a/packages/trousers.rb b/packages/trousers.rb index be20f186f..8cd6d60cb 100644 --- a/packages/trousers.rb +++ b/packages/trousers.rb @@ -24,7 +24,7 @@ class Trousers < Package def self.build system './bootstrap.sh' system "mold -run ./configure \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --with-gui=none" system 'make' end diff --git a/packages/twm.rb b/packages/twm.rb index c1e3089cc..899fd2bf1 100644 --- a/packages/twm.rb +++ b/packages/twm.rb @@ -19,7 +19,7 @@ class Twm < Package depends_on 'xorg_server' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/ucl.rb b/packages/ucl.rb index 1d2155157..8da757c13 100644 --- a/packages/ucl.rb +++ b/packages/ucl.rb @@ -22,7 +22,7 @@ class Ucl < Package def self.build system "env CFLAGS='-pipe -std=gnu90 -fPIC -flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-shared \ --enable-static" system 'make' diff --git a/packages/udisks2.rb b/packages/udisks2.rb index 9ca49c16e..e33c3f91e 100644 --- a/packages/udisks2.rb +++ b/packages/udisks2.rb @@ -24,7 +24,7 @@ class Udisks2 < Package def self.build system 'filefix' - system "./configure #{CREW_OPTIONS} --disable-man" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-man" system 'make' end diff --git a/packages/unixodbc.rb b/packages/unixodbc.rb index 7a50f9159..b9201487b 100644 --- a/packages/unixodbc.rb +++ b/packages/unixodbc.rb @@ -21,7 +21,7 @@ class Unixodbc < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode" system 'make' end diff --git a/packages/usbredir.rb b/packages/usbredir.rb index bef80e1c9..753450cb6 100644 --- a/packages/usbredir.rb +++ b/packages/usbredir.rb @@ -25,7 +25,7 @@ class Usbredir < Package def self.build system 'autoreconf -fi' system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS} \ + ./configure #{CREW_CONFIGURE_OPTIONS} \ --sbindir=#{CREW_PREFIX}/bin" system 'make' end diff --git a/packages/usbutils.rb b/packages/usbutils.rb index 8ea93a6dd..e54304fe7 100644 --- a/packages/usbutils.rb +++ b/packages/usbutils.rb @@ -22,7 +22,7 @@ class Usbutils < Package def self.build system 'NOCONFIGURE=1 ./autogen.sh' system "env #{CREW_ENV_OPTIONS} \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/vala.rb b/packages/vala.rb index 7e0793d5e..504f317f6 100644 --- a/packages/vala.rb +++ b/packages/vala.rb @@ -42,7 +42,7 @@ class Vala < Package end system "VALAC=#{Dir.pwd}/bootstrap_install/bin/valac mold -run ./autogen.sh \ - #{CREW_OPTIONS} \ + #{CREW_CONFIGURE_OPTIONS} \ --disable-maintainer-mode \ --disable-valadoc" system 'make' diff --git a/packages/volume_key.rb b/packages/volume_key.rb index de2065daa..e64902251 100644 --- a/packages/volume_key.rb +++ b/packages/volume_key.rb @@ -33,7 +33,7 @@ associated command-line tool, named volume_key.' system 'autoconf' system 'autoheader' system 'automake --add-missing' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/w3m.rb b/packages/w3m.rb index 3b9f43e44..e44831b37 100644 --- a/packages/w3m.rb +++ b/packages/w3m.rb @@ -22,7 +22,7 @@ class W3m < Package depends_on 'mailutils' def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-imagelib='gdk-pixbuf-2.0 imlib2' \ --with-editor=$(which vi) \ --with-mailer=$(which mail) \ diff --git a/packages/webrtc_audio_processing.rb b/packages/webrtc_audio_processing.rb index 7421672d8..d5a7ffa25 100644 --- a/packages/webrtc_audio_processing.rb +++ b/packages/webrtc_audio_processing.rb @@ -25,7 +25,7 @@ class Webrtc_audio_processing < Package system "env CFLAGS='-flto=auto' CXXFLAGS='-flto=auto -std=c++17' \ LDFLAGS='-flto=auto' \ ./configure \ - #{CREW_OPTIONS}" + #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/which.rb b/packages/which.rb index 01aaa5964..651424021 100644 --- a/packages/which.rb +++ b/packages/which.rb @@ -18,7 +18,7 @@ class Which < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/wine.rb b/packages/wine.rb index c966bc77f..07adbc2fd 100644 --- a/packages/wine.rb +++ b/packages/wine.rb @@ -58,7 +58,7 @@ class Wine < Package FileUtils.mkdir_p 'wine64-build' Dir.chdir 'wine64-build' do unless File.file?('Makefile') - system "../configure #{CREW_OPTIONS} \ + system "../configure #{CREW_CONFIGURE_OPTIONS} \ --enable-win64 \ --disable-maintainer-mode \ --with-gstreamer \ diff --git a/packages/wmctrl.rb b/packages/wmctrl.rb index 26db91948..02651dfd7 100644 --- a/packages/wmctrl.rb +++ b/packages/wmctrl.rb @@ -33,7 +33,7 @@ class Wmctrl < Package def self.build system "env CFLAGS='-pipe -flto=auto' CXXFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/wol.rb b/packages/wol.rb index 7f91a581a..c36d39773 100644 --- a/packages/wol.rb +++ b/packages/wol.rb @@ -20,7 +20,7 @@ class Wol < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/wput.rb b/packages/wput.rb index 33e86d052..8eecffb3d 100644 --- a/packages/wput.rb +++ b/packages/wput.rb @@ -25,7 +25,7 @@ class Wput < Package end def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/wxwidgets.rb b/packages/wxwidgets.rb index 67ddb43dc..30c5376a0 100644 --- a/packages/wxwidgets.rb +++ b/packages/wxwidgets.rb @@ -69,7 +69,7 @@ class Wxwidgets < Package end def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-gtk=3 \ --with-opengl \ --enable-unicode \ diff --git a/packages/wxwidgets30.rb b/packages/wxwidgets30.rb index f4b377d96..29e490170 100644 --- a/packages/wxwidgets30.rb +++ b/packages/wxwidgets30.rb @@ -54,7 +54,7 @@ class Wxwidgets30 < Package end def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-gtk=3 \ --with-opengl \ --enable-unicode \ diff --git a/packages/wxwidgets31.rb b/packages/wxwidgets31.rb index 741aa5375..3a0d07bf5 100644 --- a/packages/wxwidgets31.rb +++ b/packages/wxwidgets31.rb @@ -65,7 +65,7 @@ class Wxwidgets31 < Package end def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --with-gtk=3 \ --with-opengl \ --enable-unicode \ diff --git a/packages/xauth.rb b/packages/xauth.rb index 2b9d98c9a..41f7e4ff6 100644 --- a/packages/xauth.rb +++ b/packages/xauth.rb @@ -23,7 +23,7 @@ class Xauth < Package depends_on 'glibc' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-ipv6 \ --enable-tcp-transport \ --enable-unix-transport \ diff --git a/packages/xcb_util_cursor.rb b/packages/xcb_util_cursor.rb index e52e84bba..c4fee1c87 100644 --- a/packages/xcb_util_cursor.rb +++ b/packages/xcb_util_cursor.rb @@ -30,7 +30,7 @@ class Xcb_util_cursor < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xcb_util_xrm.rb b/packages/xcb_util_xrm.rb index d093e82c8..e26d6c218 100644 --- a/packages/xcb_util_xrm.rb +++ b/packages/xcb_util_xrm.rb @@ -18,7 +18,7 @@ class Xcb_util_xrm < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xclock.rb b/packages/xclock.rb index d21e8858f..d304c94a7 100644 --- a/packages/xclock.rb +++ b/packages/xclock.rb @@ -27,7 +27,7 @@ class Xclock < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xdg_dbus_proxy.rb b/packages/xdg_dbus_proxy.rb index 3e47a3497..ce67d378f 100644 --- a/packages/xdg_dbus_proxy.rb +++ b/packages/xdg_dbus_proxy.rb @@ -18,7 +18,7 @@ class Xdg_dbus_proxy < Package }) def self.build - system "./configure #{CREW_OPTIONS} --disable-maintainer-mode --disable-man" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-maintainer-mode --disable-man" system 'make' end diff --git a/packages/xdpyinfo.rb b/packages/xdpyinfo.rb index 8f0d800ed..3cae64637 100644 --- a/packages/xdpyinfo.rb +++ b/packages/xdpyinfo.rb @@ -35,7 +35,7 @@ class Xdpyinfo < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xfce4_dev_tools.rb b/packages/xfce4_dev_tools.rb index 6e2a58d42..6bcf88514 100644 --- a/packages/xfce4_dev_tools.rb +++ b/packages/xfce4_dev_tools.rb @@ -26,7 +26,7 @@ class Xfce4_dev_tools < Package def self.build system <<~BUILD [ -x autogen.sh ] && env NOCONFIGURE='1' ./autogen.sh - env #{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} + env #{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} make BUILD end diff --git a/packages/xfce4_panel.rb b/packages/xfce4_panel.rb index dba9e2987..c388fa6c2 100644 --- a/packages/xfce4_panel.rb +++ b/packages/xfce4_panel.rb @@ -30,7 +30,7 @@ class Xfce4_panel < Package def self.build system <<~BUILD [ -x autogen.sh ] && env NOCONFIGURE='1' ./autogen.sh - env #{CREW_ENV_OPTIONS} ./configure #{CREW_OPTIONS} \ + env #{CREW_ENV_OPTIONS} ./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-static \ --enable-gio-unix diff --git a/packages/xfce4_terminal.rb b/packages/xfce4_terminal.rb index 00ce05de9..0753bf38e 100644 --- a/packages/xfce4_terminal.rb +++ b/packages/xfce4_terminal.rb @@ -26,7 +26,7 @@ class Xfce4_terminal < Package depends_on 'mesa' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system "make -j#{CREW_NPROC}" end diff --git a/packages/xfconf.rb b/packages/xfconf.rb index 8b59f60d0..8c6f1c194 100644 --- a/packages/xfconf.rb +++ b/packages/xfconf.rb @@ -22,7 +22,7 @@ class Xfconf < Package depends_on 'vala' => :build def self.build - system "./configure #{CREW_OPTIONS} --enable-gsettings-backend" + system "./configure #{CREW_CONFIGURE_OPTIONS} --enable-gsettings-backend" system "make -j#{CREW_NPROC}" end diff --git a/packages/xfsprogs.rb b/packages/xfsprogs.rb index 2d024eb6c..995ea9648 100644 --- a/packages/xfsprogs.rb +++ b/packages/xfsprogs.rb @@ -27,7 +27,7 @@ class Xfsprogs < Package def self.build system 'make configure' - system "DEBUG=-DNDEBUG ./configure #{CREW_OPTIONS}" + system "DEBUG=-DNDEBUG ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xhost.rb b/packages/xhost.rb index c96a15742..0dc4186b8 100644 --- a/packages/xhost.rb +++ b/packages/xhost.rb @@ -26,7 +26,7 @@ class Xhost < Package --enable-tcp-transport \ --enable-unix-transport \ --enable-local-transport \ - #{CREW_OPTIONS}" + #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xinit.rb b/packages/xinit.rb index d4f0577b3..48739eebd 100644 --- a/packages/xinit.rb +++ b/packages/xinit.rb @@ -23,7 +23,7 @@ class Xinit < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xkbcomp.rb b/packages/xkbcomp.rb index ff8bf8149..cb9256e13 100644 --- a/packages/xkbcomp.rb +++ b/packages/xkbcomp.rb @@ -20,7 +20,7 @@ class Xkbcomp < Package depends_on 'xcb_util' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xmessage.rb b/packages/xmessage.rb index 70919c471..3991a3539 100644 --- a/packages/xmessage.rb +++ b/packages/xmessage.rb @@ -23,7 +23,7 @@ class Xmessage < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xmlcatmgr.rb b/packages/xmlcatmgr.rb index d86f0f891..5bb78a43a 100644 --- a/packages/xmlcatmgr.rb +++ b/packages/xmlcatmgr.rb @@ -18,7 +18,7 @@ class Xmlcatmgr < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xorg_cf_files.rb b/packages/xorg_cf_files.rb index 3de92839e..d3272064b 100644 --- a/packages/xorg_cf_files.rb +++ b/packages/xorg_cf_files.rb @@ -20,7 +20,7 @@ class Xorg_cf_files < Package depends_on 'font_util' def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --sysconfdir=#{CREW_PREFIX}/etc" system 'make' end diff --git a/packages/xorg_xeyes.rb b/packages/xorg_xeyes.rb index 4facdc065..38e9b1727 100644 --- a/packages/xorg_xeyes.rb +++ b/packages/xorg_xeyes.rb @@ -31,7 +31,7 @@ class Xorg_xeyes < Package depends_on 'libxcb' # R def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xorg_xlsfonts.rb b/packages/xorg_xlsfonts.rb index 447fb967a..37448388c 100644 --- a/packages/xorg_xlsfonts.rb +++ b/packages/xorg_xlsfonts.rb @@ -24,7 +24,7 @@ class Xorg_xlsfonts < Package depends_on 'xorg_macros' => ':build' def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xorg_xset.rb b/packages/xorg_xset.rb index e63003f62..777448fc3 100644 --- a/packages/xorg_xset.rb +++ b/packages/xorg_xset.rb @@ -27,7 +27,7 @@ class Xorg_xset < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --without-fontcache \ --without-xf86misc" system 'make' diff --git a/packages/xprop.rb b/packages/xprop.rb index 2e29a9821..df08ce806 100644 --- a/packages/xprop.rb +++ b/packages/xprop.rb @@ -21,7 +21,7 @@ class Xprop < Package def self.build system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xrdb.rb b/packages/xrdb.rb index 500a5a776..b821a6ae5 100644 --- a/packages/xrdb.rb +++ b/packages/xrdb.rb @@ -22,7 +22,7 @@ class Xrdb < Package def self.build system 'NOCONFIGURE=1 ./autogen.sh' - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/xterm.rb b/packages/xterm.rb index 2a3c5b476..811f2901a 100644 --- a/packages/xterm.rb +++ b/packages/xterm.rb @@ -42,7 +42,7 @@ class Xterm < Package end def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --disable-imake \ --enable-16bit-chars \ --enable-256-color \ diff --git a/packages/yara.rb b/packages/yara.rb index 8a3be42fa..d943744da 100644 --- a/packages/yara.rb +++ b/packages/yara.rb @@ -19,7 +19,7 @@ class Yara < Package def self.build system './bootstrap.sh' - system "YACC=bison ./configure #{CREW_OPTIONS}" + system "YACC=bison ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/yasm.rb b/packages/yasm.rb index 07906c376..04fdac9c2 100644 --- a/packages/yasm.rb +++ b/packages/yasm.rb @@ -22,7 +22,7 @@ class Yasm < Package def self.build system "env CFLAGS='-pipe -flto=auto' CPPFLAGS='-pipe -flto=auto' \ LDFLAGS='-flto=auto' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/zimg.rb b/packages/zimg.rb index c3e4154b8..2ab8b82f6 100644 --- a/packages/zimg.rb +++ b/packages/zimg.rb @@ -24,7 +24,7 @@ class Zimg < Package system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE #{@lto}' \ CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE #{@lto}' \ LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE #{@lto}' \ - ./configure #{CREW_OPTIONS}" + ./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end diff --git a/packages/zsh.rb b/packages/zsh.rb index cdbd4038b..74b0f9751 100644 --- a/packages/zsh.rb +++ b/packages/zsh.rb @@ -25,7 +25,7 @@ class Zsh < Package depends_on 'pcre' # R def self.build - system "./configure #{CREW_OPTIONS} \ + system "./configure #{CREW_CONFIGURE_OPTIONS} \ --enable-zsh-mem \ --enable-pcre \ --enable-cap \ diff --git a/packages/zsync.rb b/packages/zsync.rb index 5040e6397..0930ef147 100644 --- a/packages/zsync.rb +++ b/packages/zsync.rb @@ -23,7 +23,7 @@ class Zsync < Package end def self.build - system "./configure #{CREW_OPTIONS} --disable-maintainer-mode" + system "./configure #{CREW_CONFIGURE_OPTIONS} --disable-maintainer-mode" system 'make' end diff --git a/packages/zzuf.rb b/packages/zzuf.rb index 6a7c325d5..9d7dd40d4 100644 --- a/packages/zzuf.rb +++ b/packages/zzuf.rb @@ -18,7 +18,7 @@ class Zzuf < Package }) def self.build - system "./configure #{CREW_OPTIONS}" + system "./configure #{CREW_CONFIGURE_OPTIONS}" system 'make' end