Re: [PATCH] fix exec/Makefile.am

[Angus Salkeld <asalkeld@xxxxxxxxxx>]

On 21/08/12 18:27 +0200, Grüninger, Andreas (LGL Extern) wrote:
> I compiled corosync 2.0.1 and master in Solaris 11 and OpenIndiana 151a.
>
> The compilation environment and some additional patches are described in http://grueni.github.com/libqb/.

So it looks like no code changes to libqb?

Good work setting all that up!

-Angus

> The additional patches are removing of compiler flags and changes from awk to gawk.
>
> Andreas
>
> diff --git a/exec/Makefile.am b/exec/Makefile.am
> index 2f0adef..56d7acc 100644
> --- a/exec/Makefile.am
> +++ b/exec/Makefile.am
> @@ -35,9 +35,16 @@ AM_CFLAGS            = -fPIC -DLOGCONFIG_USE_ICMAP=1
>
> INCLUDES               = -I$(top_builddir)/include -I$(top_srcdir)/include $(nss_CFLAGS) $(rdmacm_CFLAGS) $(ibverbs_CFLAGS)
>
> -TOTEM_SRC              = totemip.c totemnet.c totemudp.c \
> -                         totemudpu.c totemrrp.c totemsrp.c totemmrp.c \
> -                         totempg.c cs_queue.h totemcrypto.c
> +if BUILD_SOLARIS
> +TOTEM_SRC               = totemip.c totemnet.c totemudp.c \
> +                          totemudpu.c totemrrp.c totemsrp.c totemmrp.c \
> +                          totempg.c            totemcrypto.c
> +else
> +TOTEM_SRC               = totemip.c totemnet.c totemudp.c \
> +                          totemudpu.c totemrrp.c totemsrp.c totemmrp.c \
> +                          totempg.c cs_queue.h totemcrypto.c
> +endif
> +
> if BUILD_RDMA
> TOTEM_SRC              += totemiba.c
> endif
> @@ -47,11 +54,20 @@ sbin_PROGRAMS               = corosync
>
> libtotem_pg_a_SOURCES  = $(TOTEM_SRC)
>
> -corosync_SOURCES       = vsf_ykd.c coroparse.c vsf_quorum.c sync.c \
> -                         logsys.c cfg.c cmap.c cpg.c mon.c pload.c \
> -                         votequorum.c wd.c util.c schedwrk.c main.c \
> -                         apidef.c quorum.c icmap.c timer.c \
> -                         ipc_glue.c service.c logconfig.c totemconfig.c
> +if BUILD_SOLARIS
> +corosync_SOURCES        = vsf_ykd.c coroparse.c vsf_quorum.c sync.c \
> +                          logsys.c cfg.c cmap.c cpg.c mon.c pload.c \
> +                          votequorum.c      util.c schedwrk.c main.c \
> +                          apidef.c quorum.c icmap.c timer.c \
> +                          ipc_glue.c service.c logconfig.c totemconfig.c
> +else
> +corosync_SOURCES        = vsf_ykd.c coroparse.c vsf_quorum.c sync.c \
> +                          logsys.c cfg.c cmap.c cpg.c mon.c pload.c \
> +                          votequorum.c wd.c util.c schedwrk.c main.c \
> +                          apidef.c quorum.c icmap.c timer.c \
> +                          ipc_glue.c service.c logconfig.c totemconfig.c
> +endif
> +
> corosync_LDADD         = -ltotem_pg -lcorosync_common $(LIBQB_LIBS) $(statgrab_LIBS)
> corosync_DEPENDENCIES  = libtotem_pg.so.$(SONAME) ../common_lib/libcorosync_common.so
> corosync_LDFLAGS       = $(OS_DYFLAGS) -L./ -L../common_lib
> @@ -78,7 +94,7 @@ else
>
> if BUILD_SOLARIS
> libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
> -       $(LD) $(LDFLAGS) -G $(TOTEM_OBJS) -o $@ -lpthread
> +       $(LD) $(LDFLAGS) -G $(TOTEM_OBJS) -o $@ $(nss_LIBS) $(rdmacm_LIBS) $(ibverbs_LIBS) -lpthread
>        ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so
>        ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so.$(SOMAJOR)
>
> _______________________________________________
> discuss mailing list
> discuss@xxxxxxxxxxxx
> http://lists.corosync.org/mailman/listinfo/discuss
_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss