remove workarounds for gcc2.95/sparc64 compiler bugs
This commit is contained in:
naddy
parent
83bf39eed7
commit
79f04b4bf7
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2003/06/30 18:08:34 sturm Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2004/02/25 13:59:07 naddy Exp $
|
||||
|
||||
COMMENT= "graphical network monitor"
|
||||
|
||||
@ -15,10 +15,6 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
.if ${MACHINE_ARCH} == "sparc64"
|
||||
PATCH_LIST= patch-* gcc-*
|
||||
.endif
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=etherape/}
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
$OpenBSD: gcc-configure,v 1.1.1.1 2003/06/30 17:18:37 sturm Exp $
|
||||
--- configure.orig Thu Jun 26 22:06:25 2003
|
||||
+++ configure Thu Jun 26 22:07:30 2003
|
||||
@@ -5819,6 +5819,8 @@ fi
|
||||
|
||||
done
|
||||
|
||||
+_SAVE_CFLAGS=$CFLAGS
|
||||
+CFLAGS=-O0
|
||||
echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
|
||||
echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
|
||||
if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
|
||||
@@ -5891,7 +5893,7 @@ cat >>confdefs.h <<\_ACEOF
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
-
|
||||
+CFLAGS=$_SAVE_CFLAGS
|
||||
|
||||
|
||||
echo "$as_me:$LINENO: checking for working memcmp" >&5
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2003/07/18 17:53:19 fgsch Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2004/02/25 13:59:07 naddy Exp $
|
||||
|
||||
COMMENT= "Pretty Good Privacy 5.0i (world wide use)"
|
||||
|
||||
@ -34,11 +34,6 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config
|
||||
|
||||
WRKDIST= ${WRKDIR}/pgp50i/src
|
||||
|
||||
# XXX workaround gcc bugs on sparc64
|
||||
.if ${MACHINE_ARCH:Msparc64}
|
||||
PATCH_LIST= patch-* gcc-*
|
||||
.endif
|
||||
|
||||
post-patch:
|
||||
@mv ${WRKSRC}/man/pgp.1 ${WRKSRC}/man/pgp5.1
|
||||
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
$OpenBSD: gcc-patch-lib_pgp_hash_Makefile_in,v 1.1 2003/07/18 17:53:19 fgsch Exp $
|
||||
--- lib/pgp/hash/Makefile.in.orig Fri Jul 18 12:01:53 2003
|
||||
+++ lib/pgp/hash/Makefile.in Fri Jul 18 12:02:23 2003
|
||||
@@ -10,3 +10,6 @@ OBJS= pgpHash.o pgpMD5.o pgpSHA.o pgpRIP
|
||||
SHAREDHDRS= pgpHash.h
|
||||
|
||||
all:: DONE
|
||||
+
|
||||
+pgpSHA.o:
|
||||
+ $(CC) $(CFLAGS) -O0 -c $<
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.4 2003/12/14 18:12:22 margarida Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2004/02/25 13:59:07 naddy Exp $
|
||||
|
||||
COMMENT= "modular log analyzer"
|
||||
|
||||
@ -22,11 +22,6 @@ LIB_DEPENDS= expat.3::textproc/expat \
|
||||
pcre::devel/pcre \
|
||||
adns.1::net/adns
|
||||
|
||||
# work around optimizer bug in gcc 2.95
|
||||
.if ${MACHINE_ARCH} == "sparc64"
|
||||
PATCH_LIST= patch-* gcc-*
|
||||
.endif
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/modlogan
|
||||
CONFIGURE_ENV += LOCALBASE="${LOCALBASE}" \
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: gcc-configure,v 1.1 2003/08/22 23:07:48 naddy Exp $
|
||||
--- configure.orig 2003-08-23 00:43:32.000000000 +0200
|
||||
+++ configure 2003-08-23 00:45:16.000000000 +0200
|
||||
@@ -10119,6 +10119,8 @@ exit (malloc (0) ? 0 : 1);
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
+_SAVE_CFLAGS=$CFLAGS
|
||||
+CFLAGS=-O0
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
(eval $ac_link) 2>&5
|
||||
ac_status=$?
|
||||
@@ -10138,6 +10140,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
|
||||
( exit $ac_status )
|
||||
ac_cv_func_malloc_0_nonnull=no
|
||||
fi
|
||||
+CFLAGS=$_SAVE_CFLAGS
|
||||
rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
fi
|
||||
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2003/09/27 11:01:57 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2004/02/25 13:59:07 naddy Exp $
|
||||
|
||||
COMMENT= "GNU versions of the diff utilities"
|
||||
|
||||
@ -18,11 +18,6 @@ MASTER_SITES= ${MASTER_SITE_GNU:=diffutils/}
|
||||
|
||||
MODULES= gettext
|
||||
|
||||
# work around optimizer bug in gcc 2.95
|
||||
.if ${MACHINE_ARCH} == "sparc64"
|
||||
PATCH_LIST= gcc-patch-* patch-*
|
||||
.endif
|
||||
|
||||
SEPARATE_BUILD= simple
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= --program-prefix=g
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
$OpenBSD: gcc-patch-configure,v 1.1 2003/07/23 23:30:14 naddy Exp $
|
||||
--- configure.orig Thu Jul 24 00:41:42 2003
|
||||
+++ configure Thu Jul 24 00:44:30 2003
|
||||
@@ -8943,6 +8943,8 @@
|
||||
_ACEOF
|
||||
|
||||
|
||||
+_SAVE_CFLAGS=$CFLAGS
|
||||
+CFLAGS=-O0
|
||||
echo "$as_me:$LINENO: checking for working malloc" >&5
|
||||
echo $ECHO_N "checking for working malloc... $ECHO_C" >&6
|
||||
if test "${jm_cv_func_working_malloc+set}" = set; then
|
||||
@@ -8986,6 +8988,7 @@
|
||||
fi
|
||||
|
||||
fi
|
||||
+CFLAGS=$_SAVE_CFLAGS
|
||||
echo "$as_me:$LINENO: result: $jm_cv_func_working_malloc" >&5
|
||||
echo "${ECHO_T}$jm_cv_func_working_malloc" >&6
|
||||
if test $jm_cv_func_working_malloc = no; then
|
||||
@@ -9003,7 +9006,8 @@
|
||||
#define HAVE_DONE_WORKING_REALLOC_CHECK 1
|
||||
_ACEOF
|
||||
|
||||
-
|
||||
+_SAVE_CFLAGS=$CFLAGS
|
||||
+CFLAGS=-O0
|
||||
echo "$as_me:$LINENO: checking for working realloc" >&5
|
||||
echo $ECHO_N "checking for working realloc... $ECHO_C" >&6
|
||||
if test "${jm_cv_func_working_realloc+set}" = set; then
|
||||
@@ -9047,6 +9051,7 @@
|
||||
fi
|
||||
|
||||
fi
|
||||
+CFLAGS=$_SAVE_CFLAGS
|
||||
echo "$as_me:$LINENO: result: $jm_cv_func_working_realloc" >&5
|
||||
echo "${ECHO_T}$jm_cv_func_working_realloc" >&6
|
||||
if test $jm_cv_func_working_realloc = no; then
|
||||
Loading…
Reference in New Issue
Block a user