diff options
author | Matthias Maier <tamiko@gentoo.org> | 2018-08-29 21:11:21 -0500 |
---|---|---|
committer | Matthias Maier <tamiko@gentoo.org> | 2018-08-30 21:31:08 -0500 |
commit | 3040b1578a07c14d7f9c2d64ba09b062b789c11c (patch) | |
tree | 11e4a30ec23b6e4cbfb0bf93836345eec0490d09 /dev-lang/julia/files | |
parent | dev-lang/julia: Fix dependencies (diff) | |
download | gentoo-3040b1578a07c14d7f9c2d64ba09b062b789c11c.tar.gz gentoo-3040b1578a07c14d7f9c2d64ba09b062b789c11c.tar.bz2 gentoo-3040b1578a07c14d7f9c2d64ba09b062b789c11c.zip |
dev-lang/julia: version bump to 1.0.0
Closes: https://bugs.gentoo.org/663266
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Diffstat (limited to 'dev-lang/julia/files')
-rw-r--r-- | dev-lang/julia/files/julia-1.0.0-fix_build_system.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch new file mode 100644 index 000000000000..1ed19d6e06e8 --- /dev/null +++ b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch @@ -0,0 +1,75 @@ +diff --git a/Make.inc b/Make.inc +index 8e0df61..5747a1c 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/doc/Makefile b/doc/Makefile +index 89b7988..c3125fd 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) |