From 4a7317f7aad059f0eaa818045fb88ea1544645fc Mon Sep 17 00:00:00 2001 From: OscarL Date: Sat, 23 Mar 2024 05:14:12 -0300 Subject: [PATCH] irssi: enable build on 32 bits (x86). (#10240) * irssi: enable build on 32 bits (x86). * irssi: update to version 1.4.5. --- ...{irssi-1.2.3.recipe => irssi-1.4.5.recipe} | 61 +++++++++++-------- 1 file changed, 35 insertions(+), 26 deletions(-) rename net-irc/irssi/{irssi-1.2.3.recipe => irssi-1.4.5.recipe} (68%) diff --git a/net-irc/irssi/irssi-1.2.3.recipe b/net-irc/irssi/irssi-1.4.5.recipe similarity index 68% rename from net-irc/irssi/irssi-1.2.3.recipe rename to net-irc/irssi/irssi-1.4.5.recipe index 10a89fee9..1228585d0 100644 --- a/net-irc/irssi/irssi-1.2.3.recipe +++ b/net-irc/irssi/irssi-1.4.5.recipe @@ -95,56 +95,65 @@ LICENSE="GNU GPL v2 OpenSSL GPL2 exception" REVISION="1" SOURCE_URI="https://github.com/irssi/irssi/releases/download/$portVersion/irssi-$portVersion.tar.gz" -CHECKSUM_SHA256="29cbb746d7e57591d8fcf799406fb28cb7c2d734bc4288cbb8b4c4e05cf99c25" +CHECKSUM_SHA256="31653e8e0c5b1ef9b89905c330a0d77fe3f0592f88d163e504c1923dcd28ac47" -ARCHITECTURES="all ?x86_gcc2 ?x86" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi GLOBAL_WRITABLE_FILES=" settings/irssi.conf keep-old " PROVIDES=" - irssi = $portVersion - cmd:irssi = $portVersion + irssi$secondaryArchSuffix = $portVersion + cmd:irssi$commandSuffix = $portVersion " REQUIRES=" - haiku - lib:libglib_2.0 - lib:libiconv - lib:libintl - lib:libncursesw - lib:libperl - lib:libssl + haiku$secondaryArchSuffix + lib:libglib_2.0$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libncursesw$secondaryArchSuffix + lib:libperl$secondaryArchSuffix + lib:libssl$secondaryArchSuffix " BUILD_REQUIRES=" - haiku_devel - devel:libglib_2.0 - devel:libncursesw - devel:libssl + haiku${secondaryArchSuffix}_devel + devel:libglib_2.0$secondaryArchSuffix + devel:libncursesw$secondaryArchSuffix + devel:libssl$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:autoreconf - cmd:gcc - cmd:ld - cmd:libtoolize + cmd:awk + cmd:gcc$secondaryArchSuffix cmd:make - cmd:perl - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage irssi\ - "$binDir"/irssi +defineDebugInfoPackage irssi$secondaryArchSuffix \ + "$commandBinDir"/irssi BUILD() { - autoreconf -fi # remove unichar typedef in SupportDefs.h cp /system/develop/headers/os/support/SupportDefs.h . sed -i 's/unichar/unichar2/' SupportDefs.h export CPPFLAGS="-include `pwd`/SupportDefs.h" - runConfigure ./configure --with-perl=module --with-socks \ - --with-proxy --enable-true-color + + runConfigure --omit-dirs binDir ./configure \ + --bindir=$commandBinDir \ + --with-perl=module \ + --with-socks \ + --with-proxy \ + --enable-true-color make $jobArgs }