X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=e0e6201fcb5d02b2a17d1c59fb7c5fc7a97ec2fa;hb=50d1db4f9e9c59e5dd04a4a58aca83fb8c6d6cb9;hp=a6a77b8294882aa0ecb21257ae123456914d7bba;hpb=ea579d5f0ee083910927b01c244780225fbba29f;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index a6a77b8..e0e6201 100644
--- a/Makefile
+++ b/Makefile
@@ -10,25 +10,34 @@ COMMENT=		Compiler for the functional language Haskell
 LICENSE=		modified-bsd
 
 DISTFILES=		${DISTNAME}-src.tar.bz2 \
-				${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2 \
-				${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
+				${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2 \
+				${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
 
 SITES.${DISTNAME}-src.tar.bz2						= http://www.haskell.org/ghc/dist/${VERSION}/
-SITES.${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2	= http://static.cielonegro.org/archive/
 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/
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# PLIST cannot be generated statically because of hashed package
-# config files. This requires USE_DESTDIR=yes.
-PLIST_TYPE = dynamic
-
 .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= *-*-i386 *-*-powerpc
-ONLY_FOR_PLATFORM= *-*-i386
+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.
+
+# 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+= "Using hard-coded /usr/bin/gcc as the C compiler..."
+CONFIGURE_ARGS+= --with-gcc=/usr/bin/gcc
+.else
+CONFIGURE_ARGS+= --with-gcc=${CCPATH}
+.endif
 
 USE_TOOLS+=	gmake bsdtar perl:run
 CONFIGURE_ENV+=		PerlCmd=${PERL5:Q}
@@ -36,6 +45,19 @@ 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}
+CONFIGURE_ARGS += \
+	--build=${PLATFORM} \
+	--host=${PLATFORM} \
+	--target=${PLATFORM} \
+	--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
+=======
 CONFIGURE_ARGS += \
 	--prefix=${PREFIX} \
 	--mandir=${PREFIX}/${PKGMANDIR} \
@@ -43,6 +65,7 @@ CONFIGURE_ARGS += \
 	--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"
@@ -53,20 +76,20 @@ CONFIGURE_ARGS += \
 # "${BUILDLINK_DIR}/bin". Note that in-place ghc isn't usable before
 # running "ghc-pkg recache".
 
-.if ${MACHINE_ARCH} == "i386"
-.  if ${OPSYS} == "FreeBSD"
+.if ${MACHINE_ARCH} == "i386" && ${OPSYS} == "NetBSD"
+BOOTSTRAP_TARBALL  = ${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
+BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
+
+.elif ${MACHINE_ARCH} == "i386" && ${OPSYS} == "FreeBSD"
 BOOTSTRAP_TARBALL = ${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
-.  else
-BOOTSTRAP_TARBALL = ${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
-.  endif
-#.elif ${MACHINE_ARCH} == "powerpc"
+BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
+
+#.elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
 #BOOTSTRAP_TARBALL = ${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
-.endif
+#BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
-BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap-bsd.mk
 .else
-BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
+PKG_FAIL_REASON+=	"internal error: unsupported platform"
 .endif
 
 pre-configure: