Codebase list ibutils / 44a402d6-feb8-4a84-a5cd-be031304aeb1/main debian / patches / cross.patch
44a402d6-feb8-4a84-a5cd-be031304aeb1/main

Tree @44a402d6-feb8-4a84-a5cd-be031304aeb1/main (Download .tar.gz)

cross.patch @44a402d6-feb8-4a84-a5cd-be031304aeb1/main — raw · history · blame 

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
Description: Fix cross build
 ibutils fails to cross build from source, because it abuses
 AC_CHECK_FILE to discover includes. AC_CHECK_FILE is meant for
 discovering files on the host machine, but here it is being used for
 discovering files on the build machine. A simple test -f is better and
 makes ibutils cross buildable.
Bug-Debian: https://bugs.debian.org/900673

--- ibutils-1.5.7+0.2.gbd7e502.orig/ibis/config/osm.m4
+++ ibutils-1.5.7+0.2.gbd7e502/ibis/config/osm.m4
@@ -166,7 +166,7 @@
 
 
    dnl validate the defined path - so the build id header is there
-   AC_CHECK_FILE($osm_include_dir/opensm/osm_config.h,,
+   AS_IF([test -f "$osm_include_dir/opensm/osm_config.h"],,
       AC_MSG_ERROR([OSM: could not find $with_osm/include/opensm/osm_config.h]))
 
    dnl now figure out somehow if the build was for debug or not
--- ibutils-1.5.7+0.2.gbd7e502.orig/config/osm.m4
+++ ibutils-1.5.7+0.2.gbd7e502/config/osm.m4
@@ -166,7 +166,7 @@
 
 
    dnl validate the defined path - so the build id header is there
-   AC_CHECK_FILE($osm_include_dir/opensm/osm_config.h,,
+   AS_IF([test -f "$osm_include_dir/opensm/osm_config.h"],,
       AC_MSG_ERROR([OSM: could not find $with_osm/include/opensm/osm_config.h]))
 
    dnl now figure out somehow if the build was for debug or not
--- ibutils-1.5.7+0.2.gbd7e502.orig/ibmgtsim/config/osm.m4
+++ ibutils-1.5.7+0.2.gbd7e502/ibmgtsim/config/osm.m4
@@ -166,7 +166,7 @@
 
 
    dnl validate the defined path - so the build id header is there
-   AC_CHECK_FILE($osm_include_dir/opensm/osm_config.h,,
+   AS_IF([test -f "$osm_include_dir/opensm/osm_config.h"],,
       AC_MSG_ERROR([OSM: could not find $with_osm/include/opensm/osm_config.h]))
 
    dnl now figure out somehow if the build was for debug or not