libevent: fix-ups to previous PR (#7718) (#7754)

This commit is contained in:
OscarL
2023-01-09 12:01:19 -03:00
committed by GitHub
parent ba0198b497
commit f56c392161
2 changed files with 10 additions and 24 deletions

View File

@@ -36,16 +36,8 @@ PROVIDES_devel="
libevent${secondaryArchSuffix}_devel = $portVersion
cmd:event_rpcgen.py
devel:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
devel:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
"
REQUIRES_devel="
libevent$secondaryArchSuffix == $portVersion base
@@ -73,7 +65,7 @@ BUILD()
aclocal
autoconf
automake --add-missing
runConfigure ./configure
runConfigure ./configure --disable-static
make $jobArgs
}
@@ -81,14 +73,7 @@ INSTALL()
{
make install
# TODO: replace /packages/libevent-1.4.14b-1/.self/ with an alias
mv /packages/libevent-1.4.14b-1/.self/lib/libevent.a \
/packages/libevent-1.4.14b-1/.self/lib/libevent.la \
/packages/libevent-1.4.14b-1/.self/lib/libevent_core.a \
/packages/libevent-1.4.14b-1/.self/lib/libevent_core.la \
/packages/libevent-1.4.14b-1/.self/lib/libevent_extra.a \
/packages/libevent-1.4.14b-1/.self/lib/libevent_extra.la \
$developDir
rm $libDir/*.la
prepareInstalledDevelLibs \
libevent-1.4 \
@@ -98,8 +83,8 @@ INSTALL()
fixPkgconfig
# devel package
packageEntries devel \
$binDir \
$developDir
$developDir \
$manDir
}

View File

@@ -10,7 +10,7 @@ HOMEPAGE="http://www.libevent.org/"
COPYRIGHT="2000-2007 Niels Provos
2005 Nick Mathewson, and other contributors."
LICENSE="BSD (3-clause)"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/libevent/libevent/releases/download/release-$portVersion-stable/libevent-$portVersion-stable.tar.gz"
CHECKSUM_SHA256="92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb"
SOURCE_DIR="libevent-${portVersion}-stable"
@@ -22,7 +22,7 @@ libVersion="7.0.1"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
libevent21${secondaryArchSuffix} = ${portVersion}
libevent${secondaryArchSuffix} = ${portVersion}
lib:libevent_2.1$secondaryArchSuffix = $libVersionCompat
lib:libevent_core_2.1$secondaryArchSuffix = $libVersionCompat
lib:libevent_extra_2.1$secondaryArchSuffix = $libVersionCompat
@@ -36,7 +36,7 @@ REQUIRES="
"
PROVIDES_devel="
libevent21${secondaryArchSuffix}_devel = ${portVersion}
libevent${secondaryArchSuffix}_devel = ${portVersion}
cmd:event_rpcgen.py$secondaryArchSuffix
devel:libevent$secondaryArchSuffix = $libVersionCompat
devel:libevent_2.1$secondaryArchSuffix = $libVersionCompat
@@ -50,7 +50,7 @@ PROVIDES_devel="
devel:libevent_pthreads_2.1$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
libevent21$secondaryArchSuffix == $portVersion base
libevent$secondaryArchSuffix == $portVersion base
cmd:python3
devel:libcrypto$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
@@ -111,5 +111,6 @@ INSTALL()
# devel package
packageEntries devel \
$binDir \
$developDir
$developDir \
$manDir
}