Re: [PATCH] gnu: boost: Update to 1.60.0
l...@gnu.org (Ludovic Courtès) skribis: > I cannot really decipher libs/context/build/Jamfile.v2, but I can see > that the only mentions of MIPS in there relate to the o32 ABI, whereas > we target n32. > > Another thing that’s fishy in the build log is that, at the beginning of > the build phase, we see: > > Component configuration: > > - atomic : building > - chrono : building > - container: building > - context : not building > - coroutine: not building > > Yet it attempts to build ‘context’. Looking more closely, this may be due to the ‘coroutine2’ component that the recipe did not explicitly disable, unlike ‘coroutine’. We’ll see. I’ve made this change and pushed the changes to ‘master’. Ludo’.
Re: [PATCH] gnu: boost: Update to 1.60.0
l...@gnu.org (Ludovic Courtès) skribis: > Andreas Enge skribis: > >> On Wed, Jan 06, 2016 at 11:18:19PM +0100, Ludovic Courtès wrote: >>> It has 140 dependent packages, including LibreOffice, so kinda >>> borderline for master. It’s probably safer on a separate branch that >>> Hydra will build. Mark? >> >> Finally hydra picked up the branch. Unfortunately, the new boost fails >> to build on mips: >>http://hydra.gnu.org/build/914532 >> >> I find it difficult to see what is the problem in the build log >> (C++, eh?)... > > The error is: > > gcc.compile.c++ > bin.v2/libs/context/build/gcc-4.9.3/release/threading-multi/unsupported.o > libs/context/src/unsupported.cpp:7:2: error: #error "platform not supported" > #error "platform not supported" > ^ I cannot really decipher libs/context/build/Jamfile.v2, but I can see that the only mentions of MIPS in there relate to the o32 ABI, whereas we target n32. Another thing that’s fishy in the build log is that, at the beginning of the build phase, we see: --8<---cut here---start->8--- Component configuration: - atomic : building - chrono : building - container: building - context : not building - coroutine: not building --8<---cut here---end--->8--- Yet it attempts to build ‘context’. > The options I can think of are: > > 1. Mark mips64el-linux as unsupported (134 packages depend on Boost, > notably LibreOffice, Abiword, and Ardour). > > 2. Build Boost without multi-threading support on MIPS, assuming it’s > only this feature that’s unsupported. > > 3. Hope that Debian has a patch to fix this and apply it. > > Thoughts? I think we could try another option, which is to configure with --without-libraries=context like openSuSE does in some cases: https://build.opensuse.org/package/view_file/devel:libraries:c_c++/boost/boost.spec Could someone try that? If that fails, or if nobody can test it, let’s just do #1. Ludo’.
Re: [PATCH] gnu: boost: Update to 1.60.0
On Mon, Jan 11, 2016 at 10:17:32AM +0100, Ludovic Courtès wrote: > 3. Hope that Debian has a patch to fix this and apply it. Debian is still at 1.58, so this is not an option right now. Andreas
Re: [PATCH] gnu: boost: Update to 1.60.0
Andreas Enge skribis: > On Wed, Jan 06, 2016 at 11:18:19PM +0100, Ludovic Courtès wrote: >> It has 140 dependent packages, including LibreOffice, so kinda >> borderline for master. It’s probably safer on a separate branch that >> Hydra will build. Mark? > > Finally hydra picked up the branch. Unfortunately, the new boost fails > to build on mips: >http://hydra.gnu.org/build/914532 > > I find it difficult to see what is the problem in the build log > (C++, eh?)... The error is: --8<---cut here---start->8--- gcc.compile.c++ bin.v2/libs/context/build/gcc-4.9.3/release/threading-multi/unsupported.o libs/context/src/unsupported.cpp:7:2: error: #error "platform not supported" #error "platform not supported" ^ --8<---cut here---end--->8--- The options I can think of are: 1. Mark mips64el-linux as unsupported (134 packages depend on Boost, notably LibreOffice, Abiword, and Ardour). 2. Build Boost without multi-threading support on MIPS, assuming it’s only this feature that’s unsupported. 3. Hope that Debian has a patch to fix this and apply it. Thoughts? Ludo’.
Re: [PATCH] gnu: boost: Update to 1.60.0
On Wed, Jan 06, 2016 at 11:18:19PM +0100, Ludovic Courtès wrote: > It has 140 dependent packages, including LibreOffice, so kinda > borderline for master. It’s probably safer on a separate branch that > Hydra will build. Mark? Finally hydra picked up the branch. Unfortunately, the new boost fails to build on mips: http://hydra.gnu.org/build/914532 I find it difficult to see what is the problem in the build log (C++, eh?)... Andreas
Re: [PATCH] gnu: boost: Update to 1.60.0
Eric Bavier skribis:
> On Wed, 06 Jan 2016 11:29:03 +0100
> l...@gnu.org (Ludovic Courtès) wrote:
>
>> Eric Bavier skribis:
>>
>> > diff --git a/gnu/packages/patches/boost-mips-avoid-m32.patch
>> > b/gnu/packages/patches/boost-mips-avoid-m32.patch
>> > deleted file mode 100644
>> > index 811c9fb..000
>> > --- a/gnu/packages/patches/boost-mips-avoid-m32.patch
>> > +++ /dev/null
>> > @@ -1,15 +0,0 @@
>> > -The following patch prevents the use of the -m32 flag on mips, where it
>> > -is not understood by gcc, as well as other non-x86 architectures.
>> > -
>> > -diff -u -r boost_1_58_0.orig/tools/build/src/tools/gcc.jam
>> > boost_1_58_0/tools/build/src/tools/gcc.jam
>> > boost_1_58_0.orig/tools/build/src/tools/gcc.jam 2015-04-04
>> > 19:25:07.0 +0200
>> > -+++ boost_1_58_0/tools/build/src/tools/gcc.jam2015-07-10
>> > 01:08:19.822733823 +0200
>> > -@@ -451,7 +451,7 @@
>> > - else
>> > - {
>> > - local arch = [ feature.get-values architecture :
>> > $(properties) ] ;
>> > --if $(arch) != arm
>> > -+if $(arch) = x86
>>
>> Do you know if this patch or something equivalent was applied upstream?
>>
>> I guess we’ll have to wait for Hydra’s feedback on MIPS.
>
> Something similar has been incorporated upstream, so I think we should
> be OK on MIPS.
OK, well alright then!
It has 140 dependent packages, including LibreOffice, so kinda
borderline for master. It’s probably safer on a separate branch that
Hydra will build. Mark?
Ludo’.
Re: [PATCH] gnu: boost: Update to 1.60.0
On Wed, 06 Jan 2016 11:29:03 +0100
l...@gnu.org (Ludovic Courtès) wrote:
> Eric Bavier skribis:
>
> > diff --git a/gnu/packages/patches/boost-mips-avoid-m32.patch
> > b/gnu/packages/patches/boost-mips-avoid-m32.patch
> > deleted file mode 100644
> > index 811c9fb..000
> > --- a/gnu/packages/patches/boost-mips-avoid-m32.patch
> > +++ /dev/null
> > @@ -1,15 +0,0 @@
> > -The following patch prevents the use of the -m32 flag on mips, where it
> > -is not understood by gcc, as well as other non-x86 architectures.
> > -
> > -diff -u -r boost_1_58_0.orig/tools/build/src/tools/gcc.jam
> > boost_1_58_0/tools/build/src/tools/gcc.jam
> > boost_1_58_0.orig/tools/build/src/tools/gcc.jam2015-04-04
> > 19:25:07.0 +0200
> > -+++ boost_1_58_0/tools/build/src/tools/gcc.jam 2015-07-10
> > 01:08:19.822733823 +0200
> > -@@ -451,7 +451,7 @@
> > - else
> > - {
> > - local arch = [ feature.get-values architecture :
> > $(properties) ] ;
> > --if $(arch) != arm
> > -+if $(arch) = x86
>
> Do you know if this patch or something equivalent was applied upstream?
>
> I guess we’ll have to wait for Hydra’s feedback on MIPS.
Something similar has been incorporated upstream, so I think we should
be OK on MIPS.
`~Eric
Re: [PATCH] gnu: boost: Update to 1.60.0
Eric Bavier skribis:
> This patch updates our boost package to version 1.60.0. It also fixes
> several dependent packages to build with this later version. I've
> been able to verify the x86-64 builds for all packages in `guix
> refresh -l
> boost`, except for several packages that already fail to build in
> current master (e.g. opam, simple-scan, strigi, hydra, shogun).
Cool!
> From 29771c37c9f9e304d50921d95fc250131396ea7c Mon Sep 17 00:00:00 2001
> From: Eric Bavier
> Date: Tue, 5 Jan 2016 16:09:27 -0600
> Subject: [PATCH] gnu: boost: Update to 1.60.0.
>
> * gnu/packages/boost.scm (boost): Update to 1.60.0.
> [source]: Remove patch.
> * gnu/packages/patches/boost-mips-avoid-m32.patch: Delete patch
> * gnu-system.am (dist_patch_DATA): Remove patch.
>
> Also fix dependent packages:
>
> * gnu/packages/patches/csound-header-ordering.patch: New patch.
> * gnu/packages/audio.scm (csound)[source]: Use it.
> [arguments]: Add 'set-flags phase.
> * gnu/packages/patches/libcmis-fix-test-onedrive.patch: New patch.
> * gnu/packages/libreoffice.scm (libcmis)[source]: Use it.
> (libreoffice)[arguments]: Add LDFLAGS to #:configure-flags.
> (librevenge)[inputs]: Move boost from here...
> [propogated-inputs]: to here.
> [arguments]: Add LDFLAGS to #:configure-flags.
> * gnu/packages/patches/openimageio-boost-1.60.patch: New patch.
> * gnu/packages/graphics.scm (openimageio): Use it.
> * gnu-system.am (dist_patch_DATA): Add patches.
LGTM! Impressive work on tracking down issues in dependent packages.
> diff --git a/gnu/packages/patches/boost-mips-avoid-m32.patch
> b/gnu/packages/patches/boost-mips-avoid-m32.patch
> deleted file mode 100644
> index 811c9fb..000
> --- a/gnu/packages/patches/boost-mips-avoid-m32.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -The following patch prevents the use of the -m32 flag on mips, where it
> -is not understood by gcc, as well as other non-x86 architectures.
> -
> -diff -u -r boost_1_58_0.orig/tools/build/src/tools/gcc.jam
> boost_1_58_0/tools/build/src/tools/gcc.jam
> boost_1_58_0.orig/tools/build/src/tools/gcc.jam 2015-04-04
> 19:25:07.0 +0200
> -+++ boost_1_58_0/tools/build/src/tools/gcc.jam 2015-07-10
> 01:08:19.822733823 +0200
> -@@ -451,7 +451,7 @@
> - else
> - {
> - local arch = [ feature.get-values architecture : $(properties)
> ] ;
> --if $(arch) != arm
> -+if $(arch) = x86
Do you know if this patch or something equivalent was applied upstream?
I guess we’ll have to wait for Hydra’s feedback on MIPS.
Thank you!
Ludo’.
Re: [PATCH] gnu: boost: Update to 1.60.0
On Tue, 05 Jan 2016 23:54:01 +0100 Eric Bavier wrote: > This patch updates our boost package to version 1.60.0. It also fixes > several dependent packages to build with this later version. I've been > able to verify the x86-64 builds for all packages in `guix refresh -l > boost`, except for several packages that already fail to build in > current master (e.g. opam, simple-scan, strigi, hydra, shogun). > I looked at opam a few months ago, to do a good build we should update it, and it needs a couple new ocaml packages to replace bundled versions. -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted pgpGSdh6_J9T4.pgp Description: OpenPGP digital signature
Re: [PATCH] gnu: boost: Update to 1.60.0
Eric Bavier writes: > This patch updates our boost package to version 1.60.0. Yay! I have a reviewed patch waiting for inclusion that so far depended on a patched version of boost 1.58. I’ll finally be able to add it without also having to add a variant of the boost package. > several dependent packages to build with this later version. I've been > able to verify the x86-64 builds for all packages in `guix refresh -l > boost`, except for several packages that already fail to build in > current master (e.g. opam, simple-scan, strigi, hydra, shogun). I’ll take a look at fixing shogun. Seems to be related to the Octave interface; the interfaces should probably be moved to different outputs anyway, if possible ~~ Ricardo
[PATCH] gnu: boost: Update to 1.60.0
This patch updates our boost package to version 1.60.0. It also fixes several dependent packages to build with this later version. I've been able to verify the x86-64 builds for all packages in `guix refresh -l boost`, except for several packages that already fail to build in current master (e.g. opam, simple-scan, strigi, hydra, shogun). -- `~EricFrom 29771c37c9f9e304d50921d95fc250131396ea7c Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 5 Jan 2016 16:09:27 -0600 Subject: [PATCH] gnu: boost: Update to 1.60.0. * gnu/packages/boost.scm (boost): Update to 1.60.0. [source]: Remove patch. * gnu/packages/patches/boost-mips-avoid-m32.patch: Delete patch * gnu-system.am (dist_patch_DATA): Remove patch. Also fix dependent packages: * gnu/packages/patches/csound-header-ordering.patch: New patch. * gnu/packages/audio.scm (csound)[source]: Use it. [arguments]: Add 'set-flags phase. * gnu/packages/patches/libcmis-fix-test-onedrive.patch: New patch. * gnu/packages/libreoffice.scm (libcmis)[source]: Use it. (libreoffice)[arguments]: Add LDFLAGS to #:configure-flags. (librevenge)[inputs]: Move boost from here... [propogated-inputs]: to here. [arguments]: Add LDFLAGS to #:configure-flags. * gnu/packages/patches/openimageio-boost-1.60.patch: New patch. * gnu/packages/graphics.scm (openimageio): Use it. * gnu-system.am (dist_patch_DATA): Add patches. --- gnu-system.am | 4 +- gnu/packages/audio.scm | 14 ++- gnu/packages/boost.scm | 5 +-- gnu/packages/graphics.scm | 3 +- gnu/packages/libreoffice.scm | 15 +-- gnu/packages/patches/boost-mips-avoid-m32.patch| 15 --- gnu/packages/patches/csound-header-ordering.patch | 20 + .../patches/libcmis-fix-test-onedrive.patch| 35 gnu/packages/patches/openimageio-boost-1.60.patch | 47 ++ 9 files changed, 132 insertions(+), 26 deletions(-) delete mode 100644 gnu/packages/patches/boost-mips-avoid-m32.patch create mode 100644 gnu/packages/patches/csound-header-ordering.patch create mode 100644 gnu/packages/patches/libcmis-fix-test-onedrive.patch create mode 100644 gnu/packages/patches/openimageio-boost-1.60.patch diff --git a/gnu-system.am b/gnu-system.am index 61dfced..ee1b12b 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -416,7 +416,6 @@ dist_patch_DATA = \ gnu/packages/patches/binutils-loongson-workaround.patch \ gnu/packages/patches/bitlbee-configure-doc-fix.patch \ gnu/packages/patches/bluez-tests.patch \ - gnu/packages/patches/boost-mips-avoid-m32.patch \ gnu/packages/patches/byobu-writable-status.patch \ gnu/packages/patches/calibre-drop-unrar.patch \ gnu/packages/patches/calibre-no-updates-dialog.patch \ @@ -429,6 +428,7 @@ dist_patch_DATA = \ gnu/packages/patches/cpufrequtils-fix-aclocal.patch \ gnu/packages/patches/crda-optional-gcrypt.patch \ gnu/packages/patches/crossmap-allow-system-pysam.patch \ + gnu/packages/patches/csound-header-ordering.patch \ gnu/packages/patches/cssc-gets-undeclared.patch \ gnu/packages/patches/cssc-missing-include.patch \ gnu/packages/patches/clucene-contribs-lib.patch \ @@ -544,6 +544,7 @@ dist_patch_DATA = \ gnu/packages/patches/libarchive-mtree-filename-length-fix.patch \ gnu/packages/patches/libbonobo-activation-test-race.patch \ gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \ + gnu/packages/patches/libcmis-fix-test-onedrive.patch \ gnu/packages/patches/libdrm-symbol-check.patch \ gnu/packages/patches/libevent-dns-tests.patch \ gnu/packages/patches/libmtp-devices.patch \ @@ -633,6 +634,7 @@ dist_patch_DATA = \ gnu/packages/patches/nvi-dbpagesize-binpower.patch \ gnu/packages/patches/nvi-db4.patch\ gnu/packages/patches/openexr-missing-samples.patch \ + gnu/packages/patches/openimageio-boost-1.60.patch \ gnu/packages/patches/openjpeg-CVE-2015-6581.patch \ gnu/packages/patches/openjpeg-use-after-free-fix.patch \ gnu/packages/patches/openssl-runpath.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index cf066b5..8b2656d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -318,7 +318,8 @@ tools (analyzer, mono/stereo tools, crossovers).") version "/Csound" version ".tar.gz")) (sha256 (base32 -"0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd" +"0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd")) + (patches (list (search-patch "csound-header-ordering.patch") (build-system cmake-build-system) (arguments ;; Work around this error on x86_64 with libc 2.22+: @@ -1022,7 +1023,16 @@ software.&
