svn commit: r456636 - in head/lang/ocaml: . files

[Alexey Dokuchaev]

Author: danfe
Date: Mon Dec 18 14:48:49 2017
New Revision: 456636
URL: https://svnweb.freebsd.org/changeset/ports/456636

Log:
  Further pre-update cleanups for `lang/ocaml':
  
  - Do not suppress .bak-files when patching things with ``sed(1) -i'',
    those can be useful for debugging and catching no-ops
  - Drop `files/manfiles', it is no longer used (looks like a relic from
    pre-staging times)
  - Do not pass ``-as "${AS} ${ASFLAGS}"'' in the initial CONFIGURE_ARGS:
    when ARM support was added in r361233, appropriate values are passed
    conditionally (subject to ${ARCH}), see line 69
  - Simplify handling of CFLAGS (obtained from RedHat package): rather
    than passing them as part of the compiler and "fixing" one generated
    Makefile in `post-configure', teach the configure script about them

Deleted:
  head/lang/ocaml/files/manfiles
Modified:
  head/lang/ocaml/Makefile
  head/lang/ocaml/files/patch-configure

Modified: head/lang/ocaml/Makefile
==============================================================================
--- head/lang/ocaml/Makefile	Mon Dec 18 14:46:23 2017	(r456635)
+++ head/lang/ocaml/Makefile	Mon Dec 18 14:48:49 2017	(r456636)
@@ -28,7 +28,6 @@ BROKEN_mips=	No ASM support
 USES=		cpe gmake tar:xz
 USE_LDCONFIG=	yes
 CPE_VENDOR=	inria
-REINPLACE_ARGS=	-i ""
 HAS_CONFIGURE=	yes
 ALL_TARGET=	world.opt
 STRIP=
@@ -36,8 +35,7 @@ SSP_UNSAFE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CONFIGURE_ARGS=	-verbose -prefix "${PREFIX}" \
-		-cc "${CC} ${CFLAGS}" \
-		-as "${AS} ${ASFLAGS}" \
+		-cc "${CC}" \
 		-aspp "${CC} -c" \
 		-partialld "${LD} -r"
 
@@ -96,7 +94,6 @@ CONFIGURE_ARGS+=-no-graph
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${FILESDIR}/manfiles"
 
 .if defined(NO_PROFILE) || ${ARCH:Mpowerpc} || ${ARCH:Mamd64}
 PLIST_SUB+=	PROF="@comment "
@@ -128,10 +125,7 @@ post-patch:
 		${WRKSRC}/testsuite/tests/asmcomp/Makefile
 
 post-configure:
-# CFLAGS safeness
 	@${REINPLACE_CMD} -E \
-		-e 's|(BYTECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS}|' \
-		-e 's|(NATIVECCCOMPOPTS[ \t]*=.*)|\1 ${CFLAGS}|' \
 		-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
 		${WRKSRC}/config/Makefile
 

Modified: head/lang/ocaml/files/patch-configure
==============================================================================
--- head/lang/ocaml/files/patch-configure	Mon Dec 18 14:46:23 2017	(r456635)
+++ head/lang/ocaml/files/patch-configure	Mon Dec 18 14:48:49 2017	(r456636)
@@ -146,7 +146,19 @@
  # Final twiddling of compiler options to work around known bugs
  
  nativeccprofopts="$nativecccompopts"
-@@ -1723,7 +1730,7 @@ SYSLIB=-l\$(1)
+@@ -1701,6 +1708,11 @@ case "$buggycc" in
+     nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
+ esac
+ 
++# Allow user-defined C compiler flags
++
++bytecccompopts="$bytecccompopts $CFLAGS"
++nativecccompopts="$nativecccompopts $CFLAGS"
++
+ # Finish generated files
+ 
+ cclibs="$cclibs $mathlib"
+@@ -1723,7 +1735,7 @@ SYSLIB=-l\$(1)
  MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib \$(1)
  #ml let mklib out files opts = Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s" out opts files out;;
  EOF