Date: Sat, 13 May 2006 09:13:05 -0300 (BRST) From: Rainer Alves <rainer.alves@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: mnag@FreeBSD.org, solar@openwall.com Subject: ports/97197: [MAINTAINER] security/john: fix amd64 build Message-ID: <200605131213.k4DCD5qu097413@valfenda.ibest.com.br> Resent-Message-ID: <200605131220.k4DCKAeV078065@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97197
>Category: ports
>Synopsis: [MAINTAINER] security/john: fix amd64 build
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat May 13 12:20:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rainer Alves
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
BrasilTelecom
>Environment:
>Description:
- Fix amd64 build.
>How-To-Repeat:
>Fix:
--- john-amd64-fix.diff begins here ---
diff -ruN /usr/ports/security/john/Makefile security/john/Makefile
--- /usr/ports/security/john/Makefile Sat May 13 02:19:45 2006
+++ security/john/Makefile Sat May 13 08:56:10 2006
@@ -31,41 +31,41 @@
ARCH!= /usr/bin/uname -p
OSVERSION!= /sbin/sysctl -n kern.osreldate
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+.if ${ARCH} == "i386"
. if ${OSVERSION} > 500000
-# dumps core with sse2 + gcc 2.95
OPTIONS= SSE2 "Enable SSE2 optimizations" off
. endif
-.endif
-.if ${ARCH} == "i386"
OPTIONS+= MMX "Enable MMX optimizations" off
.endif
.include <bsd.port.pre.mk>
-ALL_TARGET= generic
-
-.if defined(WITH_MMX)
+.if ${ARCH} == "i386"
. if defined(WITH_SSE2)
ALL_TARGET= ${OSNAME}-x86-sse2
-. else
+. elif defined(WITH_MMX)
ALL_TARGET= ${OSNAME}-x86-mmx
+. else
+ALL_TARGET= ${OSNAME}-x86-any
. endif
-.elif defined(WITH_SSE2)
-ALL_TARGET= ${OSNAME}-x86-sse2
+.elif ${ARCH} == "amd64"
+ALL_TARGET= ${OSNAME}-x86-64
.elif ${ARCH} == "alpha"
ALL_TARGET= ${OSNAME}-alpha
.else
-ALL_TARGET= ${OSNAME}-x86-any
+ALL_TARGET= generic
.endif
post-patch:
@${REINPLACE_CMD} -e 's|= gcc|= ${CC}|g' \
-e 's|CFLAGS =.*|CFLAGS = -c ${CFLAGS}|g' \
+ -e 's|openbsd-x86-64|${OSNAME}-x86-64|g' \
${WRKSRC}/Makefile
pre-build:
+ @${ECHO}
@${ECHO} "Building for ${ALL_TARGET}"
+ @${ECHO}
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/run/john ${PREFIX}/bin
--- john-amd64-fix.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605131213.k4DCD5qu097413>