Hi,
 I prepared the attached debdiff as a proposed NMU for boost1.58. As
was done for 1.60, it restricts the archs for the context & coroutine
libs to avoid empty packages. It also fixes and enables these libs
on arm64 (kicad builds/starts fine w/ it).
diff -Nru boost1.58-1.58.0+dfsg/debian/changelog boost1.58-1.58.0+dfsg/debian/changelog
--- boost1.58-1.58.0+dfsg/debian/changelog	2015-12-28 06:19:48.000000000 +0000
+++ boost1.58-1.58.0+dfsg/debian/changelog	2016-06-09 17:45:27.000000000 +0000
@@ -1,3 +1,15 @@
+boost1.58 (1.58.0+dfsg-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Enable context and coroutine on arm64 (LP: #1557240):
+    - d/p/boost-context-use-sysv-not-aapcs.patch: Drop
+    - d/p/Changes-required-for-aarch64-support-in-boost-config.patch: Add
+    - d/rules: Set BUILD_CONTEXT=yes on arm64
+  * d/control: Restrict arch for context, coroutine, to avoid empty packages.
+    Closes: #808626.
+
+ -- dann frazier <da...@debian.org>  Thu, 09 Jun 2016 11:43:41 -0600
+
 boost1.58 (1.58.0+dfsg-5) unstable; urgency=medium
 
   * Build Coroutine shared lib.  Closes: #802509.
diff -Nru boost1.58-1.58.0+dfsg/debian/control boost1.58-1.58.0+dfsg/debian/control
--- boost1.58-1.58.0+dfsg/debian/control	2015-12-28 06:28:50.000000000 +0000
+++ boost1.58-1.58.0+dfsg/debian/control	2016-06-09 17:47:47.000000000 +0000
@@ -117,8 +117,8 @@
  libboost1.58-tools-dev,
  libboost-atomic1.58-dev,
  libboost-chrono1.58-dev,
- libboost-context1.58-dev,
- libboost-coroutine1.58-dev,
+ libboost-context1.58-dev [any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el],
+ libboost-coroutine1.58-dev [any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el],
  libboost-date-time1.58-dev,
  libboost-exception1.58-dev,
  libboost-filesystem1.58-dev,
@@ -318,7 +318,7 @@
 
 Package: libboost-context1.58.0
 Homepage: http://www.boost.org/libs/context/
-Architecture: any
+Architecture: any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -338,7 +338,7 @@
 
 Package: libboost-context1.58-dev
 Homepage: http://www.boost.org/libs/context/
-Architecture: any
+Architecture: any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
@@ -360,7 +360,7 @@
 
 Package: libboost-coroutine1.58.0
 Homepage: http://www.boost.org/libs/coroutine/
-Architecture: any
+Architecture: any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -385,7 +385,7 @@
 
 Package: libboost-coroutine1.58-dev
 Homepage: http://www.boost.org/libs/coroutine/
-Architecture: any
+Architecture: any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
diff -Nru boost1.58-1.58.0+dfsg/debian/control.in boost1.58-1.58.0+dfsg/debian/control.in
--- boost1.58-1.58.0+dfsg/debian/control.in	2015-12-28 04:22:52.000000000 +0000
+++ boost1.58-1.58.0+dfsg/debian/control.in	2016-06-09 17:36:21.000000000 +0000
@@ -117,8 +117,8 @@
  libboost1.58-tools-dev,
  libboost-atomic1.58-dev,
  libboost-chrono1.58-dev,
- libboost-context1.58-dev,
- libboost-coroutine1.58-dev,
+ libboost-context1.58-dev [any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el],
+ libboost-coroutine1.58-dev [any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el],
  libboost-date-time1.58-dev,
  libboost-exception1.58-dev,
  libboost-filesystem1.58-dev,
@@ -318,7 +318,7 @@
 
 Package: libboost-context1.58.0
 Homepage: http://www.boost.org/libs/context/
-Architecture: any
+Architecture: any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -338,7 +338,7 @@
 
 Package: libboost-context1.58-dev
 Homepage: http://www.boost.org/libs/context/
-Architecture: any
+Architecture: any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
@@ -360,7 +360,7 @@
 
 Package: libboost-coroutine1.58.0
 Homepage: http://www.boost.org/libs/coroutine/
-Architecture: any
+Architecture: any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el
 Multi-Arch: same
 Section: libs
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -385,7 +385,7 @@
 
 Package: libboost-coroutine1.58-dev
 Homepage: http://www.boost.org/libs/coroutine/
-Architecture: any
+Architecture: any-i386 any-amd64 arm64 armel armhf mips mipsel powerpc ppc64el
 Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
diff -Nru boost1.58-1.58.0+dfsg/debian/patches/boost-context-use-sysv-not-aapcs.patch boost1.58-1.58.0+dfsg/debian/patches/boost-context-use-sysv-not-aapcs.patch
--- boost1.58-1.58.0+dfsg/debian/patches/boost-context-use-sysv-not-aapcs.patch	2015-12-27 18:56:31.000000000 +0000
+++ boost1.58-1.58.0+dfsg/debian/patches/boost-context-use-sysv-not-aapcs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-http://lists.boost.org/Archives/boost/2015/02/220155.php
-
-commit d19baee73f90de01375af69a9f8621799c649964
-Author: Edward Nevill <edward.nevill_at_[hidden]>
-Date: Mon Feb 23 17:32:49 2015 +0000
-
-    Fix build for aarch64.
-
-
-Index: boost_1_57_0/libs/context/build/Jamfile.v2
-===================================================================
---- boost_1_57_0.orig/libs/context/build/Jamfile.v2
-+++ boost_1_57_0/libs/context/build/Jamfile.v2
-@@ -214,7 +214,7 @@ alias asm_context_sources
- alias asm_context_sources
-    : [ make asm/make_arm64_aapcs_elf_gas.o : asm/make_arm64_aapcs_elf_gas.S : @gas64 ]
-      [ make asm/jump_arm64_aapcs_elf_gas.o : asm/jump_arm64_aapcs_elf_gas.S : @gas64 ]
--   : <abi>aapcs
-+   : <abi>sysv
-      <address-model>64
-      <architecture>arm
-      <binary-format>elf
-@@ -223,7 +223,7 @@ alias asm_context_sources
- alias asm_context_sources
-    : asm/make_arm64_aapcs_elf_gas.S
-      asm/jump_arm64_aapcs_elf_gas.S
--   : <abi>aapcs
-+   : <abi>sysv
-      <address-model>64
-      <architecture>arm
-      <binary-format>elf
-@@ -233,7 +233,7 @@ alias asm_context_sources
- alias asm_context_sources
-    : asm/make_arm64_aapcs_elf_gas.S
-      asm/jump_arm64_aapcs_elf_gas.S
--   : <abi>aapcs
-+   : <abi>sysv
-      <address-model>64
-      <architecture>arm
-      <binary-format>elf
diff -Nru boost1.58-1.58.0+dfsg/debian/patches/Changes-required-for-aarch64-support-in-boost-config.patch boost1.58-1.58.0+dfsg/debian/patches/Changes-required-for-aarch64-support-in-boost-config.patch
--- boost1.58-1.58.0+dfsg/debian/patches/Changes-required-for-aarch64-support-in-boost-config.patch	1970-01-01 00:00:00.000000000 +0000
+++ boost1.58-1.58.0+dfsg/debian/patches/Changes-required-for-aarch64-support-in-boost-config.patch	2016-06-09 17:15:55.000000000 +0000
@@ -0,0 +1,23 @@
+From: Ananth Jasty <aja...@cavium.com>
+Date: Wed, 15 Apr 2015 17:59:47 -0700
+Subject: [PATCH] Changes required for aarch64 support in boost::config.
+Origin: upstream, https://github.com/boostorg/config/commit/8787f6b0718b6b0750869ba52bc65d26db665a05
+Bug-Ubuntu: http://bugs.launchpad.net/bugs/1557240
+Applied-Upstream: commit, 8787f6b0718b6b0750869ba52bc65d26db665a05
+Last-Update: 2016-06-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: boost1.58-1.58.0+dfsg/libs/config/checks/architecture/arm.cpp
+===================================================================
+--- boost1.58-1.58.0+dfsg.orig/libs/config/checks/architecture/arm.cpp
++++ boost1.58-1.58.0+dfsg/libs/config/checks/architecture/arm.cpp
+@@ -8,6 +8,8 @@
+ 
+ #if !defined(__arm__) && !defined(__thumb__) && \
+     !defined(__TARGET_ARCH_ARM) && !defined(__TARGET_ARCH_THUMB) && \
+-    !defined(_ARM) && !defined(_M_ARM)
++    !defined(_ARM) && !defined(_M_ARM) && \
++    !defined(__aarch64__) 
+ #error "Not ARM"
+ #endif
++
diff -Nru boost1.58-1.58.0+dfsg/debian/patches/series boost1.58-1.58.0+dfsg/debian/patches/series
--- boost1.58-1.58.0+dfsg/debian/patches/series	2015-12-28 05:56:54.000000000 +0000
+++ boost1.58-1.58.0+dfsg/debian/patches/series	2016-06-09 17:15:55.000000000 +0000
@@ -9,8 +9,8 @@
 # boost1.58 erratra
 0002-Fix-a-regression-with-non-constexpr-types.patch
 ec60c37295146bb80aa44a92cf416027b75b5ff7.patch
-boost-context-use-sysv-not-aapcs.patch
 numeric-ublas-storage.hpp.patch
 openssl-no-ssl3.patch
 provide-missing-source-jquery.patch
 no-gcc-march-options.patch
+Changes-required-for-aarch64-support-in-boost-config.patch
diff -Nru boost1.58-1.58.0+dfsg/debian/rules boost1.58-1.58.0+dfsg/debian/rules
--- boost1.58-1.58.0+dfsg/debian/rules	2015-12-27 20:10:34.000000000 +0000
+++ boost1.58-1.58.0+dfsg/debian/rules	2016-06-09 17:15:55.000000000 +0000
@@ -309,7 +309,6 @@
 BUILD_LONG_DOUBLE = no
 else ifeq ($(DEB_BUILD_ARCH), arm64)
 BUILD_LONG_DOUBLE = no
-BUILD_CONTEXT = no
 JAM_OPT += pch=off
 else ifeq ($(DEB_BUILD_ARCH), hppa)
 BUILD_LONG_DOUBLE = no

Reply via email to