summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/sc-im/make.sh4
-rw-r--r--data/sc-im/makefile.diff34
-rw-r--r--data/sc-im/sc-im-0.7.0.tar.gz (renamed from data/sc-im/v0.7.0.tar.gz)bin1109887 -> 1109887 bytes
3 files changed, 25 insertions, 13 deletions
diff --git a/data/sc-im/make.sh b/data/sc-im/make.sh
index 4c6e8ed0d..f14235df4 100644
--- a/data/sc-im/make.sh
+++ b/data/sc-im/make.sh
@@ -1,4 +1,4 @@
pkg:setup
cd src
-pkg:make prefix=${PKG_TAPF} PKGCONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh")"
-pkg:install prefix=${PKG_TAPF} PKGCONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh")"
+pkg:make -j16 prefix="${PKG_TAPF}" PKGCONFIG="${PKG_BASE}/util/pkg-config.sh"
+pkg:install prefix="${PKG_TAPF}" PKGCONFIG="${PKG_BASE}/util/pkg-config.sh"
diff --git a/data/sc-im/makefile.diff b/data/sc-im/makefile.diff
index 6d3ab2b0c..c958683de 100644
--- a/data/sc-im/makefile.diff
+++ b/data/sc-im/makefile.diff
@@ -1,7 +1,19 @@
-diff -Naur sc-im-0.7.0/src/Makefile sc-im-0.7.0+iPhone/src/Makefile
---- sc-im-0.7.0/src/Makefile 2017-12-13 17:48:59.000000000 +0000
-+++ sc-im-0.7.0+iPhone/src/Makefile 2019-04-17 17:23:24.489629635 +0000
-@@ -68,63 +68,68 @@
+diff -ur sc-im-0.7.0/src/Makefile sc-im-0.7.0+iPhone/src/Makefile
+--- sc-im-0.7.0/src/Makefile 2017-12-13 07:48:59.000000000 -1000
++++ sc-im-0.7.0+iPhone/src/Makefile 2019-05-08 15:11:33.000000000 -1000
+@@ -16,9 +16,9 @@
+ #YACC = bison -y
+ #SED = sed
+
+-LDLIBS += -lm
++LDLIBS := -lm
+
+-CFLAGS += -Wall -g
++CFLAGS := -Wall -g
+ CFLAGS += -DNCURSES
+ CFLAGS += -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE
+ CFLAGS += -DSNAME=\"$(name)\"
+@@ -68,63 +68,64 @@
# Have threads? Set these two, if you want the autobackup feature to work with threads.
CFLAGS += -DHAVE_PTHREAD
@@ -44,22 +56,22 @@ diff -Naur sc-im-0.7.0/src/Makefile sc-im-0.7.0+iPhone/src/Makefile
+#ifneq ($(shell uname -s),FreeBSD)
+# LDLIBS += -ldl
+#endif
++
++PKGCONFIG := pkg-config
-ifneq (, $(shell which pkg-config))
-+PKGCONFIG := pkg-config
-+
+ifneq ($(PKGCONFIG),)
# Any system with pkg-config
- # NOTE: ncursesw (required)
- ifeq ($(shell uname -s),Darwin)
- # macOS' ncurses is built with wide-char support
- LDFLAGS += -lncurses
+- # NOTE: ncursesw (required)
+- ifeq ($(shell uname -s),Darwin)
+- # macOS' ncurses is built with wide-char support
+- LDFLAGS += -lncurses
- else ifneq ($(shell pkg-config --exists ncursesw || echo 'no'),no)
- CFLAGS += $(shell pkg-config --cflags ncursesw)
- LDLIBS += $(shell pkg-config --libs ncursesw)
- else ifneq ($(shell pkg-config --exists ncurses || echo 'no'),no)
-+ else ifneq ($(shell $(PKGCONFIG) --exists ncursesw || echo 'no'),no)
++ ifneq ($(shell $(PKGCONFIG) --exists ncursesw || echo 'no'),no)
+ CFLAGS += $(shell $(PKGCONFIG) --cflags ncursesw)
+ LDLIBS += $(shell $(PKGCONFIG) --libs ncursesw)
+ else ifneq ($(shell $(PKGCONFIG) --exists ncurses || echo 'no'),no)
diff --git a/data/sc-im/v0.7.0.tar.gz b/data/sc-im/sc-im-0.7.0.tar.gz
index cb840c980..cb840c980 100644
--- a/data/sc-im/v0.7.0.tar.gz
+++ b/data/sc-im/sc-im-0.7.0.tar.gz
Binary files differ