| 1 |
s4t4n 09/01/22 14:21:24 |
| 2 |
|
| 3 |
Added: wmnetload-1.3-r3-norpath.patch |
| 4 |
Log: |
| 5 |
Revision bump, with updated norpath patch to fix bug #226853. |
| 6 |
Also, now libdockapp 0.5 support patch is obsolete and not applied any longer. |
| 7 |
(Portage version: 2.1.6.4/cvs/Linux 2.6.24-tuxonice-r9 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: wmnetload-1.3-r3-norpath.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur wmnetload-1.3/configure.in wmnetload-1.3-new/configure.in |
| 18 |
--- wmnetload-1.3/configure.in 2003-02-23 10:07:39.000000000 +0100 |
| 19 |
+++ wmnetload-1.3-new/configure.in 2009-01-20 09:24:20.000000000 +0100 |
| 20 |
@@ -102,7 +102,6 @@ |
| 21 |
[inc_search_path=" -I $withval $inc_search_path"]) |
| 22 |
|
| 23 |
LIBRARY_SEARCH_PATH="$lib_search_path -L/usr/local/lib" |
| 24 |
-LIBRARY_RPATH=`echo "$LIBRARY_SEARCH_PATH" | sed 's/[ *]-L[ *]/:/g'` |
| 25 |
HEADER_SEARCH_PATH="$inc_search_path -I/usr/local/include" |
| 26 |
|
| 27 |
AC_SUBST(LIBRARY_SEARCH_PATH) |
| 28 |
@@ -122,12 +121,10 @@ |
| 29 |
;; |
| 30 |
*netbsd*) |
| 31 |
OS=netbsd |
| 32 |
- LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib" |
| 33 |
LIBS="$LIBS -lkvm" |
| 34 |
;; |
| 35 |
*freebsd*) |
| 36 |
OS=freebsd |
| 37 |
- LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib" |
| 38 |
;; |
| 39 |
*) |
| 40 |
echo "" |
| 41 |
@@ -143,22 +140,6 @@ |
| 42 |
|
| 43 |
AC_PATH_XTRA |
| 44 |
|
| 45 |
-dnl |
| 46 |
-dnl Hack in rpath -- yes, this sucks, and it even has a hidden dependency |
| 47 |
-dnl on the implementation of AC_PATH_XTRA. F@&* you, portability. |
| 48 |
-dnl |
| 49 |
-if test "$GCC" = yes; then |
| 50 |
- if test "ac_R_space" = no; then |
| 51 |
- RPATH="-Wl,\"-R$LIBRARY_RPATH\"" |
| 52 |
- else |
| 53 |
- RPATH="-Wl,\"-R $LIBRARY_RPATH\"" |
| 54 |
- fi |
| 55 |
-else |
| 56 |
- RPATH= |
| 57 |
- echo "WARNING: do not know how to set RPATH with this compiler" |
| 58 |
-fi |
| 59 |
- |
| 60 |
-AC_SUBST(RPATH) |
| 61 |
|
| 62 |
|
| 63 |
X_LIBRARY_PATH=$x_libraries |
| 64 |
diff -Naur wmnetload-1.3/src/Makefile.am wmnetload-1.3-new/src/Makefile.am |
| 65 |
--- wmnetload-1.3/src/Makefile.am 2003-02-18 07:30:48.000000000 +0100 |
| 66 |
+++ wmnetload-1.3-new/src/Makefile.am 2009-01-20 09:24:58.000000000 +0100 |
| 67 |
@@ -25,8 +25,6 @@ |
| 68 |
EXTRA_wmnetload_SOURCES = ifstat_linux.c ifstat_netbsd.c ifstat_solaris.c \ |
| 69 |
ifstat_freebsd.c |
| 70 |
|
| 71 |
-LDFLAGS = @RPATH@ |
| 72 |
- |
| 73 |
LDADD = @LIBRARY_SEARCH_PATH@ @XLFLAGS@ @XLIBS@ -ldockapp -lXpm -lm |
| 74 |
CPPFLAGS = @CPPFLAGS@ @XCFLAGS@ -DVERSION=\"@VERSION@\" |
| 75 |
INCLUDES = @HEADER_SEARCH_PATH@ -I$(top_srcdir)/xpm/@WN_LOOK@ |
Archives