diff --git a/ports/ncurses/build.sh b/ports/ncurses/build.sh index da35a39e..a6f42c8f 100755 --- a/ports/ncurses/build.sh +++ b/ports/ncurses/build.sh @@ -9,6 +9,7 @@ CONFIGURE_OPTIONS=( '--enable-pc-files' '--enable-sigwinch' '--disable-widec' + '--with-shared' '--without-ada' '--without-manpages' '--without-dlsym' diff --git a/ports/ncurses/patches/0001-add-banan_os-target.patch b/ports/ncurses/patches/0001-add-banan_os-target.patch index 5b6acf2b..0b50f5a3 100644 --- a/ports/ncurses/patches/0001-add-banan_os-target.patch +++ b/ports/ncurses/patches/0001-add-banan_os-target.patch @@ -1,116 +1,6 @@ -diff -ruN ncurses-6.5/config.log ncurses-6.5-banan_os/config.log ---- ncurses-6.5/config.log 1970-01-01 02:00:00.000000000 +0200 -+++ ncurses-6.5-banan_os/config.log 2024-08-05 12:15:48.028466613 +0300 -@@ -0,0 +1,106 @@ -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by configure, which was -+generated by GNU Autoconf 2.52.20231210. Invocation command line was -+ -+ $ ./configure --host=x86_64-pc-banan_os --prefix=/usr/local --disable-db-intall --disable-widec --without-ada --without-manpages --without-dlsym --without-cxx-binding -+ -+## ---------- ## -+## Platform. ## -+## ---------- ## -+ -+hostname = arch -+uname -m = x86_64 -+uname -r = 6.10.2-arch1-2 -+uname -s = Linux -+uname -v = #1 SMP PREEMPT_DYNAMIC Sat, 03 Aug 2024 17:56:17 +0000 -+ -+/usr/bin/uname -p = unknown -+/bin/uname -X = unknown -+ -+/bin/arch = unknown -+/usr/bin/arch -k = unknown -+/usr/convex/getsysinfo = unknown -+hostinfo = unknown -+/bin/machine = unknown -+/usr/bin/oslevel = unknown -+/bin/universe = unknown -+ -+PATH = /home/oskari/dev/banan-os/ports/../toolchain/local/bin:/home/oskari/.wasmer/bin:/home/oskari/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/usr/lib/rustup/bin -+ -+## ------------ ## -+## Core tests. ## -+## ------------ ## -+ -+configure:1175: PATH=".;."; conftest.sh -+./configure: line 1176: conftest.sh: command not found -+configure:1178: $? = 127 -+configure:1195: checking for ggrep -+configure:1221: result: no -+configure:1195: checking for grep -+configure:1210: found /usr/bin/grep -+configure:1218: result: grep -+configure:1229: checking for egrep -+configure:1285: result: grep -E -+configure:1296: result: Configuring NCURSES 6.5 ABI 6 (Mon Aug 5 12:15:47 EEST 2024) -+configure:1300: checking for package version -+configure:1321: result: 6.5 -+configure:1324: checking for package patch date -+configure:1341: result: 20240427 -+configure:1352: testing ABI VERSION 5:0:10 ... -+configure:1356: testing VERSION_MAJOR 6 ... -+configure:1360: testing VERSION_MINOR 5 ... -+configure:1364: testing VERSION_PATCH 20240427 ... -+configure:1509: checking build system type -+configure:1527: result: x86_64-pc-linux-gnu -+configure:1534: checking host system type -+configure:1543: error: /bin/sh ./config.sub x86_64-pc-banan_os failed -+ -+## ----------------- ## -+## Cache variables. ## -+## ----------------- ## -+ -+ac_cv_build=x86_64-pc-linux-gnu -+ac_cv_build_alias=x86_64-pc-linux-gnu -+ac_cv_env_CC_set= -+ac_cv_env_CC_value= -+ac_cv_env_CFLAGS_set= -+ac_cv_env_CFLAGS_value= -+ac_cv_env_CPPFLAGS_set= -+ac_cv_env_CPPFLAGS_value= -+ac_cv_env_CPP_set= -+ac_cv_env_CPP_value= -+ac_cv_env_CXXCPP_set= -+ac_cv_env_CXXCPP_value= -+ac_cv_env_CXXFLAGS_set= -+ac_cv_env_CXXFLAGS_value= -+ac_cv_env_CXX_set= -+ac_cv_env_CXX_value= -+ac_cv_env_LDFLAGS_set= -+ac_cv_env_LDFLAGS_value= -+ac_cv_env_build_alias_set= -+ac_cv_env_build_alias_value= -+ac_cv_env_host_alias_set=set -+ac_cv_env_host_alias_value=x86_64-pc-banan_os -+ac_cv_env_target_alias_set= -+ac_cv_env_target_alias_value= -+ac_cv_host= -+ac_cv_host_alias=x86_64-pc-banan_os -+ac_cv_path_EGREP='grep -E' -+ac_cv_prog_GREP=grep -+cf_cv_abi_default=6 -+cf_cv_abi_version=6 -+cf_cv_rel_version=6.5 -+cf_cv_timestamp='Mon Aug 5 12:15:47 EEST 2024' -+ -+## ------------ ## -+## confdefs.h. ## -+## ------------ ## -+ -+#define PACKAGE "ncurses" -+#define NCURSES_VERSION "6.5" -+#define NCURSES_PATCHDATE 20240427 -+ -+ -+configure: exit 1 diff -ruN ncurses-6.5/config.sub ncurses-6.5-banan_os/config.sub --- ncurses-6.5/config.sub 2023-12-27 16:41:27.000000000 +0200 -+++ ncurses-6.5-banan_os/config.sub 2024-08-05 12:17:03.025286556 +0300 ++++ ncurses-6.5-banan_os/config.sub 2025-04-19 05:53:50.863635047 +0300 @@ -1768,7 +1768,7 @@ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ diff --git a/ports/ncurses/patches/0002-add-shared-library-support.patch b/ports/ncurses/patches/0002-add-shared-library-support.patch new file mode 100644 index 00000000..846c45d6 --- /dev/null +++ b/ports/ncurses/patches/0002-add-shared-library-support.patch @@ -0,0 +1,13 @@ +diff -ruN ncurses-6.5/configure ncurses-6.5-banan_os/configure +--- ncurses-6.5/configure 2024-04-10 11:09:48.000000000 +0300 ++++ ncurses-6.5-banan_os/configure 2025-04-19 05:54:18.828084370 +0300 +@@ -6646,6 +6646,9 @@ + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr/lib -o $@' + fi + ;; ++ (banan_os*) ++ MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,`basename $@` -o $@' ++ ;; + (beos*) + MK_SHARED_LIB='${CC} ${LDFLAGS} ${CFLAGS} -o $@ -Xlinker -soname=`basename $@` -nostart -e 0' + ;;