1 |
commit: b24844a320efcce95686c90b053e9c241e1744d7 |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 7 20:33:12 2019 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 7 21:35:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24844a3 |
7 |
|
8 |
dev-lang/julia: fix live ebuild |
9 |
|
10 |
Closes: https://bugs.gentoo.org/673980 |
11 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
12 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
13 |
|
14 |
.../julia/files/julia-9999-fix_build_system.patch | 67 ++++++++++++++++------ |
15 |
1 file changed, 48 insertions(+), 19 deletions(-) |
16 |
|
17 |
diff --git a/dev-lang/julia/files/julia-9999-fix_build_system.patch b/dev-lang/julia/files/julia-9999-fix_build_system.patch |
18 |
index 336d6e3e590..13cc8cb19da 100644 |
19 |
--- a/dev-lang/julia/files/julia-9999-fix_build_system.patch |
20 |
+++ b/dev-lang/julia/files/julia-9999-fix_build_system.patch |
21 |
@@ -1,8 +1,8 @@ |
22 |
diff --git a/Make.inc b/Make.inc |
23 |
-index 8cb2c1014..d3be9de8e 100644 |
24 |
+index e9cb241198..66f3e6afd7 100644 |
25 |
--- a/Make.inc |
26 |
+++ b/Make.inc |
27 |
-@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1 |
28 |
+@@ -185,7 +185,7 @@ USE_GPL_LIBS ?= 1 |
29 |
# Directories where said libraries get installed to |
30 |
prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT) |
31 |
bindir := $(prefix)/bin |
32 |
@@ -11,7 +11,7 @@ index 8cb2c1014..d3be9de8e 100644 |
33 |
libexecdir := $(prefix)/libexec |
34 |
datarootdir := $(prefix)/share |
35 |
docdir := $(datarootdir)/doc/julia |
36 |
-@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT) |
37 |
+@@ -416,7 +416,7 @@ ifneq ($(OS), WINNT) |
38 |
JCXXFLAGS += -pedantic |
39 |
endif |
40 |
DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all |
41 |
@@ -20,7 +20,7 @@ index 8cb2c1014..d3be9de8e 100644 |
42 |
endif |
43 |
|
44 |
ifeq ($(USECLANG),1) |
45 |
-@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 |
46 |
+@@ -427,7 +427,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 |
47 |
JCPPFLAGS := -fasynchronous-unwind-tables |
48 |
JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic |
49 |
DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all |
50 |
@@ -29,7 +29,7 @@ index 8cb2c1014..d3be9de8e 100644 |
51 |
ifeq ($(OS), Darwin) |
52 |
ifeq ($(USE_LIBCPP), 1) |
53 |
MACOSX_VERSION_MIN := 10.8 |
54 |
-@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 |
55 |
+@@ -456,7 +456,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 |
56 |
JCPPFLAGS := |
57 |
JCXXFLAGS := -pipe $(fPIC) -fno-rtti |
58 |
DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all |
59 |
@@ -38,11 +38,23 @@ index 8cb2c1014..d3be9de8e 100644 |
60 |
endif |
61 |
|
62 |
ifeq ($(USECCACHE), 1) |
63 |
+diff --git a/base/Makefile b/base/Makefile |
64 |
+index acdd4bb9f8..4483149b2b 100644 |
65 |
+--- a/base/Makefile |
66 |
++++ b/base/Makefile |
67 |
+@@ -216,7 +216,6 @@ $(build_private_libdir)/libLLVM.dylib: |
68 |
+ ln -sf "$$REALPATH" "$@" |
69 |
+ ifneq ($(USE_SYSTEM_LLVM),0) |
70 |
+ ifneq ($(USE_LLVM_SHLIB),0) |
71 |
+-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM |
72 |
+ endif |
73 |
+ endif |
74 |
+ |
75 |
diff --git a/doc/Makefile b/doc/Makefile |
76 |
-index 89b79880d..c3125fde1 100644 |
77 |
+index 99e60ee665..2027fb5952 100644 |
78 |
--- a/doc/Makefile |
79 |
+++ b/doc/Makefile |
80 |
-@@ -29,7 +29,7 @@ deps: UnicodeData.txt |
81 |
+@@ -30,7 +30,7 @@ deps: UnicodeData.txt |
82 |
$(JLCHECKSUM) UnicodeData.txt |
83 |
|
84 |
clean: |
85 |
@@ -52,24 +64,41 @@ index 89b79880d..c3125fde1 100644 |
86 |
cleanall: clean |
87 |
|
88 |
diff --git a/src/Makefile b/src/Makefile |
89 |
-index 257152d24..240a4a350 100644 |
90 |
+index e4da8c6357..85a411d9b7 100644 |
91 |
--- a/src/Makefile |
92 |
+++ b/src/Makefile |
93 |
-@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h |
94 |
+@@ -50,33 +50,7 @@ ifeq ($(USEMSVC), 1) |
95 |
+ SRCS += getopt |
96 |
endif |
97 |
- PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS)) |
98 |
|
99 |
+-LLVMLINK := |
100 |
+- |
101 |
-ifeq ($(JULIACODEGEN),LLVM) |
102 |
--# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs |
103 |
--# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries. |
104 |
--ifneq ($(USE_LLVM_SHLIB),1) |
105 |
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null) |
106 |
+-SRCS += codegen jitlayers disasm debuginfo llvm-simdloop llvm-ptls llvm-muladd \ |
107 |
+- llvm-late-gc-lowering llvm-lower-handlers llvm-gc-invariant-verifier \ |
108 |
+- llvm-propagate-addrspaces llvm-multiversioning llvm-alloc-opt cgmemmgr \ |
109 |
+- llvm-api |
110 |
+-FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --includedir) |
111 |
+-LLVM_LIBS := all |
112 |
+-ifeq ($(USE_POLLY),1) |
113 |
+-LLVMLINK += -lPolly -lPollyISL |
114 |
+-FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --src-root)/tools/polly/include |
115 |
+-FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --obj-root)/tools/polly/include |
116 |
+-FLAGS += -DUSE_POLLY |
117 |
+-ifeq ($(USE_POLLY_OPENMP),1) |
118 |
+-FLAGS += -fopenmp |
119 |
+-endif |
120 |
+-ifeq ($(USE_POLLY_ACC),1) |
121 |
+-LLVMLINK += -lPollyPPCG -lGPURuntime |
122 |
+-FLAGS += -DUSE_POLLY_ACC |
123 |
+-FLAGS += -I$(shell $(LLVM_CONFIG_HOST) --src-root)/tools/polly/tools # Required to find GPURuntime/GPUJIT.h |
124 |
+-endif |
125 |
+-endif |
126 |
-else |
127 |
--LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM |
128 |
--FLAGS += -DLLVM_SHLIB |
129 |
--endif # USE_LLVM_SHLIB == 1 |
130 |
+-SRCS += anticodegen |
131 |
+-LLVM_LIBS := support |
132 |
-endif |
133 |
+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs) |
134 |
|
135 |
- COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) |
136 |
- DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS) |
137 |
+ # headers are used for dependency tracking, while public headers will be part of the dist |
138 |
+ UV_HEADERS := |