_curses_panel now builds (though the config is a bit sloppy)

OpenIndiana · Feb 6, 2024 · e39900e · e39900e
1 parent dedb6b3
commit e39900e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/components/python/python-312/patches/00-include-ncurses.patch b/components/python/python-312/patches/00-include-ncurses.patch
@@ -0,0 +1,21 @@
+--- Python-3.12.1/configure.ac.~6~	Mon Feb  5 10:07:19 2024
++++ Python-3.12.1/configure.ac	Mon Feb  5 10:21:31 2024
+@@ -6509,7 +6509,7 @@
+ # first curses header check
+ ac_save_cppflags="$CPPFLAGS"
+ if test "$cross_compiling" = no; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
++  CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw -I/usr/include/ncurses"
+ fi
+
+ # On Solaris, term.h requires curses.h
+--- Python-3.12.1/configure.ac.~7~	Mon Feb  5 17:08:56 2024
++++ Python-3.12.1/configure.ac	Mon Feb  5 17:19:15 2024
+@@ -6470,6 +6470,7 @@
+         have_panel=panelw
+       ], [
+         WITH_SAVE_ENV([
++	  AS_VAR_APPEND([LDFLAGS], [" -L/usr/gnu/lib/amd64"])
+           AC_CHECK_LIB([panelw], [update_panels], [
+             have_panel=panelw
+             PANEL_CFLAGS=${PANEL_CFLAGS-""}
diff --git a/components/python/python-312/patches/00-socket-test-2.patch b/components/python/python-312/patches/00-socket-test-2.patch
@@ -24,7 +24,7 @@
 +@MODULE__CURSES_TRUE@_curses _cursesmodule.c -Wl,-zrecord -lreadline -lncurses
  # needs -lncurses[w] and -lpanel[w]
 -@MODULE__CURSES_PANEL_TRUE@_curses_panel _curses_panel.c
-+@MODULE__CURSES_PANEL_TRUE@_curses_panel _curses_panel.c -Wl,-zrecord -L/usr/gnu/lib/amd64 -lpanel -lreadline -lncurses
++@MODULE__CURSES_PANEL_TRUE@_curses_panel _curses_panel.c -Wl,-zrecord -L/usr/gnu/lib/amd64 -Wl,-R/usr/gnu/lib/amd64 -lpanelw -lreadline -lncursesw
 
  @MODULE__SQLITE3_TRUE@_sqlite3 _sqlite/blob.c _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c