1 |
commit: c8a6c9470bc973290b00373a552cd61b4503db9e |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 13 20:27:04 2017 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 13 20:27:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a6c947 |
7 |
|
8 |
net-libs/libupnp: do not override user CFLAGS |
9 |
|
10 |
net-libs/libupnp/files/libupnp-1.6.21-cflags.patch | 30 ++++++++++++++++++++++ |
11 |
net-libs/libupnp/libupnp-1.6.21.ebuild | 1 + |
12 |
net-libs/libupnp/libupnp-1.8.0.ebuild | 1 + |
13 |
3 files changed, 32 insertions(+) |
14 |
|
15 |
diff --git a/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch b/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch |
16 |
new file mode 100644 |
17 |
index 0000000000..3eaf66e804 |
18 |
--- /dev/null |
19 |
+++ b/net-libs/libupnp/files/libupnp-1.6.21-cflags.patch |
20 |
@@ -0,0 +1,30 @@ |
21 |
+don't append flags like -O0/-Os which clobber the user's settings |
22 |
+ |
23 |
+--- a/configure.ac |
24 |
++++ b/configure.ac |
25 |
+@@ -539,25 +539,6 @@ AC_PROG_EGREP |
26 |
+ echo "--------------------- Default compilation flags -------------------------------" |
27 |
+ echo host is $host |
28 |
+ echo host_os is $host_os |
29 |
+-case $host_os in |
30 |
+-freebsd*) |
31 |
+- echo "Using FreeBSD specific compiler settings" |
32 |
+- # Put FreeBSD specific compiler flags here |
33 |
+- ;; |
34 |
+-*) |
35 |
+- echo "Using non-specific system compiler settings" |
36 |
+- if test x"$enable_debug" = xyes; then |
37 |
+- # AC_PROG_CC already sets CFLAGS to "-g -O2" by default, |
38 |
+- # but only if CFLAGS was not previously set. |
39 |
+- #: |
40 |
+- # Use -O0 in debug so that variables do not get optimized out |
41 |
+- AX_CFLAGS_GCC_OPTION([-O0, -g]) |
42 |
+- else |
43 |
+- # add optimise for size |
44 |
+- AX_CFLAGS_GCC_OPTION([-Os]) |
45 |
+- fi |
46 |
+- ;; |
47 |
+-esac |
48 |
+ |
49 |
+ AX_CFLAGS_WARN_ALL |
50 |
+ echo "-------------------------------------------------------------------------------" |
51 |
|
52 |
diff --git a/net-libs/libupnp/libupnp-1.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild |
53 |
index 4e7f7656a0..4342f131eb 100644 |
54 |
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild |
55 |
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild |
56 |
@@ -19,6 +19,7 @@ DOCS="NEWS README ChangeLog" |
57 |
|
58 |
PATCHES=( |
59 |
"${FILESDIR}"/${PN}-1.6.19-docs-install.patch |
60 |
+ "${FILESDIR}"/${PN}-1.6.21-cflags.patch |
61 |
) |
62 |
|
63 |
src_prepare() { |
64 |
|
65 |
diff --git a/net-libs/libupnp/libupnp-1.8.0.ebuild b/net-libs/libupnp/libupnp-1.8.0.ebuild |
66 |
index abee901f84..32baec6ad6 100644 |
67 |
--- a/net-libs/libupnp/libupnp-1.8.0.ebuild |
68 |
+++ b/net-libs/libupnp/libupnp-1.8.0.ebuild |
69 |
@@ -19,6 +19,7 @@ DOCS="NEWS README.md ChangeLog" |
70 |
|
71 |
PATCHES=( |
72 |
"${FILESDIR}"/${PN}-1.8.0-docs-install.patch |
73 |
+ "${FILESDIR}"/${PN}-1.6.21-cflags.patch |
74 |
) |
75 |
|
76 |
src_prepare() { |