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

Fix dependencies #279

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Fix dependencies #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e920d51
Fix dependencies
isuruf Sep 20, 2023
60f20e6
On OSX, R links to gettext and fontconfig
isuruf Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 0 additions & 107 deletions recipe/0007-Use-AC_SEARCH_LIBS-to-search-for-ncursesw-then-ncurs.patch
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions recipe/0013-Add-luuid-to-X_PRE_LIBS.patch
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions recipe/0014-link-Xt-to-uuid.patch
View file
Open in desktop

This file was deleted.

41 changes: 8 additions & 33 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,18 @@ source:
- 0004-Win32-Extend-sqrt-NA_real_-hack-to-all-GCC-versions.patch
- 0005-Win32-Prevent-conversion-of-R_ARCH-to-abs-Windows-pa.patch
- 0006-Darwin-Avoid-setting-DYLD_FALLBACK_LIBRARY_PATH.patch
- 0007-Use-AC_SEARCH_LIBS-to-search-for-ncursesw-then-ncurs.patch
- 0008-Linux-Do-not-modify-LD_LIBRARY_PATH.patch
- 0009-javareconf-Do-not-fail-on-compile-fail.patch
- 0010-Revert-part-of-9b818c6dc00143ff18775a4015a3f43b5196f.patch
- 0011-javareconf-macOS-Continue-to-allow-system-Java-lt-9-.patch
#- 0012-Allow-rpath-in-tcltk-dylib-LC_LOAD_DYLIB-command.patch
- 0013-Add-luuid-to-X_PRE_LIBS.patch
- 0014-link-Xt-to-uuid.patch
- 0015-Check-for-changes-then-forcibly-mv-in-javareconf.in.patch
- 0016-Use-LAPACK_LDFLAGS-in-Rlapack_la_LIBADD.patch
- 0017-tcltk-dylib-osx.patch

build:
skip: true # [win]
number: 4
number: 5
no_link:
- lib/R/doc/html/packages.html

Expand Down Expand Up @@ -88,17 +85,14 @@ outputs:
- {{ posix }}automake # [not win]
- make # [not win]
- libcurl # [not win]
- freetype # [build_platform != target_platform]
- readline # [build_platform != target_platform]
- ncurses # [build_platform != target_platform]
- libcurl # [build_platform != target_platform]
- xz # [build_platform != target_platform]
- libpng # [build_platform != target_platform]
- bzip2 # [build_platform != target_platform]
- cairo # [build_platform != target_platform]
- libjpeg-turbo # [build_platform != target_platform]
- libiconv # [osx and (build_platform != target_platform)]
- libuuid # [linux and (build_platform != target_platform)]
- libjpeg-turbo # [build_platform != target_platform]
- libiconv # [unix and (build_platform != target_platform)]
- glib # [unix and (build_platform != target_platform)]
- bwidget # [build_platform != target_platform]
- tktable # [build_platform != target_platform]
Expand All @@ -107,30 +101,25 @@ outputs:
- pcre2 # [build_platform != target_platform]
- tk # [build_platform != target_platform]
- zlib # [build_platform != target_platform]
- gsl # [build_platform != target_platform]
- libtiff # [build_platform != target_platform]
- libxml2 # [build_platform != target_platform]
- libssh2 # [build_platform != target_platform]
- krb5 # [build_platform != target_platform]
- libblas # [build_platform != target_platform]
- liblapack # [build_platform != target_platform]
- llvm-openmp # [osx]
- libgomp # [linux]
host:
# This is a hack, strong run_exports should cause this to be added
- llvm-openmp # [osx]
- freetype # [not win]
- readline # [not win]
- ncurses # [not win]
- libcurl # [not win]
- xz # [not win]
- libpng # [not win]
- bzip2 # [not win]
- {{ native }}bzip2 # [win]
- cairo # [not win]
- gettext # [osx]
- fontconfig # [osx]
- {{ native }}libjpeg-turbo # [win]
- libjpeg-turbo # [not win]
- libiconv # [osx]
- libiconv # [unix]
- {{ native }}libiconv # [win]
- libuuid # [linux]
- {{ native }}gmp # [win]
- glib # [unix]
- {{ native }}fftw # [win]
Expand All @@ -149,14 +138,8 @@ outputs:
- {{ native }}tk # [win]
- {{ native }}zlib # [win]
- zlib # [not win]
- {{ native }}gsl # [win]
- gsl # [not win]
- {{ native }}libtiff # [win]
- libtiff # [not win]
- {{ native }}libxml2 # [win]
- libxml2 # [not win]
- libssh2 # [not win]
- krb5 # [not win]
- libblas
- liblapack
# sed is in host env because its path is recorded in R's shell wrapper
Expand All @@ -171,12 +154,10 @@ outputs:
- {{ c_compiler|default("blah") }}_{{ target_platform }} >={{ c_compiler_version|default("0") }} # [osx]
- {{ cxx_compiler|default("blah") }}_{{ target_platform }} >={{ cxx_compiler_version|default("0") }} # [osx]
- {{ compiler('fortran') }} # [osx]
- {{ pin_compatible('llvm-openmp', max_pin=None) }} # [osx]
- curl # [not win]
- {{ native }}bzip2 # [win]
- {{ native }}libjpeg-turbo # [win]
- {{ native }}libiconv # [win]
- libuuid # [linux]
- xorg-libxt # [linux]
- {{ native }}gmp # [win]
- {{ native }}fftw # [win]
Expand All @@ -189,13 +170,7 @@ outputs:
- {{ native }}pcre2 # [win]
- {{ native }}tk # [win]
- {{ native }}zlib # [win]
- {{ native }}gsl # [win]
- {{ native }}libtiff # [win]
- {{ native }}libxml2 # [win]
# Once run_exports are in place these will not be necessary:
- {{ pin_compatible('pango') }} # [not win]
- {{ pin_compatible('bzip2') }} # [not win]
- {{ pin_compatible('icu') }} # [not win]
- sed # [linux]

test:
Expand Down