[Lsb-messages] /var/www/bzr/lsb/4.1/appbat r969: Couple of paths not quite right for bootstrapping Xaw, Xp build

[Stew Benedict]

------------------------------------------------------------
revno: 969
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: appbat
timestamp: Mon 2013-02-11 14:45:44 -0500
message:
  Couple of paths not quite right for bootstrapping Xaw, Xp build
  Disable building the "spec" dir of Xaw, some systems fail/hang on widgets.ps
modified:
  libs/xaw.xml.in
  libs/xp.xml.in
-------------- next part --------------
=== modified file 'libs/xaw.xml.in'
--- a/libs/xaw.xml.in	2013-02-08 16:40:50 +0000
+++ b/libs/xaw.xml.in	2013-02-11 19:45:44 +0000
@@ -39,7 +39,7 @@
 		<!-- bootstrap, need Xmu includes -->
 		<setenv>
 			<variable>CFLAGS</variable>
-			<value>-I &install_dir;/libbat/opt/lsb/include</value>
+			<value>-I &install_dir;/libbat/opt/lsb/libbat/@APPBATVERSION@/include</value>
 		</setenv>
 
 		<setenv>
@@ -52,7 +52,7 @@
 			<!-- need xmu and xpm to bootstrap this -->
 			<setenv>
 				<variable>PKG_CONFIG_PATH</variable>
-				<value>/opt/lsb/lib64- at APPBATVERSION@/pkgconfig:&install_dir;/libbat/opt/lsb/lib64- at APPBATVERSION@/pkgconfig</value>
+				<value>/opt/lsb/lib64- at APPBATVERSION@/pkgconfig:&install_dir;/libbat/opt/lsb/libbat/@APPBATVERSION@/lib64/pkgconfig</value>
 			</setenv>
 		
 			<configure>
@@ -69,7 +69,7 @@
 			<!-- need xmu and xpm to bootstrap this -->
 			<setenv>
 				<variable>PKG_CONFIG_PATH</variable>
-				<value>/opt/lsb/lib- at APPBATVERSION@/pkgconfig:&install_dir;/libbat/opt/lsb/lib- at APPBATVERSION@/pkgconfig</value>
+				<value>/opt/lsb/lib- at APPBATVERSION@/pkgconfig:&install_dir;/libbat/opt/lsb/libbat/@APPBATVERSION@/lib/pkgconfig</value>
 			</setenv>
 		
 			<configure>
@@ -85,6 +85,14 @@
 	</prebuild>
 
 	<build>
+                <!-- some systems hang or fail making widgets.ps, drop it -->
+		<execute>
+			<base>&build_dir;/&xaw-directory;</base>
+			<command>sed</command>
+			<param>-i</param>
+			<param>'s| spec| |g'</param>
+			<param>Makefile</param>
+		</execute>
 		<make>
 			<base>&build_dir;/&xaw-directory;</base>
 		</make>

=== modified file 'libs/xp.xml.in'
--- a/libs/xp.xml.in	2013-02-08 16:40:50 +0000
+++ b/libs/xp.xml.in	2013-02-11 19:45:44 +0000
@@ -31,6 +31,12 @@
 			<param>-i &patch_dir;/&xp-sdk-patch;</param>
 		</patch>
 
+		<!-- bootstrap, need xau, printproto includes -->
+		<setenv>
+			<variable>CFLAGS</variable>
+			<value>-I &install_dir;/libbat/opt/lsb/libbat/@APPBATVERSION@/include</value>
+		</setenv>
+
 		<setenv>
 			<variable>CC</variable>
 			<value>lsbcc</value>
@@ -46,7 +52,7 @@
 			<!-- need xau and printproto to bootstrap this -->
 			<setenv>
 				<variable>PKG_CONFIG_PATH</variable>
-				<value>/opt/lsb/lib64- at APPBATVERSION@/pkgconfig:&install_dir;/libbat/opt/lsb/lib64- at APPBATVERSION@/pkgconfig</value>
+				<value>/opt/lsb/lib64- at APPBATVERSION@/pkgconfig:&install_dir;/libbat/opt/lsb/libbat/@APPBATVERSION@/lib64/pkgconfig</value>
 			</setenv>
 		
 			<configure>
@@ -62,7 +68,7 @@
 			<!-- need xau and printproto to bootstrap this -->
 			<setenv>
 				<variable>PKG_CONFIG_PATH</variable>
-				<value>/opt/lsb/lib- at APPBATVERSION@/pkgconfig:&install_dir;/libbat/opt/lsb/lib- at APPBATVERSION@/pkgconfig</value>
+				<value>/opt/lsb/lib- at APPBATVERSION@/pkgconfig:&install_dir;/libbat/opt/lsb/libbat/@APPBATVERSION@/lib/pkgconfig</value>
 			</setenv>
 		
 			<configure>