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

@@ -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` - <sup>[Equals](#eq)</sup>
+- `#{CREW_CONFIGURE_OPTIONS}` - The preset options for `./congifure` - <sup>[Equals](#eq)</sup>
 - `#{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.
 
-<a name="eq">`CREW_OPTIONS`</a>: 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=''`
+<a name="eq">`CREW_CONFIGURE_OPTIONS`</a>: 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)
 

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

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} \

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"

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
 

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 \

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} \

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} \

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

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 \

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
 

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
 

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"

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
 

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
 

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

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

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
 

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 \

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
 

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"

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'

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'

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"

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
 

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
 

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
 

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

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
 

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  \

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

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 \

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 \

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 \

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

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
 

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
 

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
 

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

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
 

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
 

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

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
 

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
 

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

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
 

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 \

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
 

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'

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

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
 

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'

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
 

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
 

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
 

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'

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

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
 

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

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
 

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
 

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 \

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

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
 

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

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 \

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 \

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

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 \

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
 

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 \

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 \

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 \

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
 

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
 

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

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 \

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'

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 \

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

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
 

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

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
 

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 \

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 \

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
 

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
 

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
 

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
 

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

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
 

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'

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'

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
 

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"

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
 

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

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'

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

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