From 3bfccf6ba8feb65c94b5e4762b337e569de095cb Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 25 Oct 2009 11:48:09 +0000 Subject: [PATCH] steven@ points out the -O0 which is needed on amd64 with gcc 3.3 for slarrfun.c can be passed via the environment rather than in a patch; do this and only apply it to amd64. --- devel/libslang/Makefile | 9 +++++++-- devel/libslang/patches/patch-src_Makefile_in | 10 ---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 9e1672cb7c1..b617da9f9d5 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.47 2009/10/23 09:23:11 sthen Exp $ +# $OpenBSD: Makefile,v 1.48 2009/10/25 11:48:09 sthen Exp $ COMMENT= stack-based interpreter for terminal applications DISTNAME= slang-2.2.1 -PKGNAME= lib${DISTNAME}p0 +PKGNAME= lib${DISTNAME}p1 SHARED_LIBS= slang 15.0 CATEGORIES= devel @@ -35,6 +35,11 @@ REGRESS_FLAGS= TCAPLIB="-ltermlib" MAKE_ENV= LIBslang_MAJOR=${LIBslang_VERSION:R} \ LIBslang_MINOR=${LIBslang_VERSION:E} +# GCC 3.3 optimizer problems: http://marc.info/?m=125562659714004 +.if ${MACHINE_ARCH} == "amd64" +MAKE_ENV+= slarrfun_C_FLAGS=-O0 +.endif + pre-configure: cd ${AUTOCONF_DIR}; cp configure .. diff --git a/devel/libslang/patches/patch-src_Makefile_in b/devel/libslang/patches/patch-src_Makefile_in index 9fdbf065c0c..82a539967b6 100644 --- a/devel/libslang/patches/patch-src_Makefile_in +++ b/devel/libslang/patches/patch-src_Makefile_in @@ -9,13 +9,3 @@ DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules #--------------------------------------------------------------------------- -@@ -90,6 +90,9 @@ ALL_ELF_CFLAGS = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFI - COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) - ELFCOMPILE_CMD = $(ELF_CC) -c $(ALL_ELF_CFLAGS) - ELF_LINK_CMD = $(ELF_LINK) -+ -+# GCC 3.3 optimizer problems: http://marc.info/?m=125562659714004 -+slarrfun_C_FLAGS = -O0 - - NORMAL_LIB = lib$(THIS_LIB).a - OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)