From 6d0e46bcc751a17e8321576686c27dfd2a91f5fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Renaud=20Casenave-P=C3=A9r=C3=A9?= Date: Sun, 28 Mar 2021 09:41:28 +0200 Subject: [PATCH] Fix compile errors due to conflicting libraries --- src/eql_lib.pro | 5 ++--- src/make-static.lisp | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/eql_lib.pro b/src/eql_lib.pro index 62277d0..6c63eb7 100644 --- a/src/eql_lib.pro +++ b/src/eql_lib.pro @@ -57,15 +57,14 @@ static { CONFIG += create_prl DEFINES += STATIC_MODULES QT += qml multimedia network quick sql - DESTDIR = ./ + LIBS -= -lecl -L. -lini_eql5 -L/usr/local/lib OBJECTS_DIR = ./tmp/static/ MOC_DIR = ./tmp/static/ - combinedlib.files = libeql5.a libeql5.prl combinedlib.extra = ecl -shell make-static.lisp combinedlib.path = $$[QT_INSTALL_LIBS] - INSTALLS = combinedlib + INSTALLS = combinedlib target } HEADERS += gen/_lobjects.h \ diff --git a/src/make-static.lisp b/src/make-static.lisp index 52b6a28..36ae995 100644 --- a/src/make-static.lisp +++ b/src/make-static.lisp @@ -1,3 +1,3 @@ (let* ((static-libs (mapcar #'file-namestring (directory "libeql5_*.a"))) - (mri (format nil "create libeql5static.a~%addlib libini_eql5.a~%addlib libeql5.a~%~{addlib ~a~%~}save~%end~%" static-libs))) - (ext:system (format nil "sh -c 'echo ~s | ar -M && mv libeql5static.a libeql5.a'" mri))) + (mri (format nil "create libeql5static.a~%addlib libini_eql5.a~%addlib ../libeql5.a~%~{addlib ~a~%~}save~%end~%" static-libs))) + (ext:system (format nil "sh -c 'echo ~s | ar -M && mv libeql5static.a ../libeql5.a'" mri)))