mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-24 09:08:53 +02:00
irssi: perl fixes and cleanup (#10585)
* fix perl dependency after dropping gcc2 perl * don't build static libraries * install perl modules to the vendor_perl directory (we are a package repository after all) * don't install perllocal.pod files * move development files to a devel subpackage
This commit is contained in:
@@ -93,9 +93,10 @@ COPYRIGHT="1999-2019 Timo Sirainen
|
||||
xavierog"
|
||||
LICENSE="GNU GPL v2
|
||||
OpenSSL GPL2 exception"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/irssi/irssi/releases/download/$portVersion/irssi-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="31653e8e0c5b1ef9b89905c330a0d77fe3f0592f88d163e504c1923dcd28ac47"
|
||||
PATCHES="irssi-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -121,10 +122,17 @@ REQUIRES="
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
lib:libncursesw$secondaryArchSuffix
|
||||
lib:libperl$secondaryArchSuffix
|
||||
lib:libperl
|
||||
lib:libssl$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
irssi${secondaryArchSuffix}_devel = $portVersion
|
||||
"
|
||||
REQUIRES_devel="
|
||||
irssi$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libglib_2.0$secondaryArchSuffix
|
||||
@@ -132,6 +140,8 @@ BUILD_REQUIRES="
|
||||
devel:libssl$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:awk
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
@@ -148,12 +158,16 @@ BUILD()
|
||||
sed -i 's/unichar/unichar2/' SupportDefs.h
|
||||
export CPPFLAGS="-include `pwd`/SupportDefs.h"
|
||||
|
||||
autoconf -fi
|
||||
automake
|
||||
runConfigure --omit-dirs binDir ./configure \
|
||||
--bindir=$commandBinDir \
|
||||
--with-perl=module \
|
||||
--with-perl-lib=vendor \
|
||||
--with-socks \
|
||||
--with-proxy \
|
||||
--enable-true-color
|
||||
--enable-true-color \
|
||||
--disable-static
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
@@ -161,5 +175,11 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# remove libtool files
|
||||
rm $libDir/irssi/modules/lib*.la
|
||||
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
46
net-irc/irssi/patches/irssi-1.4.5.patchset
Normal file
46
net-irc/irssi/patches/irssi-1.4.5.patchset
Normal file
@@ -0,0 +1,46 @@
|
||||
From b86c65509f98ba9c34025ac867de0dc53ddf2b8e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
||||
Date: Sat, 8 Jun 2024 18:16:07 +0200
|
||||
Subject: add PREFIX to perl MakeMaker args
|
||||
|
||||
otherwise, it would use perl's prefix, which is readonly
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 9a5c252..77e55f5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -122,7 +122,7 @@ AC_ARG_WITH(perl-lib,
|
||||
want_perl=yes
|
||||
perl_prefix_note=no
|
||||
if test -z "`$perlpath -v|grep '5\.0'`"; then
|
||||
- PERL_MM_PARAMS="INSTALLDIRS=vendor"
|
||||
+ PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=$prefix"
|
||||
else
|
||||
PERL_MM_PARAMS="INSTALLDIRS=perl PREFIX=`$perlpath -e 'use Config; print $Config{prefix}'`"
|
||||
fi
|
||||
--
|
||||
2.45.1
|
||||
|
||||
|
||||
From 8304efffb2897588148747b1563248fff7e1f0f6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
||||
Date: Sat, 8 Jun 2024 18:41:09 +0200
|
||||
Subject: use pure_install for the perl modules to not generate perllocal.pod
|
||||
|
||||
|
||||
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
|
||||
index ca81d3c..32a35bf 100644
|
||||
--- a/src/perl/Makefile.am
|
||||
+++ b/src/perl/Makefile.am
|
||||
@@ -150,7 +150,7 @@ all-local:
|
||||
|
||||
install-exec-local:
|
||||
for dir in $(perl_dirs); do \
|
||||
- cd $$dir && $(MAKE) install && cd ..; \
|
||||
+ cd $$dir && $(MAKE) pure_install && cd ..; \
|
||||
done
|
||||
|
||||
clean-generic:
|
||||
--
|
||||
2.45.1
|
||||
|
||||
Reference in New Issue
Block a user