Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/julia/files/
Date: Thu, 15 Apr 2021 18:05:55
Message-Id: 1618509922.f37d2c76cf0e95e814032cb2e6e99bbc0a388779.conikost@gentoo
1 commit: f37d2c76cf0e95e814032cb2e6e99bbc0a388779
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Apr 11 08:21:40 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 18:05:22 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f37d2c76
7
8 dev-lang/julia: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/20329
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 .../julia/files/julia-1.6.0-fix_build_system.patch | 53 ----------------------
16 1 file changed, 53 deletions(-)
17
18 diff --git a/dev-lang/julia/files/julia-1.6.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.6.0-fix_build_system.patch
19 deleted file mode 100644
20 index 2a3d9762ce8..00000000000
21 --- a/dev-lang/julia/files/julia-1.6.0-fix_build_system.patch
22 +++ /dev/null
23 @@ -1,53 +0,0 @@
24 -diff --git a/Make.inc b/Make.inc
25 -index 81ff923..79e47f1 100644
26 ---- a/Make.inc
27 -+++ b/Make.inc
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 --libdir := $(prefix)/lib
33 -+libdir := $(prefix)/GENTOOLIBDIR
34 - libexecdir := $(prefix)/libexec
35 - datarootdir := $(prefix)/share
36 - docdir := $(datarootdir)/doc/julia
37 -@@ -417,7 +417,7 @@ ifneq ($(OS), WINNT)
38 - JCXXFLAGS += -pedantic
39 - endif
40 - DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector
41 --SHIPFLAGS := -O3 -ggdb2 -falign-functions
42 -+SHIPFLAGS := GENTOOCFLAGS
43 - endif
44 -
45 - ifeq ($(USECLANG),1)
46 -@@ -428,7 +428,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
50 --SHIPFLAGS := -O3 -g
51 -+SHIPFLAGS := GENTOOCFLAGS
52 - ifeq ($(OS), Darwin)
53 - ifeq ($(USE_LIBCPP), 1)
54 - MACOSX_VERSION_MIN := 10.8
55 -@@ -457,7 +457,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
59 --SHIPFLAGS := -O3 -g -falign-functions
60 -+SHIPFLAGS := GENTOOCFLAGS
61 - endif
62 -
63 - ifeq ($(USECCACHE), 1)
64 -diff --git a/doc/Makefile b/doc/Makefile
65 -index 99e60ee..2027fb5 100644
66 ---- a/doc/Makefile
67 -+++ b/doc/Makefile
68 -@@ -30,7 +30,7 @@ deps: UnicodeData.txt
69 - $(JLCHECKSUM) UnicodeData.txt
70 -
71 - clean:
72 -- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt
73 -+ @echo "Do not clean doc/_build/html. Just use it..."
74 -
75 - cleanall: clean
76 -