patches/duma/2_5_12/100-cross-compile.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jun 22 23:49:23 2010 +0200 (2010-06-22)
branch1.7
changeset 1998 110ba570a70a
permissions -rw-r--r--
scripts/wrapper: fix wrong test when checking access to the reall tool

In C, the proper syntax for a bit-wise OR is a single '|', not two.

It worked so far because all was well:
- X_OK == 1
- R_OK||X_OK == 1
- the file we searched for had the x-bit set
-> access( file, R_OK||X_OK ) worked
- inicidentally, the file we searched for also had the r-bit set,
but we were not testing that in fact.
(transplanted from eebcaff6626f09af4f69b7b06f1246a06769d0af)
yann@430
     1
diff -durN duma_2_5_12.orig/Makefile duma_2_5_12/Makefile
yann@430
     2
--- duma_2_5_12.orig/Makefile	2007-08-17 09:34:25.000000000 +0200
yann@430
     3
+++ duma_2_5_12/Makefile	2007-09-07 21:50:04.000000000 +0200
yann@430
     4
@@ -93,9 +93,6 @@
yann@430
     5
 # also define 'WIN32'
yann@430
     6
yann@430
     7
 # some defaults:
yann@430
     8
-CC=gcc
yann@430
     9
-CXX=g++
yann@430
    10
-AR=ar
yann@430
    11
 INSTALL=install
yann@430
    12
 RM=rm
yann@430
    13
 RMFORCE=rm -f
yann@430
    14
@@ -299,7 +296,7 @@
yann@430
    15
yann@430
    16
 createconf$(EXEPOSTFIX): createconf.o
yann@430
    17
 	- $(RMFORCE) createconf$(EXEPOSTFIX)
yann@430
    18
-	$(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
yann@430
    19
+	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX)
yann@430
    20
yann@430
    21
 tstheap$(EXEPOSTFIX): libduma.a tstheap.o
yann@430
    22
 	- $(RMFORCE) tstheap$(EXEPOSTFIX)
yann@430
    23
@@ -360,7 +357,7 @@
yann@430
    24
 # define rules how to build objects for createconf
yann@430
    25
 #
yann@430
    26
 createconf.o:
yann@430
    27
-	$(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
yann@430
    28
+	$(HOSTCC) $(HOSTCFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
yann@430
    29
yann@430
    30
yann@430
    31
 #