Gentoo Attachment #65985 for bug #88110

View | Details | Raw Unified
Collapse All | Expand All

(-) lam-7.1.1.orig/romio/Makefile.in (-1 / +2 lines)

Lines 111-121	Link Here

            echo " " ;\

            echo " " ;\

            echo compiling ROMIO in directory $$dir ;\

            echo compiling ROMIO in directory $$dir ;\

	    sleep 1;\

	    sleep 1;\

            (cd $$dir && $(MAKE) ;) ;\

            (cd $$dir && $(MAKE) default ;) ;\

            if [ $$? != 0 ] ; then \

            if [ $$? != 0 ] ; then \

                echo "Make failed in directory $$dir" ; exit 1 ;\

                echo "Make failed in directory $$dir" ; exit 1 ;\

            fi ;\

            fi ;\

         done

         done

	$(MAKE) -f mpi-io/Makefile shared

profile:

profile:

	@if [ "@HAVE_WEAK_SYMBOLS@" = 0 ] ; then \

	@if [ "@HAVE_WEAK_SYMBOLS@" = 0 ] ; then \

(-) lam-7.1.1.orig/romio/adio/ad_hfs/Makefile.in (-1 / +7 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

srcdir      = @srcdir@

srcdir      = @srcdir@

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

Lines 14-23	Link Here

      ad_hfs_resize.o ad_hfs_seek.o \

      ad_hfs_resize.o ad_hfs_seek.o \

      ad_hfs.o

      ad_hfs.o

default: $(LIBNAME)

dir:

	mkdir -p $(SODIR)

all: dir $(LIBNAME)

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_HFS_OBJECTS)

$(LIBNAME): $(AD_HFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_HFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_HFS_OBJECTS)

(-) lam-7.1.1.orig/romio/adio/ad_nfs/Makefile.in (-1 / +7 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

srcdir      = @srcdir@

srcdir      = @srcdir@

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

Lines 14-23	Link Here

      ad_nfs_resize.o \

      ad_nfs_resize.o \

      ad_nfs_setsh.o ad_nfs_getsh.o ad_nfs.o

      ad_nfs_setsh.o ad_nfs_getsh.o ad_nfs.o

default: $(LIBNAME)

dir:

	@mkdir -p $(SODIR)

all: dir $(LIBNAME)

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_NFS_OBJECTS)

$(LIBNAME): $(AD_NFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_NFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_NFS_OBJECTS)

(-) lam-7.1.1.orig/romio/adio/ad_pfs/Makefile.in (-1 / +6 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

srcdir      = @srcdir@

srcdir      = @srcdir@

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@  -I${srcdir}/../include -I../include

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@  -I${srcdir}/../include -I../include

Lines 14-24	Link Here

      ad_pfs_flush.o ad_pfs_seek.o ad_pfs_resize.o ad_pfs_hints.o \

      ad_pfs_flush.o ad_pfs_seek.o ad_pfs_resize.o ad_pfs_hints.o \

      ad_pfs.o

      ad_pfs.o

dir:

	@mkdir -p $(SODIR)

default: $(LIBNAME)

all: dir $(LIBNAME)

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_PFS_OBJECTS)

$(LIBNAME): $(AD_PFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_PFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_PFS_OBJECTS)

(-) lam-7.1.1.orig/romio/adio/ad_piofs/Makefile.in (-1 / +6 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

srcdir      = @srcdir@

srcdir      = @srcdir@

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

Lines 14-24	Link Here

      ad_piofs_seek.o ad_piofs_resize.o ad_piofs_hints.o \

      ad_piofs_seek.o ad_piofs_resize.o ad_piofs_hints.o \

      ad_piofs.o

      ad_piofs.o

dir:

	@mkdir -p $(SODIR)

default: $(LIBNAME)

all: dir $(LIBNAME)

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_PIOFS_OBJECTS)

$(LIBNAME): $(AD_PIOFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_PIOFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_PIOFS_OBJECTS)

(-) lam-7.1.1.orig/romio/adio/ad_pvfs/Makefile.in (-1 / +7 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

srcdir      = @srcdir@

srcdir      = @srcdir@

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

Lines 14-23	Link Here

      ad_pvfs_flush.o ad_pvfs_seek.o ad_pvfs_resize.o ad_pvfs_hints.o \

      ad_pvfs_flush.o ad_pvfs_seek.o ad_pvfs_resize.o ad_pvfs_hints.o \

      ad_pvfs_delete.o ad_pvfs.o

      ad_pvfs_delete.o ad_pvfs.o

default: $(LIBNAME)

dir:

	@mkdir -p $(SODIR)

all: dir $(LIBNAME)

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_PVFS_OBJECTS)

$(LIBNAME): $(AD_PVFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_PVFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_PVFS_OBJECTS)

(-) lam-7.1.1.orig/romio/adio/ad_sfs/Makefile.in (-1 / +7 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

srcdir      = @srcdir@

srcdir      = @srcdir@

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

Lines 14-23	Link Here

      ad_sfs_flush.o ad_sfs_resize.o \

      ad_sfs_flush.o ad_sfs_resize.o \

      ad_sfs.o

      ad_sfs.o

default: $(LIBNAME)

dir:

	@mkdir -p $(SODIR)

all: dir $(LIBNAME)

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_SFS_OBJECTS)

$(LIBNAME): $(AD_SFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_SFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_SFS_OBJECTS)

(-) lam-7.1.1.orig/romio/adio/ad_testfs/Makefile.in (-1 / +7 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

srcdir      = @srcdir@

srcdir      = @srcdir@

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

Lines 15-24	Link Here

	ad_testfs_seek.o ad_testfs_resize.o ad_testfs_hints.o \

	ad_testfs_seek.o ad_testfs_resize.o ad_testfs_hints.o \

	ad_testfs_delete.o ad_testfs.o

	ad_testfs_delete.o ad_testfs.o

default: $(LIBNAME)

dir:

	@mkdir -p $(SODIR)

all: dir $(LIBNAME)

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_TESTFS_OBJECTS)

$(LIBNAME): $(AD_TESTFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_TESTFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_TESTFS_OBJECTS)

(-) lam-7.1.1.orig/romio/adio/ad_ufs/Makefile.in (-1 / +6 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

srcdir      = @srcdir@

srcdir      = @srcdir@

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

Lines 14-24	Link Here

      ad_ufs_resize.o \

      ad_ufs_resize.o \

      ad_ufs.o

      ad_ufs.o

dir:

	@mkdir -p $(SODIR)

default: $(LIBNAME)

all: dir $(LIBNAME)

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_UFS_OBJECTS)

$(LIBNAME): $(AD_UFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_UFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_UFS_OBJECTS)

(-) lam-7.1.1.orig/romio/adio/ad_xfs/Makefile.in (-1 / +7 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

srcdir      = @srcdir@

srcdir      = @srcdir@

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include

Lines 14-23	Link Here

      ad_xfs_resize.o ad_xfs_seek.o ad_xfs_hints.o \

      ad_xfs_resize.o ad_xfs_seek.o ad_xfs_hints.o \

      ad_xfs.o

      ad_xfs.o

default: $(LIBNAME)

dir:

	mkdir -p $(SODIR)

all: dir $(LIBNAME)

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_XFS_OBJECTS)

$(LIBNAME): $(AD_XFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_XFS_OBJECTS)

	$(AR) $(LIBNAME) $(AD_XFS_OBJECTS)

(-) lam-7.1.1.orig/romio/adio/common/Makefile.in (-1 / +7 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

MPI         = @MPI@

MPI         = @MPI@

srcdir      = @srcdir@

srcdir      = @srcdir@

Lines 19-26	Link Here

all: $(LIBNAME)

all: $(LIBNAME)

dir:

	@mkdir -p $(SODIR)

.c.o:

.c.o:

	$(CC) $(CFLAGS) $(INC) -c $<

	$(CC) $(CFLAGS) $(INC) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

$(LIBNAME): $(AD_OBJECTS)

$(LIBNAME): dir $(AD_OBJECTS)

	$(AR) $(LIBNAME) $(AD_OBJECTS)

	$(AR) $(LIBNAME) $(AD_OBJECTS)

(-) lam-7.1.1.orig/romio/mpi-io/Makefile.in (-1 / +12 lines)

Lines 1-6	Link Here

CC          = @CC@

CC          = @CC@

AR          = @AR@

AR          = @AR@

LIBNAME     = @LIBNAME@

LIBNAME     = @LIBNAME@

PICFLAGS    = -fPIC -DPIC

SOFLAGS     = -shared

SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))

SONAME      = $(basename $(LIBNAME)).so

RANLIB      = @RANLIB@

RANLIB      = @RANLIB@

srcdir      = @srcdir@

srcdir      = @srcdir@

Lines 55-64	Link Here

all: $(LIBNAME)

all: $(LIBNAME)

dir:

	mkdir -p $(SODIR)

.SUFFIXES: $(SUFFIXES) .p

.SUFFIXES: $(SUFFIXES) .p

.c.o:

.c.o:

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) -c $<

	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<

.c.p:

.c.p:

	@cp $(srcdir)/$*.c _$*.c

	@cp $(srcdir)/$*.c _$*.c

Lines 69-76	Link Here

	$(AR) $(LIBNAME) $(MPIO_REAL_POBJECTS)

	$(AR) $(LIBNAME) $(MPIO_REAL_POBJECTS)

	@rm -f _*.o

	@rm -f _*.o

$(LIBNAME): $(MPIO_OBJECTS)

$(LIBNAME): dir $(MPIO_OBJECTS)

	$(AR) $(LIBNAME) $(MPIO_OBJECTS)

	$(AR) $(LIBNAME) $(MPIO_OBJECTS)

shared:

	$(CC) $(SOFLAGS) -o $(SONAME) $(SODIR)/*

clean:

clean:

	@rm -f *.o

	@rm -f *.o

(-) lam-7.1.1.orig/romio/util/romioinstall.in (+1 lines)

Lines 128-133	Link Here

# Library files

# Library files

dir="$libdir"

dir="$libdir"

append "$ROMIO_TOP_BUILDDIR/lib/liblammpio.a:$dir/liblammpio.a"

append "$ROMIO_TOP_BUILDDIR/lib/liblammpio.a:$dir/liblammpio.a"

append "$ROMIO_TOP_BUILDDIR/lib/liblammpio.so:$dir/liblammpio.so"

# Man pages

# Man pages

dir="$mandir/man3"

dir="$mandir/man3"

Attachment #65985: Enable build of liblammpio.so with PIC (includes ADIO objects now) for bug #88110