gnucap: fix linker error

"cannot locate symbol run_mode referenced by gnucap-default-plugins.sh"
This commit is contained in:
Henrik Grimler 2019-01-27 09:52:06 +01:00
parent 8d11634f79
commit 1973d60b9a
3 changed files with 29 additions and 25 deletions

View File

@ -1,28 +1,3 @@
diff -u -r ../gnucap-20171003/apps/configure ./apps/configure
--- ../gnucap-20171003/apps/configure 2017-10-04 00:50:49.000000000 +0200
+++ ./apps/configure 2019-01-24 22:31:28.643242532 +0100
@@ -25,7 +25,7 @@
#----------------------------------------------------------------
echo "CCFLAGS = -fPIC \\" >Make.ccflags
-echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
+echo "-DUNIX -O2 -DNDEBUG \$(CPPFLAGS) -I. -I../include -I../../include -W" >>Make.ccflags
echo "LIBS = \\" >Make.libs
echo "" >>Make.libs
@@ -35,10 +35,10 @@
cat <<CAT_EOF >Make.sys
#------------------------------------------------------------------------
VPATH = .:..
-CCC = c++
+CCC = \$(CXX)
TARGET_EXT = .so
-LDFLAGS = -shared
+LDFLAGS += -shared
.SUFFIXES:
.SUFFIXES: .o .cc
diff -u -r ../gnucap-20171003/apps/Make2.Debug ./apps/Make2.Debug
--- ../gnucap-20171003/apps/Make2.Debug 2017-10-04 00:50:49.000000000 +0200
+++ ./apps/Make2.Debug 2019-01-24 22:30:16.059909732 +0100

View File

@ -0,0 +1,28 @@
--- ../apps-configure.orig 2019-01-27 08:31:33.269997397 +0000
+++ ./apps/configure 2019-01-27 08:42:21.156659353 +0000
@@ -25,9 +25,9 @@
#----------------------------------------------------------------
echo "CCFLAGS = -fPIC \\" >Make.ccflags
-echo "-DUNIX -O2 -DNDEBUG -I. -I../include -I../../include -W" >>Make.ccflags
+echo "-DUNIX -O2 -DNDEBUG \$(CPPFLAGS) -I. -I../include -I../../include -W" >>Make.ccflags
-echo "LIBS = \\" >Make.libs
+echo "LIBS = -lgnucap \\" >Make.libs
echo "" >>Make.libs
echo "PREFIX = " $prefix >>Make.libs
echo "" >>Make.libs
@@ -35,10 +35,11 @@
cat <<CAT_EOF >Make.sys
#------------------------------------------------------------------------
VPATH = .:..
-CCC = c++
+CCC = \$(CXX)
TARGET_EXT = .so
-LDFLAGS = -shared
+LDFLAGS += -shared \
+-L../../lib/O
.SUFFIXES:
.SUFFIXES: .o .cc

View File

@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The Gnu Circuit Analysis Package"
TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION=20171003
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://gitlab.com/gnucap/gnucap/-/archive/${TERMUX_PKG_VERSION}/gnucap-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=2facf5e945cf253727bef9b8e2602767599ea77a6c0d8c5d91101764544fa09a
TERMUX_PKG_DEPENDS="readline"