cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak autoconf check with clang by not using nested functions

Browse Source
This commit is contained in:
dcoppa 2017-09-26 14:17:16 +00:00
parent 371d25e228
commit af76245915
2 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/silc-client/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.75 2017/07/23 10:41:22 zhuk Exp $
# $OpenBSD: Makefile,v 1.76 2017/09/26 14:17:16 dcoppa Exp $
COMMENT= Secure Internet Live Conferencing (SILC) client
DISTNAME= silc-client-1.1.11
REVISION= 1
REVISION= 2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=silc/}
EXTRACT_SUFX= .tar.bz2

67
net/silc-client/patches/patch-configure_ac
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.11 2017/04/16 20:36:58 sthen Exp $
--- configure.ac.orig Tue May 13 02:47:22 2014
+++ configure.ac Sun Apr 16 13:26:43 2017
$OpenBSD: patch-configure_ac,v 1.12 2017/09/26 14:17:16 dcoppa Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -100,9 +100,6 @@ AM_CONDITIONAL(SILC_X86_64, test x$cpu_x86_64 = xtrue)
AM_CONDITIONAL(SILC_POWERPC, test x$cpu_ppc = xtrue)
AM_CONDITIONAL(SILC_IA64, test x$cpu_ia64 = xtrue)
@ -29,7 +30,59 @@ $OpenBSD: patch-configure_ac,v 1.11 2017/04/16 20:36:58 sthen Exp $
unset tmp_CFLAGS
])
@@ -485,59 +483,9 @@ fi
@@ -387,8 +385,7 @@ AC_TRY_COMPILE(
[
#include <stdarg.h>
#include <stdlib.h>
- ],
- [
+
int t(int x, ...)
{
va_list va, cp;
@@ -400,12 +397,11 @@ AC_TRY_COMPILE(
va_end(cp);
return 0;
}
- int main()
- {
- return t(0, 0xff11);
- }
],
[
+ return t(0, 0xff11);
+ ],
+ [
AC_DEFINE([HAVE_VA_COPY], [], [HAVE_VA_COPY])
AC_MSG_RESULT(yes)
va_copy=true
@@ -422,8 +418,7 @@ if test x$va_copy = xfalse; then
[
#include <stdarg.h>
#include <stdlib.h>
- ],
- [
+
int t(int x, ...)
{
va_list va, cp;
@@ -435,12 +430,11 @@ if test x$va_copy = xfalse; then
va_end(cp);
return 0;
}
- int main()
- {
- return t(0, 0xff11);
- }
],
[
+ return t(0, 0xff11);
+ ],
+ [
AC_DEFINE([HAVE___VA_COPY], [], [HAVE___VA_COPY])
AC_MSG_RESULT(yes)
va_copy=true
@@ -485,59 +479,9 @@ fi
## Compiler and compiler flag checks
##
@ -91,7 +144,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2017/04/16 20:36:58 sthen Exp $
#
# Workaround a bug in GCC 2.x which causes memory exhaustion
# when compiling sha1 with optimizations on UltraSPARC.
@@ -630,8 +578,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
@@ -630,8 +574,8 @@ if test -n "$with_silc_includes" || test -n "$with_sil
else
# pkg-config check
@ -102,7 +155,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2017/04/16 20:36:58 sthen Exp $
if test x$compile_libs = xfalse; then
LIBSUBDIR=
@@ -1314,7 +1262,7 @@ fi
@@ -1314,7 +1258,7 @@ fi
SILC_ADD_CC_FLAGS(SILC_CRYPTO, -fno-regmove)
if test x$summary_debug = xno -a x$want_cc_optimizations = xtrue; then
@ -111,7 +164,7 @@ $OpenBSD: patch-configure_ac,v 1.11 2017/04/16 20:36:58 sthen Exp $
fi
AC_SUBST(SILC_CRYPTO_CFLAGS)
@@ -1350,7 +1298,6 @@ if test x$compile_libs = xtrue; then
@@ -1350,7 +1294,6 @@ if test x$compile_libs = xtrue; then
AC_MSG_NOTICE([configuring math library])
if test x$want_cc_optimizations = xtrue; then