diff --git a/recipe/0007-Use-AC_SEARCH_LIBS-to-search-for-ncursesw-then-ncurs.patch b/recipe/0007-Use-AC_SEARCH_LIBS-to-search-for-ncursesw-then-ncurs.patch deleted file mode 100644 index cee2e6a8..00000000 --- a/recipe/0007-Use-AC_SEARCH_LIBS-to-search-for-ncursesw-then-ncurs.patch +++ /dev/null @@ -1,107 +0,0 @@ -From a7e01d57363e2dc3042d789cf9ed066fa882de2a Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Wed, 15 Dec 2021 09:24:02 +0100 -Subject: [PATCH 07/16] Use AC_SEARCH_LIBS to search for ncursesw then ncurses - ---- - configure | 58 +++++++++++++++++++++++++++++++++------------------- - configure.ac | 2 +- - 2 files changed, 38 insertions(+), 22 deletions(-) - -diff --git a/configure b/configure -index 9af2755..a342123 100755 ---- a/configure -+++ b/configure -@@ -24744,43 +24744,59 @@ fi - ## only need ncurses if libreadline is not statically linked against it - unset ac_cv_lib_readline_rl_callback_read_char - ## FIXME replace main, maybe by tputs -- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lncurses" >&5 --printf %s "checking for main in -lncurses... " >&6; } --if test ${ac_cv_lib_ncurses_main+y} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing initscr" >&5 -+$as_echo_n "checking for library containing initscr... " >&6; } -+if ${ac_cv_search_initscr+:} false; then : - then : - printf %s "(cached) " >&6 - else $as_nop - ac_check_lib_save_LIBS=$LIBS --LIBS="-lncurses $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char initscr (); - int - main (void) - { --return main (); -+return initscr (); - ; - return 0; - } - _ACEOF --if ac_fn_c_try_link "$LINENO" --then : -- ac_cv_lib_ncurses_main=yes --else $as_nop -- ac_cv_lib_ncurses_main=no -+for ac_lib in '' ncursesw curses; do -+ if test -z "$ac_lib"; then -+ ac_res="none required" -+ else -+ ac_res=-l$ac_lib -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ fi -+ if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_search_initscr=$ac_res -+ fi -+ rm -f core conftest.err conftest.$ac_objext conftest.beam \ -+ conftest$ac_exeext -+ if ${ac_cv_search_initscr+:} false; then : -+ break -+ fi -+done -+if ${ac_cv_search_initscr+:} false; then : -+ ac_cv_search_initscr=no - fi --rm -f core conftest.err conftest.$ac_objext conftest.beam \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS - fi --{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_main" >&5 --printf "%s\n" "$ac_cv_lib_ncurses_main" >&6; } --if test "x$ac_cv_lib_ncurses_main" = xyes --then : -- printf "%s\n" "#define HAVE_LIBNCURSES 1" >>confdefs.h -- -- LIBS="-lncurses $LIBS" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_initscr" >&5 -+$as_echo "$ac_cv_search_initscr" >&6; } -+ac_res=$ac_cv_search_initscr -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - - else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -ltinfo" >&5 -diff --git a/configure.ac b/configure.ac -index d86dd3e..32f2403 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -957,7 +957,7 @@ if test "${use_readline}" = yes; then - ## only need ncurses if libreadline is not statically linked against it - unset ac_cv_lib_readline_rl_callback_read_char - ## FIXME replace main, maybe by tputs -- AC_CHECK_LIB(ncurses, main, [], -+ AC_SEARCH_LIBS([initscr], [ncursesw curses], [], - AC_CHECK_LIB(tinfo, main, [], - AC_CHECK_LIB(termcap, main, [], - AC_CHECK_LIB(termlib, main)))) diff --git a/recipe/0013-Add-luuid-to-X_PRE_LIBS.patch b/recipe/0013-Add-luuid-to-X_PRE_LIBS.patch deleted file mode 100644 index f4bfdd36..00000000 --- a/recipe/0013-Add-luuid-to-X_PRE_LIBS.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9c541630cd86796700b50e6d94ecae3ad7939935 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Fri, 1 Jun 2018 23:26:13 +0100 -Subject: [PATCH 13/16] Add -luuid to X_PRE_LIBS - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 3b5b5d6..00f30b2 100755 ---- a/configure -+++ b/configure -@@ -45248,7 +45248,7 @@ fi - printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } - if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes - then : -- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -+ X_PRE_LIBS="$X_PRE_LIBS -luuid -lSM -lICE" - fi - - LDFLAGS=$ac_save_LDFLAGS --- -2.34.1 - diff --git a/recipe/0014-link-Xt-to-uuid.patch b/recipe/0014-link-Xt-to-uuid.patch deleted file mode 100644 index 553b024b..00000000 --- a/recipe/0014-link-Xt-to-uuid.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 89af2dc803f45ecb5a876c0dc6e417c2b93dbdf4 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Tue, 2 Oct 2018 10:55:37 +0100 -Subject: [PATCH 14/16] link Xt to uuid - ---- - m4/R.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/R.m4 b/m4/R.m4 -index f6e3835..81bf493 100644 ---- a/m4/R.m4 -+++ b/m4/R.m4 -@@ -1653,7 +1653,7 @@ if test -z "${no_x}"; then - CPPFLAGS="${r_save_CPPFLAGS}" - if test "${ac_cv_header_X11_Intrinsic_h}" = yes ; then - AC_CHECK_LIB(Xt, XtToolkitInitialize, [have_Xt=yes], [have_Xt=no], -- [${X_LIBS} -lX11]) -+ [${X_LIBS} -lX11 -luuid]) - if test "${have_Xt}" = yes; then - use_X11="yes" - fi -@@ -1663,7 +1663,7 @@ if test "x${use_X11}" = "xyes"; then - AC_DEFINE(HAVE_X11, 1, - [Define if you have the X11 headers and libraries, and want - the X11 GUI to be built.]) -- X_LIBS="${X_LIBS} -lX11 -lXt" -+ X_LIBS="${X_LIBS} -lX11 -lXt -luuid" - else - if test "x${with_x}" != "xno"; then - AC_MSG_ERROR( --- -2.34.1 - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3b772ccd..1a8128cf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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 @@ -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] @@ -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] @@ -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 @@ -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] @@ -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: