diff options
| author |   Michele Noberasco <s4t4n@gentoo.org> | 2009-01-22 14:21:24 +0000 |
|---|---|---|
| committer | Michele Noberasco <s4t4n@gentoo.org> | 2009-01-22 14:21:24 +0000 |
| commit | c94c2bb047c6c6b90c87e5e3a9d5661548d7da3f (patch) | |
| tree | 88f52fdddedf01ed04d7abc49ade98b263e5e98f /x11-plugins/wmnetload/files | |
| parent | Sparc stable, Bug #255820. (diff) | |
| download | gentoo-2-c94c2bb047c6c6b90c87e5e3a9d5661548d7da3f.tar.gz gentoo-2-c94c2bb047c6c6b90c87e5e3a9d5661548d7da3f.tar.bz2 gentoo-2-c94c2bb047c6c6b90c87e5e3a9d5661548d7da3f.zip | |
Revision bump, with updated norpath patch to fix bug #226853.
Also, now libdockapp 0.5 support patch is obsolete and not applied any longer.
(Portage version: 2.1.6.4/cvs/Linux 2.6.24-tuxonice-r9 i686)
Diffstat (limited to 'x11-plugins/wmnetload/files')
| -rw-r--r-- | x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch b/x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch new file mode 100644 index 000000000000..117015d242a5 --- /dev/null +++ b/x11-plugins/wmnetload/files/wmnetload-1.3-r3-norpath.patch @@ -0,0 +1,59 @@ +diff -Naur wmnetload-1.3/configure.in wmnetload-1.3-new/configure.in +--- wmnetload-1.3/configure.in 2003-02-23 10:07:39.000000000 +0100 ++++ wmnetload-1.3-new/configure.in 2009-01-20 09:24:20.000000000 +0100 +@@ -102,7 +102,6 @@ + [inc_search_path=" -I $withval $inc_search_path"]) + + LIBRARY_SEARCH_PATH="$lib_search_path -L/usr/local/lib" +-LIBRARY_RPATH=`echo "$LIBRARY_SEARCH_PATH" | sed 's/[ *]-L[ *]/:/g'` + HEADER_SEARCH_PATH="$inc_search_path -I/usr/local/include" + + AC_SUBST(LIBRARY_SEARCH_PATH) +@@ -122,12 +121,10 @@ + ;; + *netbsd*) + OS=netbsd +- LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib" + LIBS="$LIBS -lkvm" + ;; + *freebsd*) + OS=freebsd +- LIBRARY_RPATH="$LIBRARY_RPATH:/usr/X11R6/lib" + ;; + *) + echo "" +@@ -143,22 +140,6 @@ + + AC_PATH_XTRA + +-dnl +-dnl Hack in rpath -- yes, this sucks, and it even has a hidden dependency +-dnl on the implementation of AC_PATH_XTRA. F@&* you, portability. +-dnl +-if test "$GCC" = yes; then +- if test "ac_R_space" = no; then +- RPATH="-Wl,\"-R$LIBRARY_RPATH\"" +- else +- RPATH="-Wl,\"-R $LIBRARY_RPATH\"" +- fi +-else +- RPATH= +- echo "WARNING: do not know how to set RPATH with this compiler" +-fi +- +-AC_SUBST(RPATH) + + + X_LIBRARY_PATH=$x_libraries +diff -Naur wmnetload-1.3/src/Makefile.am wmnetload-1.3-new/src/Makefile.am +--- wmnetload-1.3/src/Makefile.am 2003-02-18 07:30:48.000000000 +0100 ++++ wmnetload-1.3-new/src/Makefile.am 2009-01-20 09:24:58.000000000 +0100 +@@ -25,8 +25,6 @@ + EXTRA_wmnetload_SOURCES = ifstat_linux.c ifstat_netbsd.c ifstat_solaris.c \ + ifstat_freebsd.c + +-LDFLAGS = @RPATH@ +- + LDADD = @LIBRARY_SEARCH_PATH@ @XLFLAGS@ @XLIBS@ -ldockapp -lXpm -lm + CPPFLAGS = @CPPFLAGS@ @XCFLAGS@ -DVERSION=\"@VERSION@\" + INCLUDES = @HEADER_SEARCH_PATH@ -I$(top_srcdir)/xpm/@WN_LOOK@ |