Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
clpm
clpm
Commits
a6594934
Commit
a6594934
authored
Sep 04, 2019
by
Eric Timmons
Browse files
Remove lingering sqlite references
parent
571c0a75
Changes
6
Hide whitespace changes
Inline
Side-by-side
README.org
View file @
a6594934
...
...
@@ -81,8 +81,6 @@ is still a little rough around the edges and it may accidentally eat your files.
needed if you use bundles).
+ openssl :: Needed if accessing sources over https *and* compiling from
source or using the dynamically linked version.
+ sqlite :: Needed if compiling from source or using the dynamically linked
version.
After installing CLPM core, it is recommended you also install the CLPM client
(see [[file:doc/client.org][client.org]]), but it is not needed for the quickstart.
...
...
clpm-exec.asd
View file @
a6594934
...
...
@@ -33,7 +33,6 @@
(
o
(
s
(
eql
(
find-system
"clpm-exec/dynamic-libs"
))))
"Prevent cl-ssl from loading the foreign libraries at build time."
`
(
:cl+ssl-foreign-libs-already-loaded
:cl-sqlite-foreign-libs-already-loaded
,@
(
when
(
uiop:os-windows-p
)
`
(
:drakma-no-ssl
))))
...
...
@@ -41,7 +40,7 @@
(
o
(
s
(
eql
(
find-system
"clpm-exec/dynamic-libs"
))))
"The libraries are not truly loaded, we just tricked cl+ssl, so remove that
feature on dump."
(
list
:cl+ssl-foreign-libs-already-loaded
:cl-sqlite-foreign-libs-already-loaded
))
(
list
:cl+ssl-foreign-libs-already-loaded
))
(
defsystem
#:clpm-exec/static-libs
:license
"BSD-2-Clause"
...
...
@@ -70,12 +69,10 @@ feature on dump."
:for
lib
:in
`
(
,
(
first
(
input-files
o
s
))
,@
(
unless
(
uiop:os-windows-p
)
'
(
"-l:libcrypto.a"
"-l:libssl.a"
))
"-l:libsqlite3.a"
)
"-l:libssl.a"
)))
:appending
(
cffi-toolchain::link-all-library
lib
))))
(
defmethod
cffi-toolchain:static-image-new-features
(
o
(
s
(
eql
(
find-system
"clpm-exec/static-libs"
))))
`
(
:cl+ssl-foreign-libs-already-loaded
:cl-sqlite-foreign-libs-already-loaded
,@
(
when
(
uiop:os-windows-p
)
'
(
:drakma-no-ssl
))))
clpm.asd
View file @
a6594934
...
...
@@ -19,6 +19,3 @@
:entry-point
"clpm/cli/entry:main"
:depends-on
(
#:clpm/clpm
)
:in-order-to
((
prepare-op
(
build-op
:clpm-client
))))
(
asdf:register-system-packages
:mito-core
'
(
:mito.core
))
(
asdf:register-system-packages
:dbd-sqlite3
'
(
:dbd.sqlite3
))
docker/Dockerfile.build-alpine
View file @
a6594934
...
...
@@ -9,7 +9,7 @@ COPY customize-target-features.lisp /usr/local/src/sbcl-${SBCL_VERSION}/
RUN rebuild-sbcl
FROM alpine:3.9
RUN apk add --no-cache openssl-dev gcc zlib-dev musl-dev
sqlite-static sqlite-dev
RUN apk add --no-cache openssl-dev gcc zlib-dev musl-dev
COPY --from=sbcl-builder /usr/local/bin/sbcl /usr/local/bin/sbcl
COPY --from=sbcl-builder /usr/local/lib/ /usr/local/lib/
...
...
docker/Dockerfile.build-debian
View file @
a6594934
...
...
@@ -10,7 +10,7 @@ RUN rebuild-sbcl
FROM debian:stretch
RUN apt-get update \
&& apt-get install -y --no-install-recommends build-essential libssl1.0-dev libz-dev
libsqlite3-dev
\
&& apt-get install -y --no-install-recommends build-essential libssl1.0-dev libz-dev \
&& rm -rf /var/lists/apt
COPY --from=sbcl-builder /usr/local/bin/sbcl /usr/local/bin/sbcl
...
...
scripts/build-static.lisp
View file @
a6594934
...
...
@@ -24,7 +24,6 @@
;; (require :sb-bsd-sockets)
;; By default, openssl is ~useless on Windows. Don't build it until we can
;; figure out how to make it use the OS' certificate store.
(
pushnew
:drakma-no-ssl
*features*
)
(
pushnew
:cl-sqlite-foreign-libs-already-loaded
*features*
))
(
pushnew
:drakma-no-ssl
*features*
))
(
asdf:make
:clpm-exec/static-libs
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment