Changeset 98

Timestamp:

Mar 23, 2007, 11:07:52 PM (18 years ago)

Author:

rainer

Message:

Fix for ticket #58 (cross-compiling does not work).

Location:

trunk

Files:

• Makefile.in (modified) (5 diffs)
• configure.ac (modified) (3 diffs)
• src/sh_unix.c (modified) (1 diff)
• src/yulectl.c (modified) (1 diff)

trunk/Makefile.in

@@ -78 +78 @@
 
 CC = @CC@
+BUILD_CC = @BUILD_CC@
 # DBGDEF = -pg -DSH_PROFILE=1
 DBGDEF = @mydebugdef@
@@ -241 +242 @@
 
 depend-gen: $(srcsrc)/depend-gen.c 
-        @echo "$(CC) $(CFLAGS) -o depend-gen $(srcsrc)/depend-gen.c"; \
-        $(CC) $(CFLAGS) -o depend-gen $(srcsrc)/depend-gen.c 2>/dev/null || \
+        @echo "$(BUILD_CC) -I. -o depend-gen $(srcsrc)/depend-gen.c"; \
+        $(BUILD_CC) -I. -o depend-gen $(srcsrc)/depend-gen.c 2>/dev/null || \
         echo "failed to compile ... hope depend.dep is ok"
 
@@ -1078 +1079 @@
 
 sstrip: $(srcsrc)/sstrip.c Makefile
-        $(COMPILE)  -o sstrip $(srcsrc)/sstrip.c
+        $(BUILD_CC) -I.  -o sstrip $(srcsrc)/sstrip.c
 
 encode: $(srcsrc)/encode.c Makefile
-        $(COMPILE)  -o encode $(srcsrc)/encode.c
+        $(BUILD_CC) -I. -o encode $(srcsrc)/encode.c
 
 config_xor.h: config.h encode
@@ -1204 +1205 @@
 # For kernel syscall monitoring
 kern_head: Makefile $(top_srcdir)/include/kern_head.h $(srcsrc)/kern_head.c
-        @echo "$(COMPILE) -DSYSTEMMAP=\"@systemmap@\" -o kern_head $(srcsrc)/kern_head.c $(LIBS_KVM)"; \
-        $(COMPILE) -DSYSTEMMAP=\"@systemmap@\" -o kern_head $(srcsrc)/kern_head.c $(LIBS_KVM)
+        @echo "$(BUILD_CC) -I. -DSYSTEMMAP=\"@systemmap@\" -o kern_head $(srcsrc)/kern_head.c $(LIBS_KVM)"; \
+        $(BUILD_CC) -I. -DSYSTEMMAP=\"@systemmap@\" -o kern_head $(srcsrc)/kern_head.c $(LIBS_KVM)
 
 sh_ks.h: kern_head
@@ -1228 +1229 @@
 
 mkhdr: $(srcsrc)/mkhdr.c config.h 
-        @echo "$(COMPILE)  -o mkhdr $(srcsrc)/mkhdr.c"; \
+        @echo "$(BUILD_CC) -I. -o mkhdr $(srcsrc)/mkhdr.c"; \
         sleep 1; \
-        $(COMPILE)  -o mkhdr $(srcsrc)/mkhdr.c
+        $(BUILD_CC) -I. -o mkhdr $(srcsrc)/mkhdr.c
 
 #       $(COMPILE)  -DBIG_SHORT_NAMES -o mkhdr $(srcdir)/mkhdr.c

trunk/configure.ac

@@ -21 +21 @@
 
 AC_PROG_CC
+if test "$host" != "$build"; then
+   AC_CHECK_PROGS(BUILD_CC, gcc cc)
+else
+   BUILD_CC=$CC
+fi
 AC_PROG_CPP 
 AC_PROG_INSTALL
@@ -27 +32 @@
 AC_PATH_PROG(cmd_hostname,hostname)
 AC_SUBST(cmd_hostname)
+AC_SUBST(BUILD_CC)
 
 GCC_STACK_PROTECT_CC
@@ -199 +205 @@
         sys/select.h sys/socket.h netinet/in.h \
         regex.h glob.h \
-        linux/ext2_fs.h ext2fs/ext2_fs.h \
+        linux/ext2_fs.h linux/fs.h ext2fs/ext2_fs.h \
         elf.h linux/elf.h \
         paths.h arpa/nameser.h arpa/nameser_compat.h \

trunk/src/sh_unix.c

@@ -25 +25 @@
 #include <string.h>
 #include <ctype.h>
-
+#ifdef HAVE_LINUX_FS_H
+#include <linux/fs.h>
+#endif
 
 #ifdef HAVE_MEMORY_H

trunk/src/yulectl.c

@@ -384 +384 @@
       if (verbose && (errno == ENOENT))
         fprintf (stdout, 
-                 _("# Password file (%s) missing\n"),
+                 _("# No password file (%s) exists\n"),
                  home);
       else if (verbose)