[MLton-commit] r7493

Wesley Terpstra wesley at mlton.org
Wed Jun 16 08:17:04 PDT 2010


emdebian-tools was replaced by emdebian-crush
don't use apt-get source ... there may be no source URI
c compilers depend on libc-dev already 
  (and this way we don't need platform-specific libc dependencies)


----------------------------------------------------------------------

U   mlton/trunk/package/mlton-cross/Makefile
U   mlton/trunk/package/mlton-cross/README
U   mlton/trunk/package/mlton-cross/control.in
U   mlton/trunk/package/mlton-cross/debian/control

----------------------------------------------------------------------

Modified: mlton/trunk/package/mlton-cross/Makefile
===================================================================
--- mlton/trunk/package/mlton-cross/Makefile	2010-06-15 17:27:39 UTC (rev 7492)
+++ mlton/trunk/package/mlton-cross/Makefile	2010-06-16 15:17:03 UTC (rev 7493)
@@ -5,18 +5,20 @@
 VERSION      := $(shell echo "$(FULL_VERSION)" | cut -d- -f1)
 REVISION     := $(shell echo "$(FULL_VERSION)" | cut -d- -f2)
 
+GMP_VERSION := $(shell dpkg-query -s libgmp3-dev | grep ^Version | cut -d" " -f2 | cut -d: -f2 | cut -d- -f1)
+
 all:	debian/control $(patsubst %,cross-%,$(TARGETS)) mingw32 mingw64
 
 clean:
-	rm -rf gmp mlton mingw* cross-* constants.c
+	rm -rf gmp mlton mingw* cross-* constants.c *.tmp *~
 
 distclean:	clean
-	rm -rf gmp* *.deb mlton_*.orig.tar.gz *.tmp *~
+	rm -f *.deb *.gz
 
-release:	distclean
+release:	clean
 	tar cvzf ../mlton-cross_$(VERSION).orig.tar.gz \
-		--exclude .svn --exclude debian \
-		--transform "s@^@mlton-cross-$(VERSION)/@" \
+	  --exclude .svn --exclude debian --exclude \*.deb --exclude \*.gz \
+	  --transform "s@^@mlton-cross-$(VERSION)/@" \
                                       *
 
 install:
@@ -44,9 +46,14 @@
 	rm -rf $@.tmp
 	touch $@
 
-gmp:
-	apt-get source libgmp3-dev
-	mv gmp-* gmp
+.PRECIOUS: gmp_$(GMP_VERSION).orig.tar.gz
+gmp_$(GMP_VERSION).orig.tar.gz:
+	rm -f $@ $@.tmp
+	wget -O $@.tmp "$(MIRROR)/pool/main/g/gmp/$@"
+	mv $@.tmp $@
+
+gmp:	gmp_$(GMP_VERSION).orig.tar.gz
+	tar xvzf $< --transform "s@^gmp[^/]*@gmp@"
 	cd gmp; patch -p1 < ../fix-gmp-win64.patch
 	cd gmp; autoconf
 

Modified: mlton/trunk/package/mlton-cross/README
===================================================================
--- mlton/trunk/package/mlton-cross/README	2010-06-15 17:27:39 UTC (rev 7492)
+++ mlton/trunk/package/mlton-cross/README	2010-06-16 15:17:03 UTC (rev 7493)
@@ -6,12 +6,12 @@
 
 For example, to setup a debian armel target, run:
 	apt-get install mlton-target-arm-linux-gnueabi
-	apt-cross -a armel -i libc6-dev libgmp3-dev
 	apt-get install gcc-4.4-arm-linux-gnueabi
+	apt-cross -a armel -i libgmp3-dev
 For an ia64 target:
 	apt-get install mlton-target-ia64-linux-gnu
-	apt-cross -a ia64 -i libc6.1-dev libgmp3-dev
 	apt-get install gcc-4.4-ia64-linux-gnu
+	apt-cross -a ia64 -i libgmp3-dev
 
 To use MLton to compile SML for armel/ia64, run:
 	mlton -target arm-linux-gnueabi myproject.mlb

Modified: mlton/trunk/package/mlton-cross/control.in
===================================================================
--- mlton/trunk/package/mlton-cross/control.in	2010-06-15 17:27:39 UTC (rev 7492)
+++ mlton/trunk/package/mlton-cross/control.in	2010-06-16 15:17:03 UTC (rev 7493)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Wesley W. Terpstra (Debian) <terpstra at debian.org>
-Build-Depends: mlton (= VERSION), binfmt-support, wine-unstable, mingw-w64, gcc-mingw32, debhelper (>= 7.0.0), cdbs (>= 0.4.52), autoconf, wget
+Build-Depends: mlton (= VERSION), binfmt-support, wine-unstable, mingw-w64, gcc-mingw32, debhelper (>= 7.0.0), cdbs (>= 0.4.52), autoconf, wget, quilt
 Standards-Version: 3.8.4.0
 
 Package: mlton-target-i586-mingw32msvc
@@ -27,7 +27,7 @@
 
 Package: mlton-target-alpha-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
 Recommends: gcc-4.4-alpha-linux-gnu | c-compiler-alpha-linux-gnu, libc6.1-dev-alpha-cross, libgmp3-dev-alpha-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on alpha-linux-gnu
@@ -37,8 +37,8 @@
 
 Package: mlton-target-x86-64-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-x86-64-linux-gnu | c-compiler-x86-64-linux-gnu, libc6-dev-amd64-cross, libgmp3-dev-amd64-cross
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-x86-64-linux-gnu | c-compiler-x86-64-linux-gnu, libgmp3-dev-amd64-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on x86_64-linux-gnu
  This package adds support for -target x86_64-linux-gnu to MLton.
@@ -47,8 +47,8 @@
 
 Package: mlton-target-arm-linux-gnueabi
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-arm-linux-gnueabi | c-compiler-arm-linux-gnueabi, libc6-dev-armel-cross, libgmp3-dev-armel-cross
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-arm-linux-gnueabi | c-compiler-arm-linux-gnueabi, libgmp3-dev-armel-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on arm-linux-gnueabi
  This package adds support for -target arm-linux-gnueabi to MLton.
@@ -57,8 +57,8 @@
 
 Package: mlton-target-hppa-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-hppa-linux-gnu | c-compiler-hppa-linux-gnu, libc6-dev-hppa-cross, libgmp3-dev-hppa-cross
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-hppa-linux-gnu | c-compiler-hppa-linux-gnu, libgmp3-dev-hppa-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on hppa-linux-gnu
  This package adds support for -target hppa-linux-gnu to MLton.
@@ -67,8 +67,8 @@
 
 Package: mlton-target-i486-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-i486-linux-gnu | c-compiler-i486-linux-gnu, libc6-dev-i386-cross, libgmp3-dev-i386-cross
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-i486-linux-gnu | c-compiler-i486-linux-gnu, libgmp3-dev-i386-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on i486-linux-gnu
  This package adds support for -target i486-linux-gnu to MLton.
@@ -77,7 +77,7 @@
 
 Package: mlton-target-ia64-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
 Recommends: gcc-4.4-ia64-linux-gnu | c-compiler-ia64-linux-gnu, libc6.1-dev-ia64-cross, libgmp3-dev-ia64-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on ia64-linux-gnu
@@ -87,8 +87,8 @@
 
 Package: mlton-target-mips-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-mips-linux-gnu | c-compiler-mips-linux-gnu, libc6-dev-mips-cross, libgmp3-dev-mips-cross
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-mips-linux-gnu | c-compiler-mips-linux-gnu, libgmp3-dev-mips-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on mips-linux-gnu
  This package adds support for -target mips-linux-gnu to MLton.
@@ -97,8 +97,8 @@
 
 Package: mlton-target-mipsel-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-mipsel-linux-gnu | c-compiler-mipsel-linux-gnu, libc6-dev-mipsel-cross, libgmp3-dev-mipsel-cross
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-mipsel-linux-gnu | c-compiler-mipsel-linux-gnu, libgmp3-dev-mipsel-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on mipsel-linux-gnu
  This package adds support for -target mipsel-linux-gnu to MLton.
@@ -107,8 +107,8 @@
 
 Package: mlton-target-powerpc-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-powerpc-linux-gnu | c-compiler-powerpc-linux-gnu, libc6-dev-powerpc-cross, libgmp3-dev-powerpc-cross
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-powerpc-linux-gnu | c-compiler-powerpc-linux-gnu, libgmp3-dev-powerpc-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on powerpc-linux-gnu
  This package adds support for -target powerpc-linux-gnu to MLton.
@@ -117,8 +117,8 @@
 
 Package: mlton-target-s390-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-s390-linux-gnu | c-compiler-s390-linux-gnu, libc6-dev-s390-cross, libgmp3-dev-s390-cross
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-s390-linux-gnu | c-compiler-s390-linux-gnu, libgmp3-dev-s390-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on s390-linux-gnu
  This package adds support for -target s390-linux-gnu to MLton.
@@ -127,8 +127,8 @@
 
 Package: mlton-target-sparc-linux-gnu
 Architecture: all
-Depends: mlton (= VERSION), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-sparc-linux-gnu | c-compiler-sparc-linux-gnu, libc6-dev-sparc-cross, libgmp3-dev-sparc-cross
+Depends: mlton (= VERSION), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-sparc-linux-gnu | c-compiler-sparc-linux-gnu, libgmp3-dev-sparc-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on sparc-linux-gnu
  This package adds support for -target sparc-linux-gnu to MLton.

Modified: mlton/trunk/package/mlton-cross/debian/control
===================================================================
--- mlton/trunk/package/mlton-cross/debian/control	2010-06-15 17:27:39 UTC (rev 7492)
+++ mlton/trunk/package/mlton-cross/debian/control	2010-06-16 15:17:03 UTC (rev 7493)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Wesley W. Terpstra (Debian) <terpstra at debian.org>
-Build-Depends: mlton (= 20100608-2), binfmt-support, wine-unstable, mingw-w64, gcc-mingw32, debhelper (>= 7.0.0), cdbs (>= 0.4.52), autoconf, wget
+Build-Depends: mlton (= 20100608-2), binfmt-support, wine-unstable, mingw-w64, gcc-mingw32, debhelper (>= 7.0.0), cdbs (>= 0.4.52), autoconf, wget, quilt
 Standards-Version: 3.8.4.0
 
 Package: mlton-target-i586-mingw32msvc
@@ -27,7 +27,7 @@
 
 Package: mlton-target-alpha-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
 Recommends: gcc-4.4-alpha-linux-gnu | c-compiler-alpha-linux-gnu, libc6.1-dev-alpha-cross, libgmp3-dev-alpha-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on alpha-linux-gnu
@@ -37,8 +37,8 @@
 
 Package: mlton-target-x86-64-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-x86-64-linux-gnu | c-compiler-x86-64-linux-gnu, libc6-dev-amd64-cross, libgmp3-dev-amd64-cross
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-x86-64-linux-gnu | c-compiler-x86-64-linux-gnu, libgmp3-dev-amd64-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on x86_64-linux-gnu
  This package adds support for -target x86_64-linux-gnu to MLton.
@@ -47,8 +47,8 @@
 
 Package: mlton-target-arm-linux-gnueabi
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-arm-linux-gnueabi | c-compiler-arm-linux-gnueabi, libc6-dev-armel-cross, libgmp3-dev-armel-cross
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-arm-linux-gnueabi | c-compiler-arm-linux-gnueabi, libgmp3-dev-armel-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on arm-linux-gnueabi
  This package adds support for -target arm-linux-gnueabi to MLton.
@@ -57,8 +57,8 @@
 
 Package: mlton-target-hppa-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-hppa-linux-gnu | c-compiler-hppa-linux-gnu, libc6-dev-hppa-cross, libgmp3-dev-hppa-cross
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-hppa-linux-gnu | c-compiler-hppa-linux-gnu, libgmp3-dev-hppa-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on hppa-linux-gnu
  This package adds support for -target hppa-linux-gnu to MLton.
@@ -67,8 +67,8 @@
 
 Package: mlton-target-i486-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-i486-linux-gnu | c-compiler-i486-linux-gnu, libc6-dev-i386-cross, libgmp3-dev-i386-cross
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-i486-linux-gnu | c-compiler-i486-linux-gnu, libgmp3-dev-i386-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on i486-linux-gnu
  This package adds support for -target i486-linux-gnu to MLton.
@@ -77,7 +77,7 @@
 
 Package: mlton-target-ia64-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
 Recommends: gcc-4.4-ia64-linux-gnu | c-compiler-ia64-linux-gnu, libc6.1-dev-ia64-cross, libgmp3-dev-ia64-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on ia64-linux-gnu
@@ -87,8 +87,8 @@
 
 Package: mlton-target-mips-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-mips-linux-gnu | c-compiler-mips-linux-gnu, libc6-dev-mips-cross, libgmp3-dev-mips-cross
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-mips-linux-gnu | c-compiler-mips-linux-gnu, libgmp3-dev-mips-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on mips-linux-gnu
  This package adds support for -target mips-linux-gnu to MLton.
@@ -97,8 +97,8 @@
 
 Package: mlton-target-mipsel-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-mipsel-linux-gnu | c-compiler-mipsel-linux-gnu, libc6-dev-mipsel-cross, libgmp3-dev-mipsel-cross
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-mipsel-linux-gnu | c-compiler-mipsel-linux-gnu, libgmp3-dev-mipsel-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on mipsel-linux-gnu
  This package adds support for -target mipsel-linux-gnu to MLton.
@@ -107,8 +107,8 @@
 
 Package: mlton-target-powerpc-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-powerpc-linux-gnu | c-compiler-powerpc-linux-gnu, libc6-dev-powerpc-cross, libgmp3-dev-powerpc-cross
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-powerpc-linux-gnu | c-compiler-powerpc-linux-gnu, libgmp3-dev-powerpc-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on powerpc-linux-gnu
  This package adds support for -target powerpc-linux-gnu to MLton.
@@ -117,8 +117,8 @@
 
 Package: mlton-target-s390-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-s390-linux-gnu | c-compiler-s390-linux-gnu, libc6-dev-s390-cross, libgmp3-dev-s390-cross
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-s390-linux-gnu | c-compiler-s390-linux-gnu, libgmp3-dev-s390-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on s390-linux-gnu
  This package adds support for -target s390-linux-gnu to MLton.
@@ -127,8 +127,8 @@
 
 Package: mlton-target-sparc-linux-gnu
 Architecture: all
-Depends: mlton (= 20100608-2), emdebian-tools, ${misc:Depends}
-Recommends: gcc-4.4-sparc-linux-gnu | c-compiler-sparc-linux-gnu, libc6-dev-sparc-cross, libgmp3-dev-sparc-cross
+Depends: mlton (= 20100608-2), emdebian-crush, ${misc:Depends}
+Recommends: gcc-4.4-sparc-linux-gnu | c-compiler-sparc-linux-gnu, libgmp3-dev-sparc-cross
 Homepage: http://mlton.org/
 Description: Cross-compiler support files for MLton on sparc-linux-gnu
  This package adds support for -target sparc-linux-gnu to MLton.




More information about the MLton-commit mailing list