diff --git a/disabled-packages/iverilog/Makefile.in.patch b/disabled-packages/iverilog/Makefile.in.patch deleted file mode 100644 index 7b41ab786..000000000 --- a/disabled-packages/iverilog/Makefile.in.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNr iverilog-10_2/Makefile.in iverilog-10_2.mod/Makefile.in ---- iverilog-10_2/Makefile.in 2017-08-24 18:22:49.000000000 +0300 -+++ iverilog-10_2.mod/Makefile.in 2019-02-25 20:18:55.327140615 +0200 -@@ -67,8 +67,8 @@ - dllib=@DLLIB@ - - # For a cross compile these defines will need to be set accordingly. --HOSTCC = @CC@ --HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@ -+HOSTCC = gcc -+HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ - - CC = @CC@ - CXX = @CXX@ diff --git a/disabled-packages/iverilog/vvp-Makefile.in.patch b/disabled-packages/iverilog/vvp-Makefile.in.patch deleted file mode 100644 index 2c621040e..000000000 --- a/disabled-packages/iverilog/vvp-Makefile.in.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNr iverilog-10_2/vvp/Makefile.in iverilog-10_2.mod/vvp/Makefile.in ---- iverilog-10_2/vvp/Makefile.in 2017-08-24 18:22:49.000000000 +0300 -+++ iverilog-10_2.mod/vvp/Makefile.in 2019-02-25 20:18:31.607079821 +0200 -@@ -32,8 +32,8 @@ - includedir = @includedir@ - - # For a cross compile these defines will need to be set accordingly. --HOSTCC = @CC@ --HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@ -+HOSTCC = gcc -+HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ - - CC = @CC@ - CXX = @CXX@ diff --git a/packages/iverilog/Makefile.in.patch b/packages/iverilog/Makefile.in.patch new file mode 100644 index 000000000..0630aaa55 --- /dev/null +++ b/packages/iverilog/Makefile.in.patch @@ -0,0 +1,31 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -67,8 +67,8 @@ + dllib=@DLLIB@ + + # For a cross compile these defines will need to be set accordingly. +-HOSTCC = @CC@ +-HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@ ++HOSTCC = gcc ++HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ + + BUILDCC = @CC_FOR_BUILD@ + BUILDEXT = @BUILD_EXEEXT@ +@@ -130,7 +130,7 @@ + ifeq (@MINGW32@,yes) + all: dosify$(BUILDEXT) + dosify$(BUILDEXT): $(srcdir)/dosify.c +- $(BUILDCC) $(CFLAGS) -o dosify$(BUILDEXT) $(srcdir)/dosify.c ++ $(BUILDCC) $(CFLAGS_FOR_BUILD) -o dosify$(BUILDEXT) $(srcdir)/dosify.c + endif + + # This rule rules the compiler in the trivial hello.vl program to make +@@ -241,7 +241,7 @@ + endif + + version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h +- $(BUILDCC) $(CFLAGS) -o version.exe -I. -I$(srcdir) $(srcdir)/version.c ++ $(BUILDCC) $(CFLAGS_FOR_BUILD) -o version.exe -I. -I$(srcdir) $(srcdir)/version.c + + %.o: %.cc config.h + $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o diff --git a/disabled-packages/iverilog/build.sh b/packages/iverilog/build.sh similarity index 50% rename from disabled-packages/iverilog/build.sh rename to packages/iverilog/build.sh index 92bded882..6f6fc7a31 100644 --- a/disabled-packages/iverilog/build.sh +++ b/packages/iverilog/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://iverilog.icarus.com/ TERMUX_PKG_DESCRIPTION="Icarus Verilog compiler and simulation tool" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=10.3 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=11.0 TERMUX_PKG_SRCURL=https://github.com/steveicarus/iverilog/archive/v${TERMUX_PKG_VERSION/./_}.tar.gz -TERMUX_PKG_SHA256=4b884261645a73b37467242d6ae69264fdde2e7c4c15b245d902531efaaeb234 +TERMUX_PKG_SHA256=6327fb900e66b46803d928b7ca439409a0dc32731d82143b20387be0833f1c95 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d+.\d+" TERMUX_PKG_DEPENDS="libbz2, libc++, readline, zlib" @@ -17,4 +16,21 @@ termux_step_pre_configure() { aclocal autoconf export CFLAGS+=" -fcommon" + + local _BUILD_LIB=$TERMUX_PKG_BUILDDIR/_build/lib + mkdir -p $_BUILD_LIB + for l in bz2 termcap; do + echo '!' > $_BUILD_LIB/lib${l}.a + done + export LDFLAGS_FOR_BUILD+=" -L$_BUILD_LIB" +} + +termux_step_post_configure() { + find . -name Makefile | xargs -n 1 sed -i \ + -e 's:@EXTRALIBS@::g' \ + -e 's:@MINGW32@:no:g' \ + -e 's:@PICFLAG@:-fPIC:g' \ + -e 's:@install_suffix@::g' \ + -e 's:@rdynamic@:-rdynamic:g' \ + -e 's:@shared@:-shared:g' } diff --git a/disabled-packages/iverilog/driver-main.c.patch b/packages/iverilog/driver-main.c.patch similarity index 100% rename from disabled-packages/iverilog/driver-main.c.patch rename to packages/iverilog/driver-main.c.patch diff --git a/packages/iverilog/vvp-Makefile.in.patch b/packages/iverilog/vvp-Makefile.in.patch new file mode 100644 index 000000000..01530dc3c --- /dev/null +++ b/packages/iverilog/vvp-Makefile.in.patch @@ -0,0 +1,22 @@ +--- a/vvp/Makefile.in ++++ b/vvp/Makefile.in +@@ -32,8 +32,8 @@ + includedir = @includedir@ + + # For a cross compile these defines will need to be set accordingly. +-HOSTCC = @CC@ +-HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@ ++HOSTCC = gcc ++HOSTCFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ + + BUILDCC = @CC_FOR_BUILD@ + BUILDEXT = @BUILD_EXEEXT@ +@@ -130,7 +130,7 @@ + mv $*.d dep/$*.d + + tables.cc: $(srcdir)/draw_tt.c +- $(CC) $(CFLAGS) -o draw_tt$(BUILDEXT) $(srcdir)/draw_tt.c ++ $(BUILDCC) $(CFLAGS_FOR_BUILD) -o draw_tt$(BUILDEXT) $(srcdir)/draw_tt.c + ./draw_tt$(BUILDEXT) > tables.cc + rm draw_tt$(BUILDEXT) +