[Lsb-messages] /var/www/bzr/lsb/devel/xts5-test r125: Remove ajax.o from the gcc part of the build so the lsbcc part doesn't

[Stew Benedict]

------------------------------------------------------------
revno: 125
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: xts5-test
timestamp: Tue 2012-02-14 14:44:52 -0500
message:
  Remove ajax.o from the gcc part of the build so the lsbcc part doesn't
  try to link it and fail the build
modified:
  package/Makefile
  package/lsb-test-xts5.spec.sed
-------------- next part --------------
=== modified file 'package/Makefile'
--- a/package/Makefile	2011-05-25 20:02:19 +0000
+++ b/package/Makefile	2012-02-14 19:44:52 +0000
@@ -3,7 +3,7 @@
 VERSION=5.1.5
 LSBSpec=4.0
 LSBRelease=4
-RELEASE=41
+RELEASE=42
 # pass a conditional to rpm to do an optional native build
 # so you do something like BZRTREES=xxx WITH_GCC=1 make rpm_package
 ifdef WITH_GCC

=== modified file 'package/lsb-test-xts5.spec.sed'
--- a/package/lsb-test-xts5.spec.sed	2011-05-25 20:02:19 +0000
+++ b/package/lsb-test-xts5.spec.sed	2012-02-14 19:44:52 +0000
@@ -351,6 +351,9 @@
 
 # this is left behind from the previous run
 rm -fr xts5/lib/archive
+# 2/14/12 (sb) after resurrecting the build systems, we're falling down on 
+# blowup - ajax.o from the first run, built with gcc is left and link fails
+rm -f xts5/src/pixval/blowup/ajax.o
 
 export LSBCC_BESTEFFORT=1
 CC="lsbcc -DX11_t -DTRANS_CLIENT -DUNIXCONN -Wl,-rpath,%{topdir}/xts5/lib"