Date: Sun, 21 Oct 2018 18:17:04 +0000 (UTC) From: Gleb Popov <arrowd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482720 - in head/lang/ghc: . files Message-ID: <201810211817.w9LIH4Ke089106@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: arrowd Date: Sun Oct 21 18:17:03 2018 New Revision: 482720 URL: https://svnweb.freebsd.org/changeset/ports/482720 Log: lang/ghc: Cosmetic changes to Makefile and build.mk files. Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D17636 Modified: head/lang/ghc/Makefile head/lang/ghc/files/build.boot.mk.in head/lang/ghc/files/build.mk.in Modified: head/lang/ghc/Makefile ============================================================================== --- head/lang/ghc/Makefile Sun Oct 21 18:10:27 2018 (r482719) +++ head/lang/ghc/Makefile Sun Oct 21 18:17:03 2018 (r482720) @@ -42,8 +42,6 @@ NO_CCACHE= ccache: error: Failed to create directory / # This is better fixed in files/build.mk.in GNU_CONFIGURE= yes -# disable xelatex: PR 231438 -CONFIGURE_ENV+= ac_cv_path_XELATEX= CONFIGURE_ARGS= --with-gmp-includes=${LOCALBASE}/include \ --with-gmp-libraries=${LOCALBASE}/lib \ --with-iconv-includes=${LOCALBASE}/include \ @@ -78,17 +76,17 @@ DYNAMIC_CONFIGURE_ARGS= --with-system-libffi \ # The version number is needed as lang/gcc installs a different version DYNAMIC_LIB_DEPENDS= libffi.so.6:devel/libffi -# Append substitutions for build.mk -- the files uses '#' as comments +# Append substitutions for build.mk BOOT_SUB_LIST= HSC2HS=${LOCALBASE}/bin/hsc2hs BOOT_SUB_LIST_OFF= HSC2HS=${BOOT_HSC2HS} DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx -DYNAMIC_SUB_LIST= WITH_DYNAMIC="" -DYNAMIC_SUB_LIST_OFF= WITH_DYNAMIC="\#" +DYNAMIC_SUB_LIST= WITH_DYNAMIC="YES" +DYNAMIC_SUB_LIST_OFF= WITH_DYNAMIC="NO" -PROFILE_SUB_LIST= WITH_PROFILE="" -PROFILE_SUB_LIST_OFF= WITH_PROFILE="\#" +PROFILE_SUB_LIST= WITH_PROFILE="YES" +PROFILE_SUB_LIST_OFF= WITH_PROFILE="NO" DOCS_SUB_LIST= WITH_DOCS="YES" DOCS_SUB_LIST_OFF= WITH_DOCS="NO" Modified: head/lang/ghc/files/build.boot.mk.in ============================================================================== --- head/lang/ghc/files/build.boot.mk.in Sun Oct 21 18:10:27 2018 (r482719) +++ head/lang/ghc/files/build.boot.mk.in Sun Oct 21 18:17:03 2018 (r482720) @@ -1,8 +1,9 @@ GhcLibWays = v XMLDocWays = -HADDOCK_DOCS = -HSCOLOUR_SRCS = +HADDOCK_DOCS = NO +HSCOLOUR_SRCS = NO INTEGER_LIBRARY = integer-simple -DYNAMIC_GHC_PROGRAMS = +DYNAMIC_GHC_PROGRAMS = NO +BUILD_PROF_LIBS = NO BIN_DIST_NAME = ghc-%%GHC_VERSION%%-boot BIN_DIST_TAR = ghc-%%GHC_VERSION%%-boot.tar Modified: head/lang/ghc/files/build.mk.in ============================================================================== --- head/lang/ghc/files/build.mk.in Sun Oct 21 18:10:27 2018 (r482719) +++ head/lang/ghc/files/build.mk.in Sun Oct 21 18:17:03 2018 (r482720) @@ -2,12 +2,12 @@ docdir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%% htmldir = %%PREFIX%%/share/doc/ghc-%%GHC_VERSION%% mandir = %%PREFIX%%/man infodir = %%PREFIX%%/info -GhcLibWays = v -%%WITH_PROFILE%%GhcLibWays += p -%%WITH_DYNAMIC%%GhcLibWays += dyn -DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%%YES +DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%% +BUILD_PROF_LIBS = %%WITH_PROFILE%% HADDOCK_DOCS = %%WITH_DOCS%% HSCOLOUR_SRCS = %%WITH_DOCS%% +# disable xelatex: PR 231438 +BUILD_SPHINX_PDF = NO BSD_PATH_TO_HSC2HS = %%HSC2HS%% SRC_HC_OPTS += -I%%NCURSESINC%% -L%%NCURSESLIB%% -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib SRC_CC_OPTS += %%CFLAGS%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810211817.w9LIH4Ke089106>