mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

READELF needs to be defined for unix such as SOLARIS

Browse Source 
Change-Id: I749fa8a19e00957a3f83f41e029687b435a3a903
Signed-off-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Richard PALO
2014-11-10 17:25:47 +01:00
committed by Michael Stahl
parent 0d3ca29fd2
commit ee49e52c66
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_host.mk.in
View File

@@ -472,6 +472,7 @@ export PYTHON_VERSION_MINOR=@PYTHON_VERSION_MINOR@
export RANLIB=@RANLIB@ export RANLIB=@RANLIB@
export RAPTOR_MAJOR=@RAPTOR_MAJOR@ export RAPTOR_MAJOR=@RAPTOR_MAJOR@
export RASQAL_MAJOR=@RASQAL_MAJOR@ export RASQAL_MAJOR=@RASQAL_MAJOR@
export READELF=@READELF@
export REDLAND_CFLAGS=$(gb_SPACE)@REDLAND_CFLAGS@ export REDLAND_CFLAGS=$(gb_SPACE)@REDLAND_CFLAGS@
export REDLAND_LIBS=$(gb_SPACE)@REDLAND_LIBS@ export REDLAND_LIBS=$(gb_SPACE)@REDLAND_LIBS@
export REDLAND_MAJOR=@REDLAND_MAJOR@ export REDLAND_MAJOR=@REDLAND_MAJOR@

4
configure.ac
View File

@@ -4421,7 +4421,7 @@ if test "$cross_compiling" = "yes"; then
( (
unset COM GUIBASE OS CPUNAME unset COM GUIBASE OS CPUNAME
unset CC CXX SYSBASE CFLAGS unset CC CXX SYSBASE CFLAGS
unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP unset AR NM OBJDUMP PKG_CONFIG RANLIB READELF STRIP
unset CPPUNIT_CFLAGS CPPUNIT_LIBS unset CPPUNIT_CFLAGS CPPUNIT_LIBS
unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC unset LIBXML_CFLAGS LIBXML_LIBS LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC
test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD" test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
@@ -4977,6 +4977,7 @@ if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
AC_CHECK_TOOL(NM,nm) AC_CHECK_TOOL(NM,nm)
AC_CHECK_TOOL(OBJDUMP,objdump) AC_CHECK_TOOL(OBJDUMP,objdump)
AC_CHECK_TOOL(RANLIB,ranlib) AC_CHECK_TOOL(RANLIB,ranlib)
AC_CHECK_TOOL(READELF,readelf)
AC_CHECK_TOOL(STRIP,strip) AC_CHECK_TOOL(STRIP,strip)
if test "$_os" = "WINNT"; then if test "$_os" = "WINNT"; then
AC_CHECK_TOOL(DLLTOOL,dlltool) AC_CHECK_TOOL(DLLTOOL,dlltool)
@@ -4989,6 +4990,7 @@ AC_SUBST(NM)
AC_SUBST(OBJDUMP) AC_SUBST(OBJDUMP)
AC_SUBST(PKG_CONFIG) AC_SUBST(PKG_CONFIG)
AC_SUBST(RANLIB) AC_SUBST(RANLIB)
AC_SUBST(READELF)
AC_SUBST(STRIP) AC_SUBST(STRIP)
AC_SUBST(WINDRES) AC_SUBST(WINDRES)