sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kona: Updates to build on non-arm platforms

Browse Source 
Patch the Makefile to avoid assuming that CC is
arm-linux-androideabi-gcc on Android, and use the CFLAGS and
LDFLAGS already set.

Also avoid inlining the TERMUX_PREFIX value.
This commit is contained in:
Fredrik Fornwall 2015-12-06 15:04:23 -05:00
parent 5b61474814
commit 9a0f600ca2
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packages/kona/Makefile.patch
View File

@ -1,11 +1,11 @@
diff -u -r ../kona-Win.3.36-64/Makefile ./Makefile
--- ../kona-Win.3.36-64/Makefile 2015-07-30 11:18:02.000000000 -0400 --- ../kona-Win.3.36-64/Makefile 2015-07-30 11:18:02.000000000 -0400
+++ ./Makefile 2015-12-06 04:14:40.000000000 -0500 +++ ./Makefile 2015-12-06 14:40:50.325235408 -0500
@@ -1,10 +1,10 @@ @@ -1,10 +1,8 @@
-PREFIX = /usr/local -PREFIX = /usr/local
-CFLAGS=-g -CFLAGS=-g
+PREFIX = @TERMUX_PREFIX@ -PRODFLAGS = -O3 #-pg -g3
+CFLAGS=-O3 +PRODFLAGS =
PRODFLAGS = -O3 #-pg -g3
LIB=libkona.a LIB=libkona.a
DEVFLAGS = -O0 -g3 -DDEBUG -Wunused -Wreturn-type -Wimplicit-int #-Wall DEVFLAGS = -O0 -g3 -DDEBUG -Wunused -Wreturn-type -Wimplicit-int #-Wall
@ -14,21 +14,23 @@
# Win-64 # Win-64
ifeq (mingw32_nt-6.2,$(OS)) ifeq (mingw32_nt-6.2,$(OS))
@@ -34,7 +34,7 @@ @@ -28,16 +26,12 @@
endif
ifeq (android,$(OS))
-CC=arm-linux-androideabi-gcc
OBJS= src/0.o src/c.o src/getline.o src/getline_android.o src/mt.o src/p.o \
src/r.o src/k.o src/kc.o src/kx.o src/kg.o src/km.o src/kn.o src/ko.o \
src/ks.o src/v.o src/va.o src/vc.o src/vd.o src/vf.o src/vg.o src/vq.o src/ks.o src/v.o src/va.o src/vc.o src/vd.o src/vf.o src/vg.o src/vq.o
LDFLAGS = -Wl,--gc-sections -Wl,-z,nocopyreloc -lgcc -no-canonical-prefixes \ -LDFLAGS = -Wl,--gc-sections -Wl,-z,nocopyreloc -lgcc -no-canonical-prefixes \
-Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -mthumb \ - -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -mthumb \
- -lc -lm -ldl - -lc -lm -ldl
+ -fPIE -pie -lc -lm -ldl -CFLAGS += -fPIE -fpic -ffunction-sections -funwind-tables -fstack-protector \
CFLAGS += -fPIE -fpic -ffunction-sections -funwind-tables -fstack-protector \ - -no-canonical-prefixes -mtune=xscale -msoft-float -mthumb \
-no-canonical-prefixes -mtune=xscale -msoft-float -mthumb \ - -fomit-frame-pointer -fno-strict-aliasing
-fomit-frame-pointer -fno-strict-aliasing +LDFLAGS += -Wl,--gc-sections -Wl,-z,nocopyreloc -lgcc -no-canonical-prefixes \
@@ -109,7 +109,7 @@ + -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now \
test: k_test + -lm
endif
install: ifeq (linux,$(OS))
- install k $(PREFIX)/bin/k
+ install k ${PREFIX}/bin/k
clean:
$(RM) -r k k_test *.exe k.dSYM k_test.dSYM src/*.o src/win/*.o

6
packages/kona/build.sh
View File

@ -3,10 +3,8 @@ TERMUX_PKG_FOLDERNAME=kona-Win.$TERMUX_PKG_VERSION-64
TERMUX_PKG_HOMEPAGE=https://github.com/kevinlawler/kona TERMUX_PKG_HOMEPAGE=https://github.com/kevinlawler/kona
TERMUX_PKG_DESCRIPTION="Open-source implementation of the APL-like K programming language" TERMUX_PKG_DESCRIPTION="Open-source implementation of the APL-like K programming language"
TERMUX_PKG_SRCURL="https://github.com/kevinlawler/kona/archive/Win.$TERMUX_PKG_VERSION-64.zip" TERMUX_PKG_SRCURL="https://github.com/kevinlawler/kona/archive/Win.$TERMUX_PKG_VERSION-64.zip"
TERMUX_PKG_DEPENDS=""
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_MAINTAINER="Jonathan Badger <jhbadger@gmail.com>" TERMUX_PKG_MAINTAINER="Jonathan Badger <jhbadger@gmail.com>"
termux_step_make_install () { export PREFIX=$TERMUX_PREFIX
make install
}