1Upstream-Status: Pending
2
3make sure it can be compiled for cross target
4
51. never try to compile target binary by native gcc
62. target's chkshsgr doesn't work on native.
73. it's wrong to do target tests on native.
8
9Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
10
11diff -Nurp daemontools-0.76.orig/src/conf-cc daemontools-0.76/src/conf-cc
12--- daemontools-0.76.orig/src/conf-cc	2001-07-13 00:49:49.000000000 +0800
13+++ daemontools-0.76/src/conf-cc	2014-11-26 09:34:38.828812162 +0800
14@@ -1,3 +1,3 @@
15-gcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
16+${CC} -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
17
18 This will be used to compile .c files.
19diff -Nurp daemontools-0.76.orig/src/conf-ld daemontools-0.76/src/conf-ld
20--- daemontools-0.76.orig/src/conf-ld	2001-07-13 00:49:49.000000000 +0800
21+++ daemontools-0.76/src/conf-ld	2014-11-26 09:34:49.880811730 +0800
22@@ -1,3 +1,3 @@
23-gcc -s
24+${CC}
25
26 This will be used to link .o files into an executable.
27diff -Nurp daemontools-0.76.orig/src/Makefile daemontools-0.76/src/Makefile
28--- daemontools-0.76.orig/src/Makefile	2001-07-13 00:49:49.000000000 +0800
29+++ daemontools-0.76/src/Makefile	2014-11-26 09:38:47.120802459 +0800
30@@ -165,7 +165,7 @@ hassgprm.h: choose compile hassgprm.h1 h
31
32 hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \
33 tryshsgr.c warn-shsgr
34-	./chkshsgr || ( cat warn-shsgr; exit 1 )
35+	echo "Warning: We can not run test on cross target. - ignoring ./chkshsgr || ( cat warn-shsgr; exit 1 )"
36 	./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h
37
38 haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c
39@@ -265,7 +265,7 @@ readproctitle.o: compile error.h readpro
40 rts: envdir envuidgid fghack matchtest multilog pgrphack \
41 readproctitle rts.tests setlock setuidgid softlimit supervise svc \
42 svok svscan svscanboot svstat tai64n tai64nlocal
43-	env - /bin/sh rts.tests 2>&1 | cat -v > rts
44+	echo "Warning: We can not run test on cross target. - ignoring env - /bin/sh rts.tests 2>&1 | cat -v > rts"
45
46 scan_ulong.o: compile scan.h scan_ulong.c
47 	./compile scan_ulong.c
48