Skip to content

Corrections required for current termux and build toolchain. #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Corrections required for current termux and build toolchain. #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions R-patches/later-tincythread.h.patch
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- src/tinycthread.h.orig 2020-07-16 19:29:46.282115793 -0400
+++ ./src/tinycthread.h 2020-07-16 19:30:11.826115996 -0400
--- later/src/tinycthread.h.orig 2020-07-16 19:29:46.282115793 -0400
+++ ./later/src/tinycthread.h 2020-07-16 19:30:11.826115996 -0400
@@ -119,7 +119,7 @@

/* If TIME_UTC is missing, provide it and provide a wrapper for
Expand Down
57 changes: 39 additions & 18 deletions R-patches/rcran-fs-Makevars.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,50 @@
--- ./fs/src/Makevars.orig 2020-07-29 11:12:05.000000000 -0400
+++ ./fs/src/Makevars 2020-11-17 17:38:57.335725794 -0500
@@ -1,4 +1,6 @@
--- fs/src/Makevars.orig 2023-06-29 15:51:28.000000000 -0400
+++ fs/src/Makevars 2023-11-14 08:36:54.005159721 -0500
@@ -1,14 +1,17 @@
UNAME := $(shell uname)
-
-LIBUV := libuv-1.44.2
-
-PKG_LIBS = ./$(LIBUV)/.libs/libuv.a -pthread
+HOST :=
+UNAMEO := $(shell uname -o)

LIBUV := libuv-1.38.1
SOURCES = $(wildcard *.cc unix/*.cc)
OBJECTS = $(SOURCES:.cc=.o)

@@ -18,6 +20,10 @@
PKG_LIBS += -lkvm
endif
ifeq ($(UNAME), Linux)
+ ifeq ($(UNAMEO), Android)
+ HOST = --host=$(shell clang -print-target-triple)
+endif
+PKG_LIBS += -luv
+
ifeq ($(UNAME), SunOS)
PKG_LIBS += -lkstat -lsendfile -lsocket -lxnet
+ ifeq ($(UNAMEO), Android)
+ HOST = --host=$(shell clang -print-target-triple)
+ endif
OBJECTS += bsd/setmode.o bsd/strmode.o bsd/reallocarray.o
endif
ifeq ($(UNAME), FreeBSD)
@@ -21,24 +24,12 @@
OBJECTS += bsd/setmode.o bsd/strmode.o bsd/reallocarray.o
endif

@@ -29,7 +35,7 @@
-PKG_CPPFLAGS = -I./$(LIBUV)/include -I. -pthread
-
all: $(SHLIB)

-$(SHLIB): $(LIBUV)/.libs/libuv.a
-
-$(LIBUV)/Makefile:
- (cd $(LIBUV) \
- && CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS) $(CPICFLAGS) $(C_VISIBILITY) -std=c99" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure --quiet)
-
-$(LIBUV)/.libs/libuv.a: $(LIBUV)/Makefile
- $(MAKE) --directory=$(LIBUV) \
- HAVE_DTRACE=0
-
.PHONY: shlib-clean clean

$(LIBUV)/Makefile:
(cd $(LIBUV) \
- && CC="$(CC)" CFLAGS="$(CFLAGS) $(CPPFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure --quiet)
+ && CC="$(CC)" CFLAGS="$(CFLAGS) $(CPPFLAGS) $(CPICFLAGS) $(C_VISIBILITY)" AR="$(AR)" RANLIB="$(RANLIB)" LDFLAGS="$(LDFLAGS)" ./configure --quiet $(HOST) --disable-shared)
# shlib-clean: clean

$(LIBUV)/.libs/libuv.a: $(LIBUV)/Makefile
$(MAKE) --directory=$(LIBUV) \
clean:
- $(MAKE) --directory=$(LIBUV) distclean
+ $(MAKE) distclean
rm -f $(OBJECTS)