[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1927: Remove crti portion of lsbcc from ppc32 build.

[Jeff Licquia]

------------------------------------------------------------
revno: 1927
committer: Jeff Licquia <jeff at licquia.org>
branch nick: build_env
timestamp: Tue 2012-03-20 12:16:29 -0400
message:
  Remove crti portion of lsbcc from ppc32 build.
  
  The crti code failed to build on SLES 11.  Investigation showed that it
  had changed significantly upstream, and porting it to build everywhere
  might be difficult.  Furthermore, testing of the original reason for the
  change suggests it may no longer be a problem.
modified:
  lsbdev-cc/lsbcc.c
  package/lsb-build.spec.sed
-------------- next part --------------
=== modified file 'lsbdev-cc/lsbcc.c'
--- a/lsbdev-cc/lsbcc.c	2012-03-12 17:46:29 +0000
+++ b/lsbdev-cc/lsbcc.c	2012-03-20 16:16:29 +0000
@@ -1588,14 +1588,6 @@
 }
 
 #if __powerpc__ && !__powerpc64__
-/* fugly hack for issue with compiled apps on some plats not
- * running on others (SLES10 compiled segfaults on Debian4 ppc)
- * provide our own crti.o to work around the issue
- */
-argvaddstring(gccargs, "-B/opt/lsb/lib");
-#endif
-
-#if __powerpc__ && !__powerpc64__
 /* new defaults in gcc no longer produce the ppc32 cpu instructions
  * specified by the LSB ABI.  Force this.  Bug 3253.
  */

=== modified file 'package/lsb-build.spec.sed'
--- a/package/lsb-build.spec.sed	2012-03-13 18:19:04 +0000
+++ b/package/lsb-build.spec.sed	2012-03-20 16:16:29 +0000
@@ -70,9 +70,6 @@
 make clean
 # now rebuild using our just-built binaries
 make CC=$RPM_BUILD_DIR/xbuild/bin/lsbcc CXX=$RPM_BUILD_DIR/xbuild/bin/lsbc++ LSBCC_LSBVERSION=%build_target INSTALL_ROOT=/opt/lsb CFLAGS="-g -Wall -DLSBCC_VERSION=\\\"%ver\\\""
-%ifarch ppc
-make -C lsbdev-cc/crti
-%endif
 
 %install
 [ -e $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT
@@ -106,9 +103,6 @@
 for manpage in lsbcc.1 lsbc++.1 lsbcpp.1; do
   gzip -9 $RPM_BUILD_ROOT/opt/lsb/man/man1/$manpage
 done
-%ifarch ppc 
-for i in $RPM_BUILD_ROOT/opt/lsb/lib*; do install lsbdev-cc/crti/crti.o "$i"; done
-%endif
 
 # before leaving, we have to fix up the file lists:
 (cd package && make core_pkglist_pruned && make desktop_pkglist_pruned)