Re: [Powerpc-utils-devel] [PATCH v2] ppc64_cpu: Allow builds without librtas

[Nathan F. <nf...@li...>]

On 10/29/2014 12:38 AM, Jeremy Kerr wrote:
> Currently, --without-librtas disables ppc64_cpu.
> 
> However, we only need librtas for the run-mode determination; other
> functions will work fine without it.
> 
> This change allows ppc64_cpu to be built without librtas, by
> conditionally enabling run-mode, and restoring ppc64_cpu to be built
> when --without-librtas is given.
> 
> We need to re-work src/Makefile.am a little here - we use the +=
> operator to include rtas-specific functionality, which means the
> with-librtas cases need to be listed before the without ones.
> 
> We also need to #include stdint.h, as ppc64_cpu.c uses inttypes from
> here.
> 
> Signed-off-by: Jeremy Kerr <jk...@oz...>
> 
> ---
> v2: rebase to current git tree & update autotools changes
> 
> ---
>  Makefile.am     |   30 +++++++++++++++---------------
>  configure.ac    |    5 ++++-
>  src/ppc64_cpu.c |   22 ++++++++++++++++++++--
>  3 files changed, 39 insertions(+), 18 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 01b258e..9cb3212 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -49,12 +49,23 @@ EXTRA_DIST += COPYRIGHT Changelog powerpc-utils.spec.in doc/activate_firmware.do
>  	     doc/nvram.doxycfg doc/rtas_ibm_get_vpd.doxycfg doc/serv_config.doxycfg \
>  	     doc/set_poweron_time.doxycfg doc/uesensor.doxycfg
> 
> -sbin_PROGRAMS += src/nvram src/lsprop src/lparstat
> +sbin_PROGRAMS += src/nvram src/lsprop src/lparstat src/ppc64_cpu
> 
>  pseries_platform_SOURCES = src/common/pseries_platform.c src/common/pseries_platform.h
> 
>  librtas_error_SOURCES = src/common/librtas_error.c src/common/librtas_error.h
> 
> +src_nvram_SOURCES = src/nvram.c src/nvram.h $(pseries_platform_SOURCES)
> +src_nvram_LDADD = -ldl -lz
> +
> +src_lsprop_SOURCES = src/lsprop.c $(pseries_platform_SOURCES)
> +
> +src_lparstat_SOURCES = src/lparstat.c src/lparstat.h $(pseries_platform_SOURCES)
> +
> +src_ppc64_cpu_SOURCES = src/ppc64_cpu.c $(pseries_platform_SOURCES)
> +src_ppc64_cpu_LDADD = -lpthread
> +
> +
>  AM_CFLAGS = -Wall -g -I $(top_srcdir)/src/common/
> 
>  if WITH_LIBRTAS
> @@ -65,8 +76,7 @@ sbin_PROGRAMS += \
>  	src/serv_config \
>  	src/uesensor \
>  	src/rtas_event_decode \
> -	src/sys_ident \
> -	src/ppc64_cpu
> +	src/sys_ident
> 
>  src_activate_firmware_SOURCES = src/activate_fw.c $(pseries_platform_SOURCES)
>  src_activate_firmware_LDADD = -lrtas
> @@ -89,19 +99,9 @@ src_rtas_event_decode_LDADD = -lrtasevent
>  src_sys_ident_SOURCES = src/sys_ident.c $(pseries_platform_SOURCES)
>  src_sys_ident_LDADD = -lrtas
> 
> -src_ppc64_cpu_SOURCES = src/ppc64_cpu.c $(librtas_error_SOURCES) $(pseries_platform_SOURCES)
> -src_ppc64_cpu_LDADD = -lrtas -lpthread
> +src_ppc64_cpu_SOURCES += $(librtas_error_SOURCES) $(pseries_platform_SOURCES)

I was hitting a build error due to the second inclusion of $(pseries_platform_SOURCES)
here. Removing this to be 

+src_ppc64_cpu_SOURCES += $(librtas_error_SOURCES)

fixes it. I'll go ahead and pull this in with this slight modification unless you have
an objection.

-Nathan

> +src_ppc64_cpu_LDADD += -lrtas
> 
> -endif
> -
> -src_nvram_SOURCES = src/nvram.c src/nvram.h $(pseries_platform_SOURCES)
> -src_nvram_LDADD = -ldl -lz
> -
> -src_lsprop_SOURCES = src/lsprop.c $(pseries_platform_SOURCES)
> -
> -src_lparstat_SOURCES = src/lparstat.c src/lparstat.h $(pseries_platform_SOURCES)
> -
> -if WITH_LIBRTAS
>  sbin_PROGRAMS += src/drmgr/drmgr src/drmgr/lsslot
>  endif
> 
> diff --git a/configure.ac b/configure.ac
> index 988b3e5..2eb8b26 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -47,7 +47,10 @@ AC_ARG_WITH([librtas],
> 
>  AS_IF([test "x$with_librtas" != "xno"],
>  	[AC_CHECK_HEADER([librtas.h],
> -        [with_libtras=yes],
> +        [
> +	    with_libtras=yes
> +            AC_DEFINE(WITH_LIBRTAS)
> +	],
>          [AC_MSG_FAILURE(
>                  [librtas test failed (--without-librtas to disable)])]
>      )]
> diff --git a/src/ppc64_cpu.c b/src/ppc64_cpu.c
> index 4df4cdc..28b9b20 100644
> --- a/src/ppc64_cpu.c
> +++ b/src/ppc64_cpu.c
> @@ -10,10 +10,10 @@
>  #define _GNU_SOURCE
>  #include <stdio.h>
>  #include <stdlib.h>
> +#include <stdint.h>
>  #include <unistd.h>
>  #include <string.h>
>  #include <dirent.h>
> -#include <librtas.h>
>  #include <sys/types.h>
>  #include <sys/stat.h>
>  #include <fcntl.h>
> @@ -25,10 +25,16 @@
>  #include <sys/ptrace.h>
>  #include <sys/wait.h>
>  #include <sys/resource.h>
> +
> +#ifdef WITH_LIBRTAS
> +#include <librtas.h>
> +#include "librtas_error.h"
> +#endif
> +
>  #ifdef HAVE_LINUX_PERF_EVENT_H
>  #include <linux/perf_event.h>
>  #endif
> -#include "librtas_error.h"
> +
>  #include <errno.h>
> 
>  #define PPC64_CPU_VERSION	"1.2"
> @@ -682,6 +688,8 @@ static int do_smt_snooze_delay(char *state)
>  	return rc;
>  }
> 
> +#ifdef WITH_LIBRTAS
> +
>  static int do_run_mode(char *run_mode)
>  {
>  	char mode[3];
> @@ -744,6 +752,16 @@ static int do_run_mode(char *run_mode)
>  	return rc;
>  }
> 
> +#else
> +
> +static int do_run_mode(char *run_mode)
> +{
> +	printf("Run mode determination is not supported on this platfom.\n");
> +	return -1;
> +}
> +
> +#endif
> +
>  #ifdef HAVE_LINUX_PERF_EVENT_H
> 
>  static int setup_counters(void)
> 
> ------------------------------------------------------------------------------
> _______________________________________________
> Powerpc-utils-devel mailing list
> Pow...@li...
> https://lists.sourceforge.net/lists/listinfo/powerpc-utils-devel
>