[Glibc-bsd-commits] r6003 - trunk/kfreebsd-11/debian
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Sun Apr 10 23:38:50 UTC 2016
Author: stevenc-guest
Date: 2016-04-10 23:38:50 +0000 (Sun, 10 Apr 2016)
New Revision: 6003
Modified:
trunk/kfreebsd-11/debian/changelog
trunk/kfreebsd-11/debian/rules
Log:
Experimentally build all arches with GCC for now
Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog 2016-04-10 23:36:50 UTC (rev 6002)
+++ trunk/kfreebsd-11/debian/changelog 2016-04-10 23:38:50 UTC (rev 6003)
@@ -1,4 +1,4 @@
-kfreebsd-11 (11.0~svn295083-1~debug1) UNRELEASED; urgency=medium
+kfreebsd-11 (11.0~svn295083-1) UNRELEASED; urgency=medium
* New upstream snapshot of -CURRENT
* Make get-orig-source tarball reproducible
@@ -24,8 +24,8 @@
- 930_freebsd_cc.diff
- 940_ld_verbose.diff
- 999_config.diff
- * Change Build-Depends from clang-3.6 to clang-3.7, to match upstream
- * Bump Build-Depends: freebsd-buildutils and freebsd-mk to (>= 10.3~)
+ * Experimentally build all arches with GCC for now
+ * Bump Build-Depends: freebsd-buildutils, freebsd-mk to (>= 10.3~)
* Automatically enable debug options if ~debug appears in the Version
* Replace ar9300_devid.h with a DFSG-free re-implementation
Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules 2016-04-10 23:36:50 UTC (rev 6002)
+++ trunk/kfreebsd-11/debian/rules 2016-04-10 23:38:50 UTC (rev 6003)
@@ -12,7 +12,7 @@
full_version := $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
tar_version := $(shell echo $(full_version) | sed -e 's/-.*//g')
-svn_revision := $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
+svn_revision := $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]\+.*/\1/g' -e 's/^$(full_version)$$/HEAD/g')
version := $(shell echo $(full_version) | sed -e 's/[~+-].*//g')
major := $(shell echo $(version) | sed -e 's/\..*//g')
revision := $(shell echo $(full_version) | sed -e 's/^[^+-]*//g')
@@ -68,19 +68,21 @@
-DWITHOUT_FORMAT_EXTENSIONS
# Clang is the default compiler on these architectures (see src/share/mk/src.opts.mk)
-clang_cpus := i386 amd64 arm
+clang_cpus := # i386 amd64 arm
ifeq (, $(filter 3.7.%, $(clang_version)))
$(error Upstream is now using a different Clang version than we expected. Consider updating cc_pkg and cc_cmd)
endif
-cc_pkg := clang-3.7 [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
- gcc-4.8 [$(foreach cpu,$(clang_cpus),!any-$(cpu))]
+# Experimentally build all arches with GCC for now
+cc_pkg := gcc-5
+#cc_pkg := clang-3.7 [$(foreach cpu,$(clang_cpus),any-$(cpu))], \
+# gcc-5 [$(foreach cpu,$(clang_cpus),!any-$(cpu))]
ifneq (, $(filter $(clang_cpus), $(DEB_HOST_ARCH_CPU)))
cc_cmd := clang-3.7
else
-cc_cmd := gcc-4.8
+cc_cmd := gcc-5
endif
ifneq (, $(filter clang-%, $(cc_cmd)))
More information about the Glibc-bsd-commits
mailing list