diff options
author | Daniel Black <dragonheart@gentoo.org> | 2005-02-17 12:26:49 +0000 |
---|---|---|
committer | Daniel Black <dragonheart@gentoo.org> | 2005-02-17 12:26:49 +0000 |
commit | ad1f9bb9de89b8d9bda8c2a2251032c19c50fb9f (patch) | |
tree | cd7dec299fcfe6775e8d979e30481f923f5c2697 /net-analyzer/net-snmp/files | |
parent | Fix an ugly typo (diff) | |
download | historical-ad1f9bb9de89b8d9bda8c2a2251032c19c50fb9f.tar.gz historical-ad1f9bb9de89b8d9bda8c2a2251032c19c50fb9f.tar.bz2 historical-ad1f9bb9de89b8d9bda8c2a2251032c19c50fb9f.zip |
Dependancy fixed as per bug #69775. Thanks Carsten
Package-Manager: portage-2.0.51.16
Diffstat (limited to 'net-analyzer/net-snmp/files')
-rw-r--r-- | net-analyzer/net-snmp/files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch | 147 |
1 files changed, 147 insertions, 0 deletions
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch b/net-analyzer/net-snmp/files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch new file mode 100644 index 000000000000..9ba303369298 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch @@ -0,0 +1,147 @@ +--- configure.orig 2005-02-17 20:20:50.735101408 +0930 ++++ configure 2005-02-17 20:36:35.883389400 +0930 +@@ -1253,7 +1253,9 @@ + --with-gnu-ld assume the C compiler uses GNU ld default=no + --with-pic try to use only PIC/non-PIC objects default=use both + --with-libwrap=LIBPATH Compile in libwrap (tcp_wrappers) support. ++ --without-elf use elf libraries + --with-zlib=DIR use libz in DIR ++ --with-bzip2=DIR use libbzip2 in DIR + + Some influential environment variables: + CC C compiler command +@@ -5911,7 +5913,7 @@ + case $host in + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 5914 "configure"' > conftest.$ac_ext ++ echo '#line 5916 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -6483,7 +6485,7 @@ + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" + compiler_c_o=no +-if { (eval echo configure:6486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then ++if { (eval echo configure:6488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s out/conftest.err; then +@@ -8447,7 +8449,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 8450 "configure" ++#line 8452 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -8545,7 +8547,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +-#line 8548 "configure" ++#line 8550 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14405,6 +14407,12 @@ + + # nlist is needed for uptime on some sytems in the generic library + ++# Check whether --with-elf or --without-elf was given. ++if test "${with_elf+set}" = set; then ++ withval="$with_elf" ++ ++ if test "x$with_elf" != "xno"; then ++ + echo "$as_me:$LINENO: checking for nlist in -lelf" >&5 + echo $ECHO_N "checking for nlist in -lelf... $ECHO_C" >&6 + if test "${ac_cv_lib_elf_nlist+set}" = set; then +@@ -14478,6 +14486,11 @@ + + fi + ++ fi ++ ++fi; ++ ++ + + # On some platforms (Irix) libnsl and libsocket should not be used. + echo "$as_me:$LINENO: checking for gethostbyname" >&5 +@@ -15250,7 +15263,17 @@ + + + # two variants of bzip2 need checking. +- echo "$as_me:$LINENO: checking for bzread in -lbz2" >&5 ++ ++# Check whether --with-bzip2 or --without-bzip2 was given. ++if test "${with_bzip2+set}" = set; then ++ withval="$with_bzip2" ++ ++ if test -d "$withval"; then ++ CPPFLAGS="${CPPFLAGS} -I$withval/include" ++ LDFLAGS="${LDFLAGS} -L$withval/lib" ++ fi ++ if test "x$with_bzip2" != "xno"; then ++ echo "$as_me:$LINENO: checking for bzread in -lbz2" >&5 + echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6 + if test "${ac_cv_lib_bz2_bzread+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -15387,6 +15410,10 @@ + + fi + ++ fi ++ ++fi; ++ + + # two variants of db1 need checking. + echo "$as_me:$LINENO: checking for dbopen in -ldb1" >&5 +--- configure.in.orig 2005-02-17 19:14:14.000000000 +0930 ++++ configure.in 2005-02-17 20:36:18.450039672 +0930 +@@ -1,3 +1,4 @@ ++Wrpm + # Portions of this file are subject to the following copyright. See + # the Net-SNMP's COPYING file for more details and other copyrights + # that may apply: +@@ -2172,7 +2173,14 @@ + # AC_CHECK_LIB(des, main) + AC_CHECK_LIB(m, asin) + # nlist is needed for uptime on some sytems in the generic library +-AC_CHECK_LIB(elf, nlist) ++ AC_ARG_WITH(elf, ++ [ --without-elf use elf libraries],[ ++ if test "x$with_elf" != "xno"; then ++ AC_CHECK_LIB(elf, nlist) ++ fi ++ ]) ++ ++ + + # On some platforms (Irix) libnsl and libsocket should not be used. + AC_CHECK_FUNC(gethostbyname, AC_DEFINE(HAVE_GETHOSTBYNAME), +@@ -2219,8 +2227,18 @@ + CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}) + + # two variants of bzip2 need checking. +- AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"], +- AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],)) ++ AC_ARG_WITH(bzip2, ++ [ --with-bzip2[=DIR] use libbzip2 in DIR],[ ++ if test -d "$withval"; then ++ CPPFLAGS="${CPPFLAGS} -I$withval/include" ++ LDFLAGS="${LDFLAGS} -L$withval/lib" ++ fi ++ if test "x$with_bzip2" != "xno"; then ++ AC_CHECK_LIB(bz2, bzread, [_rpmlibs="$_rpmlibs -lbz2"], ++ AC_CHECK_LIB(bz2, BZ2_bzread, [_rpmlibs="$_rpmlibs -lbz2"],)) ++ fi ++ ]) ++ + + # two variants of db1 need checking. + AC_CHECK_LIB(db1, dbopen, [_rpmlibs="-ldb1 $_rpmlibs"], |