From b3c62ae6d8f52f30cc2073a3f418677f1d71c3d0 Mon Sep 17 00:00:00 2001 From: Volker Stolz Date: Mon, 14 Jun 2004 22:28:18 +0000 Subject: [PATCH] - Fix PLIST on non-32-bit-architectures - Do not use -O3 on alpha PR: ports/60420 Approved by: maintainer silence --- lang/swi-pl/Makefile | 10 ++++++++-- lang/swi-pl/files/extra-patch-src-configure | 13 +++++++++++++ lang/swi-pl/pkg-plist | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 lang/swi-pl/files/extra-patch-src-configure diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index e2ed46b06f76..8cf4ea381d7a 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -25,8 +25,14 @@ PLIST_SUB= DISTNAME=${DISTNAME} ARCH=${ARCH} OS=${OPSYS:L} .include -.if ${ARCH} != "i386" -BROKEN= "Broken pkg-plist" +.if (${ARCH} == "i386") +PLIST_SUB+= BITS=32 +.else +PLIST_SUB+= BITS=64 +.endif + +.if (${ARCH} == "alpha") +EXTRA_PATCHES= ${FILESDIR}/extra-patch-src-configure .endif post-install: diff --git a/lang/swi-pl/files/extra-patch-src-configure b/lang/swi-pl/files/extra-patch-src-configure new file mode 100644 index 000000000000..2f86bdb16997 --- /dev/null +++ b/lang/swi-pl/files/extra-patch-src-configure @@ -0,0 +1,13 @@ +--- src/configure.orig Sat Dec 20 00:49:33 2003 ++++ src/configure Sat Dec 20 00:50:26 2003 +@@ -2960,8 +2960,8 @@ + fi + + if test "$GCC" = "yes"; then +- COFLAGS="-O3 -fno-strict-aliasing" +- LDFLAGS="$LDFLAGS -O3" ++ COFLAGS="-O -fno-strict-aliasing" ++ LDFLAGS="$LDFLAGS -O" + if test "$ac_cv_header_stdc" = "yes" ; then + CWFLAGS=-Wall + else diff --git a/lang/swi-pl/pkg-plist b/lang/swi-pl/pkg-plist index 1f808135c955..625580ed096f 100644 --- a/lang/swi-pl/pkg-plist +++ b/lang/swi-pl/pkg-plist @@ -25,7 +25,7 @@ lib/%%DISTNAME%%/boot/syspred.pl lib/%%DISTNAME%%/boot/toplevel.pl lib/%%DISTNAME%%/boot/topvars.pl lib/%%DISTNAME%%/boot/writef.pl -lib/%%DISTNAME%%/boot32.prc +lib/%%DISTNAME%%/boot%%BITS%%.prc lib/%%DISTNAME%%/dotfiles/README lib/%%DISTNAME%%/dotfiles/dotplrc lib/%%DISTNAME%%/dotfiles/dotxpcerc