From owner-p4-projects@FreeBSD.ORG Thu Jul 20 13:03:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 938A116A4E1; Thu, 20 Jul 2006 13:03:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6C0CE16A4DF for ; Thu, 20 Jul 2006 13:03:56 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 36A7643D46 for ; Thu, 20 Jul 2006 13:03:56 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6KD3uxw002275 for ; Thu, 20 Jul 2006 13:03:56 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6KD3tpO002272 for perforce@freebsd.org; Thu, 20 Jul 2006 13:03:55 GMT (envelope-from gabor@FreeBSD.org) Date: Thu, 20 Jul 2006 13:03:55 GMT Message-Id: <200607201303.k6KD3tpO002272@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 101991 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jul 2006 13:03:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=101991 Change 101991 by gabor@gabor_spitfire on 2006/07/20 13:03:09 Remove duplicatd code. This happened when the IA32_BINARY_PORT stuff got committed into CVS but a bit differently and I was not aware of that, so my version got merged with CVS version. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#54 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#54 (text+ko) ==== @@ -1128,30 +1128,6 @@ # Kludge for pre-3.0 systems MACHINE_ARCH?= i386 -# Check the compatibility layer for amd64/ia64 - -.if ${ARCH} == "amd64" || ${ARCH} =="ia64" -.if exists(/usr/lib32) -HAVE_COMPAT_IA32_LIBS?= YES -.endif -.if !defined(HAVE_COMPAT_IA32_KERN) -HAVE_COMPAT_IA32_KERN!= if ${SYSCTL} -a compat.ia32.maxvmem >/dev/null 2>&1; then echo YES; fi -.endif -.endif - -.if defined(IA32_BINARY_PORT) && ${ARCH} != "i386" -.if ${ARCH} == "amd64" || ${ARCH} == "ia64" -.if !defined(HAVE_COMPAT_IA32_KERN) -IGNORE= you need a kernel with compiled-in IA32 compatibility to use this port. -.elif !defined(HAVE_COMPAT_IA32_LIBS) -IGNORE= you need the 32-bit libraries installed under /usr/lib32 to use this port. -.endif -.else -IGNORE= you have to use i386 (or compatible) platform to use this port. -.endif -.endif - - # Get the operating system type .if !defined(OPSYS) OPSYS!= ${UNAME} -s