nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1647880 - Upgrade cmake to 3.16.3 for toolchain builds. r=firefox-build-system-reviewers,rstewart

Browse source 
This gets us to the same version as the one used on the Debian 10
toolchain docker image.

Differential Revision: https://phabricator.services.mozilla.com/D80818
This commit is contained in:
Mike Hommey 2020-06-24 15:17:03 +00:00
parent 0c490d558c
commit 3437f37ac4
2 changed files with 34 additions and 26 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

56
build/debian-packages/cmake-jessie.diff
View file

@ -1,56 +1,64 @@
diff -Nru cmake-3.7.1/debian/changelog cmake-3.7.1/debian/changelog
--- cmake-3.7.1/debian/changelog 2016-12-04 09:01:26.000000000 +0900
+++ cmake-3.7.1/debian/changelog 2019-07-16 18:17:07.000000000 +0900
@@ -1,3 +1,15 @@
+cmake (3.7.1-1.deb8moz1) jessie; urgency=medium
diff -Nru cmake-3.16.3/debian/changelog cmake-3.16.3/debian/changelog
--- cmake-3.16.3/debian/changelog 2020-03-16 19:09:14.000000000 +0900
+++ cmake-3.16.3/debian/changelog 2020-06-24 14:59:20.000000000 +0900
@@ -1,3 +1,17 @@
+cmake (3.16.3-1.deb9moz1) jessie-backports; urgency=medium
+
+ * Mozilla backport for jessie.
+ * debian/rules, debian/control:
+ - Don't build against system libraries. libuv is missing on jessie, and
+ it's just simpler to disable the use of system libraries altogether.
+ - But still use system curl.
+ - Don't build a dbgsym package through dh_strip, that's not supported on
+ jessie.
+ * debian/compat: Restore a compat level of 10.
+ * debian/control: Remove versioned dependency on debhelper.
+
+ -- Mike Hommey <glandium@mozilla.com> Tue, 16 Jul 2019 18:17:07 +0900
+ -- Mike Hommey <glandium@goemon> Wed, 24 Jun 2020 14:59:20 +0900
+
cmake (3.7.1-1) unstable; urgency=medium
cmake (3.16.3-1~bpo9+1) stretch-backports; urgency=medium
* New upstream release.
diff -Nru cmake-3.7.1/debian/control cmake-3.7.1/debian/control
--- cmake-3.7.1/debian/control 2016-11-12 19:55:11.000000000 +0900
+++ cmake-3.7.1/debian/control 2019-07-16 18:17:07.000000000 +0900
@@ -4,16 +4,10 @@
* Rebuild for stretch-backports.
diff -Nru cmake-3.16.3/debian/compat cmake-3.16.3/debian/compat
--- cmake-3.16.3/debian/compat 1970-01-01 09:00:00.000000000 +0900
+++ cmake-3.16.3/debian/compat 2020-06-24 14:57:28.000000000 +0900
@@ -0,0 +1 @@
+10
diff -Nru cmake-3.16.3/debian/control cmake-3.16.3/debian/control
--- cmake-3.16.3/debian/control 2020-03-16 19:09:14.000000000 +0900
+++ cmake-3.16.3/debian/control 2020-06-24 14:59:20.000000000 +0900
@@ -4,17 +4,10 @@
Maintainer: Debian CMake Team <pkg-cmake-team@lists.alioth.debian.org>
Uploaders: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
Felix Geyer <fgeyer@debian.org>
-Build-Depends: debhelper (>= 9.20160114~),
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper,
dpkg-dev (>= 1.17.14~),
- libarchive-dev (>= 2.8.0),
freebsd-glue [kfreebsd-any],
- libarchive-dev (>= 3.3.3),
- libbz2-dev,
libcurl4-openssl-dev | libcurl-ssl-dev,
- libexpat1-dev,
- libjsoncpp-dev,
- liblzma-dev,
libncurses5-dev,
- libuv1-dev,
- librhash-dev,
- libuv1-dev (>= 1.10),
procps [!hurd-any],
python-sphinx,
python3-sphinx,
qtbase5-dev <!stage1>,
diff -Nru cmake-3.7.1/debian/rules cmake-3.7.1/debian/rules
--- cmake-3.7.1/debian/rules 2016-12-04 07:30:25.000000000 +0900
+++ cmake-3.7.1/debian/rules 2019-07-16 18:17:07.000000000 +0900
@@ -44,7 +44,7 @@
diff -Nru cmake-3.16.3/debian/rules cmake-3.16.3/debian/rules
--- cmake-3.16.3/debian/rules 2020-03-16 19:09:14.000000000 +0900
+++ cmake-3.16.3/debian/rules 2020-06-24 14:59:20.000000000 +0900
@@ -45,7 +45,7 @@
override_dh_auto_configure: $(BUILD_FLAGS_FILE)
rm -rf Build && mkdir -p Build
cd Build && ../bootstrap --prefix=/usr --docdir=/share/doc/cmake --mandir=/share/man \
- --init=../$(BUILD_FLAGS_FILE) --system-libs \
+ --init=../$(BUILD_FLAGS_FILE) \
+ --init=../$(BUILD_FLAGS_FILE) --system-curl \
--sphinx-man --sphinx-html --sphinx-flags="-D today=\"$(BUILD_DATE)\"" \
$(BOOTSTRAP_PARALLEL) --verbose
@@ -68,9 +68,6 @@
@@ -71,9 +71,6 @@
override_dh_sphinxdoc:
dh_sphinxdoc -pcmake-doc
@ -58,5 +66,5 @@ diff -Nru cmake-3.7.1/debian/rules cmake-3.7.1/debian/rules
- dh_strip --dbgsym-migration='cmake-dbg (<< 3.5.0-1~)'
-
%:
dh $@ --with=sphinxdoc --parallel --builddirectory=Build
dh $@ --with=sphinxdoc --builddirectory=Build

4
taskcluster/ci/packages/kind.yml
View file

@ -70,8 +70,8 @@ jobs:
run:
using: debian-package
dsc:
url: http://snapshot.debian.org/archive/debian/20161204T034107Z/pool/main/c/cmake/cmake_3.7.1-1.dsc
sha256: 406a12c0d0a2e92d44a8d444fd1b32bcc29a8810e9631427161a7cb411f60172
url: http://snapshot.debian.org/archive/debian/20200320T222820Z/pool/main/c/cmake/cmake_3.16.3-1%7Ebpo9%2B1.dsc
sha256: 714651ac6c974694eb3452f37a70624d3d786ac02fb8ea4eb8fddae44649105d
patch: cmake-jessie.diff
deb10-cmake: