mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
Texinfo: remove 6.7 recipe version (#9148)
This will force 32 bit machines to go back to texinfo 6.1, which does not require gawk, which currently can only be built with modern gcc.
This commit is contained in:
committed by
GitHub
parent
9f16d888db
commit
d886dbdf27
@@ -1,100 +0,0 @@
|
||||
From 8c565d815ba2f11f772a762bf38685290b3c2171 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Tue, 22 Dec 2015 11:52:48 +0000
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/system.h b/system.h
|
||||
index 047d794..c9c6a0e 100644
|
||||
--- a/system.h
|
||||
+++ b/system.h
|
||||
@@ -182,6 +182,10 @@ extern int kill (pid_t, int);
|
||||
# define PIPE_USE_FORK 1
|
||||
#endif /* not O_BINARY */
|
||||
|
||||
+#if defined(__HAIKU__)
|
||||
+# define DEFAULT_INFOPATH "/system/documentation/info:/system/non-packaged/documentation/info:/boot/home/config/documentation/info:/boot/home/config/non-packaged/documentation/info:."
|
||||
+#endif
|
||||
+
|
||||
/* Everything but DJGPP. */
|
||||
#ifndef ALSO_NULL_DEVICE
|
||||
# define ALSO_NULL_DEVICE ""
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From 1e83f2d47094acc0d4f0e8f3bf49818bf642cdda Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sat, 5 Mar 2016 08:51:25 +0100
|
||||
Subject: Fix gcc2 build.
|
||||
|
||||
|
||||
diff --git a/tp/Texinfo/XS/xspara.c b/tp/Texinfo/XS/xspara.c
|
||||
index ee666a1..64773f1 100644
|
||||
--- a/tp/Texinfo/XS/xspara.c
|
||||
+++ b/tp/Texinfo/XS/xspara.c
|
||||
@@ -479,6 +479,7 @@ xspara_get_state (HV *hash)
|
||||
/* Don't do anything. */
|
||||
return;
|
||||
|
||||
+{
|
||||
dTHX; /* Perl boilerplate. */
|
||||
|
||||
val = newSViv (state.end_sentence);
|
||||
@@ -492,7 +493,7 @@ xspara_get_state (HV *hash)
|
||||
|
||||
val = newSViv (state.lines_counter);
|
||||
STORE("lines_counter");
|
||||
-
|
||||
+}
|
||||
return;
|
||||
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
From b5257a73c0441e44c86bd33dce22a4fed223c899 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
||||
Date: Sun, 29 Jan 2023 11:37:33 +0100
|
||||
Subject: fix gcc2 build (part 2)
|
||||
|
||||
C11 threads are only available for the modern gcc.
|
||||
|
||||
diff --git a/gnulib/lib/glthread/lock.h b/gnulib/lib/glthread/lock.h
|
||||
index a92c2a8..c1074db 100644
|
||||
--- a/gnulib/lib/glthread/lock.h
|
||||
+++ b/gnulib/lib/glthread/lock.h
|
||||
@@ -81,7 +81,7 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#if !defined c11_threads_in_use
|
||||
-# if HAVE_THREADS_H && USE_POSIX_THREADS_WEAK
|
||||
+# if __GNUC__ > 2 && HAVE_THREADS_H && USE_POSIX_THREADS_WEAK
|
||||
# include <threads.h>
|
||||
# pragma weak thrd_exit
|
||||
# define c11_threads_in_use() (thrd_exit != NULL)
|
||||
diff --git a/gnulib/lib/regexec.c b/gnulib/lib/regexec.c
|
||||
index f464869..3a944b0 100644
|
||||
--- a/gnulib/lib/regexec.c
|
||||
+++ b/gnulib/lib/regexec.c
|
||||
@@ -3298,6 +3298,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
|
||||
re_node_set follows, *dests_node;
|
||||
bitset_t *dests_ch;
|
||||
bitset_t acceptable;
|
||||
+ size_t ndests_max;
|
||||
|
||||
struct dests_alloc
|
||||
{
|
||||
@@ -3348,7 +3349,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
|
||||
goto out_free;
|
||||
|
||||
/* Avoid arithmetic overflow in size calculation. */
|
||||
- size_t ndests_max
|
||||
+ ndests_max
|
||||
= ((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX)
|
||||
/ (3 * sizeof (re_dfastate_t *)));
|
||||
if (__glibc_unlikely (ndests_max < ndests))
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
SUMMARY="Standard GNU documentation format tool"
|
||||
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="4"
|
||||
SOURCE_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="a52d05076b90032cb2523673c50e53185938746482cf3ca0213e9b4b50ac2d3e"
|
||||
PATCHES="texinfo-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
|
||||
PROVIDES="
|
||||
texinfo = $portVersion compat >= 4
|
||||
cmd:info = $portVersion compat >= 4
|
||||
cmd:infokey = $portVersion compat >= 4
|
||||
cmd:install_info = $portVersion compat >= 4
|
||||
cmd:makeinfo = $portVersion compat >= 4
|
||||
cmd:pdftexi2dvi = $portVersion compat >= 4
|
||||
cmd:pod2texi = $portVersion compat >= 6
|
||||
cmd:texi2any = $portVersion compat >= 6
|
||||
cmd:texi2dvi = $portVersion compat >= 4
|
||||
cmd:texi2pdf = $portVersion compat >= 4
|
||||
cmd:texindex = $portVersion compat >= 4
|
||||
"
|
||||
REQUIRES="
|
||||
haiku
|
||||
cmd:gawk
|
||||
lib:libiconv
|
||||
lib:libintl
|
||||
lib:libncurses
|
||||
lib:libperl
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku_devel
|
||||
devel:libncurses
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:gawk
|
||||
cmd:gcc
|
||||
cmd:gettext
|
||||
cmd:grep
|
||||
cmd:ld
|
||||
cmd:make
|
||||
cmd:perl
|
||||
cmd:sed
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
AUTOPOINT=true runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
}
|
||||
Reference in New Issue
Block a user