Группа :: Звук
Пакет: libffado
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: libffado-2.0-alt.patch
Скачать
Скачать
diff --git a/libffado/SConstruct b/libffado/SConstruct
index 5c0c9a3..04aba5f 100644
--- a/libffado/SConstruct
+++ b/libffado/SConstruct
@@ -541,7 +541,7 @@ config_kernel = 2
config_os = 3
config = config_guess.split ("-")
-needs_fPIC = False
+needs_fPIC = True
#=== Begin Revised CXXFLAGS =========================================
def outputof(*cmd):
@@ -602,25 +602,32 @@ class CpuInfo (object):
def cpu_info_x86(self):
"parse /proc/cpuinfo for x86 kernels"
- for k,v in cpuinfo_kv():
- if k == 'processor':
- self.cpu_count += 1
- if self.cpu_count > 1:
- # assume all CPUs are identical features, no need to
- # parse all of them
- continue
- elif k == 'vendor_id': # AuthenticAMD, GenuineIntel
- self.vendor_id = v
- self.is_amd = v == 'AuthenticAMD'
- self.is_intel = v == 'GenuineIntel'
- elif k == 'flags':
- self.x86_flags = v.split()
- elif k == 'model name':
- self.model_name = v
- elif k == 'cpu family':
- self.cpu_family = v
- elif k == 'model':
- self.model = v
+ #for k,v in cpuinfo_kv():
+ # if k == 'processor':
+ # self.cpu_count += 1
+ # if self.cpu_count > 1:
+ # # assume all CPUs are identical features, no need to
+ # # parse all of them
+ # continue
+ # elif k == 'vendor_id': # AuthenticAMD, GenuineIntel
+ # self.vendor_id = v
+ # self.is_amd = v == 'AuthenticAMD'
+ # self.is_intel = v == 'GenuineIntel'
+ # elif k == 'flags':
+ # self.x86_flags = v.split()
+ # elif k == 'model name':
+ # self.model_name = v
+ # elif k == 'cpu family':
+ # self.cpu_family = v
+ # elif k == 'model':
+ # self.model = v
+ self.x86_flags = "mmx sse sse2".split()
+ self.vendor_id = 'GenuineIntel'
+ self.is_amd = False
+ self.is_intel = True
+ self.model_name = 'Generic Model Name'
+ self.cpu_family = 'Generic CPU Family'
+ self.model = 'Generic Model'
def cpu_info_ppc(self):
"parse /proc/cpuinfo for PowerPC kernels"
@@ -668,8 +675,8 @@ def is_userspace_32bit(cpuinfo):
be 32-bit, such as Debian on powerpc64. This function tries to figure out
if userspace is 32-bit, i.e. we might need to pass '-m32' or '-m64' to gcc.
"""
- if not cpuinfo.is_64bit:
- return True
+ #if not cpuinfo.is_64bit:
+ # return True
# note that having a 64-bit CPU means nothing for these purposes. You could
# run a completely 32-bit system on a 64-bit capable CPU.
answer = None
@@ -681,7 +688,7 @@ def is_userspace_32bit(cpuinfo):
# Debian ppc64 returns machine 'ppc64', but userspace might be 32-bit
# We'll make an educated guess by examining a known executable
- exe = '/bin/mount'
+ exe = '/bin/bash'
if os.path.isfile(exe):
#print 'Found %s' % exe
if os.path.islink(exe):