From owner-freebsd-gnome@FreeBSD.ORG Fri Nov 20 03:51:27 2009 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB2CD106566B for ; Fri, 20 Nov 2009 03:51:27 +0000 (UTC) (envelope-from xcllnt@mac.com) Received: from asmtpout028.mac.com (asmtpout028.mac.com [17.148.16.103]) by mx1.freebsd.org (Postfix) with ESMTP id A7EDE8FC0A for ; Fri, 20 Nov 2009 03:51:27 +0000 (UTC) MIME-version: 1.0 Content-type: multipart/mixed; boundary="Boundary_(ID_KMGX8rIDnr1JKGhFkz7UrA)" Received: from macbook-pro.lan.xcllnt.net (mail.xcllnt.net [75.101.29.67]) by asmtp028.mac.com (Sun Java(tm) System Messaging Server 6.3-8.01 (built Dec 16 2008; 32bit)) with ESMTPSA id <0KTE00MWJ2PQAV20@asmtp028.mac.com> for gnome@freebsd.org; Thu, 19 Nov 2009 19:51:27 -0800 (PST) From: Marcel Moolenaar Date: Thu, 19 Nov 2009 19:51:25 -0800 Message-id: <390692D5-CF4E-4523-8E8F-30E479356F36@mac.com> To: gnome@freebsd.org X-Mailer: Apple Mail (2.1077) Cc: Anton Shterenlikht Subject: [PATCH] Fix security/nss for ia64 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2009 03:51:27 -0000 --Boundary_(ID_KMGX8rIDnr1JKGhFkz7UrA) Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT All, The attached patch fixes the build for ia64. Ok for me to commit? -- Marcel Moolenaar xcllnt@mac.com --Boundary_(ID_KMGX8rIDnr1JKGhFkz7UrA) Content-type: application/octet-stream; name=nss.diff Content-transfer-encoding: 7bit Content-disposition: attachment; filename=nss.diff Index: files/patch-..::coreconf::FreeBSD.mk =================================================================== RCS file: /home/ncvs/ports/security/nss/files/patch-..::coreconf::FreeBSD.mk,v retrieving revision 1.13 diff -u -r1.13 patch-..::coreconf::FreeBSD.mk --- files/patch-..::coreconf::FreeBSD.mk 17 Sep 2009 02:59:49 -0000 1.13 +++ files/patch-..::coreconf::FreeBSD.mk 20 Nov 2009 03:33:12 -0000 @@ -1,6 +1,6 @@ ---- ../../security/coreconf/FreeBSD.mk.orig 2008-07-12 10:28:59.000000000 -0400 -+++ ../../security/coreconf/FreeBSD.mk 2009-09-16 22:57:28.000000000 -0400 -@@ -37,16 +37,28 @@ +--- ../../security/coreconf/FreeBSD.mk.orig 2008-07-12 07:28:59.000000000 -0700 ++++ ../../security/coreconf/FreeBSD.mk 2009-11-19 19:29:23.000000000 -0800 +@@ -37,16 +37,33 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk @@ -22,6 +22,10 @@ +CPU_ARCH = sparc64 +USE_64 = 1 +else ++ifeq ($(OS_TEST),ia64) ++CPU_ARCH = ia64 ++USE_64 = 1 ++else +ifeq ($(OS_TEST),amd64) +USE_64 = 1 +endif @@ -29,10 +33,11 @@ endif +endif +endif ++endif OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -60,20 +72,18 @@ ifndef CLASSIC_NSPR +@@ -60,20 +77,18 @@ USE_PTHREADS = 1 DEFINES += -D_THREAD_SAFE -D_REENTRANT OS_LIBS += -pthread @@ -58,7 +63,7 @@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -@@ -82,4 +92,5 @@ PROCESS_MAP_FILE = grep -v ';-' $< | \ +@@ -82,4 +97,5 @@ G++INCLUDES = -I/usr/include/g++ --Boundary_(ID_KMGX8rIDnr1JKGhFkz7UrA)--