Page MenuHomeFreeBSD
Files F175475908

D17636.diff
No OneTemporary
Actions

D17636.diff
View Options

Index: head/lang/ghc/Makefile
===================================================================
--- head/lang/ghc/Makefile
+++ head/lang/ghc/Makefile
@@ -42,8 +42,6 @@
# 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 @@
# 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"
Index: head/lang/ghc/files/build.boot.mk.in
===================================================================
--- head/lang/ghc/files/build.boot.mk.in
+++ head/lang/ghc/files/build.boot.mk.in
@@ -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
Index: head/lang/ghc/files/build.mk.in
===================================================================
--- head/lang/ghc/files/build.mk.in
+++ head/lang/ghc/files/build.mk.in
@@ -2,12 +2,12 @@
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%%

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 12, 3:33 AM (7 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40645514
Default Alt Text
D17636.diff (2 KB)

Event Timeline