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

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/wireshark/files: wireshark-1.6.13-ldflags.patch wireshark-1.8.1-ldflags.patch
Date: Wed, 30 Jan 2013 18:59:48
Message-Id: 20130130185905.8FB502171D@flycatcher.gentoo.org
1 jer 13/01/30 18:59:05
2
3 Modified: wireshark-1.6.13-ldflags.patch
4 Removed: wireshark-1.8.1-ldflags.patch
5 Log:
6 Simplify LDFLAGS patch.
7
8 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
9
10 Revision Changes Path
11 1.2 net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch?r1=1.1&r2=1.2
16
17 Index: wireshark-1.6.13-ldflags.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- wireshark-1.6.13-ldflags.patch 30 Jan 2013 03:40:50 -0000 1.1
24 +++ wireshark-1.6.13-ldflags.patch 30 Jan 2013 18:59:05 -0000 1.2
25 @@ -1,141 +1,14 @@
26 --- a/acinclude.m4
27 +++ b/acinclude.m4
28 -@@ -416,7 +416,7 @@
29 - #
30 - CFLAGS="$CFLAGS -I$pcap_dir/include"
31 - CPPFLAGS="$CPPFLAGS -I$pcap_dir/include"
32 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
33 -+dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $pcap_dir/lib)
34 - fi
35 -
36 - # Pcap header check
37 -@@ -642,7 +642,7 @@
38 - wireshark_save_CPPFLAGS="$CPPFLAGS"
39 - CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
40 - wireshark_save_LIBS="$LIBS"
41 -- AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
42 -+dnl AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
43 - fi
44 -
45 - #
46 -@@ -695,7 +695,7 @@
47 - # LIBS.
48 - #
49 - LIBS=""
50 -- AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
51 -+dnl AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
52 - LIBS="$LIBS -lz $wireshark_save_LIBS"
53 - else
54 - LIBS="-lz $LIBS"
55 -@@ -1268,7 +1268,8 @@
56 - if test "x$ac_cv_enable_usr_local" = "xyes" ; then
57 - withval=/usr/local
58 - if test -d "$withval"; then
59 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
60 -+dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
61 -+ true
62 - fi
63 - fi
64 - fi
65 -@@ -1299,7 +1300,8 @@
66 - if test "x$ac_cv_enable_usr_local" = "xyes" ; then
67 - withval=/usr/local
68 - if test -d "$withval"; then
69 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
70 -+dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
71 -+ true
72 - fi
73 - fi
74 - fi
75 -@@ -1330,7 +1332,8 @@
76 - if test "x$ac_cv_enable_usr_local" = "xyes" ; then
77 - withval=/usr/local
78 - if test -d "$withval"; then
79 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
80 -+dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
81 -+ true
82 - fi
83 - fi
84 - fi
85 -@@ -1619,7 +1622,8 @@
86 - if test "x$ac_cv_enable_usr_local" = "xyes" ; then
87 - withval=/usr/local
88 - if test -d "$withval"; then
89 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
90 -+dnl AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
91 -+ true
92 - fi
93 - fi
94 - fi
95 ---- a/configure.in
96 -+++ b/configure.in
97 -@@ -616,7 +616,8 @@
98 - #
99 - # Arrange that we search for libraries in "$prefix/lib".
100 - #
101 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
102 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
103 -+ true
104 - else
105 - AC_MSG_RESULT(no)
106 - fi
107 -@@ -647,7 +648,8 @@
108 - #
109 - # Arrange that we search for libraries in "/usr/local/lib".
110 - #
111 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
112 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, /usr/local/lib)
113 -+ true
114 - else
115 - AC_MSG_RESULT(no)
116 - fi
117 -@@ -1468,7 +1470,8 @@
118 - want_libcap=yes
119 - elif test -d "$withval"; then
120 - want_libcap=yes
121 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
122 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
123 -+ true
124 - fi
125 - ])
126 - if test "x$with_libcap" = "xno" ; then
127 -@@ -1499,7 +1502,8 @@
128 - want_ssl=yes
129 - elif test -d "$withval"; then
130 - want_ssl=yes
131 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
132 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
133 -+ true
134 - fi
135 - ],[
136 - want_ssl=no
137 -@@ -1564,7 +1568,8 @@
138 - want_c_ares=yes
139 - elif test -d "$withval"; then
140 - want_c_ares=yes
141 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
142 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
143 -+ true
144 - fi
145 - ])
146 - if test "x$want_c_ares" = "xno" ; then
147 -@@ -1589,7 +1594,8 @@
148 - want_adns=yes
149 - elif test -d "$withval"; then
150 - want_adns=yes
151 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
152 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
153 -+ true
154 - fi
155 - ])
156 - if test "x$want_adns" = "xno" -o "x$have_good_c_ares" = "xyes" ; then
157 -@@ -1614,7 +1620,8 @@
158 - want_geoip=yes
159 - elif test -d "$withval"; then
160 - want_geoip=yes
161 -- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
162 -+# AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
163 -+ true
164 - fi
165 - ])
166 - if test "x$want_geoip" = "xno"; then
167 +@@ -61,9 +61,9 @@
168 + # "-R" here.
169 + #
170 + AC_DEFUN([AC_WIRESHARK_ADD_DASH_L],
171 +-[$1="$$1 -L$2"
172 +-case "$host_os" in
173 ++[case "$host_os" in
174 + solaris*)
175 ++ $1="$$1 -L$2"
176 + $1="$$1 -R$2"
177 + ;;
178 + esac
Report Message
Find on MARC Find on Google Groups