diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-01 00:17:18 +0100 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-01 11:24:34 +0100 |
| commit | c3613e450b2ecd33bb606f2b67ea6214ef4eaa15 (patch) | |
| tree | e05efcd194baf4d38d6f9b7c1bd8d9926c9f5c29 /testing/dcd/do-shared-linking.patch | |
| parent | 48200a70087efe66cfa215f859a499a0f8266dde (diff) | |
| download | aports-c3613e450b2ecd33bb606f2b67ea6214ef4eaa15.tar.bz2 aports-c3613e450b2ecd33bb606f2b67ea6214ef4eaa15.tar.xz | |
testing/dcd: new aport
https://github.com/dlang-community/DCD
The D Completion Daemon is an auto-complete program for the D programming language
Diffstat (limited to 'testing/dcd/do-shared-linking.patch')
| -rw-r--r-- | testing/dcd/do-shared-linking.patch | 90 |
1 files changed, 90 insertions, 0 deletions
diff --git a/testing/dcd/do-shared-linking.patch b/testing/dcd/do-shared-linking.patch new file mode 100644 index 0000000000..abb63b36c5 --- /dev/null +++ b/testing/dcd/do-shared-linking.patch @@ -0,0 +1,90 @@ +diff --git a/makefile b/makefile +index 2bf0be9..2c568f0 100644 +--- a/makefile ++++ b/makefile +@@ -1,4 +1,4 @@ +-.PHONY: all +++.PHONY: all + + all: dmd + dmd: dmdserver dmdclient +@@ -32,8 +32,7 @@ clean: + + CLIENT_SRC := \ + $(shell find src/dcd/common -name "*.d")\ +- $(shell find src/dcd/client -name "*.d")\ +- $(shell find msgpack-d/src/ -name "*.d") ++ $(shell find src/dcd/client -name "*.d") + + DMD_CLIENT_FLAGS := -Imsgpack-d/src\ + -Imsgpack-d/src\ +@@ -49,8 +48,8 @@ GDC_CLIENT_FLAGS := -Imsgpack-d/src\ + -frelease\ + -obin/dcd-client + +-LDC_CLIENT_FLAGS := -Imsgpack-d/src\ +- -Imsgpack-d/src\ ++LDC_CLIENT_FLAGS := \ ++ $(shell pkg-config --cflags msgpack-d) $(subst -l,-L=-l,$(shell pkg-config --libs msgpack-d))\ + -J=bin\ + -release\ + -O5\ +@@ -63,29 +62,7 @@ override GDC_CLIENT_FLAGS += $(DFLAGS) + + SERVER_SRC := \ + $(shell find src/dcd/common -name "*.d")\ +- $(shell find src/dcd/server -name "*.d")\ +- $(shell find ${DSYMBOL_DIR}/src -name "*.d")\ +- $(shell find ${STDXALLOC_DIR}/source -name "*.d")\ +- ${DPARSE_DIR}/src/dparse/ast.d\ +- ${DPARSE_DIR}/src/dparse/entities.d\ +- ${DPARSE_DIR}/src/dparse/lexer.d\ +- ${DPARSE_DIR}/src/dparse/parser.d\ +- ${DPARSE_DIR}/src/dparse/formatter.d\ +- ${DPARSE_DIR}/src/dparse/rollback_allocator.d\ +- ${DPARSE_DIR}/src/dparse/stack_buffer.d\ +- ${DPARSE_DIR}/src/std/experimental/lexer.d\ +- containers/src/containers/dynamicarray.d\ +- containers/src/containers/ttree.d\ +- containers/src/containers/unrolledlist.d\ +- containers/src/containers/openhashset.d\ +- containers/src/containers/hashset.d\ +- containers/src/containers/internal/hash.d\ +- containers/src/containers/internal/node.d\ +- containers/src/containers/internal/storage_type.d\ +- containers/src/containers/internal/element_type.d\ +- containers/src/containers/internal/backwards.d\ +- containers/src/containers/slist.d\ +- $(shell find msgpack-d/src/ -name "*.d") ++ $(shell find src/dcd/server -name "*.d") + + DMD_SERVER_FLAGS := -Icontainers/src\ + -Imsgpack-d/src\ +@@ -117,10 +94,10 @@ GDC_SERVER_FLAGS := -Icontainers/src\ + -frelease\ + -obin/dcd-server + +-LDC_SERVER_FLAGS := -Icontainers/src\ +- -Imsgpack-d/src\ +- -I${DPARSE_DIR}/src\ +- -I${DSYMBOL_DIR}/src\ ++LDC_SERVER_FLAGS := $(shell pkg-config --cflags dcontainers) $(subst -l,-L=-l,$(shell pkg-config --libs dcontainers))\ ++ $(shell pkg-config --cflags msgpack-d) $(subst -l,-L=-l,$(shell pkg-config --libs msgpack-d))\ ++ $(shell pkg-config --cflags dparse) $(subst -l,-L=-l,$(shell pkg-config --libs dparse))\ ++ $(shell pkg-config --cflags dsymbol) $(subst -l,-L=-l,$(shell pkg-config --libs dsymbol))\ + -Isrc\ + -J=bin\ + -O5\ +@@ -150,10 +127,10 @@ gdcserver: githash + mkdir -p bin + ${GDC} ${SERVER_SRC} ${GDC_SERVER_FLAGS} + +-ldcclient: githash ++ldcclient: + ${LDC} ${CLIENT_SRC} ${LDC_CLIENT_FLAGS} -oq -of=bin/dcd-client + +-ldcserver: githash ++ldcserver: + ${LDC} $(LDC_SERVER_FLAGS) ${SERVER_SRC} -oq -of=bin/dcd-server + + test: debugserver dmdclient |