Bug 1520163 - Remove nasm debian package. r=glandium
authorThomas Daede <tdaede@mozilla.com>
Tue, 26 Mar 2019 00:05:00 +0000
changeset 466242 e06a25b5771c1024c6539d2d94fbc011a8cc6884
parent 466241 ae1ddf7ebb7b85071331283e67db6ff39ba9c1c0
child 466243 9efbede2c61c534714e2034477f2c055b33c8f54
push id35762
push usercsabou@mozilla.com
push dateWed, 27 Mar 2019 04:44:00 +0000
treeherdermozilla-central@bc572aee49b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1520163
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1520163 - Remove nasm debian package. r=glandium Differential Revision: https://phabricator.services.mozilla.com/D20041
build/debian-packages/nasm-wheezy.diff
taskcluster/docker/debian-build/Dockerfile
deleted file mode 100644
--- a/build/debian-packages/nasm-wheezy.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nru nasm-2.13.01/debian/changelog nasm-2.13.01/debian/changelog
---- nasm-2.13.01/debian/changelog	2017-05-08 16:33:23.000000000 +0000
-+++ nasm-2.13.01/debian/changelog	2018-11-30 09:54:37.000000000 +0000
-@@ -1,3 +1,12 @@
-+nasm (2.13.01-1.deb7moz1) wheezy; urgency=low
-+
-+  * Changes for compatibility with building on Debian Wheezy:
-+  * Remove fonts-liberation2 dep which is not present on Wheezy
-+  * Disable docs building and installation which is not possible
-+    without fonts-liberation2
-+
-+ -- Thomas Daede <tdaede@mozilla.com>  Fri, 30 Nov 2018 09:54:37 +0000
-+
- nasm (2.13.01-1) experimental; urgency=low
- 
-   * New upstream version 2.13.01
---- nasm-2.13.01/debian/control	2017-05-08 16:33:23.000000000 +0000
-+++ nasm-2.13.01/debian/control	2018-11-30 09:53:57.000000000 +0000
-@@ -8,7 +8,7 @@
- Build-Depends:
-  debhelper (>= 9),
-  dpkg-dev (>= 1.16.1~),
-- fonts-liberation2,
-+ fontconfig,
-  ghostscript,
-  libfont-ttf-perl,
-  libsort-versions-perl,
---- nasm-2.13.01/debian/rules	2017-05-08 16:33:23.000000000 +0000
-+++ nasm-2.13.01/debian/rules	2018-11-30 09:53:57.000000000 +0000
-@@ -28,7 +28,7 @@
- build-stamp:
- 	dh_testdir
- 	./configure --prefix=/usr --mandir=/usr/share/man
--	$(MAKE) all doc
-+	$(MAKE) all
- 	> $@
- 
- binary: binary-arch binary-indep
-@@ -38,8 +38,7 @@
- 	dh_testroot
- 	dh_clean
- 	dh_installdirs usr/bin usr/share/man/man1
--	$(MAKE) INSTALLROOT=$(CURDIR)/debian/nasm install install_rdf
--	dh_installdocs AUTHORS README TODO doc/html doc/nasmdoc.txt doc/nasmdoc.ps doc/nasmdoc.pdf
-+	$(MAKE) INSTALLROOT=$(CURDIR)/debian/nasm install
- 	dh_installexamples misc/nasm.sl test/*
- 	dh_installman debian/*.1
- 	dh_installchangelogs CHANGES
--- a/taskcluster/docker/debian-build/Dockerfile
+++ b/taskcluster/docker/debian-build/Dockerfile
@@ -38,17 +38,16 @@ RUN apt-get update && \
       autoconf2.13 \
       automake \
       bzip2 \
       curl \
       file \
       gawk \
       gcc-multilib \
       gnupg \
-      nasm \
       p7zip-full \
       procps \
       python-pip \
       python-setuptools \
       python-virtualenv \
       rsync \
       screen \
       tar \