haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

texinfo: move commands to $prefix/bin and update for secondaryArch perl (#9461)

Browse Source 
installs binaries in $prefix/bin on x86.

* texinfo 6: revbump, remove libperl dependency

When rebuilding it, the Perl XS libraries aren't built any more, because there
is no gcc2 version of perl (the build system checks this automatically, so no
need to disable it explicitly).

Also, set ARCHITECTURES to "x86_gcc2" only to make it  clear what this is for.

---------

Co-authored-by: Joachim Mairböck <j.mairboeck@gmail.com>
This commit is contained in:
Jérôme Duval
2024-06-14 10:44:59 +02:00
committed by GitHub
parent 0a2e4dda19
commit 96c9a6564a
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sys-apps/texinfo/texinfo-6.1.recipe
View File

@@ -4,12 +4,12 @@ Texinfo is the official documentation format of the GNU project."
HOMEPAGE="http://www.gnu.org/software/texinfo/"
COPYRIGHT="1992-2008 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="7"
REVISION="8"
SOURCE_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-$portVersion.tar.gz"
CHECKSUM_SHA256="02582b6d9b0552f1cb1312be6bd7023e9799603c3b2320fa68a36029e4cbafbb"
PATCHES="texinfo-$portVersion.patchset"
ARCHITECTURES="all"
ARCHITECTURES="x86_gcc2"
PROVIDES="
texinfo = $portVersion compat >= 4
@@ -30,7 +30,6 @@ REQUIRES="
lib:libiconv
lib:libintl
lib:libncurses
lib:libperl
"
BUILD_REQUIRES="

42
sys-apps/texinfo/texinfo-7.0.3.recipe
View File

@@ -3,7 +3,7 @@ DESCRIPTION="Texinfo is the official documentation format of the GNU project."
HOMEPAGE="http://www.gnu.org/software/texinfo/"
COPYRIGHT="1992-2008 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="3"
REVISION="4"
SOURCE_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-$portVersion.tar.gz"
CHECKSUM_SHA256="3cc5706fb086b895e1dc2b407aade9f95a3a233ff856273e2b659b089f117683"
PATCHES="texinfo-$portVersion.patchset"
@@ -11,18 +11,26 @@ PATCHES="texinfo-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
PROVIDES="
texinfo$secondaryArchSuffix = $portVersion compat >= 4
cmd:info$secondaryArchSuffix = $portVersion compat >= 4
cmd:infokey$secondaryArchSuffix = $portVersion compat >= 4
cmd:install_info$secondaryArchSuffix = $portVersion compat >= 4
cmd:makeinfo$secondaryArchSuffix = $portVersion compat >= 4
cmd:pdftexi2dvi$secondaryArchSuffix = $portVersion compat >= 4
cmd:pod2texi$secondaryArchSuffix = $portVersion compat >= 6
cmd:texi2any$secondaryArchSuffix = $portVersion compat >= 6
cmd:texi2dvi$secondaryArchSuffix = $portVersion compat >= 4
cmd:texi2pdf$secondaryArchSuffix = $portVersion compat >= 4
cmd:texindex$secondaryArchSuffix = $portVersion compat >= 4
cmd:info$commandSuffix = $portVersion compat >= 4
cmd:infokey$commandSuffix = $portVersion compat >= 4
cmd:install_info$commandSuffix = $portVersion compat >= 4
cmd:makeinfo$commandSuffix = $portVersion compat >= 4
cmd:pdftexi2dvi$commandSuffix = $portVersion compat >= 4
cmd:pod2texi$commandSuffix = $portVersion compat >= 6
cmd:texi2any$commandSuffix = $portVersion compat >= 6
cmd:texi2dvi$commandSuffix = $portVersion compat >= 4
cmd:texi2pdf$commandSuffix = $portVersion compat >= 4
cmd:texindex$commandSuffix = $portVersion compat >= 4
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -32,10 +40,8 @@ REQUIRES="
lib:libncurses$secondaryArchSuffix
lib:libperl$secondaryArchSuffix
"
if [ -n "$secondaryArchSuffix" ]; then
CONFLICTS="
texinfo
"
if [ "$targetArchitecture" = x86_gcc2 ]; then
CONFLICTS="texinfo"
fi
BUILD_REQUIRES="
@@ -49,17 +55,17 @@ BUILD_PREREQUIRES="
cmd:autoconf
cmd:gawk
cmd:gcc$secondaryArchSuffix
cmd:gettext
cmd:gettext$secondaryArchSuffix
cmd:grep
cmd:ld$secondaryArchSuffix
cmd:make
cmd:perl$secondaryArchSuffix
cmd:perl
cmd:sed
"
BUILD()
{
AUTOPOINT=true runConfigure ./configure
AUTOPOINT=: runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
make $jobArgs
}