Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 88110 | Differences between
and this patch

Collapse All | Expand All

(-)lam-7.1.1.orig/romio/Makefile.in (-1 / +2 lines)
Lines 111-121 Link Here
111
            echo " " ;\
111
            echo " " ;\
112
            echo compiling ROMIO in directory $$dir ;\
112
            echo compiling ROMIO in directory $$dir ;\
113
	    sleep 1;\
113
	    sleep 1;\
114
            (cd $$dir && $(MAKE) ;) ;\
114
            (cd $$dir && $(MAKE) all ;) ;\
115
            if [ $$? != 0 ] ; then \
115
            if [ $$? != 0 ] ; then \
116
                echo "Make failed in directory $$dir" ; exit 1 ;\
116
                echo "Make failed in directory $$dir" ; exit 1 ;\
117
            fi ;\
117
            fi ;\
118
         done
118
         done
119
	$(MAKE) -f mpi-io/Makefile shared
119
120
120
profile: 
121
profile: 
121
	@if [ "@HAVE_WEAK_SYMBOLS@" = 0 ] ; then \
122
	@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
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
srcdir      = @srcdir@
6
srcdir      = @srcdir@
5
7
6
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
8
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
Lines 14-23 Link Here
14
      ad_hfs_resize.o ad_hfs_seek.o \
16
      ad_hfs_resize.o ad_hfs_seek.o \
15
      ad_hfs.o
17
      ad_hfs.o
16
18
17
default: $(LIBNAME)
19
dir:
20
	mkdir -p $(SODIR)
21
22
all: dir $(LIBNAME)
18
23
19
.c.o:
24
.c.o:
20
	$(CC) $(CFLAGS) -c $<
25
	$(CC) $(CFLAGS) -c $<
26
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
21
27
22
$(LIBNAME): $(AD_HFS_OBJECTS)
28
$(LIBNAME): $(AD_HFS_OBJECTS)
23
	$(AR) $(LIBNAME) $(AD_HFS_OBJECTS)
29
	$(AR) $(LIBNAME) $(AD_HFS_OBJECTS)
(-)lam-7.1.1.orig/romio/adio/ad_nfs/Makefile.in (-1 / +7 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
srcdir      = @srcdir@
6
srcdir      = @srcdir@
5
7
6
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
8
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
Lines 14-23 Link Here
14
      ad_nfs_resize.o \
16
      ad_nfs_resize.o \
15
      ad_nfs_setsh.o ad_nfs_getsh.o ad_nfs.o
17
      ad_nfs_setsh.o ad_nfs_getsh.o ad_nfs.o
16
18
17
default: $(LIBNAME)
19
dir:
20
	@mkdir -p $(SODIR)
21
22
all: dir $(LIBNAME)
18
23
19
.c.o:
24
.c.o:
20
	$(CC) $(CFLAGS) -c $<
25
	$(CC) $(CFLAGS) -c $<
26
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
21
27
22
$(LIBNAME): $(AD_NFS_OBJECTS)
28
$(LIBNAME): $(AD_NFS_OBJECTS)
23
	$(AR) $(LIBNAME) $(AD_NFS_OBJECTS)
29
	$(AR) $(LIBNAME) $(AD_NFS_OBJECTS)
(-)lam-7.1.1.orig/romio/adio/ad_pfs/Makefile.in (-1 / +6 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
srcdir      = @srcdir@
6
srcdir      = @srcdir@
5
7
6
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@  -I${srcdir}/../include -I../include
8
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@  -I${srcdir}/../include -I../include
Lines 14-24 Link Here
14
      ad_pfs_flush.o ad_pfs_seek.o ad_pfs_resize.o ad_pfs_hints.o \
16
      ad_pfs_flush.o ad_pfs_seek.o ad_pfs_resize.o ad_pfs_hints.o \
15
      ad_pfs.o
17
      ad_pfs.o
16
18
19
dir:
20
	@mkdir -p $(SODIR)
17
21
18
default: $(LIBNAME)
22
all: dir $(LIBNAME)
19
23
20
.c.o:
24
.c.o:
21
	$(CC) $(CFLAGS) -c $<
25
	$(CC) $(CFLAGS) -c $<
26
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
22
27
23
$(LIBNAME): $(AD_PFS_OBJECTS)
28
$(LIBNAME): $(AD_PFS_OBJECTS)
24
	$(AR) $(LIBNAME) $(AD_PFS_OBJECTS)
29
	$(AR) $(LIBNAME) $(AD_PFS_OBJECTS)
(-)lam-7.1.1.orig/romio/adio/ad_piofs/Makefile.in (-1 / +6 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
srcdir      = @srcdir@
6
srcdir      = @srcdir@
5
7
6
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
8
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
Lines 14-24 Link Here
14
      ad_piofs_seek.o ad_piofs_resize.o ad_piofs_hints.o \
16
      ad_piofs_seek.o ad_piofs_resize.o ad_piofs_hints.o \
15
      ad_piofs.o
17
      ad_piofs.o
16
18
19
dir:
20
	@mkdir -p $(SODIR)
17
21
18
default: $(LIBNAME)
22
all: dir $(LIBNAME)
19
23
20
.c.o:
24
.c.o:
21
	$(CC) $(CFLAGS) -c $<
25
	$(CC) $(CFLAGS) -c $<
26
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
22
27
23
$(LIBNAME): $(AD_PIOFS_OBJECTS)
28
$(LIBNAME): $(AD_PIOFS_OBJECTS)
24
	$(AR) $(LIBNAME) $(AD_PIOFS_OBJECTS)
29
	$(AR) $(LIBNAME) $(AD_PIOFS_OBJECTS)
(-)lam-7.1.1.orig/romio/adio/ad_pvfs/Makefile.in (-1 / +7 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
srcdir      = @srcdir@
6
srcdir      = @srcdir@
5
7
6
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
8
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
Lines 14-23 Link Here
14
      ad_pvfs_flush.o ad_pvfs_seek.o ad_pvfs_resize.o ad_pvfs_hints.o \
16
      ad_pvfs_flush.o ad_pvfs_seek.o ad_pvfs_resize.o ad_pvfs_hints.o \
15
      ad_pvfs_delete.o ad_pvfs.o
17
      ad_pvfs_delete.o ad_pvfs.o
16
18
17
default: $(LIBNAME)
19
dir:
20
	@mkdir -p $(SODIR)
21
22
all: dir $(LIBNAME)
18
23
19
.c.o:
24
.c.o:
20
	$(CC) $(CFLAGS) -c $<
25
	$(CC) $(CFLAGS) -c $<
26
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
21
27
22
$(LIBNAME): $(AD_PVFS_OBJECTS)
28
$(LIBNAME): $(AD_PVFS_OBJECTS)
23
	$(AR) $(LIBNAME) $(AD_PVFS_OBJECTS)
29
	$(AR) $(LIBNAME) $(AD_PVFS_OBJECTS)
(-)lam-7.1.1.orig/romio/adio/ad_sfs/Makefile.in (-1 / +7 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
srcdir      = @srcdir@
6
srcdir      = @srcdir@
5
7
6
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
8
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
Lines 14-23 Link Here
14
      ad_sfs_flush.o ad_sfs_resize.o \
16
      ad_sfs_flush.o ad_sfs_resize.o \
15
      ad_sfs.o
17
      ad_sfs.o
16
18
17
default: $(LIBNAME)
19
dir:
20
	@mkdir -p $(SODIR)
21
22
all: dir $(LIBNAME)
18
23
19
.c.o:
24
.c.o:
20
	$(CC) $(CFLAGS) -c $<
25
	$(CC) $(CFLAGS) -c $<
26
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
21
27
22
$(LIBNAME): $(AD_SFS_OBJECTS)
28
$(LIBNAME): $(AD_SFS_OBJECTS)
23
	$(AR) $(LIBNAME) $(AD_SFS_OBJECTS)
29
	$(AR) $(LIBNAME) $(AD_SFS_OBJECTS)
(-)lam-7.1.1.orig/romio/adio/ad_testfs/Makefile.in (-1 / +7 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
srcdir      = @srcdir@
6
srcdir      = @srcdir@
5
7
6
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
8
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
Lines 15-24 Link Here
15
	ad_testfs_seek.o ad_testfs_resize.o ad_testfs_hints.o \
17
	ad_testfs_seek.o ad_testfs_resize.o ad_testfs_hints.o \
16
	ad_testfs_delete.o ad_testfs.o
18
	ad_testfs_delete.o ad_testfs.o
17
19
18
default: $(LIBNAME)
20
dir:
21
	@mkdir -p $(SODIR)
22
23
all: dir $(LIBNAME)
19
24
20
.c.o:
25
.c.o:
21
	$(CC) $(CFLAGS) -c $<
26
	$(CC) $(CFLAGS) -c $<
27
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
22
28
23
$(LIBNAME): $(AD_TESTFS_OBJECTS)
29
$(LIBNAME): $(AD_TESTFS_OBJECTS)
24
	$(AR) $(LIBNAME) $(AD_TESTFS_OBJECTS)
30
	$(AR) $(LIBNAME) $(AD_TESTFS_OBJECTS)
(-)lam-7.1.1.orig/romio/adio/ad_ufs/Makefile.in (-1 / +6 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
srcdir      = @srcdir@
6
srcdir      = @srcdir@
5
7
6
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
8
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
Lines 14-24 Link Here
14
      ad_ufs_resize.o \
16
      ad_ufs_resize.o \
15
      ad_ufs.o
17
      ad_ufs.o
16
18
19
dir:
20
	@mkdir -p $(SODIR)
17
21
18
default: $(LIBNAME)
22
all: dir $(LIBNAME)
19
23
20
.c.o:
24
.c.o:
21
	$(CC) $(CFLAGS) -c $<
25
	$(CC) $(CFLAGS) -c $<
26
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
22
27
23
$(LIBNAME): $(AD_UFS_OBJECTS)
28
$(LIBNAME): $(AD_UFS_OBJECTS)
24
	$(AR) $(LIBNAME) $(AD_UFS_OBJECTS)
29
	$(AR) $(LIBNAME) $(AD_UFS_OBJECTS)
(-)lam-7.1.1.orig/romio/adio/ad_xfs/Makefile.in (-1 / +7 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
srcdir      = @srcdir@
6
srcdir      = @srcdir@
5
7
6
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
8
INCLUDE_DIR = -I@MPI_INCLUDE_DIR@ -I${srcdir}/../include -I../include
Lines 14-23 Link Here
14
      ad_xfs_resize.o ad_xfs_seek.o ad_xfs_hints.o \
16
      ad_xfs_resize.o ad_xfs_seek.o ad_xfs_hints.o \
15
      ad_xfs.o
17
      ad_xfs.o
16
18
17
default: $(LIBNAME)
19
dir:
20
	mkdir -p $(SODIR)
21
22
all: dir $(LIBNAME)
18
23
19
.c.o:
24
.c.o:
20
	$(CC) $(CFLAGS) -c $<
25
	$(CC) $(CFLAGS) -c $<
26
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
21
27
22
$(LIBNAME): $(AD_XFS_OBJECTS)
28
$(LIBNAME): $(AD_XFS_OBJECTS)
23
	$(AR) $(LIBNAME) $(AD_XFS_OBJECTS)
29
	$(AR) $(LIBNAME) $(AD_XFS_OBJECTS)
(-)lam-7.1.1.orig/romio/adio/common/Makefile.in (-1 / +7 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
4
MPI         = @MPI@
6
MPI         = @MPI@
5
srcdir      = @srcdir@
7
srcdir      = @srcdir@
6
8
Lines 19-26 Link Here
19
21
20
all: $(LIBNAME)
22
all: $(LIBNAME)
21
23
24
dir:
25
	@mkdir -p $(SODIR)
26
22
.c.o:
27
.c.o:
23
	$(CC) $(CFLAGS) $(INC) -c $<
28
	$(CC) $(CFLAGS) $(INC) -c $<
29
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
24
30
25
$(LIBNAME): $(AD_OBJECTS)
31
$(LIBNAME): dir $(AD_OBJECTS)
26
	$(AR) $(LIBNAME) $(AD_OBJECTS)
32
	$(AR) $(LIBNAME) $(AD_OBJECTS)
(-)lam-7.1.1.orig/romio/mpi-io/Makefile.in (-1 / +12 lines)
Lines 1-6 Link Here
1
CC          = @CC@
1
CC          = @CC@
2
AR          = @AR@
2
AR          = @AR@
3
LIBNAME     = @LIBNAME@
3
LIBNAME     = @LIBNAME@
4
PICFLAGS    = -fPIC -DPIC
5
SOFLAGS     = -shared
6
SODIR       = $(addsuffix .libs/,$(dir $(LIBNAME)))
7
SONAME      = $(basename $(LIBNAME)).so
4
RANLIB      = @RANLIB@
8
RANLIB      = @RANLIB@
5
srcdir      = @srcdir@
9
srcdir      = @srcdir@
6
10
Lines 55-64 Link Here
55
59
56
all: $(LIBNAME)
60
all: $(LIBNAME)
57
61
62
dir:
63
	mkdir -p $(SODIR)
64
58
.SUFFIXES: $(SUFFIXES) .p
65
.SUFFIXES: $(SUFFIXES) .p
59
66
60
.c.o:
67
.c.o:
61
	$(CC) $(CFLAGS) -c $<
68
	$(CC) $(CFLAGS) -c $<
69
	$(CC) $(CFLAGS) $(PICFLAGS) -c -o $(addprefix $(SODIR),$@) $<
62
70
63
.c.p:
71
.c.p:
64
	@cp $(srcdir)/$*.c _$*.c
72
	@cp $(srcdir)/$*.c _$*.c
Lines 69-76 Link Here
69
	$(AR) $(LIBNAME) $(MPIO_REAL_POBJECTS)
77
	$(AR) $(LIBNAME) $(MPIO_REAL_POBJECTS)
70
	@rm -f _*.o
78
	@rm -f _*.o
71
79
72
$(LIBNAME): $(MPIO_OBJECTS)
80
$(LIBNAME): dir $(MPIO_OBJECTS)
73
	$(AR) $(LIBNAME) $(MPIO_OBJECTS)
81
	$(AR) $(LIBNAME) $(MPIO_OBJECTS)
82
	
83
shared:
84
	$(CC) $(SOFLAGS) -o $(SONAME) $(SODIR)/* 
74
85
75
clean:
86
clean:
76
	@rm -f *.o
87
	@rm -f *.o
(-)lam-7.1.1.orig/romio/util/romioinstall.in (+1 lines)
Lines 128-133 Link Here
128
# Library files
128
# Library files
129
dir="$libdir"
129
dir="$libdir"
130
append "$ROMIO_TOP_BUILDDIR/lib/liblammpio.a:$dir/liblammpio.a"
130
append "$ROMIO_TOP_BUILDDIR/lib/liblammpio.a:$dir/liblammpio.a"
131
append "$ROMIO_TOP_BUILDDIR/lib/liblammpio.so:$dir/liblammpio.so"
131
132
132
# Man pages
133
# Man pages
133
dir="$mandir/man3"
134
dir="$mandir/man3"

Return to bug 88110