File tree 4 files changed +357
-11
lines changed
4 files changed +357
-11
lines changed Original file line number Diff line number Diff line change 2
2
3
3
@ REM Here we ditch the -GL flag, which messes up our static libraries.
4
4
set " CFLAGS = -MD -DGRAPHITE2_STATIC"
5
- set " CXXFLAGS = -MD -DGRAPHITE2_STATIC"
5
+ set " CXXFLAGS = -MD -DGRAPHITE2_STATIC -std:c++17 "
6
6
set " PKG_CONFIG_PATH = %LIBRARY_PREFIX:\ =/ % /lib/pkgconfig;%LIBRARY_PREFIX:\ =/ % /share/pkgconfig"
7
7
8
8
@ REM FIX UP LIBZ-SYS
@@ -14,10 +14,10 @@ cargo-bundle-licenses --format yaml --output THIRDPARTY.yml
14
14
@ REM Also need to skip the Unicode filename test due to conda-build issue:
15
15
@ REM https://github.com/conda/conda-build/issues/4043
16
16
set RUST_TEST_THREADS = 1
17
- cargo test --release -- --skip unicode_file_name
17
+ cargo test --release --features external-harfbuzz -- --skip unicode_file_name
18
18
if errorlevel 1 exit 1
19
19
20
- cargo install --path . --bin tectonic --root %LIBRARY_PREFIX%
20
+ cargo install --path . --bin tectonic --root %LIBRARY_PREFIX% --features external-harfbuzz
21
21
if errorlevel 1 exit 1
22
22
23
23
del %LIBRARY_PREFIX% \.crates.toml
Original file line number Diff line number Diff line change 1
- #! / bin/bash
1
+ #! /usr/ bin/env bash
2
2
3
3
set -ex
4
4
@@ -7,23 +7,23 @@ export PKG_CONFIG_ALLOW_CROSS=1
7
7
# https://github.com/rust-lang/cargo/issues/10583#issuecomment-1129997984
8
8
export CARGO_NET_GIT_FETCH_WITH_CLI=true
9
9
10
- if [ $( uname) = Darwin ] ; then
11
- export CXXFLAGS=" -arch $OSX_ARCH -stdlib=libc++ -std=c++11 "
10
+ if [ $( uname) = Darwin ]; then
11
+ export CXXFLAGS=" -arch $OSX_ARCH -stdlib=libc++ -std=c++17 "
12
12
export RUSTFLAGS=" -C link-args=-Wl,-rpath,$PREFIX /lib"
13
13
14
14
if [[ " ${CONDA_BUILD_CROSS_COMPILATION} " != " 1" ]]; then
15
- DYLD_FALLBACK_LIBRARY_PATH=$PREFIX /lib RUSTDOCFLAGS=" -C linker=$CC " cargo test --release
15
+ DYLD_FALLBACK_LIBRARY_PATH=$PREFIX /lib RUSTDOCFLAGS=" -C linker=$CC " cargo test --release --features external-harfbuzz
16
16
fi
17
17
else
18
18
export CFLAGS=" -std=gnu99 $CFLAGS "
19
19
export RUSTFLAGS=" -C link-args=-Wl,-rpath-link,$PREFIX /lib"
20
20
21
21
if [[ " ${CONDA_BUILD_CROSS_COMPILATION} " != " 1" ]]; then
22
- LD_LIBRARY_PATH=$PREFIX /lib RUSTDOCFLAGS=" -C linker=$CC " cargo test --release
22
+ LD_LIBRARY_PATH=$PREFIX /lib RUSTDOCFLAGS=" -C linker=$CC " cargo test --release --features external-harfbuzz
23
23
fi
24
24
fi
25
25
26
26
cargo-bundle-licenses --format yaml --output THIRDPARTY.yml
27
- cargo install --locked -- no-track --path . --bin tectonic --root $PREFIX
27
+ cargo install --no-track --locked -- path . --bin tectonic --root $PREFIX --features external-harfbuzz
28
28
rm -f $PREFIX /.crates.toml
29
29
rm -f $PREFIX /.crates2.json
Original file line number Diff line number Diff line change 1
1
{% set name = "tectonic" %}
2
2
{% set version = "0.15.0" %}
3
- {% set sha256 = "fe58806e4ffc54487f40b91da4cbd46717807937e33e2fc830fcfef7e023ab39 " %}
3
+ {% set sha256 = "3c13de312c4fe39ff905ad17e64a15a3a59d33ab65dacb0a8b9482c57e6bc6aa " %}
4
4
{% set posix = 'm2-' if win else '' %}
5
5
{% set native = 'm2w64-' if win else '' %}
6
6
@@ -10,9 +10,10 @@ package:
10
10
11
11
source :
12
12
fn : {{ name }}-{{ version }}.tar.gz
13
- url : https://crates.io/api/v1/crates/ {{ name }}/ {{ version }}/download
13
+ url : https://github.com/tectonic-typesetting/{{ name }}/archive/refs/tags/ {{ name }}@ {{ version }}.tar.gz
14
14
sha256 : {{ sha256 }}
15
15
patches :
16
+ - pr-1202-fix-use-cxx-17.patch
16
17
- winzip.patch # [win]
17
18
18
19
build :
@@ -31,6 +32,7 @@ requirements:
31
32
- harfbuzz # [build_platform != target_platform]
32
33
33
34
host :
35
+ - expat # [not osx]
34
36
- fontconfig # [not osx]
35
37
- freetype
36
38
- glib # development files needed by harfbuzz
72
74
extra :
73
75
recipe-maintainers :
74
76
- pkgw
77
+ - anjos
You can’t perform that action at this time.
0 commit comments