Author: qboosh Date: Fri Nov 4 11:59:48 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - added alpha-gcc3 support - recognize gcc 4 on x86 as gcc 3, not gcc 2.95
---- Files affected: SOURCES: helixplayer-morearchs.patch (1.8 -> 1.9) ---- Diffs: ================================================================ Index: SOURCES/helixplayer-morearchs.patch diff -u SOURCES/helixplayer-morearchs.patch:1.8 SOURCES/helixplayer-morearchs.patch:1.9 --- SOURCES/helixplayer-morearchs.patch:1.8 Fri Nov 4 09:41:59 2005 +++ SOURCES/helixplayer-morearchs.patch Fri Nov 4 12:59:43 2005 @@ -12,7 +12,27 @@ static __inline__ void --- hxplay-1.0.5/build/lib/sysinfo.py.orig 2005-05-11 20:39:02.000000000 +0200 +++ hxplay-1.0.5/build/lib/sysinfo.py 2005-11-03 20:47:25.000000000 +0100 -@@ -1020,6 +1020,10 @@ +@@ -314,6 +314,13 @@ + family_list = ['unix', 'linux', 'linux2', 'linux-glibc-2.0'] )) + + AddPlatform(Platform( ++ id = 'linux-2.2-libc6-gcc32-alpha', ++ platform = 'linux2', ++ arch = 'alpha', ++ distribution_id = 'linux-2.2-libc6-gcc32-alpha', ++ family_list = ['unix', 'linux', 'linux2', 'gcc3', 'linux-glibc-2.0'] )) ++ ++AddPlatform(Platform( + id = 'linux-2.2-libc6-powerpc', + platform = 'linux2', + arch = 'powerpc', +@@ -1015,11 +1022,15 @@ + gcc_version=os.popen("gcc -dumpversion").read() + gcc_version=string.strip(gcc_version) + +- if gcc_version[0] == "3": ++ if gcc_version[0] == "3" or gcc_version[0] == '4': + set_platform('linux-2.2-libc6-gcc32-i586') else: set_platform('linux-2.2-libc6-i586') @@ -23,6 +43,21 @@ ## Linux PPC Q3 elif arch == 'ppc': set_platform('linux-2.2-libc6-powerpc') +@@ -1030,7 +1041,13 @@ + + ## Linux Alpha + elif arch == 'alpha': +- set_platform('linux-2.0-libc6-alpha-gcc2.95') ++ gcc_version=os.popen("gcc -dumpversion").read() ++ gcc_version=string.strip(gcc_version) ++ ++ if gcc_version[0] == "3" or gcc_version[0] == '4': ++ set_platform('linux-2.2-libc6-gcc32-alpha') ++ else: ++ set_platform('linux-2.0-libc6-alpha-gcc2.95') + + elif arch == 'ia64': + set_platform('linux-2.4-libc6-ia64') --- hxplay-1.0.5/build/umakecf/linux-2.6-glibc23-amd64.cf.orig 2005-02-24 22:17:20.000000000 +0100 +++ hxplay-1.0.5/build/umakecf/linux-2.6-glibc23-amd64.cf 2005-11-03 21:17:00.000000000 +0100 @@ -56,10 +56,13 @@ @@ -294,3 +329,67 @@ #include "linux/soundcard.h" #elif defined(__powerpc__) #include "sys/soundcard.h" +--- hxplay-1.0.5/build/umakecf/linux-2.2-libc6-gcc32-alpha.cf.orig 1970-01-01 01:00:00.000000000 +0100 ++++ hxplay-1.0.5/build/umakecf/linux-2.2-libc6-gcc32-alpha.cf 2005-11-04 11:15:52.000000000 +0100 +@@ -0,0 +1,61 @@ ++# ++# ***** BEGIN LICENSE BLOCK ***** ++# Source last modified: $Id$ ++# ++# Portions Copyright (c) 1995-2004 RealNetworks, Inc. All Rights Reserved. ++# ++# The contents of this file, and the files included with this file, ++# are subject to the current version of the RealNetworks Public ++# Source License (the "RPSL") available at ++# http://www.helixcommunity.org/content/rpsl unless you have licensed ++# the file under the current version of the RealNetworks Community ++# Source License (the "RCSL") available at ++# http://www.helixcommunity.org/content/rcsl, in which case the RCSL ++# will apply. You may also obtain the license terms directly from ++# RealNetworks. You may not use this file except in compliance with ++# the RPSL or, if you have a valid RCSL with RealNetworks applicable ++# to this file, the RCSL. Please see the applicable RPSL or RCSL for ++# the rights, obligations and limitations governing use of the ++# contents of the file. ++# ++# Alternatively, the contents of this file may be used under the ++# terms of the GNU General Public License Version 2 or later (the ++# "GPL") in which case the provisions of the GPL are applicable ++# instead of those above. If you wish to allow use of your version of ++# this file only under the terms of the GPL, and not to allow others ++# to use your version of this file under the terms of either the RPSL ++# or RCSL, indicate your decision by deleting the provisions above ++# and replace them with the notice and other provisions required by ++# the GPL. If you do not delete the provisions above, a recipient may ++# use your version of this file under the terms of any one of the ++# RPSL, the RCSL or the GPL. ++# ++# This file is part of the Helix DNA Technology. RealNetworks is the ++# developer of the Original Code and owns the copyrights in the ++# portions it created. ++# ++# This file, and the files included with this file, is distributed ++# and made available on an 'AS IS' basis, WITHOUT WARRANTY OF ANY ++# KIND, EITHER EXPRESS OR IMPLIED, AND REALNETWORKS HEREBY DISCLAIMS ++# ALL SUCH WARRANTIES, INCLUDING WITHOUT LIMITATION, ANY WARRANTIES ++# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, QUIET ++# ENJOYMENT OR NON-INFRINGEMENT. ++# ++# Technology Compatibility Kit Test Suite(s) Location: ++# http://www.helixcommunity.org/content/tck ++# ++# Contributor(s): ++# ++# ***** END LICENSE BLOCK ***** ++# ++"""Linux 2.x using GCC 3.2 libc6 on the Alpha processor. This is used for ++building the RealPlayer client only.""" ++ ++exec_config_file('linux-2.2-libc6-gcc32.cf') ++ ++## list of PCF files to run ++platform.pcf_prefix_list = ['unix', 'linux2', "linux-2.2-libc6-gcc32-alpha"] ++ ++## platform defines ++project.AddDefines("_ALPHA", "_LONG_IS_64", "_LITTLE_ENDIAN", "_STRICT_ALIGNMENT") ++ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/helixplayer-morearchs.patch?r1=1.8&r2=1.9&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit