From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- .../julia/files/julia-1.0.3-fix_build_system.patch | 87 ---------------------- .../julia/files/julia-1.1.0-fix_llvm_install.patch | 15 ++++ 2 files changed, 15 insertions(+), 87 deletions(-) delete mode 100644 dev-lang/julia/files/julia-1.0.3-fix_build_system.patch create mode 100644 dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch (limited to 'dev-lang/julia/files') diff --git a/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch deleted file mode 100644 index 98f4fc5c754a..000000000000 --- a/dev-lang/julia/files/julia-1.0.3-fix_build_system.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/Make.inc b/Make.inc -index e5c102f..c4c6640 100644 ---- a/Make.inc -+++ b/Make.inc -@@ -181,7 +181,7 @@ USE_GPL_LIBS ?= 1 - # Directories where said libraries get installed to - prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT) - bindir := $(prefix)/bin --libdir := $(prefix)/lib -+libdir := $(prefix)/GENTOOLIBDIR - libexecdir := $(prefix)/libexec - datarootdir := $(prefix)/share - docdir := $(datarootdir)/doc/julia -@@ -413,7 +413,7 @@ ifneq ($(OS), WINNT) - JCXXFLAGS += -pedantic - endif - DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -ggdb2 -falign-functions -+SHIPFLAGS := GENTOOCFLAGS - endif - - ifeq ($(USECLANG),1) -@@ -424,7 +424,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 - JCPPFLAGS := -fasynchronous-unwind-tables - JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -g -+SHIPFLAGS := GENTOOCFLAGS - ifeq ($(OS), Darwin) - ifeq ($(USE_LIBCPP), 1) - MACOSX_VERSION_MIN := 10.8 -@@ -453,7 +453,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 - JCPPFLAGS := - JCXXFLAGS := -pipe $(fPIC) -fno-rtti - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -g -falign-functions -+SHIPFLAGS := GENTOOCFLAGS - endif - - ifeq ($(USECCACHE), 1) -diff --git a/base/Makefile b/base/Makefile -index 21c7ad4..737e40d 100644 ---- a/base/Makefile -+++ b/base/Makefile -@@ -207,7 +207,6 @@ $(build_private_libdir)/libLLVM.dylib: - ln -sf "$$REALPATH" "$@" - ifneq ($(USE_SYSTEM_LLVM),0) - ifneq ($(USE_LLVM_SHLIB),0) --SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM - endif - endif - -diff --git a/doc/Makefile b/doc/Makefile -index 3d07733..8bd3bc0 100644 ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -29,7 +29,7 @@ deps: UnicodeData.txt - $(JLCHECKSUM) UnicodeData.txt - - clean: -- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt -+ @echo "Do not clean doc/_build/html. Just use it..." - - cleanall: clean - -diff --git a/src/Makefile b/src/Makefile -index 20da34d..84eae21 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h - endif - PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS)) - --ifeq ($(JULIACODEGEN),LLVM) --# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs --# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries. --ifneq ($(USE_LLVM_SHLIB),1) --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) --else --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM --FLAGS += -DLLVM_SHLIB --endif # USE_LLVM_SHLIB == 1 --endif -+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs) - - COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) - DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS) diff --git a/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch b/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch new file mode 100644 index 000000000000..9cb75188b963 --- /dev/null +++ b/dev-lang/julia/files/julia-1.1.0-fix_llvm_install.patch @@ -0,0 +1,15 @@ +--- a/deps/llvm.mk 2019-02-09 10:09:30.102927517 +0300 ++++ b/deps/llvm.mk 2019-02-09 10:10:51.479924878 +0300 +@@ -464,10 +464,11 @@ + + $(build_prefix)/manifest/llvm: | $(llvm_python_workaround) + ++# unset DESTDIR to fix https://github.com/JuliaLang/julia/issues/23462 + LLVM_INSTALL = \ + cd $1 && mkdir -p $2$$(build_depsbindir) && \ + cp -r $$(LLVM_SRC_DIR)/utils/lit $2$$(build_depsbindir)/ && \ +- $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake ++ DESTDIR="" $$(CMAKE) -DCMAKE_INSTALL_PREFIX="$2$$(build_prefix)" -P cmake_install.cmake + ifeq ($(OS), WINNT) + LLVM_INSTALL += && cp $2$$(build_shlibdir)/LLVM.dll $2$$(build_depsbindir) + endif -- cgit v1.2.3