diff --git a/main/avahi/template.py b/main/avahi/template.py index 710e3421dd..aab3ee323e 100644 --- a/main/avahi/template.py +++ b/main/avahi/template.py @@ -37,8 +37,7 @@ "--without-systemdsystemunitdir", "ssp_cv_lib=no", ] -configure_gen = [] -hostmakedepends = ["pkgconf", "python", "gettext"] +hostmakedepends = ["automake", "gettext-devel", "slibtool", "pkgconf", "python"] makedepends = ["dbus-devel", "libcap-devel", "libdaemon-devel"] depends = ["dinit-dbus"] pkgdesc = "Multicast DNS Service Discovery" diff --git a/main/bash/template.py b/main/bash/template.py index bf44187ff8..0f8a9f82b6 100644 --- a/main/bash/template.py +++ b/main/bash/template.py @@ -10,6 +10,7 @@ "ac_cv_lib_error_at_line=no", "ac_cv_header_sys_cdefs_h=no", ] +# autoreconf: error: /usr/bin/autoheader failed with exit status: 1 configure_gen = [] make_check_target = "tests" hostmakedepends = ["bison", "texinfo"] diff --git a/main/byacc/template.py b/main/byacc/template.py index 59c6a19301..89fc743bab 100644 --- a/main/byacc/template.py +++ b/main/byacc/template.py @@ -3,7 +3,7 @@ pkgrel = 0 build_style = "gnu_configure" configure_args = ["--program-transform=s,^,b,"] -configure_gen = [] +hostmakedepends = ["automake"] pkgdesc = "Berkeley yacc, a LALR(1) parser generator" maintainer = "q66 " license = "custom:byacc" diff --git a/main/cabextract/template.py b/main/cabextract/template.py index 05b5a63cf3..eb704ddf3f 100644 --- a/main/cabextract/template.py +++ b/main/cabextract/template.py @@ -3,9 +3,7 @@ pkgrel = 0 build_style = "gnu_configure" configure_args = ["--with-external-libmspack"] -# broken -configure_gen = [] -hostmakedepends = ["pkgconf"] +hostmakedepends = ["automake", "gettext-devel", "pkgconf"] makedepends = ["libmspack-devel"] pkgdesc = "Tool for extracting Microsoft cabinet files" maintainer = "psykose " diff --git a/main/check/template.py b/main/check/template.py index 1d7298094c..7fdfb0916a 100644 --- a/main/check/template.py +++ b/main/check/template.py @@ -3,7 +3,7 @@ pkgrel = 0 build_style = "gnu_configure" make_check_args = ["-j1"] -hostmakedepends = ["pkgconf"] +hostmakedepends = ["automake", "pkgconf", "slibtool"] pkgdesc = "Unit testing framework for C" maintainer = "q66 " license = "LGPL-2.1-or-later" @@ -18,6 +18,3 @@ @subpackage("check-devel") def _(self): return self.default_devel() - - -configure_gen = [] diff --git a/main/chrony/template.py b/main/chrony/template.py index 7bb74f2b58..f99f75b8d7 100644 --- a/main/chrony/template.py +++ b/main/chrony/template.py @@ -8,6 +8,7 @@ "--enable-ntp-signd", "--enable-scfilter", ] +# Custom configure script configure_gen = [] make_dir = "." hostmakedepends = ["pkgconf"] diff --git a/main/coturn/template.py b/main/coturn/template.py index 326e3565dc..fc030934c1 100644 --- a/main/coturn/template.py +++ b/main/coturn/template.py @@ -3,6 +3,7 @@ pkgrel = 3 build_style = "gnu_configure" configure_args = ["--turndbdir=/var/lib/coturn"] +# Custom configure script configure_gen = [] make_dir = "." make_check_target = "test" diff --git a/main/cppunit/template.py b/main/cppunit/template.py index b32d409b02..bc229927e4 100644 --- a/main/cppunit/template.py +++ b/main/cppunit/template.py @@ -3,7 +3,7 @@ pkgrel = 0 build_style = "gnu_configure" configure_args = ["--disable-werror"] -hostmakedepends = ["pkgconf"] +hostmakedepends = ["automake", "pkgconf", "slibtool"] pkgdesc = "C++ unit testing framework" maintainer = "q66 " license = "LGPL-2.1-or-later" @@ -15,6 +15,3 @@ @subpackage("cppunit-devel") def _(self): return self.default_devel(extra=["usr/bin"]) - - -configure_gen = [] diff --git a/main/crun/template.py b/main/crun/template.py index 4d02e37aca..9222e02abd 100644 --- a/main/crun/template.py +++ b/main/crun/template.py @@ -3,14 +3,14 @@ pkgrel = 0 build_style = "gnu_configure" configure_args = ["--disable-systemd"] -# broken presently -configure_gen = [] # full testsuite fails in netns make_check_target = "tests/tests_libcrun_errors.log" hostmakedepends = [ + "automake", "go-md2man", "pkgconf", "python", + "libtool", ] makedepends = [ "argp-standalone", diff --git a/main/cups/template.py b/main/cups/template.py index ad58054f52..172a7c377c 100644 --- a/main/cups/template.py +++ b/main/cups/template.py @@ -24,6 +24,7 @@ "--with-cups-group=lp", "--with-system-groups=_lpadmin root", ] +# autoreconf: error: /usr/bin/autoheader failed with exit status: 1 configure_gen = [] # build system is bad make_dir = "." diff --git a/main/dejagnu/template.py b/main/dejagnu/template.py index 1308375818..18698bd413 100644 --- a/main/dejagnu/template.py +++ b/main/dejagnu/template.py @@ -2,7 +2,7 @@ pkgver = "1.6.3" pkgrel = 0 build_style = "gnu_configure" -hostmakedepends = ["expect-devel"] +hostmakedepends = ["automake", "expect-devel"] makedepends = ["expect-devel"] depends = ["expect"] pkgdesc = "Framework for running test suites on GNU tools" @@ -14,5 +14,3 @@ hardening = ["vis", "cfi"] # like 4 tests fail and it's impossible to tell what is going on options = ["!check"] - -configure_gen = [] diff --git a/main/dfu-programmer/template.py b/main/dfu-programmer/template.py index 8c0b5f20d9..144f5d54b0 100644 --- a/main/dfu-programmer/template.py +++ b/main/dfu-programmer/template.py @@ -2,9 +2,8 @@ pkgver = "1.1.0" pkgrel = 0 build_style = "gnu_configure" -# broken -configure_gen = [] make_dir = "." +hostmakedepends = ["automake"] makedepends = ["libusb-devel"] pkgdesc = "Command-line programmer for Atmel USB microcontrollers" maintainer = "psykose " @@ -13,3 +12,8 @@ source = f"https://github.com/dfu-programmer/dfu-programmer/releases/download/v{pkgver}/dfu-programmer-{pkgver}.tar.gz" sha256 = "844e469be559657bc52c9d9d03c30846acd11ffbb1ddd42438fa8af1d2b8587d" hardening = ["vis", "cfi"] + + +def post_extract(self): + # otherwise configure gen fails + (self.cwd / "ChangeLog").touch() diff --git a/main/dialog/template.py b/main/dialog/template.py index 325ed32746..090d33e778 100644 --- a/main/dialog/template.py +++ b/main/dialog/template.py @@ -3,9 +3,7 @@ pkgrel = 0 build_style = "gnu_configure" configure_args = ["--with-ncursesw", "--disable-nls"] -# broken to reconf -configure_gen = [] -makedepends = ["ncurses-devel"] +makedepends = ["automake", "ncurses-devel"] pkgdesc = "Tool to display dialog boxes from shell scripts" maintainer = "q66 " license = "LGPL-2.1-only" diff --git a/main/dosfstools/template.py b/main/dosfstools/template.py index 7280b90101..1fb0205d33 100644 --- a/main/dosfstools/template.py +++ b/main/dosfstools/template.py @@ -3,7 +3,7 @@ pkgrel = 0 build_style = "gnu_configure" configure_args = ["--enable-compat-symlinks"] -hostmakedepends = ["pkgconf"] +hostmakedepends = ["automake", "gettext-devel", "pkgconf"] makedepends = ["udev-devel", "linux-headers"] pkgdesc = "DOS filesystem tools" maintainer = "q66 " @@ -16,6 +16,3 @@ def post_install(self): self.uninstall("usr/share/doc") - - -configure_gen = [] diff --git a/main/dracut-install/template.py b/main/dracut-install/template.py index e670c9737e..91195393b0 100644 --- a/main/dracut-install/template.py +++ b/main/dracut-install/template.py @@ -2,6 +2,7 @@ pkgver = "103" pkgrel = 1 build_style = "gnu_configure" +# handrolled configure configure_gen = [] make_dir = "." make_build_target = "dracut-install" diff --git a/main/fdupes/template.py b/main/fdupes/template.py index 5adb3a3c46..ca0cd823f4 100644 --- a/main/fdupes/template.py +++ b/main/fdupes/template.py @@ -2,7 +2,7 @@ pkgver = "2.3.2" pkgrel = 0 build_style = "gnu_configure" -configure_gen = [] +hostmakedepends = ["automake", "pkgconf"] makedepends = ["ncurses-devel", "pcre2-devel", "sqlite-devel"] pkgdesc = "Tool for identifying and/or deleting duplicate files" maintainer = "autumnontape " diff --git a/main/file/template.py b/main/file/template.py index 846d9ac307..dc3997200c 100644 --- a/main/file/template.py +++ b/main/file/template.py @@ -8,7 +8,7 @@ "--disable-bzlib", "--disable-xzlib", ] -hostmakedepends = ["pkgconf"] +hostmakedepends = ["automake", "pkgconf", "slibtool"] makedepends = ["zlib-ng-compat-devel"] pkgdesc = "File type identification utility" maintainer = "q66 " @@ -43,6 +43,3 @@ def _(self): self.pkgdesc = "File type identification library" return self.default_devel() - - -configure_gen = [] diff --git a/main/flex/template.py b/main/flex/template.py index 5facd0753d..e7de84fe68 100644 --- a/main/flex/template.py +++ b/main/flex/template.py @@ -3,7 +3,7 @@ pkgrel = 1 build_style = "gnu_configure" configure_args = ["--disable-bootstrap", "--disable-shared"] -hostmakedepends = ["byacc"] +hostmakedepends = ["automake", "byacc"] makedepends = ["byacc"] depends = ["byacc", self.with_pkgver("libfl-devel-static")] pkgdesc = "Fast Lexical Analyzer" @@ -40,6 +40,3 @@ def _(self): ] return self.default_devel() - - -configure_gen = [] diff --git a/main/font-alias/template.py b/main/font-alias/template.py index 437166e673..a167416b51 100644 --- a/main/font-alias/template.py +++ b/main/font-alias/template.py @@ -3,6 +3,8 @@ pkgrel = 0 build_style = "gnu_configure" configure_args = ["--with-fontrootdir=/usr/share/fonts"] +# cycle with font-util +configure_gen = [] pkgdesc = "Standard aliases for X11 PCF fonts" maintainer = "q66 " license = "MIT" @@ -14,6 +16,3 @@ def post_install(self): self.install_license("COPYING") - - -configure_gen = [] diff --git a/main/fossil/template.py b/main/fossil/template.py index 2d636cd2ac..c7ac4ec9ff 100644 --- a/main/fossil/template.py +++ b/main/fossil/template.py @@ -9,6 +9,7 @@ "--with-tcl=1", "--with-tcl-private-stubs", ] +# handrolled configure script configure_gen = [] make_check_target = "test" makedepends = ["openssl-devel", "zlib-ng-compat-devel", "tcl-devel"] diff --git a/main/ghostscript/template.py b/main/ghostscript/template.py index e715b03f2e..6f343fbf02 100644 --- a/main/ghostscript/template.py +++ b/main/ghostscript/template.py @@ -22,11 +22,10 @@ "CUPSCONFIG": "/usr/bin/cups-config", "CCAUX": "cc", } -configure_gen = [] make_dir = "." # bad build system make_build_args = ["all", "so"] make_install_args = ["install", "install-so"] -hostmakedepends = ["pkgconf"] +hostmakedepends = ["automake", "pkgconf"] makedepends = [ "cups-devel", "dbus-devel",