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.

Sign up for GitHub

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

Jump to bottom

texlive.bin: fix compatibility with poppler 0.62 #35370

Merged
merged 1 commit into from Feb 24, 2018
Merged

texlive.bin: fix compatibility with poppler 0.62 #35370

merged 1 commit into from Feb 24, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Feb 23, 2018 •
edited

Motivation for this change

Fixes texlive-bin build after #34541.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@jtojnar jtojnar requested a review from vcunat February 23, 2018 02:02
@Mic92
Copy link
Member

Mic92 commented Feb 23, 2018

@GrahamcOfBorg build texlive.combined.scheme-basic

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

           ^
1 error generated.
[3/114] Building CXX object CMakeFiles/poppler.dir/goo/GooList.cc.o
[4/114] Building CXX object CMakeFiles/poppler.dir/goo/GooTimer.cc.o
[5/114] Building CXX object CMakeFiles/poppler.dir/goo/gfile.cc.o
ninja: build stopped: subcommand failed.
builder for '/nix/store/kzxi259d98yx05bvda0gydqv3sn4gwn1-poppler-min-0.62.0.drv' failed with exit code 1
cannot build derivation '/nix/store/mbqlk4vswhiymdhjcmn58s30r3clgxhv-texlive-bin-2017.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/hk25y6r9ncg08b7avbn9zyxwzywd8x4b-texlive-combined-basic-2017.drv': 1 dependencies couldn't be built
error: build of '/nix/store/hk25y6r9ncg08b7avbn9zyxwzywd8x4b-texlive-combined-basic-2017.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

'/nix/store/z0zm3y1zhjaa72hhpy1ws9f0cv10cagk-texlive-combined-basic-2017/bin/rungs' -> '/nix/store/jix2s1zdq4r0jc4363aa2dcyz3szzi0q-texlive-scripts-2017/scripts/texlive/rungs.tlu'
'/nix/store/z0zm3y1zhjaa72hhpy1ws9f0cv10cagk-texlive-combined-basic-2017/bin/updmap-sys' -> '/nix/store/iyjl1qvcf2l6kaz5wa20mld8bxpayic0-tetex-3.0/scripts/texlive/updmap-sys.sh'
'/nix/store/z0zm3y1zhjaa72hhpy1ws9f0cv10cagk-texlive-combined-basic-2017/bin/updmap-user' -> '/nix/store/iyjl1qvcf2l6kaz5wa20mld8bxpayic0-tetex-3.0/scripts/texlive/updmap-user.sh'
Wrapping './bin/fmtutil-user' and patching shebang '/bin/sh'
Wrapping './bin/mptopdf' and patching weird perl shebang
Wrapping './bin/pdfatfi' and patching shebang '/usr/bin/env perl'
Wrapping './bin/rungs' Warning: unknown shebang '/usr/bin/env texlua' in '/nix/store/jix2s1zdq4r0jc4363aa2dcyz3szzi0q-texlive-scripts-2017/scripts/texlive/rungs.tlu'
Wrapping './bin/simpdftex' and patching shebang '/bin/sh'
Wrapping './bin/updmap-user' and patching shebang '/bin/sh'
/nix/store/z0zm3y1zhjaa72hhpy1ws9f0cv10cagk-texlive-combined-basic-2017

@Mic92
Copy link
Member

Mic92 commented Feb 23, 2018

So libpoppler is also broken at the moment on darwin?

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

'/nix/store/zgjnfjmdb0c8h6mdfpngsphxzxqmi8n8-texlive-combined-basic-2017/bin/rungs' -> '/nix/store/jix2s1zdq4r0jc4363aa2dcyz3szzi0q-texlive-scripts-2017/scripts/texlive/rungs.tlu'
'/nix/store/zgjnfjmdb0c8h6mdfpngsphxzxqmi8n8-texlive-combined-basic-2017/bin/updmap-sys' -> '/nix/store/iyjl1qvcf2l6kaz5wa20mld8bxpayic0-tetex-3.0/scripts/texlive/updmap-sys.sh'
'/nix/store/zgjnfjmdb0c8h6mdfpngsphxzxqmi8n8-texlive-combined-basic-2017/bin/updmap-user' -> '/nix/store/iyjl1qvcf2l6kaz5wa20mld8bxpayic0-tetex-3.0/scripts/texlive/updmap-user.sh'
Wrapping './bin/fmtutil-user' and patching shebang '/bin/sh'
Wrapping './bin/mptopdf' and patching weird perl shebang
Wrapping './bin/pdfatfi' and patching shebang '/usr/bin/env perl'
Wrapping './bin/rungs' Warning: unknown shebang '/usr/bin/env texlua' in '/nix/store/jix2s1zdq4r0jc4363aa2dcyz3szzi0q-texlive-scripts-2017/scripts/texlive/rungs.tlu'
Wrapping './bin/simpdftex' and patching shebang '/bin/sh'
Wrapping './bin/updmap-user' and patching shebang '/bin/sh'
/nix/store/zgjnfjmdb0c8h6mdfpngsphxzxqmi8n8-texlive-combined-basic-2017

vcunat
vcunat approved these changes Feb 24, 2018
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's deal with Darwin in another round. Hydra's UI will probably be dead this weekend.

@vcunat vcunat merged commit 32cc682 into NixOS:staging Feb 24, 2018
vcunat added a commit that referenced this pull request Feb 24, 2018
@vcunat
Merge #35370: texlive.bin: fix with poppler 0.62
63ca2cc
@jtojnar jtojnar deleted the texlive-poppler-fix branch February 24, 2018 21:32
@vcunat
Copy link
Member

vcunat commented Feb 26, 2018

Darwin confirmed on Hydra. See #35667

vcunat added a commit that referenced this pull request Mar 7, 2018
@vcunat
Merge #35370: texlive.bin: fix with poppler 0.62
4dd70f9 
(cherry picked from commit 63ca2cc)
vcunat added a commit that referenced this pull request Mar 7, 2018
@vcunat
Revert "Merge #35370: texlive.bin: fix with poppler 0.62"
c43e04d 
This reverts commit 4dd70f9.
It actually broke texlive - I somehow forgot we don't have the new
poppler in 18.03.
@matthewbauer
Copy link
Member

So now getting this with texlive.bin:

building '/nix/store/yllzqif9nsikn6hgmfh3gh2i0hylsr3k-texlive-bin-2017.drv'...
unpacking sources
unpacking source archive /nix/store/knv6ycakvz8ik7ymyfqklnnj8bs13lka-texlive-20170524-source.tar.xz

source root is texlive-20170524-source
setting SOURCE_DATE_EPOCH to timestamp 1495234981 of file texlive-20170524-source/README.7coding
patching sources
applying patch /nix/store/kavcxk6lnzkrh6zl10rcgqf7qzga87z9-texlive-poppler-0.59.patch
patching file texk/web2c/luatexdir/image/pdftoepdf.w
patching file texk/web2c/luatexdir/lua/lepdflib.cc
patching file texk/web2c/luatexdir/lua/lpdfscannerlib.cc
patching file texk/web2c/pdftexdir/pdftoepdf.cc
patching file texk/web2c/pdftexdir/pdftosrc.cc
configuring
configure flags: --disable-static --disable-dependency-tracking --prefix=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017 --bindir=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017/bin --sbindir=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017/sbin --includedir=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017/include --oldincludedir=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017/include --mandir=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017/share/man --infodir=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017/share/info --docdir=/nix/store/k08b3qahgxjivrbgaxlc8lf9chbrnr6c-texlive-bin-2017-doc/share/doc/texlive-bin --libdir=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017/lib --libexecdir=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017/libexec --localedir=/nix/store/0axv1syvaspx7w661nn5lxw4i84kdyn6-texlive-bin-2017/share/locale --with-banner-add=/NixOS.org --disable-missing --disable-native-texlive-build --enable-shared --enable-tex-synctex -C --with-system-zziplib --with-system-xpdf --with-system-poppler --with-system-mpfr --with-system-gmp --with-system-pixman --with-system-potrace --with-system-gd --with-system-freetype2 --with-system-libpng --with-system-libpaper --with-system-zlib --without-x --disable-dvisvgm --disable-dvipng --disable-luatex --disable-luajittex --disable-mp --disable-pmp --disable-upmp --disable-mf --disable-xetex --disable-bibtexu --disable-bibtex8 --disable-bibtex-x --disable-upmendex --without-system-harfbuzz --without-system-icu
configure: creating cache config.cache
checking build system type... x86_64-apple-darwin17.4.0
checking host system type... x86_64-apple-darwin17.4.0
checking for gcc... clang
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether clang accepts -g... yes
checking for clang option to accept ISO C89... none needed
checking whether clang understands -c and -o together... yes
checking for native WIN32 or MINGW32... no
configure: Assuming `--enable-autosp=yes'
configure: Assuming `--enable-devnag=yes'
configure: Assuming `--enable-lacheck=yes'
configure: Assuming `--enable-m-tx=yes'
configure: Assuming `--enable-pmx=yes'
configure: Assuming `--enable-ps2eps=yes'
configure: Assuming `--enable-t1utils=yes'
configure: Assuming `--enable-texdoctk=yes'
configure: Assuming `--enable-tpic2pdftex=yes'
configure: Assuming `--enable-vlna=yes'
configure: Assuming `--enable-xindy=no'
configure: Assuming `--with-clisp-runtime=system'
configure: `--without-x' -> `--disable-xpdfopen'
configure: Assuming `--enable-web2c=yes'
configure: Assuming `--enable-afm2pl=yes'
configure: Assuming `--enable-chktex=yes'
configure: Assuming `--enable-cjkutils=yes'
configure: Assuming `--enable-detex=yes'
configure: Assuming `--enable-dtl=yes'
configure: Assuming `--enable-dvi2tty=yes'
configure: Assuming `--enable-dvidvi=yes'
configure: Assuming `--enable-dviljk=yes'
configure: Assuming `--enable-dvipdfm-x=yes'
configure: Assuming `--enable-dvipos=yes'
configure: Assuming `--enable-dvipsk=yes'
configure: Assuming `--enable-gregorio=yes'
configure: Assuming `--enable-gsftopk=yes'
configure: Assuming `--enable-lcdf-typetools=yes'
configure: Assuming `--enable-makeindexk=yes'
configure: Assuming `--enable-makejvf=yes'
configure: Assuming `--enable-mendexk=yes'
configure: Assuming `--enable-musixtnt=yes'
configure: Assuming `--enable-ps2pk=yes'
configure: Assuming `--enable-psutils=yes'
configure: Assuming `--enable-seetexk=yes'
configure: Assuming `--enable-tex4htk=yes'
configure: Assuming `--enable-ttf2pk2=yes'
configure: Assuming `--enable-ttfdump=yes'
configure: `--without-x' -> `--disable-xdvik'
configure: Assuming `--enable-texlive=yes'
configure: Using `harfbuzz' headers and library from TL tree
configure: Using `icu' headers and library from TL tree
configure: Assuming `teckit' headers and library from TL tree
configure: Assuming installed `graphite2' headers and library
configure: Using installed `zziplib' headers and library
configure: Using installed `xpdf' headers and library
configure: Using installed `poppler' headers and library
configure: Using installed `mpfr' headers and library
configure: Using installed `gmp' headers and library
configure: Assuming installed `cairo' headers and library
configure: Using installed `pixman' headers and library
configure: Using installed `potrace' headers and library
configure: Using installed `gd' headers and library
configure: Using installed `freetype2' headers and library
configure: Using installed `libpng' headers and library
configure: Using installed `libpaper' headers and library
configure: Using installed `zlib' headers and library
configure: Assuming `ptexenc' headers and library from TL tree
configure: Assuming `kpathsea' headers and library from TL tree
checking for a BSD-compatible install... /nix/store/s28xb9v7xf6axvf4a3av2mnczws2hsdg-coreutils-8.29/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /nix/store/s28xb9v7xf6axvf4a3av2mnczws2hsdg-coreutils-8.29/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking whether make supports nested variables... yes
checking how to print strings... printf
checking for a sed that does not truncate output... /nix/store/myrlb24yw6fkl043hbw3zj659d6n10dl-gnused-4.4/bin/sed
checking for grep that handles long lines and -e... /nix/store/fpn4936vg1r01xab5abhrbxzibixzvwn-gnugrep-3.1/bin/grep
checking for egrep... /nix/store/fpn4936vg1r01xab5abhrbxzibixzvwn-gnugrep-3.1/bin/grep -E
checking for fgrep... /nix/store/fpn4936vg1r01xab5abhrbxzibixzvwn-gnugrep-3.1/bin/grep -F
checking for ld used by clang... ld
checking if the linker (ld) is GNU ld... no
checking for BSD- or MS-compatible name lister (nm)... nm
checking the name lister (nm) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 196608
checking how to convert x86_64-apple-darwin17.4.0 file names to x86_64-apple-darwin17.4.0 format... func_convert_file_noop
checking how to convert x86_64-apple-darwin17.4.0 file names to toolchain format... func_convert_file_noop
checking for ld option to reload object files... -r
checking for objdump... no
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... no
checking for strip... strip
checking for ranlib... ranlib
checking command to parse nm output from clang object... ok
checking for sysroot... no
checking for a working dd... /nix/store/s28xb9v7xf6axvf4a3av2mnczws2hsdg-coreutils-8.29/bin/dd
checking how to truncate binary pipes... /nix/store/s28xb9v7xf6axvf4a3av2mnczws2hsdg-coreutils-8.29/bin/dd bs=4096 count=1
checking for mt... no
checking if : is a manifest tool... no
checking for dsymutil... dsymutil
checking for nmedit... no
checking for lipo... lipo
checking for otool... otool
checking for otool64... no
checking for -single_module linker flag... yes
checking for -exported_symbols_list linker flag... yes
checking for -force_load linker flag... yes
checking how to run the C preprocessor... clang -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for dlfcn.h... yes
checking how to create a pax tar archive... gnutar
checking dependency style of clang... none
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether the compiler accepts prototypes... yes
checking what warning flags to pass to the C compiler... -Wimplicit -Wreturn-type -Wdeclaration-after-statement -Wno-unknown-pragmas
checking for objdir... .libs
checking if clang supports -fno-rtti -fno-exceptions... yes
checking for clang option to produce PIC... -fno-common -DPIC
checking if clang PIC flag -fno-common -DPIC works... yes
checking if clang static flag -static works... no
checking if clang supports -c -o file.o... yes
checking if clang supports -c -o file.o... (cached) yes
checking whether the clang linker (ld) supports shared libraries... yes
checking dynamic linker characteristics... darwin17.4.0 dyld
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking for _LARGEFILE_SOURCE value needed for large files... no
checking for dirent.h that defines DIR... yes
checking for library containing opendir... none required
checking for ANSI C header files... (cached) yes
checking whether closedir returns void... no
checking assert.h usability... yes
checking assert.h presence... yes
checking for assert.h... yes
checking float.h usability... yes
checking float.h presence... yes
checking for float.h... yes
checking limits.h usability... yes
checking limits.h presence... yes
checking for limits.h... yes
checking pwd.h usability... yes
checking pwd.h presence... yes
checking for pwd.h... yes
checking for stdlib.h... (cached) yes
checking sys/param.h usability... yes
checking sys/param.h presence... yes
checking for sys/param.h... yes
checking for putenv... yes
checking for getcwd... yes
checking for getwd... yes
checking for memcmp... yes
checking for memcpy... yes
checking for mkstemp... yes
checking for mktemp... yes
checking for strchr... yes
checking for strrchr... yes
checking for an ANSI C-conforming const... yes
checking for inline... inline
checking for size_t... yes
checking for int64_t... yes
checking for uint64_t... yes
checking whether isascii is declared... yes
checking for struct stat.st_mtim... no
checking for X... disabled
checking whether we are using the GNU C++ compiler... yes
checking whether clang++ accepts -g... yes
checking dependency style of clang++... none
checking what warning flags to pass to the C++ compiler... -Wimplicit -Wreturn-type -Wno-unknown-pragmas -Wno-write-strings
checking how to run the C++ preprocessor... clang++ -E
checking for ld used by clang++... ld
checking if the linker (ld) is GNU ld... no
checking whether the clang++ linker (ld) supports shared libraries... yes
checking for clang++ option to produce PIC... -fno-common -DPIC
checking if clang++ PIC flag -fno-common -DPIC works... yes
checking if clang++ static flag -static works... no
checking if clang++ supports -c -o file.o... yes
checking if clang++ supports -c -o file.o... (cached) yes
checking whether the clang++ linker (ld) supports shared libraries... yes
checking dynamic linker characteristics... darwin17.4.0 dyld
checking how to hardcode library paths into programs... immediate
checking whether ln -s works... yes
checking for TeX specific libraries to build... texk/kpathsea texk/ptexenc
checking for pkg-config... pkg-config
checking for freetype-config... freetype-config
checking for icu-config... no
checking requested system `zlib' library... ok
checking requested system `libpaper' library... ok
checking requested system `libpng' library... ok
checking requested system `freetype2' library... ok
checking requested system `xpdf' library... failed
configure: error: some requested system libraries failed
builder for '/nix/store/yllzqif9nsikn6hgmfh3gh2i0hylsr3k-texlive-bin-2017.drv' failed with exit code 1

Any ideas what's going on? xpdf shouldn't be needed due to disabled X.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jtojnar @Mic92 @GrahamcOfBorg @vcunat @matthewbauer @fpletz