Fix --host crosscompile (acr 0.9.2)

binr/rules.mk

@@ -16,6 +16,7 @@ LDFLAGS+=../../libr/db/sdb/src/libsdb.a
 LDFLAGS+=../../libr/fs/p/grub/libgrubfs.a
 LDFLAGS+=-lm
 endif
+LDFLAGS+=${DL_LIBS}
 
 #--------------------#
 # Rules for programs #

config-user.mk.acr

@@ -1,6 +1,7 @@
 # This file should be generated by the ./configure script
 
 DESTDIR=
+CC=@CC@
 PREFIX=@PREFIX@
 BINDIR=@BINDIR@
 LIBDIR=@LIBDIR@

configure

@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script was automatically generated by ACR v0.9.1
+# This script was automatically generated by ACR v0.9.2
 # @author: pancake <youterm.com>
 # @url:    http://www.nopcode.org
 # @repo:   hg clone http://hg.youterm.com/acr
@@ -36,7 +36,7 @@ while : ; do
 ENVWORDS="${ENVWORDS} $1_CPU $1_OS"
 STR=`eval "echo ${S}$1"`
 SPLIT_CPU="`echo "$STR" | cut -d - -f 1`"
-SPLIT_OS="`echo "$STR" | cut -d - -f 3`"
+SPLIT_OS="`echo "$STR" | awk -F - '{if(NF==3){print $2}else{print $3}}'`"
 eval "$1_CPU=\"$SPLIT_CPU\""
 eval "$1_OS=\"$SPLIT_OS\""
 shift
@@ -190,7 +190,7 @@ take_environ() {
 }
 
 show_version() {
-echo "radare2-0.9.3git configuration script done with acr v0.9.1.
+echo "radare2-0.9.3git configuration script done with acr v0.9.2.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <youterm.com>."
 exit 0
@@ -510,7 +510,7 @@ done
 do_remove
 echo
 echo "Final report:"
-for A in  PREFIX HAVE_LIB_EWF HAVE_LIB_GMP HAVE_OPENSSL HAVE_LIB_TCC USE_LIB_MAGIC DEBUGGER USERCC USEROSTYPE LIL_ENDIAN VERSION LIBVERSION ; do # REPORT
+for A in  PREFIX HAVE_LIB_EWF HAVE_LIB_GMP HAVE_OPENSSL HAVE_LIB_TCC USE_LIB_MAGIC DEBUGGER CC USERCC USEROSTYPE LIL_ENDIAN VERSION LIBVERSION ; do # REPORT
 eval VAL="\$${A}"
 [ -z "${VAL}" ] && VAL="(null)"
 echo " - ${A} = ${VAL}"

configure.acr

@@ -114,7 +114,7 @@ IFEQ LIBVERSION xxx ; {
 }
 
 REPORT PREFIX HAVE_LIB_EWF HAVE_LIB_GMP HAVE_OPENSSL HAVE_LIB_TCC
-	USE_LIB_MAGIC DEBUGGER USERCC USEROSTYPE LIL_ENDIAN VERSION LIBVERSION ;
+	USE_LIB_MAGIC DEBUGGER CC USERCC USEROSTYPE LIL_ENDIAN VERSION LIBVERSION ;
 
 (( TODO: Add the rest of .pc files here.. add a rule for acr? ))
 SUBDIRS ./config-user.mk

libr/anal/cparse/Makefile

@@ -1,3 +1,4 @@
+include ../../../global.mk
 include ../../config.mk
 
 CFLAGS+=-I../../include

libr/config.mk.tail

@@ -80,6 +80,9 @@ endif
 
 # XXX do it in configure stage
 OSTYPE?=gnulinux
+ifeq (${OSTYPE},auto)
+OSTYPE=gnulinux
+endif
 # Output
 ifeq (${OSTYPE},windows)
 CFLAGS+=-D__WINDOWS__=1
@@ -125,7 +128,7 @@ endif
 
 ifeq (${EXT_SO},)
 all:
-	@echo Unidentified platform; exit 1
+	@echo "Unidentified platform '${OSTYPE}'" ; exit 1
 endif
 
 LIB=lib${NAME}

libr/fs/p/grub/Makefile

@@ -63,7 +63,7 @@ endif
 
 BIN=test${EXT_EXE}
 
-all: ${BIN}
+all: ${KERNOBJS}
 
 ${BIN}: ${KERNOBJS} main.o
 	${CC} -o ${BIN} main.o ${CFLAGS} ${KERNOBJS}

libr/fs/p/grub/fs/ntfscomp.c

@@ -1,3 +1,4 @@
+#if NOT_USER_RIGHT_NOW
 /* ntfscomp.c - compression support for the NTFS filesystem */
 /*
  *  Copyright (C) 2007 Free Software Foundation, Inc.
@@ -285,7 +286,6 @@ read_block (struct grub_ntfs_rlst *ctx, char *buf, int num)
   return 0;
 }
 
-#if 0
 static grub_err_t
 ntfscomp (struct grub_ntfs_attr *at, char *dest, grub_uint32_t ofs,
 	  grub_uint32_t len, struct grub_ntfs_rlst *ctx, grub_uint32_t vcn)

libr/include/r_flist.h

@@ -66,7 +66,7 @@ static inline void r_flist_free(void **it) {
 	free (--it);
 }
 
-static int r_flist_length (void **it) {
+static inline int r_flist_length (void **it) {
 	void *pos;
 	int len = 0;
 	r_flist_foreach (it, pos)