From owner-svn-ports-all@freebsd.org Mon Dec 18 14:48:51 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1848DE908D1; Mon, 18 Dec 2017 14:48:51 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E3B107DDFB; Mon, 18 Dec 2017 14:48:50 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBIEmoLg044077; Mon, 18 Dec 2017 14:48:50 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBIEmnZQ044075; Mon, 18 Dec 2017 14:48:49 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201712181448.vBIEmnZQ044075@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Mon, 18 Dec 2017 14:48:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456636 - in head/lang/ocaml: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/lang/ocaml: . files X-SVN-Commit-Revision: 456636 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Dec 2017 14:48:51 -0000 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 -.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