|
 |
6500202 |
From 1b17bd751601202687f28b95e38013418ac580b2 Mon Sep 17 00:00:00 2001
|
|
|
6500202 |
From: Jan Wielemaker <J.Wielemaker@cs.vu.nl>
|
|
|
6500202 |
Date: Fri, 24 Aug 2012 10:45:46 +0200
|
|
|
6500202 |
Subject: [PATCH] FIXED: Bug#48: libjpl.so must be linked against swipl.lib
|
|
|
6500202 |
|
|
|
6500202 |
---
|
|
|
6500202 |
packages/Dialect.defs.in | 5 ++++-
|
|
|
6500202 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
6500202 |
|
|
|
6500202 |
diff --git a/packages/Dialect.defs.in b/packages/Dialect.defs.in
|
|
|
6500202 |
index d569fff..cd65855 100644
|
|
|
6500202 |
--- a/packages/Dialect.defs.in
|
|
|
6500202 |
+++ b/packages/Dialect.defs.in
|
|
|
6500202 |
@@ -20,6 +20,8 @@
|
|
|
6500202 |
# * LIBPLSO
|
|
|
6500202 |
# Library to include for linking shared objects to the Prolog kernel.
|
|
|
6500202 |
# Added after the user files.
|
|
|
6500202 |
+# * LIBPLEMBED
|
|
|
6500202 |
+# Library containing the Prolog kernel. Needed for embedding Prolog.
|
|
|
6500202 |
|
|
|
6500202 |
PL=../swipl.sh
|
|
|
6500202 |
PLBASE=@PLBASE@
|
|
|
6500202 |
@@ -45,10 +47,11 @@ DEFS=@DEFS@ -D__SWI_PROLOG__
|
|
|
6500202 |
CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) $(PKGCFLAGS) $(DEFS)
|
|
|
6500202 |
CXXFLAGS=$(CFLAGS) -I../cpp
|
|
|
6500202 |
|
|
|
6500202 |
+LIBPLEMBED=@USEPLLIB@
|
|
|
6500202 |
ifeq (@EXEFORMAT@,ELF)
|
|
|
6500202 |
LIBPLSO=
|
|
|
6500202 |
else
|
|
|
6500202 |
-LIBPLSO=-lswipl
|
|
|
6500202 |
+LIBPLSO=$(LIBPL)
|
|
|
6500202 |
endif
|
|
|
6500202 |
|
|
|
6500202 |
PLLDFLAGS=@LDFLAGS@ -L@abs_top_builddir@/../lib/$(PLARCH)
|
|
|
6500202 |
--
|
|
|
6500202 |
1.7.11.4
|
|
|
6500202 |
|
|
|
6500202 |
Submodule: packages/jpl
|
|
|
6500202 |
From fee8dd81b50c9f28852cbf7d882eedff9e342a9e Mon Sep 17 00:00:00 2001
|
|
|
6500202 |
From: Jan Wielemaker <J.Wielemaker@cs.vu.nl>
|
|
|
6500202 |
Date: Fri, 24 Aug 2012 10:46:59 +0200
|
|
|
6500202 |
Subject: [PATCH] FIXED: Bug#48: use new LIBPLEMBED from Dialect.in
|
|
|
6500202 |
|
|
|
6500202 |
---
|
|
|
6500202 |
Makefile.in | 2 +-
|
|
|
6500202 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
6500202 |
|
|
|
6500202 |
diff --git a/packages/jpl/Makefile.in b/packages/jpl/Makefile.in
|
|
|
6500202 |
index 06a14de..e44b6e2 100644
|
|
|
6500202 |
--- a/packages/jpl/Makefile.in
|
|
|
6500202 |
+++ b/packages/jpl/Makefile.in
|
|
|
6500202 |
@@ -34,7 +34,7 @@ OBJ= src/c/jpl.o
|
|
|
6500202 |
all: $(TARGETS) jpl.jar exjava-compile jpl_doc
|
|
|
6500202 |
|
|
|
6500202 |
$(LIBJPL): $(OBJ)
|
|
|
6500202 |
- $(LD) $(LDSOFLAGS) -o $@ $(OBJ) $(LIBS) $(JAVALIBS) $(LIBPLSO)
|
|
|
6500202 |
+ $(LD) $(LDSOFLAGS) -o $@ $(OBJ) $(LIBS) $(JAVALIBS) $(LIBPLEMBED)
|
|
|
6500202 |
if [ -r @LIBJPL@.dylib ]; then \
|
|
|
6500202 |
rm -f @LIBJPL@.jnilib && ln -s @LIBJPL@.dylib @LIBJPL@.jnilib ; \
|
|
|
6500202 |
fi
|
|
|
6500202 |
--
|
|
|
6500202 |
1.7.11.4
|
|
|
6500202 |
|