Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/files/
Date: Fri, 01 May 2020 14:04:16
Message-Id: 1588341846.c6660e15ded7d96ebb158f1c0aa1ea718bbdcc00.juippis@gentoo
1 commit: c6660e15ded7d96ebb158f1c0aa1ea718bbdcc00
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 30 16:29:37 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Fri May 1 14:04:06 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6660e15
7
8 www-servers/nginx-unit: remove unused patches
9
10 Package-Manager: Portage-2.3.99, Repoman-2.3.22
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/15579
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 www-servers/nginx-unit/files/auto-make.patch | 14 ---
16 www-servers/nginx-unit/files/auto-os-conf.patch | 109 ------------------------
17 2 files changed, 123 deletions(-)
18
19 diff --git a/www-servers/nginx-unit/files/auto-make.patch b/www-servers/nginx-unit/files/auto-make.patch
20 deleted file mode 100644
21 index 9a157ed6a86..00000000000
22 --- a/www-servers/nginx-unit/files/auto-make.patch
23 +++ /dev/null
24 @@ -1,14 +0,0 @@
25 ---- a/auto/make 2019-10-03 16:08:32.000000000 +0200
26 -+++ b/auto/make 2019-10-31 16:57:43.354566956 +0100
27 -@@ -13,10 +13,9 @@
28 -
29 - cat << END > $NXT_MAKEFILE
30 -
31 -+AR = $AR
32 - CC = $CC
33 -
34 --CFLAGS = $NXT_CFLAGS $NXT_CC_OPT $CFLAGS
35 --
36 - NXT_EXEC_LINK = $NXT_EXEC_LINK $NXT_LD_OPT
37 - NXT_SHARED_LOCAL_LINK = $NXT_SHARED_LOCAL_LINK $NXT_LD_OPT
38 - NXT_MODULE_LINK = $NXT_MODULE_LINK
39
40 diff --git a/www-servers/nginx-unit/files/auto-os-conf.patch b/www-servers/nginx-unit/files/auto-os-conf.patch
41 deleted file mode 100644
42 index e1d6775f935..00000000000
43 --- a/www-servers/nginx-unit/files/auto-os-conf.patch
44 +++ /dev/null
45 @@ -1,109 +0,0 @@
46 ---- a/auto/os/conf 2019-10-31 17:17:33.194445276 +0100
47 -+++ b/auto/os/conf 2019-10-31 17:19:51.780033224 +0100
48 -@@ -21,7 +21,7 @@
49 - Linux)
50 - nxt_have=NXT_LINUX . auto/have
51 -
52 -- NXT_STATIC_LINK="ar -r -c"
53 -+ NXT_STATIC_LINK="\$(AR) -r -c"
54 - NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so"
55 - NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
56 - -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
57 -@@ -44,7 +44,7 @@
58 - FreeBSD)
59 - nxt_have=NXT_FREEBSD . auto/have
60 -
61 -- NXT_STATIC_LINK="ar -r -c"
62 -+ NXT_STATIC_LINK="\$(AR) -r -c"
63 - NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so"
64 - NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
65 - -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
66 -@@ -71,14 +71,14 @@
67 - case "$NXT_CC_NAME" in
68 -
69 - SunC):
70 -- NXT_STATIC_LINK="ar -r -c"
71 -+ NXT_STATIC_LINK="\$(AR) -r -c"
72 - NXT_SHARED_LINK="\$(CC) -G -h libnxt.so"
73 - NXT_SHARED_LOCAL_LINK="\$(CC) -G -h \\\$\$ORIGIN/libnxt.so"
74 - NXT_MODULE_LINK="\$(CC) -G"
75 - ;;
76 -
77 - *)
78 -- NXT_STATIC_LINK="ar -r -c"
79 -+ NXT_STATIC_LINK="\$(AR) -r -c"
80 - NXT_SHARED_LINK="\$(CC) -shared -Wl,-soname,libnxt.so"
81 - NXT_SHARED_LOCAL_LINK="\$(CC) -shared \
82 - -Wl,-soname,\\\$\$ORIGIN/libnxt.so"
83 -@@ -106,7 +106,7 @@
84 - # HFS+ volumes are caseless by default.
85 - nxt_have=NXT_HAVE_CASELESS_FILESYSTEM . auto/have
86 -
87 -- NXT_STATIC_LINK="ar -r -c"
88 -+ NXT_STATIC_LINK="\$(AR) -r -c"
89 - NXT_SHARED_LINK="\$(CC) -dynamiclib"
90 - NXT_SHARED_LOCAL_LINK="\$(CC) -dynamiclib \
91 - -install_name @executable_path/libnxt.dylib"
92 -@@ -130,7 +130,7 @@
93 - NetBSD)
94 - nxt_have=NXT_NETBSD . auto/have
95 -
96 -- NXT_STATIC_LINK="ar -r -c"
97 -+ NXT_STATIC_LINK="\$(AR) -r -c"
98 - NXT_SHARED_LINK="\$(CC) -shared"
99 - NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
100 - NXT_MODULE_LINK="\$(CC) -shared"
101 -@@ -152,7 +152,7 @@
102 - OpenBSD)
103 - nxt_have=NXT_OPENBSD . auto/have
104 -
105 -- NXT_STATIC_LINK="ar -r -c"
106 -+ NXT_STATIC_LINK="\$(AR) -r -c"
107 - NXT_SHARED_LINK="\$(CC) -shared"
108 - NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
109 - NXT_MODULE_LINK="\$(CC) -shared"
110 -@@ -174,7 +174,7 @@
111 - DragonFly)
112 - nxt_have=NXT_DRAGONFLY . auto/have
113 -
114 -- NXT_STATIC_LINK="ar -r -c"
115 -+ NXT_STATIC_LINK="\$(AR) -r -c"
116 - NXT_SHARED_LINK="\$(CC) -shared"
117 - NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
118 - NXT_MODULE_LINK="\$(CC) -shared"
119 -@@ -196,7 +196,7 @@
120 - AIX)
121 - nxt_have=NXT_AIX . auto/have
122 -
123 -- NXT_STATIC_LINK="ar -r -c"
124 -+ NXT_STATIC_LINK="\$(AR) -r -c"
125 - NXT_SHARED_LINK="\$(CC) -G"
126 - NXT_SHARED_LOCAL_LINK="\$(CC) -G"
127 - NXT_MODULE_LINK="\$(CC) -G"
128 -@@ -220,7 +220,7 @@
129 - NXT_EXEC_LINK="\$(CC)"
130 - NXT_SHARED_LOCAL_EXEC_LINK=
131 -
132 -- NXT_STATIC_LINK="ar -r -c"
133 -+ NXT_STATIC_LINK="\$(AR) -r -c"
134 - NXT_SHARED_LINK="\$(CC) -shared"
135 - NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
136 - NXT_MODULE_LINK="\$(CC) -shared"
137 -@@ -238,7 +238,7 @@
138 - QNX)
139 - nxt_have=NXT_QNX . auto/have
140 -
141 -- NXT_STATIC_LINK="ar -r -c"
142 -+ NXT_STATIC_LINK="\$(AR) -r -c"
143 - NXT_SHARED_LINK="\$(CC) -shared"
144 - NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
145 - NXT_MODULE_LINK="\$(CC) -shared"
146 -@@ -257,7 +257,7 @@
147 - ;;
148 -
149 - *)
150 -- NXT_STATIC_LINK="ar -r -c"
151 -+ NXT_STATIC_LINK="\$(AR) -r -c"
152 - NXT_SHARED_LINK="\$(CC) -shared"
153 - NXT_SHARED_LOCAL_LINK="\$(CC) -shared"
154 - NXT_MODULE_LINK="\$(CC) -shared"
Report Message
Find on MARC Find on Google Groups