X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=399d09d818d8316ef60c0b5f16dcd655571ebc4f;hb=dfc823b34b5e59c29c9bd5777c21a80b976d386d;hp=e0e6201fcb5d02b2a17d1c59fb7c5fc7a97ec2fa;hpb=50d1db4f9e9c59e5dd04a4a58aca83fb8c6d6cb9;p=pkgsrc-ghc.git diff --git a/Makefile b/Makefile index e0e6201..399d09d 100644 --- a/Makefile +++ b/Makefile @@ -11,28 +11,32 @@ LICENSE= modified-bsd DISTFILES= ${DISTNAME}-src.tar.bz2 \ ${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 \ - ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 + ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 \ + ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2 SITES.${DISTNAME}-src.tar.bz2 = http://www.haskell.org/ghc/dist/${VERSION}/ SITES.${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 = http://static.cielonegro.org/archive/ SITES.${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 = http://static.cielonegro.org/archive/ +SITES.${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2 = http://static.cielonegro.org/archive/ PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" # Unregisterised HC packages are architecture dependent. We have to -# create more HC packages to support more architectures. -ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 -# Note: Darwin-*-powerpc is temporarily disabled for now. It shall -# come back in the near future. Thanks for your patience. +# create more HC packages to support more architectures. Note that +# these packages are built with integer-simple, not integer-gmp, to +# reduce some complexity by not depending on the GMP. The resulting +# registerised GHC uses integer-gmp so this won't be a problem. +ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 Darwin-*-powerpc # We must provide the real pass to gcc to the ./configure script, # because GHC has a runtime dependency on it. Aren't there any better # way than this? .include "../../mk/compiler.mk" .if empty(CCPATH) -WARNINGS+= "This package depends on pkgsrc's undocumented variable CCPATH but it disappeared somehow." +WARNINGS+= "This package depends on pkgsrc's undocumented variable\ +CCPATH but it disappeared somehow." WARNINGS+= "Using hard-coded /usr/bin/gcc as the C compiler..." CONFIGURE_ARGS+= --with-gcc=/usr/bin/gcc .else @@ -45,8 +49,7 @@ CONFIGURE_ENV+= PerlCmd=${PERL5:Q} # We don't want to extract all of the DISTFILEs. EXTRACT_ONLY= ${DISTNAME}-src.tar.bz2 -<<<<<<< Makefile -PLATFORM= ${LOWER_ARCH}-unknown-${LOWER_OPSYS} +PLATFORM= ${MACHINE_ARCH}-unknown-${LOWER_OPSYS} CONFIGURE_ARGS += \ --build=${PLATFORM} \ --host=${PLATFORM} \ @@ -57,15 +60,6 @@ CONFIGURE_ARGS += \ --with-gmp-libraries=${PREFIX}/lib \ --with-iconv-includes=${PREFIX}/include \ --with-iconv-libraries=${PREFIX}/lib -======= -CONFIGURE_ARGS += \ - --prefix=${PREFIX} \ - --mandir=${PREFIX}/${PKGMANDIR} \ - --with-gmp-includes=${PREFIX}/include \ - --with-gmp-libraries=${PREFIX}/lib \ - --with-iconv-includes=${PREFIX}/include \ - --with-iconv-libraries=${PREFIX}/lib ->>>>>>> 1.14 # Build an unregisterised bootstrap compiler and install it directly # into the .buildlink directory. But we can't use "make install" @@ -84,9 +78,12 @@ BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk BOOTSTRAP_TARBALL = ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk -#.elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin" -#BOOTSTRAP_TARBALL = ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2 -#BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk +.elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin" +BOOTSTRAP_TARBALL = ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2 +BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk +# Existence of libelf makes LeadingUnderscore being "NO", which is +# incorrect. See ghc-6.12.1/aclocal.m4 (FP_LEADING_UNDERSCORE) +CONFLICTS= libelf-[0-9]* .else PKG_FAIL_REASON+= "internal error: unsupported platform" @@ -100,14 +97,14 @@ pre-configure: cd bootstrap/${DISTNAME} && \ ${LN} -sf ${PWD_CMD} utils/ghc-pwd/ghc-pwd && \ ${ECHO} "====> Configuring for bootstrap compiler" && \ - ${ENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot ${CONFIGURE_ARGS} && \ + ${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot ${CONFIGURE_ARGS} && \ ${ECHO} "====> Extracting bootstrap HC archive" && \ (cd .. && bsdtar jxfm ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \ ${SH} mkfiles && \ ${ECHO} "====> Building bootstrap compiler" && \ ${SED} -e "s#\\[\\[PREFIX\\]\\]#${PREFIX}#g" ${BOOTSTRAP_BUILD_MK} > mk/build.mk && \ for c in libraries/*/configure; do \ - (cd `${DIRNAME} $$c` && ${ENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \ + (cd `${DIRNAME} $$c` && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \ done && \ for i in inplace/lib/package.conf.d/*.conf */*/package-data.mk */*/*/package-data.mk; do \ ${SED} -e "s#\\[\\[GHC_SOURCE_PATH\\]\\]#`${PWD_CMD}`#g" $$i > $$i.tmp; \ @@ -127,7 +124,7 @@ pre-configure: # link programs by executing ld(1) without passing it -L${PREFIX}/lib. do-configure: ${RUN} cd ${WRKSRC} && \ - ${ENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} + ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} ${RUN} ${ECHO} "libraries/integer-gmp_CONFIGURE_OPTS += \ --configure-option=--with-gmp-includes=${PREFIX}/include \ --configure-option=--with-gmp-libraries=${PREFIX}/lib" > ${WRKSRC}/mk/build.mk @@ -145,6 +142,20 @@ do-configure: # Disable file splitting until pkgsrc gets improved. pre-build: ${RUN} ${ECHO} "SplitObjs = NO" >> ${WRKSRC}/mk/build.mk +# We have to sacrifice the GHCi library for GHC itself to work around +# for powerpc ld bug. See +# http://hackage.haskell.org/trac/ghc/ticket/3260 +.if ${MACHINE_ARCH} == "powerpc" + ${RUN} ${MKDIR} ${WRKSRC}/compiler/stage1/build + ${RUN} ${TOUCH} ${WRKSRC}/compiler/stage1/build/HS${DISTNAME}.o + ${RUN} ${MKDIR} ${WRKSRC}/compiler/stage2/build + ${RUN} ${TOUCH} ${WRKSRC}/compiler/stage2/build/HS${DISTNAME}.o +.endif + +.if ${MACHINE_ARCH} == "powerpc" +WARNINGS+= "You won't be able to use GHCi library for GHC itself\ +because of powerpc ld bug." +.endif # Some unused scripts don't pass the portability test. CHECK_PORTABILITY_SKIP+= distrib/prep-bin-dist-mingw