| 1 |
ssuominen 10/06/29 15:05:59 |
| 2 |
|
| 3 |
Added: fe3d-0.11.2-asneeded.patch |
| 4 |
Log: |
| 5 |
Fix building with -Wl,--as-needed wrt #277794 by Kacper Kowalik. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/fe3d/files/fe3d-0.11.2-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: fe3d-0.11.2-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
--- configure.ac |
| 17 |
+++ configure.ac |
| 18 |
@@ -46,16 +46,15 @@ |
| 19 |
]) |
| 20 |
fi |
| 21 |
|
| 22 |
-CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" |
| 23 |
-CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" |
| 24 |
-CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" |
| 25 |
-LIBS="$LIBS $WX_LIBS" |
| 26 |
+#CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" |
| 27 |
+#CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" |
| 28 |
+#CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" |
| 29 |
+#LIBS="$LIBS $WX_LIBS" |
| 30 |
|
| 31 |
AM_CPPFLAGS="$AM_CPPFLAGS $GL_CFLAGS $GLU_CFLAGS" |
| 32 |
-AM_LDFLAGS="$AM_LDFLAGS $GL_LIBS $GLU_LIBS" |
| 33 |
AC_SUBST([AM_CPPFLAGS]) |
| 34 |
AC_SUBST([AM_LDFLAGS]) |
| 35 |
-AC_SUBST([$PREFIX]) |
| 36 |
+#AC_SUBST([$PREFIX]) |
| 37 |
|
| 38 |
AC_OUTPUT |
| 39 |
|
| 40 |
--- src/Makefile.am |
| 41 |
+++ src/Makefile.am |
| 42 |
@@ -1,8 +1,10 @@ |
| 43 |
-fe3d_CPPFLAGS = -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\"" |
| 44 |
+fe3d_CPPFLAGS = -DFE_DATA_DIR="\"@datadir@/@PACKAGE@/\"" @WX_CPPFLAGS@ |
| 45 |
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/include |
| 46 |
bin_PROGRAMS = fe3d |
| 47 |
fe3d_SOURCES = fe_config.cpp fe_core.cpp fe_draw.cpp fe_events.cpp fe_host.cpp fe_hosts.cpp fe_match.cpp fe_node.cpp fe_os_rgx.cpp fe_port.cpp fe_root_node.cpp fe_tools.cpp geo_cache.cpp gl_util.cpp libfe3d.cpp nmap_parser.cpp tex_cache.cpp wxfe3d_app.cpp wxfe3d_frame.cpp wxfe3d_glcanvas.cpp ui_nmap_ctrl.cpp ./gui/fe3d_ui.cpp ./regexp/Matcher.cpp ./regexp/Pattern.cpp ./regexp/WCMatcher.cpp ./regexp/WCPattern.cpp |
| 48 |
- |
| 49 |
+fe3d_CFLAGS = @WX_CFLAGS@ |
| 50 |
+fe3d_CXXFLAGS = @WX_CXXFLAGS_ONLY@ |
| 51 |
+fe3d_LDADD = @GLU_LIBS@ @WX_LIBS@ |
| 52 |
fe3ddir = @datadir@/@PACKAGE@ |
| 53 |
fe3d_imgdir = @datadir@/@PACKAGE@/img |
| 54 |
fe3d_DATA = $(top_srcdir)/data/* |
Archives