View | Details | Raw Unified | Return to bug 143878 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.ext (-30 / +68 lines)
Lines 4-10 Link Here
4
USE_GMAKE=	yes
4
USE_GMAKE=	yes
5
USE_LDCONFIG=	yes
5
USE_LDCONFIG=	yes
6
SAL_MODULE=	${PKGNAMESUFFIX:S/-//}
6
SAL_MODULE=	${PKGNAMESUFFIX:S/-//}
7
#.if ${SAL_MODULE} == "med" || ${SAL_MODULE} == "smesh" || ${SAL_MODULE} == "visu" || ${SAL_MODULE} == "sierpinsky" || ${SAL_MODULE} == "multipr"
8
.if !${SAL_MODULE} == "gui" 
7
.if !${SAL_MODULE} == "gui" 
9
USE_FORTRAN=yes
8
USE_FORTRAN=yes
10
USE_GCC=        4.4
9
USE_GCC=        4.4
Lines 37-45 Link Here
37
CONFIGURE_ARGS+=	--prefix=${PREFIX}
36
CONFIGURE_ARGS+=	--prefix=${PREFIX}
38
CONFIGURE_ARGS+=	--enable-debug
37
CONFIGURE_ARGS+=	--enable-debug
39
CONFIGURE_ENV+=		MACHINE=${OPSYS:U}
38
CONFIGURE_ENV+=		MACHINE=${OPSYS:U}
40
#CXXFLAGS+=		-L${LOCALBASE}/lib -I/usr/include -I${LOCALBASE}/include -D__freebsd__ -DFREEBSD -DHAVE_IOSTREAM -DHAVE_LIMITS_H -DHAVE_IOMANIP -DMPICH_IGNORE_CXX_SEEK
41
CPPFLAGS+=		-L${LOCALBASE}/lib -I/usr/include -I${LOCALBASE}/include -D__freebsd__ -DFREEBSD -DHAVE_IOSTREAM -DHAVE_LIMITS_H -DHAVE_IOMANIP -DMPICH_IGNORE_CXX_SEEK
39
CPPFLAGS+=		-L${LOCALBASE}/lib -I/usr/include -I${LOCALBASE}/include -D__freebsd__ -DFREEBSD -DHAVE_IOSTREAM -DHAVE_LIMITS_H -DHAVE_IOMANIP -DMPICH_IGNORE_CXX_SEEK
42
CXXFLAGS+=		-ffriend-injection -fno-inline -fpermissive -L${LOCALBASE}/lib -L${LOCALBASE}/lib/salome
40
CXXFLAGS+=		-ffriend-injection -fno-inline -fpermissive -fPIC -L${LOCALBASE}/lib -L${LOCALBASE}/lib/salome
43
CONFIGURE_SCRIPT=	../configure
41
CONFIGURE_SCRIPT=	../configure
44
PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}/${SAL_MODULE_UPPER}_SRC_${RELEASENAME}
42
PATCH_WRKSRC=		${WRKDIR}/${DISTNAME}/${SAL_MODULE_UPPER}_SRC_${RELEASENAME}
45
WRKSRC=			${PATCH_WRKSRC}
43
WRKSRC=			${PATCH_WRKSRC}
Lines 53-58 Link Here
53
.if !${SAL_MODULE} == "kernel"
51
.if !${SAL_MODULE} == "kernel"
54
.for D in ${${SAL_MODULE_UPPER}_DEPEND}
52
.for D in ${${SAL_MODULE_UPPER}_DEPEND}
55
    CONFIGURE_ENV+=	${D}_ROOT_DIR=${LOCALBASE}
53
    CONFIGURE_ENV+=	${D}_ROOT_DIR=${LOCALBASE}
54
    AUTOTOOLS_ENV+=	${D}_ROOT_DIR=${LOCALBASE}
56
    CPPFLAGS+=		-L${LOCALBASE}/lib/salome
55
    CPPFLAGS+=		-L${LOCALBASE}/lib/salome
57
.endfor
56
.endfor
58
.endif
57
.endif
Lines 74-79 Link Here
74
.if ${SAL_MODULE} == "smesh" || ${SAL_MODULE} == "sierpinsky" || ${SAL_MODULE} == "multipr" || ${SAL_MODULE} == "visu"
73
.if ${SAL_MODULE} == "smesh" || ${SAL_MODULE} == "sierpinsky" || ${SAL_MODULE} == "multipr" || ${SAL_MODULE} == "visu"
75
BUILD_DEPENDS+=		${RESOURCEDIR}/med:${PORTSDIR}/cad/salome-med
74
BUILD_DEPENDS+=		${RESOURCEDIR}/med:${PORTSDIR}/cad/salome-med
76
RUN_DEPENDS+=		${RESOURCEDIR}/med:${PORTSDIR}/cad/salome-med
75
RUN_DEPENDS+=		${RESOURCEDIR}/med:${PORTSDIR}/cad/salome-med
76
AUTOTOOLS_ENV+= 	MED2HOME=${LOCALBASE}
77
.endif
77
.endif
78
78
79
#Depndency from GEOM module
79
#Depndency from GEOM module
Lines 95-106 Link Here
95
#Dependency from other ports
95
#Dependency from other ports
96
###########################################################################
96
###########################################################################
97
#Dependency from autotools
97
#Dependency from autotools
98
USE_AUTOTOOLS=	autoconf:262 automake:15 libtool:22
98
USE_AUTOTOOLS=	autoconf:262 automake:15 libtool:22 aclocal:19
99
.if ${SAL_MODULE} == "kernel"
100
    ACLOCAL_ARGS=	-I salome_adm/unix/config_files
101
.else
102
. if ${SAL_MODULE} == "yacs"
103
    ACLOCAL_ARGS=	-I adm/unix/config_files
104
    USE_AUTOTOOLS+=	autoheader:262
105
    AUTOHEADER_ARGS=	-I adm/unix/config_files
106
. else
107
    ACLOCAL_ARGS=	-I adm_local/unix/config_files -I ${LOCALBASE}/salome_adm/unix/config_files 
108
.	if ${SAL_MODULE} != "gui"
109
    ACLOCAL_ARGS+= -I ${LOCALBASE}/adm_local/unix/config_files
110
.	endif
111
. endif
112
.endif
113
LIBTOOLFLAGS=--force --copy --automake 
114
AUTOMAKE_ARGS=--add-missing --copy --gnu
99
115
100
#Dependency from HDF5
116
#Dependency from HDF5
101
.if !${SAL_MODULE} == "randomizer" &&  !${SAL_MODULE} == "yacs" && !${SAL_MODULE} == "hello" && !${SAL_MODULE} == "pyhello"
117
.if !${SAL_MODULE} == "randomizer" &&  !${SAL_MODULE} == "yacs" && !${SAL_MODULE} == "hello" && !${SAL_MODULE} == "pyhello"
102
LIB_DEPENDS+=		hdf5.0:${PORTSDIR}/science/hdf5
118
LIB_DEPENDS+=		hdf5.0:${PORTSDIR}/science/hdf5
103
CONFIGURE_ARGS+=	--with-hdf5=${LOCALBASE} 
119
CONFIGURE_ARGS+=	--with-hdf5=${LOCALBASE} 
120
AUTOTOOLS_ENV+= 	HDF5HOME=${LOCALBASE}
104
.endif
121
.endif
105
122
106
#Dependency from Opencascade
123
#Dependency from Opencascade
Lines 108-113 Link Here
108
LIB_DEPENDS+=		TKernel.0:${PORTSDIR}/cad/opencascade
125
LIB_DEPENDS+=		TKernel.0:${PORTSDIR}/cad/opencascade
109
CASROOT=		${LOCALBASE}/OpenCAS/ros
126
CASROOT=		${LOCALBASE}/OpenCAS/ros
110
CONFIGURE_ENV+=		CASROOT=${CASROOT}
127
CONFIGURE_ENV+=		CASROOT=${CASROOT}
128
AUTOTOOLS_ENV+= 	CASROOT=${CASROOT}
111
#CXXFLAGS+=		-I${CASROOT}/inc
129
#CXXFLAGS+=		-I${CASROOT}/inc
112
.endif
130
.endif
113
131
Lines 141-146 Link Here
141
CONFIGURE_ENV+=		QTDIR=${LOCALBASE}
159
CONFIGURE_ENV+=		QTDIR=${LOCALBASE}
142
QTFLAGS+=		-I${LOCALBASE}/include/qt4 -L${LOCALBASE}/lib/qt4
160
QTFLAGS+=		-I${LOCALBASE}/include/qt4 -L${LOCALBASE}/lib/qt4
143
QT_COMPONENTS=		gui opengl svg xml qmake_build moc_build rcc_build uic_build linguist
161
QT_COMPONENTS=		gui opengl svg xml qmake_build moc_build rcc_build uic_build linguist
162
AUTOTOOLS_ENV+= 	QTDIR=${LOCALBASE}
144
.endif
163
.endif
145
164
146
#Dependency from qscintilla2
165
#Dependency from qscintilla2
Lines 162-167 Link Here
162
#CONFIGURE_ENV+=		QWTHOME=${LOCALBASE}
181
#CONFIGURE_ENV+=		QWTHOME=${LOCALBASE}
163
CONFIGURE_ARGS+=	--with-qwt=${LOCALBASE}
182
CONFIGURE_ARGS+=	--with-qwt=${LOCALBASE}
164
CPPFLAGS+=		-I/${LOCALBASE}/include/qwt/
183
CPPFLAGS+=		-I/${LOCALBASE}/include/qwt/
184
AUTOTOOLS_ENV+= 	QWTHOME=${LOCALBASE}
165
.endif
185
.endif
166
186
167
#Dependency from omniORB & py-omniorb
187
#Dependency from omniORB & py-omniorb
Lines 169-174 Link Here
169
LIB_DEPENDS+=		omniORB4.1:${PORTSDIR}/devel/omniORB
189
LIB_DEPENDS+=		omniORB4.1:${PORTSDIR}/devel/omniORB
170
RUN_DEPENDS+=		${LOCALBASE}/include/omniORBpy.h:${PORTSDIR}/devel/py-omniorb
190
RUN_DEPENDS+=		${LOCALBASE}/include/omniORBpy.h:${PORTSDIR}/devel/py-omniorb
171
RUN_DEPENDS+=		notifd:${PORTSDIR}/devel/omniNotify
191
RUN_DEPENDS+=		notifd:${PORTSDIR}/devel/omniNotify
192
AUTOTOOLS_ENV+= 	OMNIORBDIR=${LOCALBASE}
172
.endif
193
.endif
173
194
174
#Dependency from sip
195
#Dependency from sip
Lines 228-233 Link Here
228
.endif
249
.endif
229
.endif
250
.endif
230
251
252
#optionally dependency from mpich2
231
.if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med"
253
.if ${SAL_MODULE} == "kernel" || ${SAL_MODULE} == "med"
232
.if defined(WITH_MPI)
254
.if defined(WITH_MPI)
233
BUILD_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
255
BUILD_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
Lines 253-258 Link Here
253
.		endif
275
.		endif
254
.endif
276
.endif
255
277
278
.if ${SAL_MODULE} == "yacs"
279
    post-patch:
280
	${CP} ${WRKSRC}/configure.in.base  ${WRKSRC}/configure.in
281
.endif
282
256
.if ${SAL_MODULE} == "kernel"
283
.if ${SAL_MODULE} == "kernel"
257
    pre-patch:
284
    pre-patch:
258
	${MKDIR} ${WRKSRC}/src/Communication/rpc
285
	${MKDIR} ${WRKSRC}/src/Communication/rpc
Lines 260-291 Link Here
260
	${REINPLACE_CMD} 's|__rpc_xdr|XDR|g' ${WRKSRC}/src/Communication/rpc/xdr.h
287
	${REINPLACE_CMD} 's|__rpc_xdr|XDR|g' ${WRKSRC}/src/Communication/rpc/xdr.h
261
.endif
288
.endif
262
289
290
MMDEPENDS=${SAL_MODULE_UPPER}_DEPEND
291
AUTOTOOLS_ENV+=	${SAL_MODULE_UPPER}_ROOT_DIR=${PREFIX}
292
293
.for D in ${MMDEPENDS}
294
    AUTOTOOLS_ENV+=${D}_ROOT_DIR=${LOCALBASE}
295
.endfor
296
297
run-autotools-aclocal:
298
	echo "Start of aclocal"
299
	@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
300
		${ACLOCAL_ARGS})
301
	echo "End of aclocal"
302
303
run-autotools-autoconf:
304
	echo "Start of autoconf"
305
	@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
306
		${AUTOCONF_ARGS})
307
	echo "End of autotools"
308
309
run-autotools-automake:
310
	echo "Start of automake"
311
	@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
312
		${AUTOMAKE_ARGS})
313
	echo "End of automake"
314
315
.if ${SAL_MODULE} == "yacs"
316
run-autotools-autoheader:
317
	echo "Start of autoheader"
318
	@(cd ${PATCH_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
319
		${AUTOHEADER_ARGS})
320
	echo "End of autoheader"
321
.endif
322
323
patch-autotools:
324
	@(cd ${PATCH_WRKSRC}; ${LIBTOOLIZE} --force;)
263
325
264
    pre-configure:
326
pre-configure:
265
#	SAL_MODULE_UPPER=`${ECHO} ${SAL_MODULE} | ${AWK} '{ print(toupper($1)); }'`; \
327
	${MKDIR} ${BUILD_WRKSRC}
266
	MMDEPENDS="${${SAL_MODULE_UPPER}_DEPEND}"; \
267
	for D in $${MMDEPENDS}; do \
268
	      export "$$D"_ROOT_DIR=${LOCALBASE}; \
269
		if test "$$D"="MED2"; then \
270
		    export MED2HOME=${LOCALBASE}; \
271
		fi; \
272
		if test "$$D"="QWT"; then \
273
		    export QWTHOME=${LOCALBASE}; \
274
		fi; \
275
		if test "$$D"="HDF5HOME"; then \
276
		    export HDF5HOME=${LOCALBASE}; \
277
		fi; \
278
		if test "$$D"="CASROOT"; then \
279
		    export CASROOT=${CASROOT}; \
280
		fi; \
281
		if test "$$D"="QT"; then \
282
		    export QTDIR=${LOCALBASE}; \
283
		fi; \
284
		if test "$$D"="OMNIORB"; then \
285
		    export OMNIORBDIR=${LOCALBASE}; \
286
		fi; \
287
		echo "$$D"_ROOT_DIR; \
288
	done; \
289
	MACHINE=${OPSYS:U}; export MACHINE;  set ${SAL_MODULE_UPPER}_ROOT_DIR ${PREFIX};  export ${SAL_MODULE_UPPER}_ROOT_DIR; cd ${WRKSRC}; ${MKDIR} ${BUILD_WRKSRC}; ${SH} ./build_configure
290
328
291
.include <bsd.port.post.mk>
329
.include <bsd.port.post.mk>

Return to bug 143878