spec: prerelease 0.4 for testing cross-compile

Change-Id: I26908b6b415483711f55338e45d7b2d862b5c028

CMakeLists.txt

@@ -10,7 +10,7 @@ project(mckernel C ASM)
 set(MCKERNEL_VERSION "1.7.0")
 
 # See "Fedora Packaging Guidlines -- Versioning"
-set(MCKERNEL_RELEASE "0.3")
+set(MCKERNEL_RELEASE "0.4")
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 # for rpmbuild
@@ -136,17 +136,19 @@ if (NOT LIBIBERTY)
 	message(FATAL_ERROR "error: couldn't find libiberty")
 endif()
 
-# libdwarf-devel provides /usr/lib64/libdwarf.so
 find_library(LIBDWARF dwarf)
 
-# elfutils-devel provides /usr/include/dwarf.h
-find_library(LIBEBL ebl)
-
-if ((NOT LIBDWARF) OR (NOT LIBEBL))
+if (NOT LIBDWARF)
+	if (CMAKE_CROSSCOMPILING)
+		message(FATAL_ERROR "Could not find libdwarf.so, install libdwarf-devel to ${CMAKE_FIND_ROOT_PATH}")
+	endif()
 	message("WARNING: libdwarf will be compiled locally")
-	set(LIBDWARF LIBDWARF-NOTFOUND)
-	set(LIBEBL LIBEBL-NOTFOUND)
 	enable_language(CXX)
+else()
+	# Note that libdwarf-devel provides /usr/include/libdwarf/dwarf.h
+	# but elfutils-devel provides /usr/include/dwarf.h
+	# while mcinspect.c performs "#include <dwarf.h>"
+	find_path(DWARF_H dwarf.h PATH_SUFFIXES libdwarf)
 endif()
 
 if (ENABLE_QLMPI)

executer/user/CMakeLists.txt

@@ -27,6 +27,7 @@ if (NOT LIBDWARF)
 		"${CMAKE_CURRENT_SOURCE_DIR}/lib/libdwarf/libdwarf/libdwarf/")
 	target_link_libraries(mcinspect dwarf z elf)
 else()
+	target_include_directories(mcinspect PRIVATE ${DWARF_H})
 	target_link_libraries(mcinspect ${LIBDWARF})
 endif()
 target_link_libraries(mcinspect ${LIBBFD})

scripts/mckernel.spec.in

@@ -99,7 +99,6 @@ This package contains headers and libraries required for build apps using IHK/Mc
 %{_bindir}/eclair-dump-backtrace.exp
 %{_bindir}/mcinspect
 %{_bindir}/mcps
-/usr/lib/debug/usr/bin/mcinspect-%{version}-%{release}.%{_arch}.debug
 %{_bindir}/vmcore2mckdump
 %{_bindir}/mcstat
 %{_libdir}/libihk.so