2012-05-14 Brian Cameron <[email protected]> gnome-2-30-s11update
authoryippi
Mon, 14 May 2012 17:56:25 +0000
branchgnome-2-30-s11update
changeset 22424 e46ab03c8dac
parent 22423 b7c1167a1542
child 22428 a1bc8b20e90f
2012-05-14 Brian Cameron <[email protected]> WebRTI #362627. CR #7166622 PulseAudio does not work on Sparc. * specs/SUNWpulseaudio.spec, base-specs/pulseaudio.spec: Build with -xO2 on sparc and add -KPIC. * base-specs/libgc.spec, patches/libgc-03-sparc-atomic.diff: Build with -KPIC.
ChangeLog
base-specs/libgc.spec
base-specs/pulseaudio.spec
patches/libgc-03-sparc-atomic.diff
specs/SUNWpulseaudio.spec
--- a/ChangeLog	Mon May 14 17:34:54 2012 +0000
+++ b/ChangeLog	Mon May 14 17:56:25 2012 +0000
@@ -1,3 +1,12 @@
+2012-05-14  Brian Cameron  <[email protected]>
+
+	WebRTI #362627.
+        CR #7166622 PulseAudio does not work on Sparc.
+	* specs/SUNWpulseaudio.spec, base-specs/pulseaudio.spec: Build with
+	  -xO2 on sparc and add -KPIC.
+	* base-specs/libgc.spec, patches/libgc-03-sparc-atomic.diff:  Build
+	  with -KPIC.
+
 2012-05-14 Ada Luong <[email protected]>
 
         ==== S11U1 build 16 ====
--- a/base-specs/libgc.spec	Mon May 14 17:34:54 2012 +0000
+++ b/base-specs/libgc.spec	Mon May 14 17:56:25 2012 +0000
@@ -65,7 +65,7 @@
   CPUS=1
 fi
 
-export CFLAGS="%optflags"
+export CFLAGS="%optflags -KPIC"
 export LDFLAGS="%{_ldflags}"
 
 libtoolize --force
--- a/base-specs/pulseaudio.spec	Mon May 14 17:34:54 2012 +0000
+++ b/base-specs/pulseaudio.spec	Mon May 14 17:56:25 2012 +0000
@@ -66,7 +66,6 @@
 # headers are delivered there on Solaris.
 #
 export CPPFLAGS="-xc99"
-export CFLAGS="%optflags -xc99 -I/usr/include/gc"
 export LDFLAGS="$SOLARIS_PULSE_LDFLAGS"
 
 autoreconf --force --install
@@ -104,6 +103,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri May 04 2012 - Brian Cameron  <[email protected]>
+- Now set optimization -xO2 on sparc to fix CR #7166622.
 * Thu Oct 20 2011 - Brian Cameron <[email protected]>
 - Bump to 1.1.
 * Thu Oct 06 2011 - Brian Cameron <[email protected]>
--- a/patches/libgc-03-sparc-atomic.diff	Mon May 14 17:34:54 2012 +0000
+++ b/patches/libgc-03-sparc-atomic.diff	Mon May 14 17:56:25 2012 +0000
@@ -9,3 +9,14 @@
  endif
  
  # Include THREADDLLIBS here to ensure that the correct versions of
+--- gc-7.2alpha6/Makefile.am-orig	2012-05-02 07:45:17.396247578 +0800
++++ gc-7.2alpha6/Makefile.am	2012-05-02 07:46:40.232361840 +0800
+@@ -141,7 +144,7 @@ if COMPILER_XLC
+ else
+   ## We use -Wp,-P to strip #line directives.  Irix `as' chokes on
+   ## these.
+-  ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp
++  ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp -KPIC
+ endif
+ .s.lo:
+ 	$(LTCOMPILE) $(ASM_CPP_OPTIONS) -c $<
--- a/specs/SUNWpulseaudio.spec	Mon May 14 17:34:54 2012 +0000
+++ b/specs/SUNWpulseaudio.spec	Mon May 14 17:56:25 2012 +0000
@@ -41,6 +41,7 @@
 BuildRequires: codec/speex
 BuildRequires: gnome/config/gconf
 BuildRequires: library/desktop/gtk2
+BuildRequires: library/fftw-3
 BuildRequires: library/gc
 BuildRequires: library/json-c
 BuildRequires: library/libtool/libltdl
@@ -87,8 +88,18 @@
 gzcat %SOURCE0 | tar xf -
 
 %build
+# Use no higher than -xO2 on sparc.
+#
+%ifarch sparc
+export PA_OPTFLAGS64=`/usr/bin/echo %optflags64 | /usr/gnu/bin/sed -e 's/-xO./-xO2/'`
+export PA_OPTFLAGS=`/usr/bin/echo %optflags | /usr/gnu/bin/sed -e 's/-xO./-xO2/'`
+%else
+export PA_OPTFLAGS64=`/usr/bin/echo %optflags64`
+export PA_OPTFLAGS=`/usr/bin/echo %optflags`
+%endif
+
 %ifarch amd64 sparcv9
-
+export CFLAGS="$PA_OPTFLAGS64 -xc99 -I/usr/include/gc -KPIC"
 export SOLARIS_PULSE_ARGS="--disable-avahi"
 
 # Need to add -Wl,-z,now and -Wl,-z-nodelete and remove -Wl,-zignore for
@@ -105,6 +116,7 @@
 
 # Now build 32-bit.
 #
+export CFLAGS="$PA_OPTFLAGS -xc99 -I/usr/include/gc -KPIC"
 export SOLARIS_PULSE_ARGS=""
 
 %if %debug_build
@@ -213,6 +225,8 @@
 %endif
 
 %changelog
+* Fri May 04 2012 - Brian Cameron  <[email protected]>
+- Now set optimization -xO2 on sparc to fix CR #7166622.
 * Sun Oct 02 2011 - Brian Cameron  <[email protected]>
 - Bump to 1.0.
 * Tue Sep 28 2011 - Brian Cameron  <[email protected]>