From johans@stack.nl  Tue Feb  8 21:31:59 2005
Return-Path: <johans@stack.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 030C516A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Feb 2005 21:31:59 +0000 (GMT)
Received: from mailhost.stack.nl (vaak.stack.nl [131.155.140.140])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BF79543D39
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Feb 2005 21:31:57 +0000 (GMT)
	(envelope-from johans@stack.nl)
Received: by mailhost.stack.nl (Postfix, from userid 65534)
	id CA8CB1F095; Tue,  8 Feb 2005 22:31:56 +0100 (CET)
Received: from mud.stack.nl (mud.stack.nl [IPv6:2001:610:1108:5011:207:e9ff:fe14:b498])
	by mailhost.stack.nl (Postfix) with ESMTP id AFE741F02C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Feb 2005 22:31:55 +0100 (CET)
Received: by mud.stack.nl (Postfix, from userid 801)
	id 0C64A171E4; Tue,  8 Feb 2005 22:32:15 +0100 (CET)
Message-Id: <20050208213215.0C64A171E4@mud.stack.nl>
Date: Tue,  8 Feb 2005 22:32:15 +0100 (CET)
From: Johan van Selst <johans@stack.nl>
Reply-To: Johan van Selst <johans@stack.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: lang/aleph: fix compilation on amd64 (and ia64)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         77278
>Category:       ports
>Synopsis:       lang/aleph: fix compilation on amd64 (and ia64)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 08 21:40:30 GMT 2005
>Closed-Date:    Wed Feb 09 19:11:00 GMT 2005
>Last-Modified:  Wed Feb 09 19:11:00 GMT 2005
>Originator:     Johan van Selst
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.3-STABLE FreeBSD 5.3-STABLE #0: Mon Jan 31 22:31:14 CET 2005 root@mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	
	Problem: - cpu amd64 was not recognized
		- failed to link with static system library

	Fix: add amd64, remove unnecessary library

	I have no ia64 test machine, but it should run there as well.

>How-To-Repeat:
	
>Fix:

	

This patch introduces three extra files/patch* files.
cnf/mak/aleph-gcc-3.mak is changed to remove unused libsupc++

The others add definitions to recognize amd64 (no special handling required)


diff -uNr aleph/files/patch-cnf_bin_aleph-guess aleph/files/patch-cnf_bin_aleph-guess
--- aleph/files/patch-cnf_bin_aleph-guess	Thu Jan  1 01:00:00 1970
+++ aleph/files/patch-cnf_bin_aleph-guess	Tue Feb  8 21:55:35 2005
@@ -0,0 +1,10 @@
+--- cnf/bin/aleph-guess.orig	Tue Feb  8 21:33:40 2005
++++ cnf/bin/aleph-guess	Tue Feb  8 21:33:37 2005
+@@ -113,6 +113,7 @@
+     mips)     proc_name=mips;;
+     mipsel)   proc_name=mipsel;;    
+     parisc64) proc_name=pa64;;
++    amd64)    proc_name=amd64;;
+     ia64)     proc_name=ia64;;
+     s390)     proc_name=s390;;
+     esac
diff -uNr aleph/files/patch-cnf_mak_aleph-gcc-3.mak aleph/files/patch-cnf_mak_aleph-gcc-3.mak
--- aleph/files/patch-cnf_mak_aleph-gcc-3.mak	Thu Jan  1 01:00:00 1970
+++ aleph/files/patch-cnf_mak_aleph-gcc-3.mak	Tue Feb  8 21:55:22 2005
@@ -0,0 +1,11 @@
+--- cnf/mak/aleph-gcc-3.mak.orig	Tue Feb  8 21:55:12 2005
++++ cnf/mak/aleph-gcc-3.mak	Tue Feb  8 21:43:13 2005
+@@ -43,7 +43,7 @@ ALPCPPVERS	= 3
+ # - compiler dependant libraries                                             -
+ # ----------------------------------------------------------------------------
+ 
+-ALPCPPLIBS	= -lsupc++
++ALPCPPLIBS	=
+ 
+ # ----------------------------------------------------------------------------
+ # - platform dependant linking flags                                         -
diff -uNr aleph/files/patch-src_plt_acf_ccnf.cpp aleph/files/patch-src_plt_acf_ccnf.cpp
--- aleph/files/patch-src_plt_acf_ccnf.cpp	Thu Jan  1 01:00:00 1970
+++ aleph/files/patch-src_plt_acf_ccnf.cpp	Tue Feb  8 21:55:23 2005
@@ -0,0 +1,37 @@
+--- src/plt/acf/ccnf.cpp.orig	Tue Feb  8 21:37:05 2005
++++ src/plt/acf/ccnf.cpp	Tue Feb  8 21:38:33 2005
+@@ -41,6 +41,7 @@
+ #define ALEPH_PROCTYPE_PA64      9
+ #define ALEPH_PROCTYPE_IA64     10
+ #define ALEPH_PROCTYPE_S390     11
++#define ALEPH_PROCTYPE_AMD64    12
+ 
+ // recognized processor name
+ #define ALEPH_PROCNAME_IA        "ia"
+@@ -54,6 +55,7 @@
+ #define ALEPH_PROCNAME_PA64      "pa64"
+ #define ALEPH_PROCNAME_IA64      "ia64"
+ #define ALEPH_PROCNAME_S390      "s390"
++#define ALEPH_PROCNAME_AMD64     "amd64"
+ 
+ // force size type with S390
+ #if defined(__s390__)
+@@ -114,6 +116,9 @@
+   // s390
+   if (strcmp (proc, ALEPH_PROCNAME_S390) == 0)
+     return ALEPH_PROCTYPE_S390;
++  // amd64
++  if (strcmp (proc, ALEPH_PROCNAME_AMD64) == 0)
++    return ALEPH_PROCTYPE_AMD64;
+   // unknown
+   return ALEPH_PROCTYPE_UNKNOWN;
+ }
+@@ -228,6 +233,8 @@
+ 	   ALEPH_PROCTYPE_IA64);
+   fprintf (stdout, "#define  ALEPH_PROCTYPE_S390      %d\n",
+ 	   ALEPH_PROCTYPE_S390);
++  fprintf (stdout, "#define  ALEPH_PROCTYPE_AMD64     %d\n",
++	   ALEPH_PROCTYPE_AMD64);
+   fprintf (stdout, "\n");
+ 
+   // install the config names
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Feb 9 19:10:52 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77278 
>Unformatted:
