mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2024-09-20 11:23:16 +00:00
main/opensp: fix build with gcc 14
This commit is contained in:
Natanael Copa
parent
0118694110
commit
57a4ceee30
3 changed files with 224 additions and 5 deletions
|
|
@ -4,21 +4,26 @@
|
|||
pkgname=opensp
|
||||
_realname=OpenSP
|
||||
pkgver=1.5.2
|
||||
pkgrel=5
|
||||
pkgrel=6
|
||||
pkgdesc="Implementation of the DSSSL style language"
|
||||
url="https://openjade.sourceforge.net/"
|
||||
arch="all"
|
||||
license="ICU"
|
||||
makedepends="$depends_dev xmlto"
|
||||
makedepends="$depends_dev xmlto autoconf automake libtool gettext-dev bash"
|
||||
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
|
||||
source="https://prdownloads.sourceforge.net/openjade/$_realname-$pkgver.tar.gz
|
||||
opensp-1.5-install.patch
|
||||
removed-failing-tests.patch"
|
||||
removed-failing-tests.patch
|
||||
opensp-1.5.2-configure-clang16.patch
|
||||
fix-tests.patch
|
||||
"
|
||||
|
||||
builddir="$srcdir"/$_realname-$pkgver
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
update_config_sub
|
||||
rm m4/progtest.m4
|
||||
autoreconf -vif
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -36,7 +41,7 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
make check
|
||||
make check SHOWSTOPPERS=
|
||||
}
|
||||
|
||||
lang() {
|
||||
|
|
@ -55,4 +60,6 @@ sha512sums="
|
|||
a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e OpenSP-1.5.2.tar.gz
|
||||
6d4cddb3c98313643ef7ab57ce154dd8a188b7ea8edc608a62ff25e4f995ab4167be94e40c2a62ae568e22e1ada4bd9bf0c9687e4dfa43dafde4d87e8b73fdf8 opensp-1.5-install.patch
|
||||
4d32af7936193281b621b40a7d8248e61ffb100960a4d07a03b52f47102e8fa47f823d01b059860408cce469404a0cd6f63d4201b976730565a8196872b8d4d3 removed-failing-tests.patch
|
||||
191d5c61eeb73b4040be06b7de197f25a0599286dcd6077e942bc2cc1d4400e70e8af69a08563713036c1225e41adf6ee2f4dba3d264ffcf3ca6a35b7c37e087 opensp-1.5.2-configure-clang16.patch
|
||||
556bf4e0bd270e14633f7503404a04acdf5e55b9559f4ce50bb4b3d15ebc885a2ababf49d3ead3cb94b3df9a78f8db7cb611386ec362bcb1402fc07c0932860d fix-tests.patch
|
||||
"
|
||||
|
|
|
|||
14
main/opensp/fix-tests.patch
Normal file
14
main/opensp/fix-tests.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index fa491ec..f170147 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -35,8 +35,7 @@ EXTRA_DIST = $(TESTS_THAT_PASS) $(DTDDECL_TEST)
|
||||
TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
|
||||
PATH=.:../nsgmls:../sgmlnorm:../sx:../spent:../spcat:../spam:$$PATH \
|
||||
ONSGMLS=`echo onsgmls|sed '$(transform)'`\
|
||||
- OSGMLNORM=`echo osgmlnorm|sed '$(transform)'`\
|
||||
- $(SHELL)
|
||||
+ OSGMLNORM=`echo osgmlnorm|sed '$(transform)'`
|
||||
|
||||
# Two auxiliary programs used by the tests.
|
||||
INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl
|
||||
198
main/opensp/opensp-1.5.2-configure-clang16.patch
Normal file
198
main/opensp/opensp-1.5.2-configure-clang16.patch
Normal file
|
|
@ -0,0 +1,198 @@
|
|||
https://bugs.gentoo.org/889600
|
||||
https://src.fedoraproject.org/rpms/opensp/blob/ad3afd1f07f600aa21cd6a3f1960db5570682e47/f/opensp-configure-c99.patch
|
||||
|
||||
Avoid implicit function declarations because they have been removed
|
||||
from C in 1999. Future compilers are likely to reject them by
|
||||
default.
|
||||
|
||||
No need to upstream this because the aclocal.m4 file is not checked
|
||||
into the repository since:
|
||||
|
||||
------------------------------------------------------------------------
|
||||
r412 | clasen | 1999-11-06 14:10:34 +0100 (Sat, 06 Nov 1999) | 3 lines
|
||||
Changed paths:
|
||||
M /trunk/sp/Makefile.in
|
||||
D /trunk/sp/config/aclocal.m4
|
||||
D /trunk/sp/config/configure.in
|
||||
M /trunk/sp/configure
|
||||
A /trunk/sp/configure.in
|
||||
|
||||
Install headers in $(includedir)/OpenSP, move configure.in to toplevel,
|
||||
remove generated file aclocal.m4.
|
||||
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -833,10 +833,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -850,7 +846,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}]
|
||||
EOF
|
||||
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2917,7 +2917,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
for ac_declaration in \
|
||||
- '' \
|
||||
+ '#include <stdlib.h>' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
@@ -5186,8 +5186,8 @@ main ()
|
||||
for (i = 0; i < 256; i++)
|
||||
if (XOR (islower (i), ISLOWER (i))
|
||||
|| toupper (i) != TOUPPER (i))
|
||||
- exit(2);
|
||||
- exit (0);
|
||||
+ return 2;
|
||||
+ return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
@@ -9508,10 +9508,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -9525,7 +9521,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -9606,10 +9602,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -9623,7 +9615,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -13321,10 +13313,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -13338,7 +13326,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -13419,10 +13407,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -13436,7 +13420,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -19110,10 +19094,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -19127,7 +19107,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -19208,10 +19188,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -19225,7 +19201,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -27450,8 +27426,8 @@ main ()
|
||||
for (i = 0; i < 256; i++)
|
||||
if (XOR (islower (i), ISLOWER (i))
|
||||
|| toupper (i) != TOUPPER (i))
|
||||
- exit(2);
|
||||
- exit (0);
|
||||
+ return 2;
|
||||
+ return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
|
||||
Loading…
Reference in a new issue