diff options
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/Makefile | 16 | ||||
| -rw-r--r-- | lang/ocaml/files/patch-configure | 34 |
2 files changed, 30 insertions, 20 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index e4ba7d887ebf..9ced7c1cccbc 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -2,7 +2,7 @@ PORTNAME= ocaml PORTVERSION= 4.08.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \ http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs @@ -49,7 +49,6 @@ CONFIGURE_ARGS= --prefix="${PREFIX}" CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" \ ASPP="${CC} -c" \ PARTIALLD="${LD} -r" -MAKE_ENV= SYSTEM_ARCH="${ARCH:C/aarch64/arm64/:C/powerpc.*/power/}" OPTIONS_DEFINE= X11 THREADS DOCS EXAMPLES OPTIONS_DEFAULT=X11 THREADS @@ -91,7 +90,7 @@ CONFIGURE_ENV+= AS="${AS} ${ASFLAGS}" \ CC="${CC}" .endif -.if defined(NO_PROFILE) || ${ARCH:Mpowerpc} || ${ARCH:Mamd64} +.if defined(NO_PROFILE) PLIST_SUB+= PROF="@comment " .else PLIST_SUB+= PROF="" @@ -103,17 +102,12 @@ post-patch: -e '\|RANLIB|s|ranlib|${RANLIB}|' \ -e '\|^ldflags=|s|""|"${LDFLAGS}"|' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \ - ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tools \ - ${WRKSRC}/runtime/Makefile \ - ${WRKSRC}/ocamltest/Makefile \ - ${WRKSRC}/otherlibs/systhreads/Makefile check-test: do-install @cd ${WRKSRC}/testsuite; ${RM} _log; for d in tests/* ; do \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one DIR=$${d} \ - 2>&1 | tee -a _log || ${TRUE} ; done ; \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} one \ + DIR=$${d} 2>&1 | tee -a _log || ${TRUE} ; done ; \ + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} report post-install: .if ${PORT_OPTIONS:MDOCS} diff --git a/lang/ocaml/files/patch-configure b/lang/ocaml/files/patch-configure index 2cf280415341..c3e62de2bf07 100644 --- a/lang/ocaml/files/patch-configure +++ b/lang/ocaml/files/patch-configure @@ -50,13 +50,13 @@ model=ppc fi; system=elf ;; #( + powerpc64le*-*-freebsd*) : -+ arch=power; model=ppc64le; system=bsd_elf;; #( ++ arch=power; model=ppc64le; system=freebsd;; #( + powerpc*-*-freebsd*) : + arch=power; if $arch64; then : + model=ppc64 +else + model=ppc -+fi; system=bsd_elf ;; #( ++fi; system=freebsd ;; #( powerpc-*-netbsd*) : arch=power; model=ppc; system=netbsd ;; #( powerpc-*-openbsd*) : @@ -69,7 +69,16 @@ earmv6*-*-netbsd*) : arch=arm; model=armv6; system=netbsd ;; #( earmv7*-*-netbsd*) : -@@ -13544,6 +13560,8 @@ fi; system=elf ;; #( +@@ -13534,6 +13550,8 @@ fi; system=elf ;; #( + arch=amd64; system=dragonfly ;; #( + x86_64-*-freebsd*) : + arch=amd64; system=freebsd ;; #( ++ amd64-*-freebsd*) : ++ arch=amd64; system=freebsd ;; #( + x86_64-*-netbsd*) : + arch=amd64; system=netbsd ;; #( + x86_64-*-openbsd*) : +@@ -13544,6 +13562,8 @@ fi; system=elf ;; #( arch=amd64; system=mingw64 ;; #( aarch64-*-linux*) : arch=arm64; system=linux ;; #( @@ -78,7 +87,7 @@ x86_64-*-cygwin*) : arch=amd64; system=cygwin ;; #( -@@ -13714,6 +13732,8 @@ case "$arch,$system" in #( +@@ -13714,6 +13734,8 @@ case "$arch,$system" in #( profiling=true ;; #( amd64,openbsd) : profiling=true ;; #( @@ -87,14 +96,21 @@ amd64,freebsd) : profiling=true ;; #( amd64,netbsd) : -@@ -13721,6 +13741,10 @@ case "$arch,$system" in #( - arm,netbsd) : +@@ -13722,11 +13744,17 @@ case "$arch,$system" in #( profiling=true ;; #( amd64,gnu) : + profiling=true ;; #( ++ arm64,freebsd) : + profiling=true ;; #( -+ arm64,freebsd*) : ++ arm,freebsd) : + profiling=true ;; #( -+ arm,freebsd*) : - profiling=true ;; #( arm,linux*) : profiling=true ;; #( + power,elf) : + profiling=true ;; #( + power,bsd*) : ++ profiling=true ;; #( ++ power,freebsd) : + profiling=true ;; #( + power,netbsd) : + profiling=true ;; #( |