diff options
| author |   Peter Volkov <pva@gentoo.org> | 2010-11-09 17:57:07 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2010-11-09 17:57:07 +0000 |
| commit | cfe63e9f9ce877a1f300014e08a7ba83c4ba847a (patch) | |
| tree | 48764da6e62d00ce140e41e1e99498b7a8468e2b /net-analyzer/mrtg/files | |
| parent | New package: sci-mathematics/topcom, revised import from sci overlay, fixes b... (diff) | |
| download | gentoo-2-cfe63e9f9ce877a1f300014e08a7ba83c4ba847a.tar.gz gentoo-2-cfe63e9f9ce877a1f300014e08a7ba83c4ba847a.tar.bz2 gentoo-2-cfe63e9f9ce877a1f300014e08a7ba83c4ba847a.zip | |
Fix static linkage and rpath, bug #332287, thank Diego Elio Pettenò for report.
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Diffstat (limited to 'net-analyzer/mrtg/files')
| -rw-r--r-- | net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch | 29 | ||||
| -rw-r--r-- | net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch | 46 |
2 files changed, 75 insertions, 0 deletions
diff --git a/net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch b/net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch new file mode 100644 index 000000000000..af513a38c6e0 --- /dev/null +++ b/net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch @@ -0,0 +1,29 @@ +http://oss.oetiker.ch/mrtg-trac/ticket/97 + +--- configure.in 2010-11-09 16:25:34 +0000 ++++ configure.in 2010-11-09 16:35:39 +0000 +@@ -98,6 +98,8 @@ + AC_ARG_WITH(png-inc,[ --with-png-inc=DIR location of the libpng include files], + [CPPFLAGS="${CPPFLAGS} -I${withval}"]) + ++AC_ARG_ENABLE(static,[ --disable-static avoid rateup static linkage with gd], ++ [AVOID_STATIC="${enableval}"],[AVOID_STATIC="no"]) + + LIBS="${LIBS} ${MATHLIBS}" + +@@ -127,9 +129,11 @@ + CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImageGif" + fi + +-AC_CHECK_LIB(gd,gdImageGd,[ +- GLIBS="-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic" +- ],:,[-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic]) ++if test x$AVOID_STATIC = xyes; then ++ AC_CHECK_LIB(gd,gdImageGd,[ ++ GLIBS="-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic" ++ ],:,[-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic]) ++fi + + if test x$GDFORM_EXT = xpng; then + CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImagePng" + diff --git a/net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch b/net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch new file mode 100644 index 000000000000..1f634134269d --- /dev/null +++ b/net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch @@ -0,0 +1,46 @@ +http://oss.oetiker.ch/mrtg-trac/ticket/98 + +--- Makefile.in 2010-11-09 16:25:34 +0000 ++++ Makefile.in 2010-11-09 17:13:17 +0000 +@@ -21,7 +21,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + GDFORM_EXT = @GDFORM_EXT@ +-LD_RUN_PATH = @LD_RUN_PATH@ ++SET_LD_RUN_PATH = @SET_LD_RUN_PATH@ + LIBS = @LIBS@ + + INSTALL = @INSTALL@ +@@ -30,7 +30,8 @@ + all: bin/rateup subst + + bin/rateup: bin/rateup.o +- LD_RUN_PATH=$(LD_RUN_PATH) $(CC) bin/rateup.o -o bin/rateup $(LDFLAGS) $(LIBS) ++ $(SET_LD_RUN_PATH) $(CC) bin/rateup.o -o bin/rateup $(LDFLAGS) $(LIBS) ++ + + bin/rateup.o: $(top_srcdir)/src/rateup.c + $(CC) $(CPPFLAGS) $(CFLAGS) -c $(top_srcdir)/src/rateup.c -o bin/rateup.o + +--- configure.in 2010-11-09 17:11:20 +0000 ++++ configure.in 2010-11-09 17:12:49 +0000 +@@ -141,6 +141,9 @@ + + LIBS="${GLIBS} ${LIBS}" + ++if test x$LD_RUN_PATH != x; then ++ SET_LD_RUN_PATH="LD_RUN_PATH=${LD_RUN_PATH}" ++fi + + dnl Make sure the header is here + AC_CHECK_HEADER( gd.h,:,[ GDFORM_EXT="" ]) +@@ -198,7 +201,7 @@ + AC_SUBST(PERL) + AC_SUBST(RRD_PERL) + AC_SUBST(GDFORM_EXT) +-AC_SUBST(LD_RUN_PATH) ++AC_SUBST(SET_LD_RUN_PATH) + AC_SUBST(LIBS) + AC_SUBST(CFLAGS) + AC_CONFIG_HEADERS(config.h) + |