Skip to content

Commit 2c660e7

Browse files
committed
add more deps
1 parent 69ee7dd commit 2c660e7

File tree

3 files changed

+473
-0
lines changed

3 files changed

+473
-0
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
diff -Naur ncurses-6.1/ncurses/curses.priv.h ncurses-6.1_emscripten/ncurses/curses.priv.h
2+
--- ncurses-6.1/ncurses/curses.priv.h 2018-01-20 23:13:41.000000000 -0300
3+
+++ ncurses-6.1_emscripten/ncurses/curses.priv.h 2019-08-08 21:50:05.174897464 -0300
4+
@@ -64,6 +64,23 @@
5+
#include <stddef.h> /* for offsetof */
6+
#include <stdlib.h>
7+
#include <string.h>
8+
+
9+
+#ifdef __EMSCRIPTEN__
10+
+#ifdef getenv
11+
+#undef getenv
12+
+#endif
13+
+
14+
+#define getenv(name)(char*)\
15+
+({\
16+
+ char* data = getenv(name);\
17+
+ int length = strlen(data);\
18+
+ char* dest = (char*)malloc(length+1);\
19+
+ strncpy(dest, data, length);\
20+
+ dest[length+1] = '\0';\
21+
+ dest;\
22+
+})
23+
+#endif
24+
+
25+
#include <sys/types.h>
26+
#include <sys/stat.h>
27+
Lines changed: 223 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,223 @@
1+
--- ncurses/Makefile 2022-04-26 00:07:51.617172493 +0200
2+
+++ ncurses-wasm/Makefile 2022-04-26 00:12:57.704905779 +0200
3+
@@ -115,7 +115,7 @@
4+
cd panel && ${MAKE} ${TOP_MFLAGS} $@
5+
cd menu && ${MAKE} ${TOP_MFLAGS} $@
6+
cd form && ${MAKE} ${TOP_MFLAGS} $@
7+
- cd misc && ${MAKE} ${TOP_MFLAGS} $@
8+
+# cd misc && ${MAKE} ${TOP_MFLAGS} $@
9+
10+
libs \
11+
install.libs \
12+
--- ncurses/ncurses/Makefile 2022-04-26 00:07:51.624172419 +0200
13+
+++ ncurses-wasm/ncurses/Makefile 2022-04-26 00:13:43.524417020 +0200
14+
@@ -49,14 +49,14 @@
15+
VPATH = /data/git/python-wasm-plus/src/ncurses-6.1/ncurses
16+
THIS = Makefile
17+
18+
-CF_MFLAGS =
19+
+CF_MFLAGS =
20+
21+
22+
-x =
23+
+x =
24+
o = .o
25+
26+
MODEL = normal
27+
-DESTDIR =
28+
+DESTDIR =
29+
top_srcdir = /data/git/python-wasm-plus/src/ncurses-6.1
30+
srcdir = /data/git/python-wasm-plus/src/ncurses-6.1/ncurses
31+
prefix = /data/git/python-wasm-plus/devices/emsdk/usr
32+
@@ -72,14 +72,14 @@
33+
34+
PACKAGE = ncurses
35+
36+
-LIBTOOL =
37+
-LIBTOOL_OPTS =
38+
-LIBTOOL_CLEAN =
39+
-LIBTOOL_COMPILE =
40+
+LIBTOOL =
41+
+LIBTOOL_OPTS =
42+
+LIBTOOL_CLEAN =
43+
+LIBTOOL_COMPILE =
44+
LIBTOOL_LINK = ${CC}
45+
-LIBTOOL_INSTALL =
46+
-LIBTOOL_UNINSTALL =
47+
-LT_UNDEF =
48+
+LIBTOOL_INSTALL =
49+
+LIBTOOL_UNINSTALL =
50+
+LT_UNDEF =
51+
52+
INSTALL = /usr/bin/install -c
53+
INSTALL_LIB = /usr/bin/install -c -m 644
54+
@@ -94,7 +94,7 @@
55+
NM = /data/git/python-wasm-plus/emsdk/upstream/bin/llvm-nm
56+
57+
CTAGS = ctags
58+
-ETAGS =
59+
+ETAGS =
60+
61+
CC = /data/git/python-wasm-plus/emsdk/upstream/emscripten/emcc
62+
CPP = /data/git/python-wasm-plus/emsdk/upstream/emscripten/emcc -E
63+
@@ -105,7 +105,7 @@
64+
65+
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
66+
67+
-BUILD_CPPFLAGS = -DHAVE_CONFIG_H -DUSE_BUILD_CC -I../ncurses -I$(srcdir) -I../include -I$(INCDIR) ${CPPFLAGS}
68+
+BUILD_CPPFLAGS = -DHAVE_CONFIG_H -DUSE_BUILD_CC -I../ncurses -I$(srcdir) -I../include -I$(INCDIR) ${CPPFLAGS}
69+
BUILD_CC = ${CC}
70+
BUILD_CCFLAGS = ${CFLAGS}
71+
BUILD_LDFLAGS = ${LDFLAGS}
72+
@@ -115,7 +115,7 @@
73+
# is compiled into the build, or are test-programs that are not installed.
74+
75+
BUILD_EXEEXT = $x
76+
-x =
77+
+x =
78+
79+
CFLAGS_LIBTOOL = $(CCFLAGS)
80+
CFLAGS_NORMAL = $(CCFLAGS)
81+
@@ -126,16 +126,16 @@
82+
CFLAGS_DEFAULT = $(CFLAGS_NORMAL)
83+
84+
LINK = $(LIBTOOL)
85+
-LDFLAGS = -L/data/git/python-wasm-plus/devices/emsdk/usr/lib
86+
+LDFLAGS = -L/data/git/python-wasm-plus/devices/emsdk/usr/lib
87+
88+
SHLIB_DIRS = -L../lib
89+
-SHLIB_LIST = $(SHLIB_DIRS)
90+
-TINFO_LIST = $(SHLIB_DIRS)
91+
-TICS_LIST = $(SHLIB_DIRS)
92+
+SHLIB_LIST = $(SHLIB_DIRS)
93+
+TINFO_LIST = $(SHLIB_DIRS)
94+
+TICS_LIST = $(SHLIB_DIRS)
95+
96+
RPATH_LIST = ${libdir}
97+
-RESULTING_SYMS =
98+
-VERSIONED_SYMS =
99+
+RESULTING_SYMS =
100+
+VERSIONED_SYMS =
101+
MK_SHARED_LIB = ${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,`basename $@ .${REL_VERSION}`.${ABI_VERSION},-stats,-lc -o $@
102+
103+
NCURSES_MAJOR = 6
104+
@@ -147,11 +147,11 @@
105+
106+
LIBRARIES = ../lib/libncurses.a ../lib/libncurses_g.a
107+
108+
-LINT =
109+
-LINT_OPTS =
110+
-LINT_LIBS = -lncurses
111+
+LINT =
112+
+LINT_OPTS =
113+
+LINT_LIBS = -lncurses
114+
115+
-FALLBACK_LIST =
116+
+FALLBACK_LIST =
117+
118+
USE_BIG_STRINGS = 1
119+
TERMINFO_CAPS = $(top_srcdir)/include/Caps
120+
@@ -186,7 +186,7 @@
121+
$(INCDIR)/nc_mingw.h
122+
123+
TEST_DEPS = ../lib/libncurses.a
124+
-TEST_ARGS = -static -L../lib -lform -lmenu -lpanel -lncurses -dynamic
125+
+TEST_ARGS = -static -L../lib -lform -lmenu -lpanel -lncurses -dynamic
126+
TEST_LDFLAGS = $(TEST_ARGS) -L/data/git/python-wasm-plus/devices/emsdk/usr/lib
127+
128+
TEST_PROGS = \
129+
@@ -208,7 +208,7 @@
130+
################################################################################
131+
all libs :: $(AUTO_SRC) ../lib $(LIBRARIES)
132+
133+
-all libs :: report_offsets$(BUILD_EXEEXT)
134+
+all libs :: report_offsets$(BUILD_EXEEXT)
135+
136+
sources: $(AUTO_SRC)
137+
138+
@@ -230,20 +230,20 @@
139+
keys.list : $(tinfo)/MKkeys_list.sh
140+
AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | LC_ALL=C sort >$@
141+
142+
-make_keys$(BUILD_EXEEXT) : \
143+
- $(tinfo)/make_keys.c \
144+
- names.c
145+
- $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
146+
-
147+
-make_hash$(BUILD_EXEEXT) : \
148+
- $(tinfo)/make_hash.c \
149+
- ../include/hashsize.h
150+
- $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
151+
-
152+
-report_offsets$(BUILD_EXEEXT) : \
153+
- $(srcdir)/report_offsets.c
154+
- $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(srcdir)/report_offsets.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
155+
- ./report_offsets$(BUILD_EXEEXT)
156+
+#make_keys$(BUILD_EXEEXT) : \
157+
+# $(tinfo)/make_keys.c \
158+
+# names.c
159+
+# $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
160+
+
161+
+#make_hash$(BUILD_EXEEXT) : \
162+
+# $(tinfo)/make_hash.c \
163+
+# ../include/hashsize.h
164+
+# $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(tinfo)/make_hash.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
165+
+
166+
+#report_offsets$(BUILD_EXEEXT) : \
167+
+# $(srcdir)/report_offsets.c
168+
+# $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(srcdir)/report_offsets.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
169+
+# ./report_offsets$(BUILD_EXEEXT)
170+
171+
./expanded.c : $(srcdir)/curses.priv.h $(serial)/MKexpanded.sh
172+
$(SHELL) -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@
173+
@@ -280,9 +280,9 @@
174+
175+
clean :: mostlyclean
176+
-rm -f $(AUTO_SRC)
177+
- -rm -f make_keys$(BUILD_EXEEXT)
178+
- -rm -f make_hash$(BUILD_EXEEXT)
179+
- -rm -f report_offsets$(BUILD_EXEEXT)
180+
+# -rm -f make_keys$(BUILD_EXEEXT)
181+
+# -rm -f make_hash$(BUILD_EXEEXT)
182+
+# -rm -f report_offsets$(BUILD_EXEEXT)
183+
-rm -rf .libs *.dSYM *.map
184+
185+
distclean :: clean
186+
@@ -327,7 +327,7 @@
187+
###############################################################################
188+
189+
# Generated by CF_LIB_RULES
190+
-resulting.map:
191+
+resulting.map:
192+
gawk 'BEGIN { skip = 1; last=""; } /deprecated in ABI6/ { next; }{ sub("NCURSES([WT]+)?", "&6"); } { if ( last != "" && ( skip == 0 || $$0 !~ /}/ ) ) { print last; } skip = 0; last = $$0; } END { print last; }' < >$@
193+
194+
distclean::
195+
@@ -336,8 +336,8 @@
196+
# generated by mk-0th.awk
197+
# libname: ncurses
198+
# subsets: ticlib+termlib+ext_tinfo+base+ext_funcs
199+
-# ticlib:
200+
-# termlib:
201+
+# ticlib:
202+
+# termlib:
203+
204+
.SUFFIXES: .c .cc .h .i .ii
205+
.c.i :
206+
@@ -885,7 +885,7 @@
207+
# echo: no
208+
# subset: ticlib+termlib+ext_tinfo+base+ext_funcs
209+
# crenames: yes
210+
-# cxxrenames:
211+
+# cxxrenames:
212+
# traces: DEBUG
213+
# srcdir: /data/git/python-wasm-plus/src/ncurses-6.1
214+
215+
@@ -1902,7 +1902,7 @@
216+
# echo: no
217+
# subset: ticlib+termlib+ext_tinfo+base+ext_funcs
218+
# crenames: yes
219+
-# cxxrenames:
220+
+# cxxrenames:
221+
# traces: DEBUG
222+
# srcdir: /data/git/python-wasm-plus/src/ncurses-6.1
223+

0 commit comments

Comments
 (0)