remove gcc2 workarounds
This commit is contained in:
naddy
parent
ce66c1dccc
commit
54315b49c6
@ -1,14 +0,0 @@
|
|||||||
$OpenBSD: patch-speech_tools_config_compilers_gcc295_mak,v 1.1 2004/07/11 06:27:07 jolan Exp $
|
|
||||||
--- speech_tools/config/compilers/gcc295.mak.orig 2004-05-06 15:03:05.000000000 -0500
|
|
||||||
+++ speech_tools/config/compilers/gcc295.mak 2004-05-06 15:02:28.000000000 -0500
|
|
||||||
@@ -46,8 +46,8 @@ ifndef GCC295
|
|
||||||
GCC295 = gcc
|
|
||||||
endif
|
|
||||||
|
|
||||||
-CC= $(GCC295)
|
|
||||||
-CXX = $(GCC295)
|
|
||||||
+#CC= $(GCC295)
|
|
||||||
+#CXX = $(GCC295)
|
|
||||||
|
|
||||||
CXXFLAGS += -fguiding-decls
|
|
||||||
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
$OpenBSD: patch-source_screen_c,v 1.1 2009/03/31 13:31:18 jasper Exp $
|
|
||||||
|
|
||||||
Fix compilation with GCC2.
|
|
||||||
|
|
||||||
--- source/screen.c.orig Tue Mar 31 15:32:24 2009
|
|
||||||
+++ source/screen.c Tue Mar 31 15:33:21 2009
|
|
||||||
@@ -1799,6 +1799,8 @@ const u_char *ptr;
|
|
||||||
{
|
|
||||||
int lhs_count = 0;
|
|
||||||
int continued_count = 0;
|
|
||||||
+ char *copy;
|
|
||||||
+ size_t cont_len;
|
|
||||||
|
|
||||||
if (indent > max_cols / 3)
|
|
||||||
indent = max_cols / 3;
|
|
||||||
@@ -1806,9 +1808,9 @@ const u_char *ptr;
|
|
||||||
/* refined this to use proper logic to
|
|
||||||
** decide the length of cont. - pegasus
|
|
||||||
*/
|
|
||||||
- char *copy = LOCAL_COPY(cont_ptr);
|
|
||||||
+ copy = LOCAL_COPY(cont_ptr);
|
|
||||||
copy = normalize_string(copy, 0);
|
|
||||||
- size_t cont_len = output_with_count(copy, 0, 0);
|
|
||||||
+ cont_len = output_with_count(copy, 0, 0);
|
|
||||||
if (do_indent && (cont_len < indent))
|
|
||||||
{
|
|
||||||
size_t size = indent + 1 +
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
$OpenBSD: patch-src_openssl_c,v 1.5 2012/10/20 18:49:48 dcoppa Exp $
|
|
||||||
|
|
||||||
Fix build with GCC2.
|
|
||||||
|
|
||||||
--- src/openssl.c.orig Mon Jun 4 22:05:40 2012
|
|
||||||
+++ src/openssl.c Fri Oct 19 09:34:53 2012
|
|
||||||
@@ -513,6 +513,8 @@ ssl_check_certificate (int fd, const char *host)
|
|
||||||
bool success = true;
|
|
||||||
bool alt_name_checked = false;
|
|
||||||
|
|
||||||
+ X509_NAME *xname;
|
|
||||||
+
|
|
||||||
/* If the user has specified --no-check-cert, we still want to warn
|
|
||||||
him about problems with the server's certificate. */
|
|
||||||
const char *severity = opt.check_cert ? _("ERROR") : _("WARNING");
|
|
||||||
@@ -661,7 +663,7 @@ ssl_check_certificate (int fd, const char *host)
|
|
||||||
if (alt_name_checked == false)
|
|
||||||
{
|
|
||||||
/* Test commomName */
|
|
||||||
- X509_NAME *xname = X509_get_subject_name(cert);
|
|
||||||
+ xname = X509_get_subject_name(cert);
|
|
||||||
common_name[0] = '\0';
|
|
||||||
X509_NAME_get_text_by_NID (xname, NID_commonName, common_name,
|
|
||||||
sizeof (common_name));
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
$OpenBSD: patch-src_sysdep_h,v 1.2 2011/10/12 10:14:30 dcoppa Exp $
|
|
||||||
|
|
||||||
Fix build with GCC2 where the configure test fails
|
|
||||||
to pickup stdbool.h. So it creates the lib/stdbool.h
|
|
||||||
which these definitions would override.
|
|
||||||
|
|
||||||
--- src/sysdep.h.orig Thu Oct 6 09:43:49 2011
|
|
||||||
+++ src/sysdep.h Thu Oct 6 09:47:13 2011
|
|
||||||
@@ -119,7 +119,23 @@ void *alloca (size_t);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Provided by gnulib on systems that don't have it: */
|
|
||||||
+#if HAVE_STDBOOL_H
|
|
||||||
# include <stdbool.h>
|
|
||||||
+#else
|
|
||||||
+# if !(defined(__GNUC__) && __GNUC__ < 3)
|
|
||||||
+# if ! HAVE__BOOL
|
|
||||||
+# ifdef __cplusplus
|
|
||||||
+typedef bool _Bool;
|
|
||||||
+# else
|
|
||||||
+typedef unsigned char _Bool;
|
|
||||||
+# endif
|
|
||||||
+# endif
|
|
||||||
+# define bool _Bool
|
|
||||||
+# define false 0
|
|
||||||
+# define true 1
|
|
||||||
+# define __bool_true_false_are_defined 1
|
|
||||||
+#endif
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* Needed for compilation under OS/2 and MSDOS */
|
|
||||||
#if defined(__EMX__) || defined(MSDOS)
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
$OpenBSD: patch-configure_in,v 1.1.1.1 2013/01/02 10:12:02 sthen Exp $
|
$OpenBSD: patch-configure_in,v 1.2 2013/08/09 14:40:44 naddy Exp $
|
||||||
--- configure.in.orig Tue Mar 16 20:10:12 2010
|
--- configure.in.orig Wed Mar 17 01:10:12 2010
|
||||||
+++ configure.in Fri Aug 17 00:44:48 2012
|
+++ configure.in Fri Aug 9 16:38:38 2013
|
||||||
@@ -17,11 +17,6 @@ AM_MAINTAINER_MODE
|
@@ -17,11 +17,6 @@ AM_MAINTAINER_MODE
|
||||||
PRESET_CFLAGS="$CFLAGS"
|
PRESET_CFLAGS="$CFLAGS"
|
||||||
PRESET_LDFLAGS="$LDFLAGS"
|
PRESET_LDFLAGS="$LDFLAGS"
|
||||||
@ -13,26 +13,7 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2013/01/02 10:12:02 sthen Exp $
|
|||||||
dnl Check for GNU cc
|
dnl Check for GNU cc
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AM_PROG_CC_C_O
|
AM_PROG_CC_C_O
|
||||||
@@ -2350,18 +2345,6 @@ dnl during compile.
|
@@ -2906,12 +2901,14 @@ AC_ARG_WITH(maxfd,
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
-# Remove optimization for GCC 2.95.[123]
|
|
||||||
-# gcc -O[2] on *BSD and Linux (x86) causes pointers to magically become NULL
|
|
||||||
-if test "$GCC" = "yes"; then
|
|
||||||
- GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
|
|
||||||
- case "$GCCVER" in
|
|
||||||
- [2.95.[123]])
|
|
||||||
- echo "Removing -O for gcc on $host with GCC $GCCVER"
|
|
||||||
- CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`"
|
|
||||||
- ;;
|
|
||||||
- esac
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
# Recommended by Balint Nagy Endre <bne@CareNet.hu>
|
|
||||||
case "$host" in
|
|
||||||
*-univel-sysv4.2MP)
|
|
||||||
@@ -2906,12 +2889,14 @@ AC_ARG_WITH(maxfd,
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
])
|
])
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user