Date: Sat, 20 Dec 2003 10:46:30 +0100 (CET) From: Volker Stolz <vs@foldr.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: max@FreeBSD.org Subject: ports/60420: [patch] lang/swi-prolog: Fix packaging on non-i386 Message-ID: <200312200946.hBK9kUZR030815@varphi.theater.foldr.org> Resent-Message-ID: <200312200950.hBK9oJV7047325@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60420
>Category: ports
>Synopsis: [patch] lang/swi-prolog: Fix packaging on non-i386
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 20 01:50:18 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 5.1-20031207-SNAP alpha
>Organization:
Lehrstuhl fuer Informatik II
>Environment:
System: FreeBSD varphi.theater.foldr.org 5.1-20031207-SNAP FreeBSD 5.1-20031207-SNAP #0: Mon Dec 8 00:56:45 GMT 2003 root@mithlond.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC alpha
>Description:
- Fix PLIST on non-32-bit-architectures
- Do not use -O3 on alpha
Maintainer: Should PORTREV be bumped?
>How-To-Repeat:
>Fix:
Add one new patch-file: extra-patch-src-configure
--- swipl begins here ---
--- Makefile.orig Fri Dec 19 23:44:01 2003
+++ Makefile Sat Dec 20 10:21:08 2003
@@ -23,9 +23,21 @@
MAN1= pl.1 plrc.1 plld.1
PLIST_SUB= DISTNAME=${DISTNAME} ARCH=${ARCH} OS=${OPSYS:L}
+.include <bsd.port.pre.mk>
+
+.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:
.for f in pl plld plrc
@${STRIP_CMD} ${PREFIX}/lib/${DISTNAME}/bin/${ARCH}-${OPSYS:L}/$f
.endfor
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- pkg-plist.orig Fri Dec 19 23:43:54 2003
+++ pkg-plist Fri Dec 19 23:46:05 2003
@@ -25,7 +25,7 @@
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
--- /dev/null Sat Dec 20 10:22:02 2003
+++ files/extra-patch-src-configure Sat Dec 20 00:56:43 2003
@@ -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
--- swipl ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312200946.hBK9kUZR030815>