Attachment #103831 for bug #143866

View | Details | Raw Unified | Return to bug 143866
Collapse All | Expand All





PORTNAME=	pvm
PORTVERSION=	3.4.6
PORTREVISION=	1
CATEGORIES=	net parallel
MASTER_SITES=	http://www.netlib.org/pvm3/	\
		ftp://ftp.chg.ru/pub/prog/parallel/pvm3/

.endif

USE_FORTRAN=	yes
USE_LDCONFIG=	yes

WRKSRC=		${WRKDIR}/pvm3
MAKE_ENV+=	PVM_ROOT=${WRKSRC} SHAREDLDFLAGS="-lgfortran -shared"
ALL_TARGET=	all shared install
PVM_ROOT=	${PREFIX}/lib/pvm
REINPLACE_ARGS=	-i ""
MAKE_JOBS_UNSAFE=yes

.include <bsd.port.pre.mk>

pre-patch:
	@${REINPLACE_CMD} -e 's|$$(ARCHCFLAGS)|$$(ARCHCFLAGS) -fPIC|g' ${WRKSRC}/src/Makefile.aimk
	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
		${WRKSRC}/tracer/tracer.h ${WRKSRC}/tracer/trclib.h \
		${WRKSRC}/tracer/trcsort.c

	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libfpvm3.a ${PREFIX}/lib
	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.a ${PREFIX}/lib
	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvmtrc.a ${PREFIX}/lib
	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvm3.so ${PREFIX}/lib
	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvm3.so ${PREFIX}/lib/libpvm3.so.3
	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.so ${PREFIX}/lib
	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.so ${PREFIX}/lib/libgpvm3.so.3
	@ ${INSTALL_DATA} ${WRKSRC}/conf/FREEBSD.def ${PVM_ROOT}/conf
	@ ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include
	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1

Lines 67-72 Link Here

(-)pkg-plist (+4 lines)
67	lib/libpvmtrc.a	67	lib/libpvmtrc.a
68	lib/libfpvm3.a	68	lib/libfpvm3.a
69	lib/libgpvm3.a	69	lib/libgpvm3.a
		70	lib/libpvm3.so
		71	lib/libpvm3.so.3
		72	lib/libgpvm3.so
		73	lib/libgpvm3.so.3
70	@dirrm lib/pvm/lib/FREEBSD	74	@dirrm lib/pvm/lib/FREEBSD
71	@dirrm lib/pvm/lib	75	@dirrm lib/pvm/lib
72	@dirrm lib/pvm/conf	76	@dirrm lib/pvm/conf




Index: pvmgs/Makefile.aimk
===================================================================
--- pvmgs/Makefile.aimk
+++ pvmgs/Makefile.aimk
@@ -45,13 +45,13 @@ PROGS		=	$(PVMXDIR)/pvm_gstat$(EXESFX) \
 
 LPROGS		=	$(PVMLDIR)/pvmgs$(EXESFX)
 
-LIBGPVM		=	$(LIBPREFIX)gpvm3.a
+LIBGPVM		=	$(LIBPREFIX)gpvm3
 
 install:	all
 
 install-mpp:	all-mpp
 
-all:	$(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM) $(LPROGS)
+all:	$(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM).a $(PVMLDIR)/$(LIBGPVM).so $(LPROGS)
 
 all-mpp:	$(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM)-mpp $(LPROGS)
 
@@ -71,40 +71,57 @@ $(PVMXDIR)/pvmgs$(EXESFX):  pvmgs$(EXESF
 $(PVMXDIR)/pvmgroups$(EXESFX):  pvmgroups$(EXESFX)
 	cp pvmgroups$(EXESFX) $(PVMXDIR)
 
-$(PVMLDIR)/$(LIBGPVM):  $(LIBGPVM)
-	cp $(LIBGPVM) $(PVMLDIR)
-	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM) ;; esac
+$(PVMLDIR)/$(LIBGPVM).a:  $(LIBGPVM).a
+	cp $(LIBGPVM).a $(PVMLDIR)
+	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM).a ;; esac
 
 $(PVMLDIR)/$(LIBGPVM)-mpp:  $(LIBGPVM)-mpp
-	cp $(LIBGPVM) $(PVMLDIR)
-	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM) ;; esac
+	cp $(LIBGPVM).a $(PVMLDIR)
+	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM).a ;; esac
 	touch $(PVMLDIR)/$(LIBGPVM)-mpp
 
+$(PVMLDIR)/$(LIBGPVM).so:  $(LIBGPVM).so
+	cp $(LIBGPVM).so $(PVMLDIR)
+
 $(PVMLDIR)/pvmgs$(EXESFX):  pvmgs$(EXESFX)
 	cp pvmgs$(EXESFX) $(PVMLDIR)
 
-pvmgroups$(EXESFX):	pvmgroups.o $(LIBGPVM) $(PVMLIBDEP)
-	$(CC) $(CFLAGS) -o $@ pvmgroups.o $(LIBGPVM) $(LIBS) 
+pvmgroups$(EXESFX):	pvmgroups.o $(LIBGPVM).a $(PVMLIBDEP)
+	$(CC) $(CFLAGS) -o $@ pvmgroups.o $(LIBGPVM).a $(LIBS) 
 
 pvmgs$(EXESFX):	$(DOBJ) $(PVMLIBDEP)
 	$(CC) $(CFLAGS) -o $@ $(DOBJ) $(LIBS)
 
-$(LIBGPVM):	$(LOBJ)
-	rm -f $(LIBGPVM)
-	$(AR) cr $(LIBGPVM) $(LOBJ)
-	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM) ;; esac
+$(LIBGPVM).a:
+	echo -------------------------------
+	echo --- Building static Library ---
+	echo -------------------------------
+	rm -f $(LIBGPVM).a $(LOBJ)
+	pwd
+	cd .. && ../lib/aimk CFLOPTS='$(CFLOPTS)' $(LOBJ)
+	$(AR) cr $(LIBGPVM).a $(LOBJ)
+	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM).a ;; esac
+
+$(LIBGPVM).so:
+	echo -------------------------------
+	echo --- Building shared Library ---
+	echo -------------------------------
+	rm -f $(LIBGPVM).a $(LOBJ)
+	pwd
+	cd .. && ../lib/aimk CFLOPTS='-fPIC $(CFLOPTS)' $(LOBJ)
+	$(CC) -shared -Wl,-soname,libgpvm3.so.3 -o $(LIBGPVM).so $(LOBJ) -lc
 
 $(LIBGPVM)-mpp:	$(LOBJ)
-	rm -f $(LIBGPVM)
-	$(AR_FRONT) cr $(LIBGPVM) $(LOBJ)
-	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM) ;; esac
+	rm -f $(LIBGPVM).a
+	$(AR_FRONT) cr $(LIBGPVM).a $(LOBJ)
+	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM).a ;; esac
 	touch $(LIBGPVM)-mpp
 
-pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM) $(PVMLIBDEP)
-	$(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM) $(LIBS)
+pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM).a $(PVMLIBDEP)
+	$(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM).a $(LIBS)
 
 clean:
-	rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM) \
+	rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM).a \
 		pvm_gstat.o pvmgroups.o pvm_gstat$(EXESFX) pvmgroups$(EXESFX)
 
 tidy:

Return to bug 143866

Lines 7-12 Link Here

(-)Makefile (-2 / +9 lines)
7		7
8	PORTNAME= pvm	8	PORTNAME= pvm
9	PORTVERSION= 3.4.6	9	PORTVERSION= 3.4.6
		10	PORTREVISION= 1
10	CATEGORIES= net parallel	11	CATEGORIES= net parallel
11	MASTER_SITES= http://www.netlib.org/pvm3/ \	12	MASTER_SITES= http://www.netlib.org/pvm3/ \
12	ftp://ftp.chg.ru/pub/prog/parallel/pvm3/	13	ftp://ftp.chg.ru/pub/prog/parallel/pvm3/
Lines 26-35 Link Here
26	.endif	27	.endif
27		28
28	USE_FORTRAN= yes	29	USE_FORTRAN= yes
		30	USE_LDCONFIG= yes
29		31
30	WRKSRC= ${WRKDIR}/pvm3	32	WRKSRC= ${WRKDIR}/pvm3
31	MAKE_ENV+= PVM_ROOT=${WRKSRC} ARCHCFLAGS="${CFLAGS}"	33	MAKE_ENV+= PVM_ROOT=${WRKSRC} SHAREDLDFLAGS="-lgfortran -shared"
32	ALL_TARGET= all install	34	ALL_TARGET= all shared install
33	PVM_ROOT= ${PREFIX}/lib/pvm	35	PVM_ROOT= ${PREFIX}/lib/pvm
34	REINPLACE_ARGS= -i ""	36	REINPLACE_ARGS= -i ""
35	MAKE_JOBS_UNSAFE=yes	37	MAKE_JOBS_UNSAFE=yes
Lines 115-120 Link Here
115	.include <bsd.port.pre.mk>	117	.include <bsd.port.pre.mk>
116		118
117	pre-patch:	119	pre-patch:
		120	@${REINPLACE_CMD} -e 's\|$$(ARCHCFLAGS)\|$$(ARCHCFLAGS) -fPIC\|g' ${WRKSRC}/src/Makefile.aimk
118	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \	121	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
119	${WRKSRC}/tracer/tracer.h ${WRKSRC}/tracer/trclib.h \	122	${WRKSRC}/tracer/tracer.h ${WRKSRC}/tracer/trclib.h \
120	${WRKSRC}/tracer/trcsort.c	123	${WRKSRC}/tracer/trcsort.c
Lines 138-143 Link Here
138	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libfpvm3.a ${PREFIX}/lib	141	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libfpvm3.a ${PREFIX}/lib
139	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.a ${PREFIX}/lib	142	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.a ${PREFIX}/lib
140	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvmtrc.a ${PREFIX}/lib	143	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvmtrc.a ${PREFIX}/lib
		144	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvm3.so ${PREFIX}/lib
		145	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libpvm3.so ${PREFIX}/lib/libpvm3.so.3
		146	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.so ${PREFIX}/lib
		147	@ ${INSTALL_DATA} ${WRKSRC}/lib/FREEBSD/libgpvm3.so ${PREFIX}/lib/libgpvm3.so.3
141	@ ${INSTALL_DATA} ${WRKSRC}/conf/FREEBSD.def ${PVM_ROOT}/conf	148	@ ${INSTALL_DATA} ${WRKSRC}/conf/FREEBSD.def ${PVM_ROOT}/conf
142	@ ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include	149	@ ${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include
143	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1	150	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1

Added Link Here

(-)files/patch-pvmgs-Makefile.aimk (+95 lines)
1	Index: pvmgs/Makefile.aimk
2	===================================================================
3	--- pvmgs/Makefile.aimk
4	+++ pvmgs/Makefile.aimk
5	@@ -45,13 +45,13 @@ PROGS = $(PVMXDIR)/pvm_gstat$(EXESFX) \
6
7	LPROGS = $(PVMLDIR)/pvmgs$(EXESFX)
8
9	-LIBGPVM = $(LIBPREFIX)gpvm3.a
10	+LIBGPVM = $(LIBPREFIX)gpvm3
11
12	install: all
13
14	install-mpp: all-mpp
15
16	-all: $(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM) $(LPROGS)
17	+all: $(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM).a $(PVMLDIR)/$(LIBGPVM).so $(LPROGS)
18
19	all-mpp: $(DIRS) $(PROGS) $(PVMLDIR)/$(LIBGPVM)-mpp $(LPROGS)
20
21	@@ -71,40 +71,57 @@ $(PVMXDIR)/pvmgs$(EXESFX): pvmgs$(EXESF
22	$(PVMXDIR)/pvmgroups$(EXESFX): pvmgroups$(EXESFX)
23	cp pvmgroups$(EXESFX) $(PVMXDIR)
24
25	-$(PVMLDIR)/$(LIBGPVM): $(LIBGPVM)
26	- cp $(LIBGPVM) $(PVMLDIR)
27	- case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM) ;; esac
28	+$(PVMLDIR)/$(LIBGPVM).a: $(LIBGPVM).a
29	+ cp $(LIBGPVM).a $(PVMLDIR)
30	+ case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM).a ;; esac
31
32	$(PVMLDIR)/$(LIBGPVM)-mpp: $(LIBGPVM)-mpp
33	- cp $(LIBGPVM) $(PVMLDIR)
34	- case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM) ;; esac
35	+ cp $(LIBGPVM).a $(PVMLDIR)
36	+ case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(PVMLDIR)/$(LIBGPVM).a ;; esac
37	touch $(PVMLDIR)/$(LIBGPVM)-mpp
38
39	+$(PVMLDIR)/$(LIBGPVM).so: $(LIBGPVM).so
40	+ cp $(LIBGPVM).so $(PVMLDIR)
41	+
42	$(PVMLDIR)/pvmgs$(EXESFX): pvmgs$(EXESFX)
43	cp pvmgs$(EXESFX) $(PVMLDIR)
44
45	-pvmgroups$(EXESFX): pvmgroups.o $(LIBGPVM) $(PVMLIBDEP)
46	- $(CC) $(CFLAGS) -o $@ pvmgroups.o $(LIBGPVM) $(LIBS)
47	+pvmgroups$(EXESFX): pvmgroups.o $(LIBGPVM).a $(PVMLIBDEP)
48	+ $(CC) $(CFLAGS) -o $@ pvmgroups.o $(LIBGPVM).a $(LIBS)
49
50	pvmgs$(EXESFX): $(DOBJ) $(PVMLIBDEP)
51	$(CC) $(CFLAGS) -o $@ $(DOBJ) $(LIBS)
52
53	-$(LIBGPVM): $(LOBJ)
54	- rm -f $(LIBGPVM)
55	- $(AR) cr $(LIBGPVM) $(LOBJ)
56	- case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM) ;; esac
57	+$(LIBGPVM).a:
58	+ echo -------------------------------
59	+ echo --- Building static Library ---
60	+ echo -------------------------------
61	+ rm -f $(LIBGPVM).a $(LOBJ)
62	+ pwd
63	+ cd .. && ../lib/aimk CFLOPTS='$(CFLOPTS)' $(LOBJ)
64	+ $(AR) cr $(LIBGPVM).a $(LOBJ)
65	+ case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM).a ;; esac
66	+
67	+$(LIBGPVM).so:
68	+ echo -------------------------------
69	+ echo --- Building shared Library ---
70	+ echo -------------------------------
71	+ rm -f $(LIBGPVM).a $(LOBJ)
72	+ pwd
73	+ cd .. && ../lib/aimk CFLOPTS='-fPIC $(CFLOPTS)' $(LOBJ)
74	+ $(CC) -shared -Wl,-soname,libgpvm3.so.3 -o $(LIBGPVM).so $(LOBJ) -lc
75
76	$(LIBGPVM)-mpp: $(LOBJ)
77	- rm -f $(LIBGPVM)
78	- $(AR_FRONT) cr $(LIBGPVM) $(LOBJ)
79	- case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM) ;; esac
80	+ rm -f $(LIBGPVM).a
81	+ $(AR_FRONT) cr $(LIBGPVM).a $(LOBJ)
82	+ case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBGPVM).a ;; esac
83	touch $(LIBGPVM)-mpp
84
85	-pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM) $(PVMLIBDEP)
86	- $(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM) $(LIBS)
87	+pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM).a $(PVMLIBDEP)
88	+ $(CC) $(CFLAGS) -o $@ pvm_gstat.o $(LIBGPVM).a $(LIBS)
89
90	clean:
91	- rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM) \
92	+ rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM).a \
93	pvm_gstat.o pvmgroups.o pvm_gstat$(EXESFX) pvmgroups$(EXESFX)
94
95	tidy: