Unbreak for amd64. Noticed, suggested and ok, steven@.

Zap a -O3 from packages/semweb and honor our CFLAGS instead (also
noticed by steven@). No ok (or any feedback at all) for this. But I'm
pretty sure it doesn't break *%&$#@
This commit is contained in:
kili 2007-07-10 20:53:59 +00:00
parent f4c12d15f7
commit efea454f2b
3 changed files with 41 additions and 4 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.6 2007/06/10 23:32:27 kili Exp $
# $OpenBSD: Makefile,v 1.7 2007/07/10 20:53:59 kili Exp $
CATEGORIES= lang
V= 5.6.27
XV= 6.6.27
FULLARCH= ${MACHINE_ARCH}-openbsd${OSREV}
FULLARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-openbsd${OSREV}
SUBST_VARS= V XV FULLARCH
DISTNAME= pl-$V
PKGNAME= swi-prolog-$Vp0
PKGNAME= swi-prolog-$Vp1
MASTER_SITES= http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/
COMMENT= 'prolog for the real world'
HOMEPAGE= http://www.swi-prolog.org/
@ -21,7 +21,7 @@ PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.59
AUTOCONF_DIR= ${WRKSRC}/src
AUTOCONF_DIR= ${WRKSRC}/src ${WRKSRC}/packages/semweb
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/src \
${WRKSRC}/packages/jpl \
${WRKSRC}/packages/xpce/src

View File

@ -0,0 +1,15 @@
$OpenBSD: patch-packages_semweb_Makefile_in,v 1.1 2007/07/10 20:53:59 kili Exp $
Honor CFLAGS.
--- packages/semweb/Makefile.in.orig Tue Jun 26 13:02:46 2007
+++ packages/semweb/Makefile.in Tue Jun 26 13:17:25 2007
@@ -29,7 +29,7 @@ COFLAGS=@COFLAGS@
CWFLAGS=@CWFLAGS@
CMFLAGS=@CMFLAGS@
CIFLAGS=-I.
-CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@
+CFLAGS=@CFLAGS@ $(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@
LIBS=@LIBS@
NETLIBS=@NETLIBS@

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-packages_semweb_configure_in,v 1.1 2007/07/10 20:53:59 kili Exp $
Don't override CFLAGS, don't force -O3 (but keep -fno-strict-aliasing).
--- packages/semweb/configure.in.orig Tue Jan 23 20:25:14 2007
+++ packages/semweb/configure.in Tue Jun 26 13:28:57 2007
@@ -65,14 +65,13 @@ AC_CHECK_PROGS(ETAGS, etags ctags, ":")
AC_PROG_INSTALL
AC_ISC_POSIX
AC_HEADER_STDC
-CFLAGS="$CMFLAGS"
AC_FUNC_ALLOCA
AC_C_BIGENDIAN
AC_C_INLINE
AC_CHECK_SIZEOF(long)
if test ! -z "$GCC"; then
- COFLAGS="-O3 -fno-strict-aliasing"
+ COFLAGS=-fno-strict-aliasing
CWFLAGS=${CWFLAGS--Wall}
else
COFLAGS=-O