| 1 |
commit: b17d286105097a4108ea021a20280825eea1ab78 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 18 22:17:24 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 18 23:08:29 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17d2861 |
| 7 |
|
| 8 |
net-misc/portfwd: cleanup Makefile patch further |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
.../portfwd/files/portfwd-0.29-build-system.patch | 31 +++++++++++----------- |
| 13 |
1 file changed, 16 insertions(+), 15 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-misc/portfwd/files/portfwd-0.29-build-system.patch b/net-misc/portfwd/files/portfwd-0.29-build-system.patch |
| 16 |
index fb9649b65cd9..e69c33cb5ef2 100644 |
| 17 |
--- a/net-misc/portfwd/files/portfwd-0.29-build-system.patch |
| 18 |
+++ b/net-misc/portfwd/files/portfwd-0.29-build-system.patch |
| 19 |
@@ -1,10 +1,3 @@ |
| 20 |
---- a/Makefile.am |
| 21 |
-+++ b/Makefile.am |
| 22 |
-@@ -1,4 +1,3 @@ |
| 23 |
- SUBDIRS = getopt src tools doc |
| 24 |
- |
| 25 |
--docdir = $(prefix)/doc/portfwd |
| 26 |
- doc_DATA = COPYING README CREDITS TODO |
| 27 |
--- a/configure.in |
| 28 |
+++ b/configure.in |
| 29 |
@@ -8,6 +8,7 @@ dnl Checks for programs. |
| 30 |
@@ -14,7 +7,7 @@ |
| 31 |
+AM_PROG_AR |
| 32 |
AM_PROG_LEX |
| 33 |
AC_PROG_RANLIB |
| 34 |
- |
| 35 |
+ |
| 36 |
@@ -45,6 +46,7 @@ dnl ) |
| 37 |
dnl Checks for MSG_PROXY symbol |
| 38 |
AC_TRY_RUN( |
| 39 |
@@ -23,6 +16,13 @@ |
| 40 |
#include <sys/socket.h> |
| 41 |
int main() |
| 42 |
{ |
| 43 |
+--- a/Makefile.am |
| 44 |
++++ b/Makefile.am |
| 45 |
+@@ -1,4 +1,3 @@ |
| 46 |
+ SUBDIRS = getopt src tools doc |
| 47 |
+ |
| 48 |
+-docdir = $(prefix)/doc/portfwd |
| 49 |
+ doc_DATA = COPYING README CREDITS TODO |
| 50 |
--- a/doc/Makefile.am |
| 51 |
+++ b/doc/Makefile.am |
| 52 |
@@ -3,5 +3,4 @@ |
| 53 |
@@ -58,19 +58,20 @@ |
| 54 |
to intersperse the options with the other arguments. |
| 55 |
--- a/src/Makefile.am |
| 56 |
+++ b/src/Makefile.am |
| 57 |
-@@ -1,5 +1,5 @@ |
| 58 |
+@@ -1,6 +1,4 @@ |
| 59 |
-CFLAGS = -Wall -ggdb -O3 -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" |
| 60 |
-CXXFLAGS = $(CFLAGS) |
| 61 |
-+CFLAGS = @CFLAGS@ -Wall -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" |
| 62 |
-+CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" |
| 63 |
- INCLUDES = -I$(top_srcdir)/src |
| 64 |
+-INCLUDES = -I$(top_srcdir)/src |
| 65 |
++AM_CPPFLAGS = -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" -I$(top_srcdir)/src |
| 66 |
|
| 67 |
sbin_PROGRAMS = portfwd |
| 68 |
+ portfwd_SOURCES = addr.cc from_addr.cc host_map.cc portfwd.cc \ |
| 69 |
--- a/tools/Makefile.am |
| 70 |
+++ b/tools/Makefile.am |
| 71 |
-@@ -1,4 +1,4 @@ |
| 72 |
+@@ -1,5 +1,4 @@ |
| 73 |
-CXXFLAGS = -Wall -g -O3 |
| 74 |
-+CPPFLAGS = @CXXFLAGS@ -Wall -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" |
| 75 |
- INCLUDES = -I$(top_srcdir)/src |
| 76 |
+-INCLUDES = -I$(top_srcdir)/src |
| 77 |
++AM_CPPFLAGS = -DPORTFWD_CONF=\"$(sysconfdir)/portfwd.cfg\" -I$(top_srcdir)/src |
| 78 |
|
| 79 |
noinst_PROGRAMS = t_vector udp_rcv udp_snd |
| 80 |
+ |
Archives