git.iko.soy/prybar
on master help sign in
add pkgconf file
commit2a1e6bb877f4fa062000bdd2432696105a8ded32 authormason clayton <masongclayton@gmail.com> dateWed 20 Feb 2019, 19:39 (8 years ago) parent5142a4c
5 files changed+35−7
compare with master
unifiedsplit
Dockerfile+23−3 Makefile+1−1 languages/julia/julia.pc+9 languages/julia/main.go+1−1 languages/julia/pry.h+1−2
Dockerfile+23−3
@@ -14,11 +14,21 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
1414 expect \
1515 nodejs
1616
17−RUN wget \
18− http://launchpadlibrarian.net/309343864/libmozjs185-dev_1.8.5-1.0.0+dfsg-7_amd64.deb && \
17+RUN wget http://launchpadlibrarian.net/309343864/libmozjs185-dev_1.8.5-1.0.0+dfsg-7_amd64.deb && \
1918 wget http://launchpadlibrarian.net/309343863/libmozjs185-1.0_1.8.5-1.0.0+dfsg-7_amd64.deb && \
2019 dpkg -i libmozjs185*.deb && rm libmozjs185*.deb
2120
21+RUN wget https://julialang-s3.julialang.org/bin/linux/x64/1.1/julia-1.1.0-linux-x86_64.tar.gz && \
22+ tar xf julia-1.1.0-linux-x86_64.tar.gz && \
23+ cd julia-1.1.0 && \
24+ cp -r bin/* /usr/bin/ && \
25+ cp -r include/* /usr/include/ && \
26+ cp -r lib/* /usr/lib/ && \
27+ cp -r share/* /usr/share/ && \
28+ cd .. && \
29+ rm -rf julia-1.1.0-linux-x86_64.tar.gz julia-1.1.0
30+
31+
2232RUN mkdir -p /gocode/src/github.com/replit/prybar
2333
2434ENV GOPATH=/gocode
@@ -27,7 +37,17 @@ WORKDIR /gocode/src/github.com/replit/prybar
2737
2838RUN which node
2939
30−RUN make prybar-python2 prybar-python3 prybar-ruby prybar-lua prybar-spidermonkey prybar-nodejs
40+RUN make prybar-julia
41+
42+RUN make \
43+ prybar-python2 \
44+ prybar-python3 \
45+ prybar-ruby \
46+ prybar-lua \
47+ prybar-spidermonkey \
48+ prybar-nodejs \
49+ prybar-julia
50+
3151RUN make test
3252
3353ENV LC_ALL=C.UTF-8
Makefile+1−1
@@ -9,7 +9,7 @@ all: $(BINS)
99prybar-%: ./languages/$(*) ./utils/* ./linenoise/* ./languages/$(*)/*
1010 ./scripts/inject.sh $(*)
1111 go generate ./languages/$(*)/main.go
12− PKG_CONFIG="pkg-config" PKG_CONFIG_PATH=./languages/julia CGO_LDFLAGS_ALLOW=".*" go build -o prybar-$(*) ./languages/$(*)
12+ PKG_CONFIG_PATH=./languages/julia go build -o prybar-$(*) ./languages/$(*)
1313 rm ./languages/$(*)/generated_*.go
1414
1515test:
languages/julia/julia.pcnew file+9
@@ -0,0 +1,9 @@
1+prefix=/usr
2+libdir=${prefix}/lib
3+includedir=${prefix}/include/julia
4+
5+Name: julia
6+Cflags: -I${includedir}
7+Version: 1.1.0
8+Description: it's julia
9+Libs: -L${libdir} -ljulia
languages/julia/main.go+1−1
@@ -3,7 +3,7 @@ package main
33// USING_CGO
44
55/*
6−#cgo LDFLAGS: -ljulia
6+#cgo pkg-config: julia
77#include "pry.h"
88*/
99import "C"
languages/julia/pry.h+1−2
@@ -23,8 +23,7 @@
2323#include <sys/types.h>
2424#include <time.h>
2525
26−#include <julia/julia.h>
27−#include <julia/uv.h>
26+#include <julia.h>
2827
2928JULIA_DEFINE_FAST_TLS()
3029