From 25a808d5ecfd199ac8a414a02410709539ae7ea9 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 13 Dec 2022 10:02:24 +0100 Subject: [PATCH] flex, build shared library instead of a static library (#7547) add libVersionCompat add debuginfopackage --- sys-devel/flex/flex-2.6.4.recipe | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/sys-devel/flex/flex-2.6.4.recipe b/sys-devel/flex/flex-2.6.4.recipe index 3a41b1980..2ef97d531 100644 --- a/sys-devel/flex/flex-2.6.4.recipe +++ b/sys-devel/flex/flex-2.6.4.recipe @@ -5,25 +5,36 @@ HOMEPAGE="https://github.com/westes/flex/" COPYRIGHT="2001-2007 The Flex Project 1990, 1997 The Regents of the University of California" LICENSE="Flex" -REVISION="2" +REVISION="3" SOURCE_URI="$HOMEPAGE/releases/download/v$portVersion/flex-$portVersion.tar.gz" CHECKSUM_SHA256="e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995" PATCHES="flex-$portVersion.patchset" ARCHITECTURES="all" +libVersion="2.0.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" flex = $portVersion compat >= 2.5 cmd:flex = $portVersion compat >= 2.5 cmd:flex++ = $portVersion compat >= 2.5 cmd:lex = $portVersion compat >= 2.5 - devel:libfl = 2.0.0 compat >= 2 + lib:libfl = $libVersionCompat " REQUIRES=" haiku cmd:m4 " +PROVIDES_devel=" + flex_devel = $portVersion compat >= 2.5 + devel:libfl = $libVersionCompat + " +REQUIRES_devel=" + flex == $portVersion base + " + BUILD_REQUIRES=" haiku_devel " @@ -43,13 +54,18 @@ BUILD_PREREQUIRES=" cmd:yacc " +defineDebugInfoPackage flex \ + $binDir/flex \ + $libDir/libfl.so.$libVersion + BUILD() { rm -f aclocal.m4 autoreconf -fi runConfigure ./configure \ - --disable-rpath --with-gnu-ld --disable-shared \ - --disable-dependency-tracking --disable-nls + --disable-rpath --with-gnu-ld --enable-shared \ + --disable-dependency-tracking --disable-nls \ + --disable-static make $jobArgs } @@ -57,6 +73,7 @@ INSTALL() { make install + # remove libtool file rm $libDir/libfl.la # Create symlink to lex @@ -64,6 +81,9 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLib libfl + + packageEntries devel \ + $developDir } TEST()