stage0.mk -> bootstrap.mk

diff --git a/Makefile b/Makefile
index 8ad240a370b1e78ff6b3a54fa5ea9ae749ea6416..4ea112401217991eb154921ae5d233d64353bfe8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ CONFIGURE_ARGS += \
        --with-iconv-libraries=${PREFIX}/lib
 
 # Define ${PLATFORM} and the target "pre-configure".
-.include "../../wip/ghc/stage0.mk"
+.include "../../wip/ghc/bootstrap.mk"
 
 do-configure:
        ${RUN} cd ${WRKSRC} && \

diff --git a/stage0.mk b/bootstrap.mk
similarity index 59%
rename from stage0.mk
rename to bootstrap.mk
index 103ad3046e1715d084bd743a959b6348b7a75d46..2047238cfcbf9c06a89c394bb3366486f3b95242 100644 (file)
--- a/stage0.mk
+++ b/bootstrap.mk
@@ -12,32 +12,28 @@ USE_TOOLS+= autoconf date gtar perl
 # run "ghc-pkg recache".
 
 .if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "NetBSD"
-BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
-BOOTSTRAP_CAPI_C   = ${PKGDIR}/files/capi-wrappers-netbsd-i386.c
-BOOTSTRAP_TARBALL  = ${DISTNAME}-boot-i386-unknown-netbsdelf6.99.1.tar.bz2
-PLATFORM           = i386-unknown-netbsd
+BOOTSTRAP_CAPI_C=      ${PKGDIR}/files/capi-wrappers-netbsd-i386.c
+BOOTSTRAP_TARBALL=     ${DISTNAME}-boot-i386-unknown-netbsdelf6.99.1.tar.bz2
+PLATFORM               = i386-unknown-netbsd
 
 .elif ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD"
-BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
-BOOTSTRAP_CAPI_C   = ${PKGDIR}/files/capi-wrappers-freebsd-i386.c
-BOOTSTRAP_TARBALL  = ${DISTNAME}-boot-i386-unknown-freebsd8.0.tar.bz2
-PLATFORM           = i386-unknown-freebsd
+BOOTSTRAP_CAPI_C=      ${PKGDIR}/files/capi-wrappers-freebsd-i386.c
+BOOTSTRAP_TARBALL=     ${DISTNAME}-boot-i386-unknown-freebsd8.0.tar.bz2
+PLATFORM=              i386-unknown-freebsd
 
 .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
-BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
-BOOTSTRAP_CAPI_C   = ${PKGDIR}/files/capi-wrappers-darwin-powerpc.c
-BOOTSTRAP_TARBALL  = ${DISTNAME}-boot-i386-unknown-darwin9.8.0.tar.bz2
-PLATFORM           = powerpc-apple-darwin
+BOOTSTRAP_CAPI_C=      ${PKGDIR}/files/capi-wrappers-darwin-powerpc.c
+BOOTSTRAP_TARBALL=     ${DISTNAME}-boot-powerpc-apple-darwin9.8.0.tar.bz2
+PLATFORM=              powerpc-apple-darwin
 # Existence of libelf makes LeadingUnderscore being "NO", which is
 # incorrect for this platform. See ghc-6.12.1/aclocal.m4
 # (FP_LEADING_UNDERSCORE)
-CONFLICTS=     libelf-[0-9]*
+CONFLICTS=             libelf-[0-9]*
 
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "Linux"
-BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-linux.mk
-BOOTSTRAP_CAPI_C   = ${PKGDIR}/files/capi-wrappers-linux-x86_64.c
-BOOTSTRAP_TARBALL  = ${DISTNAME}-boot-x86_64-unknown-linux-gnu.tar.bz2
-PLATFORM           = x86_64-unknown-linux
+BOOTSTRAP_CAPI_C=      ${PKGDIR}/files/capi-wrappers-linux-x86_64.c
+BOOTSTRAP_TARBALL=     ${DISTNAME}-boot-x86_64-unknown-linux-gnu.tar.bz2
+PLATFORM=              x86_64-unknown-linux
 
 .else
 PKG_FAIL_REASON+=      "internal error: unsupported platform"
@@ -59,8 +55,8 @@ ${WRKDIR}/stamp-prepare-bootstrap: ${WRKDIR}/stamp-autoreconf
                ${RM} -rf bootstrap && \
                ${MKDIR} bootstrap && \
                ${GTAR} -cf - ${DISTNAME} | ${GTAR} -C bootstrap -xf - && \
-               ${CP} ${BOOTSTRAP_MAIN_C} bootstrap/${DISTNAME}/rts/bootstrap-main.c && \
-               ${CP} ${BOOTSTRAP_CAPI_C} bootstrap/${DISTNAME}/rts/capi-wrappers.c  && \
+               ${CP} -f ${BOOTSTRAP_MAIN_C} bootstrap/${DISTNAME}/rts/bootstrap-main.c && \
+               ${CP} -f ${BOOTSTRAP_CAPI_C} bootstrap/${DISTNAME}/rts/capi-wrappers.c  && \
                ${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
@@ -80,10 +76,35 @@ ${WRKDIR}/stamp-extract-hc: ${WRKDIR}/stamp-configure-hc-boot
                (cd ${DISTNAME} && ${SH} mkfiles) && \
                ${TOUCH} ${.TARGET}
 
-${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc
+${WRKDIR}/bootstrap/${DISTNAME}/mk/build.mk: ${WRKDIR}/stamp-extract-hc
+       ${RUN} ${PHASE_MSG} "Creating bootstrapping configuration file for ${PKGNAME}"
+       ${RUN} ${CP} -f ${PKGDIR}/files/build.bootstrap.common.mk ${.TARGET}
+       ${RUN} ${ECHO} "SRC_CC_OPTS += -I${PREFIX}/include" >> ${.TARGET}
+.if ${OPSYS} == "Darwin"
+       ${RUN} ${ECHO} "ghc_stage2_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv" >> ${.TARGET}
+       ${RUN} ${ECHO} "utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lncurses" >> ${.TARGET}
+       ${RUN} ${ECHO} "EXTRA_CC_OPTS += -O2" >> ${.TARGET}
+.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD"
+       ${RUN} ${ECHO} "ghc_stage2_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lutil -lrt" >> ${.TARGET}
+       ${RUN} ${ECHO} "utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lutil -lrt -lncurses" >> ${.TARGET}
+#   Unregisterised stage0 compiler gets too large (.text section being
+# over 64 MiB) without -Os, exceeding NetBSD/i386's kernel default
+# limitation.
+#   Note that stage1 currently doesn't bloat that much (about 42.6
+# MiB), but when it does we have to append CONF_CC_OPTS_STAGE0="-Os"
+# to CONFIGURE_ARGS as well. I guess that's a matter of time :(
+       ${RUN} ${ECHO} "EXTRA_CC_OPTS += -Os" >> ${.TARGET}
+.elif ${OPSYS} == "Linux"
+       ${RUN} ${ECHO} "ghc_stage2_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lrt -ldl" >> ${.TARGET}
+       ${RUN} ${ECHO} "utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L${PREFIX}/lib -lm -liconv -lrt -ldl -lncurses" >> ${.TARGET}
+       ${RUN} ${ECHO} "EXTRA_CC_OPTS += -O2" >> ${.TARGET}
+.else
+PKG_FAIL_REASON+=      "internal error: unsupported platform"
+.endif
+
+${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc ${WRKDIR}/bootstrap/${DISTNAME}/mk/build.mk
        ${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
                ${PHASE_MSG} "Rewriting source paths in bootstrapping compiler for ${PKGNAME}" && \
-               ${SED} -e "s#\\[\\[PREFIX\\]\\]#${PREFIX}#g" ${BOOTSTRAP_BUILD_MK} > mk/build.mk && \
                for c in libraries/*/configure; do \
                        (cd `${DIRNAME} $$c` && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \
                done && \

diff --git a/files/bootstrap-bsd.mk b/files/bootstrap-bsd.mk
deleted file mode 100644 (file)
index f67e5b9..0000000
--- a/files/bootstrap-bsd.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-OMIT_PHASE_0 = YES
-OMIT_PHASE_1 = YES
-GHC = false
-GHC_STAGE1 =
-GHC_PKG_INPLACE =
-GHC_CABAL_INPLACE =
-DUMMY_GHC_INPLACE =
-UNLIT =
-NO_INCLUDE_DEPS = YES
-GhcUnregisterised = YES
-GhcLibWays = v
-GhcRTSWays =
-SplitObjs = NO
-GhcWithNativeCodeGen = NO
-GhcWithInterpreter = NO
-GhcWithSMP = NO
-ghc_stage2_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lutil -lrt
-utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lutil -lrt -lncurses
-
-SRC_CC_OPTS += -I[[PREFIX]]/include
-INTEGER_LIBRARY = integer-simple
-
-#   Unregisterised stage0 compiler gets too large (.text section being
-# over 64 MiB) without -Os, exceeding NetBSD/i386's kernel default
-# limitation.
-#   Note that stage1 currently doesn't bloat that much (about 42.6
-# MiB), but when it does we have to append CONF_CC_OPTS_STAGE0="-Os"
-# to CONFIGURE_ARGS as well. I guess that's a matter of time :(
-EXTRA_CC_OPTS += -Os

diff --git a/files/bootstrap-linux.mk b/files/bootstrap-linux.mk
deleted file mode 100644 (file)
index ac8ca7d..0000000
--- a/files/bootstrap-linux.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-OMIT_PHASE_0 = YES
-OMIT_PHASE_1 = YES
-GHC = false
-GHC_STAGE1 =
-GHC_PKG_INPLACE =
-GHC_CABAL_INPLACE =
-DUMMY_GHC_INPLACE =
-UNLIT =
-NO_INCLUDE_DEPS = YES
-GhcUnregisterised = YES
-GhcLibWays = v
-GhcRTSWays =
-SplitObjs = NO
-GhcWithNativeCodeGen = NO
-GhcWithInterpreter = NO
-GhcWithSMP = NO
-ghc_stage2_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lrt -ldl
-utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lrt -ldl -lncurses
-
-SRC_CC_OPTS += -I[[PREFIX]]/include
-INTEGER_LIBRARY = integer-simple
-
-# Unregisterised stage0 compiler runs way too slow without GCC's
-# optimisation. The stage1 (which is also unregisterised) is still
-# slow, but then we have to append CONF_CC_OPTS_STAGE0="-O2" to
-# CONFIGURE_ARGS as well.
-EXTRA_CC_OPTS += -O2

diff --git a/files/bootstrap.mk b/files/bootstrap.mk
deleted file mode 100644 (file)
index 80e9cca..0000000
--- a/files/bootstrap.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-OMIT_PHASE_0 = YES
-OMIT_PHASE_1 = YES
-GHC = false
-GHC_STAGE1 =
-GHC_PKG_INPLACE =
-GHC_CABAL_INPLACE =
-DUMMY_GHC_INPLACE =
-UNLIT =
-NO_INCLUDE_DEPS = YES
-GhcUnregisterised = YES
-GhcLibWays = v
-GhcRTSWays =
-SplitObjs = NO
-GhcWithNativeCodeGen = NO
-GhcWithInterpreter = NO
-GhcWithSMP = NO
-ghc_stage2_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv
-utils/ghc-pkg_dist-install_v_EXTRA_CC_OPTS += -L[[PREFIX]]/lib -lm -liconv -lncurses
-
-SRC_CC_OPTS += -I[[PREFIX]]/include
-INTEGER_LIBRARY = integer-simple
-
-# Unregisterised stage0 compiler runs way too slow without GCC's
-# optimisation. The stage1 (which is also unregisterised) is still
-# slow, but then we have to append CONF_CC_OPTS_STAGE0="-O2" to
-# CONFIGURE_ARGS as well.
-EXTRA_CC_OPTS += -O2

diff --git a/files/build.bootstrap.common.mk b/files/build.bootstrap.common.mk
new file mode 100644 (file)
index 0000000..80cae7b
--- /dev/null
+++ b/files/build.bootstrap.common.mk
@@ -0,0 +1,18 @@
+OMIT_PHASE_0 = YES
+OMIT_PHASE_1 = YES
+GHC = false
+GHC_STAGE1 =
+GHC_PKG_INPLACE =
+GHC_CABAL_INPLACE =
+DUMMY_GHC_INPLACE =
+UNLIT =
+NO_INCLUDE_DEPS = YES
+GhcUnregisterised = YES
+GhcLibWays = v
+GhcRTSWays =
+SplitObjs = NO
+GhcWithNativeCodeGen = NO
+GhcWithInterpreter = NO
+GhcWithSMP = NO
+
+INTEGER_LIBRARY = integer-simple