Skip to content

Commit

Permalink
libncurses: don't build separate tinfo library
Browse files Browse the repository at this point in the history
  • Loading branch information
@micahsnyder
micahsnyder committed Sep 1, 2024
1 parent b1101ff commit ecd619b
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 86 deletions.
154 changes: 77 additions & 77 deletions recipes/clamav-1.0.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ platforms:
-D PCRE2_INCLUDE_DIR="{install}/include" \
-D PCRE2_LIBRARY="{install}/lib/libpcre2-8.dylib" \
-D NCURSES_INCLUDE_DIR="{install}/include" \
-D CURSES_LIBRARY="{install}/lib/libncurses.a" \
-D CURSES_LIBRARIES="{install}/lib/libncurses.a" \
-D ZLIB_INCLUDE_DIR="{install}/include" \
-D ZLIB_LIBRARY="{install}/lib/libz.dylib" \
-D LIBCHECK_INCLUDE_DIR="{install}/include" \
Expand Down Expand Up @@ -95,30 +95,30 @@ platforms:
mkdir build
cd build
cmake .. \
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \
-D CMAKE_PREFIX_PATH={install} \
-D CMAKE_INSTALL_PREFIX="{install}" \
-D CMAKE_MODULE_PATH={install}/lib/cmake \
-D CMAKE_BUILD_TYPE=Release \
-D ENABLE_EXAMPLES=OFF \
-D JSONC_INCLUDE_DIR="{install}/include/json-c" \
-D JSONC_LIBRARY="{install}/lib/libjson-c.a" \
-D ENABLE_JSON_SHARED=OFF \
-D BZIP2_INCLUDE_DIR="{install}/include" \
-D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a" \
-D OPENSSL_ROOT_DIR="{install}" \
-D OPENSSL_INCLUDE_DIR="{install}/include" \
-D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \
-D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \
-D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \
-D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \
-D PCRE2_INCLUDE_DIR="{install}/include" \
-D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \
-D NCURSES_INCLUDE_DIR="{install}/include" \
-D CURSES_LIBRARY="{install}/lib/libncurses.a" \
-D ZLIB_INCLUDE_DIR="{install}/include" \
-D ZLIB_LIBRARY="{install}/lib/libz.a" \
-D LIBCHECK_INCLUDE_DIR="{install}/include" \
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \
-D CMAKE_PREFIX_PATH={install} \
-D CMAKE_INSTALL_PREFIX="{install}" \
-D CMAKE_MODULE_PATH={install}/lib/cmake \
-D CMAKE_BUILD_TYPE=Release \
-D ENABLE_EXAMPLES=OFF \
-D JSONC_INCLUDE_DIR="{install}/include/json-c" \
-D JSONC_LIBRARY="{install}/lib/libjson-c.a" \
-D ENABLE_JSON_SHARED=OFF \
-D BZIP2_INCLUDE_DIR="{install}/include" \
-D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a" \
-D OPENSSL_ROOT_DIR="{install}" \
-D OPENSSL_INCLUDE_DIR="{install}/include" \
-D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \
-D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \
-D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \
-D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \
-D PCRE2_INCLUDE_DIR="{install}/include" \
-D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \
-D NCURSES_INCLUDE_DIR="{install}/include" \
-D CURSES_LIBRARIES="{install}/lib/libncurses.a" \
-D ZLIB_INCLUDE_DIR="{install}/include" \
-D ZLIB_LIBRARY="{install}/lib/libz.a" \
-D LIBCHECK_INCLUDE_DIR="{install}/include" \
-D LIBCHECK_LIBRARY="{install}/lib/libcheck.a"
make: |
cd build
Expand Down Expand Up @@ -183,7 +183,7 @@ platforms:
-D PCRE2_INCLUDE_DIR="{install}/include" \
-D PCRE2_LIBRARY="{install}/lib/libpcre2-8.so" \
-D NCURSES_INCLUDE_DIR="{install}/include" \
-D CURSES_LIBRARY="{install}/lib/libncurses.a" \
-D CURSES_LIBRARIES="{install}/lib/libncurses.a" \
-D ZLIB_INCLUDE_DIR="{install}/include" \
-D ZLIB_LIBRARY="{install}/lib/libz.so" \
-D LIBCHECK_INCLUDE_DIR="{install}/include" \
Expand Down Expand Up @@ -230,30 +230,30 @@ platforms:
mkdir build
cd build
cmake .. \
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \
-D CMAKE_PREFIX_PATH={install} \
-D CMAKE_INSTALL_PREFIX="{install}" \
-D CMAKE_MODULE_PATH={install}/lib/cmake \
-D CMAKE_BUILD_TYPE=Release \
-D ENABLE_EXAMPLES=OFF \
-D JSONC_INCLUDE_DIR="{install}/include/json-c" \
-D JSONC_LIBRARY="{install}/lib/libjson-c.a" \
-D ENABLE_JSON_SHARED=OFF \
-D BZIP2_INCLUDE_DIR="{install}/include" \
-D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a" \
-D OPENSSL_ROOT_DIR="{install}" \
-D OPENSSL_INCLUDE_DIR="{install}/include" \
-D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \
-D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \
-D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \
-D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \
-D PCRE2_INCLUDE_DIR="{install}/include" \
-D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \
-D NCURSES_INCLUDE_DIR="{install}/include" \
-D CURSES_LIBRARY="{install}/lib/libncurses.a" \
-D ZLIB_INCLUDE_DIR="{install}/include" \
-D ZLIB_LIBRARY="{install}/lib/libz.a" \
-D LIBCHECK_INCLUDE_DIR="{install}/include" \
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \
-D CMAKE_PREFIX_PATH={install} \
-D CMAKE_INSTALL_PREFIX="{install}" \
-D CMAKE_MODULE_PATH={install}/lib/cmake \
-D CMAKE_BUILD_TYPE=Release \
-D ENABLE_EXAMPLES=OFF \
-D JSONC_INCLUDE_DIR="{install}/include/json-c" \
-D JSONC_LIBRARY="{install}/lib/libjson-c.a" \
-D ENABLE_JSON_SHARED=OFF \
-D BZIP2_INCLUDE_DIR="{install}/include" \
-D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a" \
-D OPENSSL_ROOT_DIR="{install}" \
-D OPENSSL_INCLUDE_DIR="{install}/include" \
-D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \
-D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \
-D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \
-D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \
-D PCRE2_INCLUDE_DIR="{install}/include" \
-D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \
-D NCURSES_INCLUDE_DIR="{install}/include" \
-D CURSES_LIBRARIES="{install}/lib/libncurses.a" \
-D ZLIB_INCLUDE_DIR="{install}/include" \
-D ZLIB_LIBRARY="{install}/lib/libz.a" \
-D LIBCHECK_INCLUDE_DIR="{install}/include" \
-D LIBCHECK_LIBRARY="{install}/lib/libcheck.a"
make: |
cd build
Expand Down Expand Up @@ -319,7 +319,7 @@ platforms:
-D PCRE2_INCLUDE_DIR="{install}/include" \
-D PCRE2_LIBRARY="{install}/lib/libpcre2-8.so" \
-D NCURSES_INCLUDE_DIR="{install}/include" \
-D CURSES_LIBRARY="{install}/lib/libncurses.a" \
-D CURSES_LIBRARIES="{install}/lib/libncurses.a" \
-D ZLIB_INCLUDE_DIR="{install}/include" \
-D ZLIB_LIBRARY="{install}/lib/libz.so" \
-D LIBCHECK_INCLUDE_DIR="{install}/include" \
Expand Down Expand Up @@ -366,30 +366,30 @@ platforms:
mkdir build
cd build
cmake .. \
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \
-D CMAKE_PREFIX_PATH={install} \
-D CMAKE_INSTALL_PREFIX="{install}" \
-D CMAKE_MODULE_PATH={install}/lib/cmake \
-D CMAKE_BUILD_TYPE=Release \
-D ENABLE_EXAMPLES=OFF \
-D JSONC_INCLUDE_DIR="{install}/include/json-c" \
-D JSONC_LIBRARY="{install}/lib/libjson-c.a" \
-D ENABLE_JSON_SHARED=OFF \
-D BZIP2_INCLUDE_DIR="{install}/include" \
-D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a" \
-D OPENSSL_ROOT_DIR="{install}" \
-D OPENSSL_INCLUDE_DIR="{install}/include" \
-D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \
-D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \
-D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \
-D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \
-D PCRE2_INCLUDE_DIR="{install}/include" \
-D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \
-D NCURSES_INCLUDE_DIR="{install}/include" \
-D CURSES_LIBRARY="{install}/lib/libncurses.a" \
-D ZLIB_INCLUDE_DIR="{install}/include" \
-D ZLIB_LIBRARY="{install}/lib/libz.a" \
-D LIBCHECK_INCLUDE_DIR="{install}/include" \
-D CMAKE_FIND_PACKAGE_PREFER_CONFIG=TRUE \
-D CMAKE_PREFIX_PATH={install} \
-D CMAKE_INSTALL_PREFIX="{install}" \
-D CMAKE_MODULE_PATH={install}/lib/cmake \
-D CMAKE_BUILD_TYPE=Release \
-D ENABLE_EXAMPLES=OFF \
-D JSONC_INCLUDE_DIR="{install}/include/json-c" \
-D JSONC_LIBRARY="{install}/lib/libjson-c.a" \
-D ENABLE_JSON_SHARED=OFF \
-D BZIP2_INCLUDE_DIR="{install}/include" \
-D BZIP2_LIBRARY_RELEASE="{install}/lib/libbz2.a" \
-D OPENSSL_ROOT_DIR="{install}" \
-D OPENSSL_INCLUDE_DIR="{install}/include" \
-D OPENSSL_CRYPTO_LIBRARY="{install}/lib/libcrypto.a" \
-D OPENSSL_SSL_LIBRARY="{install}/lib/libssl.a" \
-D LIBXML2_INCLUDE_DIR="{install}/include/libxml2" \
-D LIBXML2_LIBRARY="{install}/lib/libxml2.a" \
-D PCRE2_INCLUDE_DIR="{install}/include" \
-D PCRE2_LIBRARY="{install}/lib/libpcre2-8.a" \
-D NCURSES_INCLUDE_DIR="{install}/include" \
-D CURSES_LIBRARIES="{install}/lib/libncurses.a" \
-D ZLIB_INCLUDE_DIR="{install}/include" \
-D ZLIB_LIBRARY="{install}/lib/libz.a" \
-D LIBCHECK_INCLUDE_DIR="{install}/include" \
-D LIBCHECK_LIBRARY="{install}/lib/libcheck.a"
make: |
cd build
Expand Down Expand Up @@ -452,7 +452,7 @@ platforms:
-D PCRE2_INCLUDE_DIR="{install}\include" \
-D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \
-D PDCURSES_INCLUDE_DIR="{install}\include" \
-D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \
-D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \
-D PThreadW32_INCLUDE_DIR="{install}\include" \
-D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \
-D ZLIB_INCLUDE_DIR="{install}\include" \
Expand Down Expand Up @@ -503,7 +503,7 @@ platforms:
-D PCRE2_INCLUDE_DIR="{install}\include" \
-D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \
-D PDCURSES_INCLUDE_DIR="{install}\include" \
-D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \
-D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \
-D PThreadW32_INCLUDE_DIR="{install}\include" \
-D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \
-D ZLIB_INCLUDE_DIR="{install}\include" \
Expand Down
6 changes: 3 additions & 3 deletions recipes/clamav-1.5.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ platforms:
-D PCRE2_INCLUDE_DIR="{install}\include" \
-D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \
-D PDCURSES_INCLUDE_DIR="{install}\include" \
-D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \
-D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \
-D PThreadW32_INCLUDE_DIR="{install}\include" \
-D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \
-D ZLIB_INCLUDE_DIR="{install}\include" \
Expand Down Expand Up @@ -521,7 +521,7 @@ platforms:
-D PCRE2_INCLUDE_DIR="{install}\include" \
-D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \
-D PDCURSES_INCLUDE_DIR="{install}\include" \
-D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \
-D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \
-D PThreadW32_INCLUDE_DIR="{install}\include" \
-D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \
-D ZLIB_INCLUDE_DIR="{install}\include" \
Expand Down Expand Up @@ -572,7 +572,7 @@ platforms:
-D PCRE2_INCLUDE_DIR="{install}\include" \
-D PCRE2_LIBRARY="{install}\lib\pcre2-8.lib" \
-D PDCURSES_INCLUDE_DIR="{install}\include" \
-D CURSES_LIBRARY="{install}\lib\pdcurses.lib" \
-D CURSES_LIBRARIES="{install}\lib\pdcurses.lib" \
-D PThreadW32_INCLUDE_DIR="{install}\include" \
-D PThreadW32_LIBRARY="{install}\lib\pthreadVC3.lib" \
-D ZLIB_INCLUDE_DIR="{install}\include" \
Expand Down
12 changes: 6 additions & 6 deletions recipes/ncurses-6.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ platforms:
host:
build_script:
configure: |
CFLAGS="-arch x86_64 -arch arm64" ./configure --with-termlib --disable-widec --prefix={install}
CFLAGS="-arch x86_64 -arch arm64" ./configure --disable-widec --prefix={install}
make: |
make
install: |
Expand All @@ -37,7 +37,7 @@ platforms:
host-static:
build_script:
configure: |
CFLAGS="-arch x86_64 -arch arm64" ./configure --with-termlib --disable-widec --prefix={install}
CFLAGS="-arch x86_64 -arch arm64" ./configure --disable-widec --prefix={install}
make: |
make
install: |
Expand All @@ -53,7 +53,7 @@ platforms:
host:
build_script:
configure: |
./configure --with-termlib --disable-widec --prefix={install}
./configure --disable-widec --prefix={install}
make: |
gmake
install: |
Expand All @@ -68,7 +68,7 @@ platforms:
host-static:
build_script:
configure: |
./configure --with-termlib --disable-widec --prefix={install}
./configure --disable-widec --prefix={install}
make: |
gmake
install: |
Expand All @@ -84,7 +84,7 @@ platforms:
host:
build_script:
configure: |
./configure --with-termlib --disable-widec --prefix={install}
./configure --disable-widec --prefix={install}
make: |
make
install: |
Expand All @@ -99,7 +99,7 @@ platforms:
host-static:
build_script:
configure: |
./configure --with-termlib --disable-widec --prefix={install}
./configure --disable-widec --prefix={install}
make: |
make
install: |
Expand Down

0 comments on commit ecd619b

Please sign in to comment.