Skip to content

Add libraries override to koga #1643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add libraries override to koga #1643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions src/koga/configure.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,11 @@ is not compatible with snapshots.")
:initform t
:type boolean
:documentation "Enable long-float")
(libraries :accessor libraries
:initarg :libraries
:initform nil
:type list
:documentation "Local overrides for pkgconfig libraries.")
(units :accessor units
:initform '(:git :describe :cpu-count #+darwin :xcode :base :default-target :pkg-config
:clang :llvm :ar :cc :cxx :dis :mpi :nm :etags :ctags :objcopy :jupyter
Expand Down Expand Up @@ -911,12 +916,24 @@ the function to the overall configuration."
(defun configure-library (configuration library &rest rest
&key required min-version max-version &allow-other-keys)
"Configure a library"
(message :info "Configuring library ~a" library)
(message :emph "Configuring library ~a" library)
(flet ((failure (control-string &rest args)
(apply #'message (if required :err :warn) control-string args)
nil))
(let ((version (run-program-capture (list (pkg-config configuration) "--modversion" library))))
(cond ((not version)
nil)
(apply-flags (&key cflags ldflags ldlibs)
(when cflags
(apply #'append-cflags configuration cflags rest))
(when ldflags
(apply #'append-ldflags configuration ldflags rest))
(when ldlibs
(apply #'append-ldlibs configuration ldlibs rest))
t))
(let ((pair (assoc library (libraries configuration) :test #'equalp))
(version nil))
(cond (pair
(message :info "Override configuration found for library ~a." library)
(apply #'apply-flags (cdr pair)))
((not (setf version (run-program-capture (list (pkg-config configuration) "--modversion" library))))
(failure "Module ~a not found." library))
((and min-version
(uiop:version< version min-version))
Expand All @@ -925,16 +942,10 @@ the function to the overall configuration."
(uiop:version<= max-version version))
(failure "Module ~a with a version of ~a is not less then maximum version of ~a." library version max-version))
(t
(apply #'append-cflags configuration
(run-program-capture (list (pkg-config configuration) "--cflags" library))
rest)
(apply #'append-ldflags configuration
(run-program-capture (list (pkg-config configuration) "--libs-only-L" library))
rest)
(apply #'append-ldlibs configuration
(run-program-capture (list (pkg-config configuration) "--libs-only-l" library))
rest)
t)))))
(message :info "Found version ~a of library ~a." version library)
(apply-flags :cflags (run-program-capture (list (pkg-config configuration) "--cflags" library))
:ldflags (run-program-capture (list (pkg-config configuration) "--libs-only-L" library))
:ldlibs (run-program-capture (list (pkg-config configuration) "--libs-only-l" library))))))))

(defun library (&rest rest)
"Configure a library with the current configuration state."
Expand Down
Loading