Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix x86 build #24

Closed
wants to merge 1 commit into from
Closed

Fix x86 build #24

wants to merge 1 commit into from

Conversation

olafhering
Copy link

config.h must be included first.
Fixes 0ff22a1 ("decoder/ffmpeg: move code to lib/ffmpeg/Time.hxx")

Signed-off-by: Olaf Hering olaf@aepfle.de

config.h must be included first.
Fixes 0ff22a1 ("decoder/ffmpeg: move code to lib/ffmpeg/Time.hxx")

Signed-off-by: Olaf Hering <olaf@aepfle.de>
@MaxKellermann
Copy link
Member

You didn't describe the problem that you're trying to solve.

@olafhering
Copy link
Author

The problem is in the Subject, the solution in the body.
Just browse config.h.

@MaxKellermann
Copy link
Member

Sorry, I don't see a problem. If you're not willing to describe the problem properly and nobody else has it, then just keep your "fix" in your private repository.

@olafhering
Copy link
Author

See check.h

@globin
Copy link

globin commented Mar 23, 2017

This happens for i686-linux builds.
We are seeing these issues on our build farm in NixOS (example: https://hydra.nixos.org/build/50715969)

Error log excerpt:

g++ -std=c++14 -DHAVE_CONFIG_H -I.  -I./src  -DSYSTEM_CONFIG_FILE_LOCATION='"/nix/store/9nlgicj1sdxdsyhvrazpxdqvj1qwl1j1-mpd-0.20.6/etc/mpd.conf"' -I/nix/store/wk1vn58b8g4gnr02li7l36id3y7xir2s-libvorbis-1.3.5-dev/include -I/nix/store/4bdg1x1zs9jd54hr184i37dpdmjmjx91-libogg-1.3.2-dev/include  -I/nix/store/mvxmn95fhgfr65qf87mqq2iz1x5xbvl2-flac-1.3.2-dev/include  -I/nix/store/i3gkis6fvajsz53v5xld8mkxaxn4748p-audiofile-0.3.6/include -I/nix/store/69362sdggx40biy7bgd4jsqm52lwaan0-libmikmod-3.3.10/include -pthread -D_REENTRANT -I/nix/store/fx6f8azb04i00lqvw6plgggnbjpyjp4l-game-music-emu-0.6.1/include  -I/nix/store/y60qyba3xbc34gqrp6x5pplkhd7whsqy-fluidsynth-1.1.6/include    -I/nix/store/9s15l53ci59xjjw96wwl5fv48csnvdy9-mpg123-1.23.8/include -I/nix/store/4bdg1x1zs9jd54hr184i37dpdmjmjx91-libogg-1.3.2-dev/include -I/nix/store/pz4w4g6jngh624rzz510giydqwj0z6js-libopus-1.1.3-dev/include/opus -I/nix/store/kz8dxa9l4w3rmliqy3wfp0gdrh045ry4-ffmpeg-3.1.7-dev/include    -D_GNU_SOURCE -pthread -g -O2 -fvisibility=hidden -fno-threadsafe-statics -fmerge-all-constants -ffast-math -ftree-vectorize -Wall -Wextra -Wmissing-declarations -Wshadow -Wpointer-arith -Wcast-qual -Wwrite-strings -Wsign-compare -c -o src/decoder/plugins/libdecoder_a-FfmpegDecoderPlugin.o `test -f 'src/decoder/plugins/FfmpegDecoderPlugin.cxx' || echo './'`src/decoder/plugins/FfmpegDecoderPlugin.cxx
In file included from src/decoder/plugins/../DecoderAPI.hxx:32:0,
                 from src/decoder/plugins/FfmpegDecoderPlugin.cxx:31:
./src/check.h:44:2: error: #error config.h was included too late
 #error config.h was included too late
  ^
make[1]: *** [Makefile:8445: src/decoder/plugins/libdecoder_a-FfmpegDecoderPlugin.o] Error 1
make[1]: Leaving directory '/tmp/nix-build-mpd-0.20.6.drv-0/mpd-0.20.6'
make: *** [Makefile:4681: all] Error 2

globin added a commit to NixOS/nixpkgs that referenced this pull request Mar 23, 2017
See upstream MusicPlayerDaemon/MPD#24, not clear if
this will be merged upstream as the author has been quite uncooperative.

Github patch URL (https://github.com/MaxKellermann/MPD/pull/24.patch)
sadly does not work for this.
globin added a commit to NixOS/nixpkgs that referenced this pull request Mar 23, 2017
See upstream MusicPlayerDaemon/MPD#24, not clear if
this will be merged upstream as the author has been quite uncooperative.

Github patch URL (https://github.com/MaxKellermann/MPD/pull/24.patch)
sadly does not work for this.

(cherry picked from commit d6e2366)
adrianpk added a commit to adrianpk/nixpkgs that referenced this pull request May 31, 2024
See upstream MusicPlayerDaemon/MPD#24, not clear if
this will be merged upstream as the author has been quite uncooperative.

Github patch URL (https://github.com/MaxKellermann/MPD/pull/24.patch)
sadly does not work for this.

(cherry picked from commit d6e2366)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants