[Lsb-messages] /var/www/bzr/lsb/4.0/xts5-test r104: Work around build issues using modern sdk

Stew Benedict stewb at linux-foundation.org
Sat May 12 17:02:58 UTC 2012


------------------------------------------------------------
revno: 104
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: xts5-test
timestamp: Sat 2012-05-12 13:02:58 -0400
message:
  Work around build issues using modern sdk
added:
  package/old-libbat-X-headers.tar.gz
modified:
  package/lsb-test-xts5.spec
-------------- next part --------------
=== modified file 'package/lsb-test-xts5.spec'
--- a/package/lsb-test-xts5.spec	2012-02-28 17:33:54 +0000
+++ b/package/lsb-test-xts5.spec	2012-05-12 17:02:58 +0000
@@ -45,6 +45,7 @@
 Source0: xts5-5.1.5.tar.gz
 Source1: %{name}-%{version}.tar.gz
 Source2: vsw4-evi-tests.tar.gz
+Source3: old-libbat-X-headers.tar.gz
 Patch0: xts5-5.1.5-lsb-generic.patch
 Patch1: xts5-5.1.5-lsb-Xt.patch
 Patch2: xts5-5.1.5-lsb-Xlib.patch
@@ -311,6 +312,10 @@
 patch -p0 < %{PATCH16}
 patch -p0 < %{PATCH18}
 
+# had this in libbat, now in lsb-build, but only for 5.0+
+install -d xts5/src/lib/X11
+tar xzf %{SOURCE3} -C xts5/src/lib/X11
+
 # this one is *only* for the hybrid build - things blow up if we try to
 # use it for the normal build - trying not to rely on XInput_find_display
 patch -p1 < %{PATCH21}
@@ -340,6 +345,10 @@
 # 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
+# 5/12/12 (sb) we now have Xos.h, Xarch.h, Xfuncs.h in lsb-build-base, but
+# only for 5.0+ - blowup build is falling down on malloc, which we've patched
+# out elsewhere, just sed this one out
+sed -i 's|extern char|extern void|' xts5/src/pixval/blowup/vblowup_c.c
 
 export LSBCC_BESTEFFORT=1
 CC="lsbcc -DX11_t -DTRANS_CLIENT -DUNIXCONN -Wl,-rpath,%{topdir}/xts5/lib"

=== added file 'package/old-libbat-X-headers.tar.gz'
Binary files a/package/old-libbat-X-headers.tar.gz	1970-01-01 00:00:00 +0000 and b/package/old-libbat-X-headers.tar.gz	2012-05-12 17:02:58 +0000 differ


More information about the lsb-messages mailing list