[openib-general] respect CFLAGS in ibis/ibdm, fix missing file warning

[Eitan Zahavi]

Hi Pete,

Looks fine so far but I will look at this further early next week. 

Thanks

Eitan Zahavi
Design Technology Director
Mellanox Technologies LTD
Tel:+972-4-9097208
Fax:+972-4-9593245
P.O. Box 586 Yokneam 20692 ISRAEL


> -----Original Message-----
> From: openib-general-bounces at openib.org [mailto:openib-general-
> bounces at openib.org] On Behalf Of Pete Wyckoff
> Sent: Thursday, January 19, 2006 11:53 PM
> To: openib-general at openib.org
> Subject: [openib-general] respect CFLAGS in ibis/ibdm,fix missing file
warning
> 
> Avoid overriding CFLAGS in ibis and ibdm.  These apply to ibis and
> ibdm below gen2/utils/src/linux-user/.
> 
> The third chunk below avoids a configure warning for a file
> "osm_build_id.h" that appears nowhere in my source or build tree.
> 
> Signed-off-by: Pete Wyckoff <pw at osc.edu>
> 
> Index: ibis/src/Makefile.am
> ===================================================================
> --- ibis/src/Makefile.am	(revision 5098)
> +++ ibis/src/Makefile.am	(working copy)
> @@ -38,7 +38,7 @@
>  if DEBUG
>  DBG = -O0 -g -Wall -Werror
>  else
> -DBG = -O2 -Wall
> +DBG = -Wall
>  endif
> 
>  AM_CFLAGS = $(TCL_CPPFLAGS) $(OSM_CFLAGS) $(DBG) -fno-strict-aliasing
-
> fPIC
> Index: ibdm/datamodel/Makefile.am
> ===================================================================
> --- ibdm/datamodel/Makefile.am	(revision 5098)
> +++ ibdm/datamodel/Makefile.am	(working copy)
> @@ -60,8 +60,6 @@
>  # Support debug mode through config variable
>  if DEBUG
>  DBG = -O0 -g
> -else
> -DBG = -O2
>  endif
> 
>  # We have a special mode where we know the package will be eventually
moved
> Index: ibis/config/osm.m4
> ===================================================================
> --- ibis/config/osm.m4	(revision 5098)
> +++ ibis/config/osm.m4	(working copy)
> @@ -156,6 +156,8 @@
>  AM_CONDITIONAL(OSM_VENDOR_SIM, test $OSM_VENDOR = sim)
>  AM_CONDITIONAL(OSM_BUILD_OPENIB, test $OSM_BUILD = openib)
> 
> +if test -f $osm_include_dir/opensm/osm_build_id.h; then
> +
>  dnl validate the defined path - so the build id header is there
>  AC_CHECK_FILE($osm_include_dir/opensm/osm_build_id.h,,
>     AC_MSG_ERROR([OSM: could not find
> $with_osm/include/opensm/osm_build_id.h]))
> @@ -168,6 +170,9 @@
>  else
>     osm_debug_flags=
>  fi
> +else
> +   osm_debug_flags=
> +fi
> 
>  OSM_CFLAGS="-I$osm_include_dir $osm_extra_includes $osm_debug_flags
> $osm_vendor_sel -D_XOPEN_SOURCE=600 -D_BSD_SOURCE=1"
> 
> _______________________________________________
> openib-general mailing list
> openib-general at openib.org
> http://openib.org/mailman/listinfo/openib-general
> 
> To unsubscribe, please visit
http://openib.org/mailman/listinfo/openib-general