rpms/net-snmp/devel net-snmp-5.3.1-config_libdir.patch, NONE, 1.1 net-snmp.spec, 1.82, 1.83
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 10 14:14:07 UTC 2006
Author: rvokal
Update of /cvs/dist/rpms/net-snmp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7667
Modified Files:
net-snmp.spec
Added Files:
net-snmp-5.3.1-config_libdir.patch
Log Message:
- fix libdir in configure
net-snmp-5.3.1-config_libdir.patch:
configure | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
--- NEW FILE net-snmp-5.3.1-config_libdir.patch ---
--- net-snmp-5.3.1/configure.libdir 2006-08-10 13:35:32.000000000 +0200
+++ net-snmp-5.3.1/configure 2006-08-10 14:01:09.000000000 +0200
@@ -4981,7 +4981,7 @@
lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
;;
*) # Darwin 1.3 on
- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+ lt_cv_file_magic_test_file='$LIBDIR/libSystem.dylib'
;;
esac
;;
@@ -4994,7 +4994,7 @@
# Let's accept both of them until this is cleared up.
lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ lt_cv_file_magic_test_file=`echo $LIBDIR/libc.so.*`
;;
esac
else
@@ -5009,7 +5009,7 @@
hpux10.20*|hpux11*)
lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ lt_cv_file_magic_test_file=$LIBDIR/libc.sl
;;
irix5* | irix6* | nonstopux*)
@@ -5056,12 +5056,12 @@
newos6*)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ lt_cv_file_magic_test_file=$LIBDIR/libnls.so
;;
openbsd*)
lt_cv_file_magic_cmd=/usr/bin/file
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ lt_cv_file_magic_test_file=`echo $LIBDIR/libc.so.*`
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
else
@@ -5093,7 +5093,7 @@
case $host_vendor in
motorola)
lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+ lt_cv_file_magic_test_file=`echo $LIBDIR/libc.so*`
;;
ncr)
lt_cv_deplibs_check_method=pass_all
@@ -7154,15 +7154,15 @@
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:$LIBDIR:/lib'
archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
else
if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ hardcode_libdir_flag_spec='${wl}-R $libdir:$LIBDIR:/lib'
allow_undefined_flag="-z nodefs"
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
else
- hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+ hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:$LIBDIR:/lib'
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='${wl}-berok'
@@ -7229,7 +7229,7 @@
# does not break anything, and helps significantly (at the cost of a little
# extra space).
freebsd2.2*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags $LIBDIR/c++rt0.o'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
@@ -7582,8 +7582,8 @@
shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+sys_lib_dlsearch_path_spec="/lib $LIBDIR"
+sys_lib_search_path_spec="/lib $LIBDIR /usr/local/lib"
case $host_os in
aix3*)
@@ -7660,8 +7660,8 @@
soname_spec='${libname}${release}.so$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
- sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ sys_lib_search_path_spec="/shlib $LIBDIR /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib $LIBDIR /usr/local/lib"
export_dynamic_flag_spec=-rdynamic
# the default ld.so.conf also contains /usr/contrib/lib and
# /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
@@ -7793,8 +7793,8 @@
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="$LIBDIR${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+ sys_lib_dlsearch_path_spec="$LIBDIR${libsuff} /lib${libsuff}"
;;
# No shared lib support for Linux oldld, aout, or coff.
@@ -7886,7 +7886,7 @@
soname_spec='${libname}${release}.so$major'
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib $LIBDIR/cmplrs/cc $LIBDIR /usr/local/lib /var/shlib"
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
hardcode_into_libs=yes
;;
@@ -7942,7 +7942,7 @@
need_lib_prefix=no
need_version=no
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ sys_lib_search_path_spec='/lib $LIBDIR /usr/ccs/lib'
;;
esac
;;
Index: net-snmp.spec
===================================================================
RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- net-snmp.spec 3 Aug 2006 09:59:22 -0000 1.82
+++ net-snmp.spec 10 Aug 2006 14:14:03 -0000 1.83
@@ -7,7 +7,7 @@
Summary: A collection of SNMP protocol tools and libraries.
Name: net-snmp
Version: %{major_ver}.0
-Release: 2
+Release: 3
License: BSDish
Group: System Environment/Daemons
@@ -38,6 +38,7 @@
Patch26: net-snmp-5.3_vendorperl.patch
Patch27: net-snmp-5.3.1-multilib.patch
Patch28: net-snmp-5.3.1-retrans_time.patch
+Patch29: net-snmp-5.3.1-config_libdir.patch
Prereq: /sbin/chkconfig
Obsoletes: ucd-snmp
@@ -142,6 +143,7 @@
%patch24 -p1 -b .size_t
%patch27 -p1 -b .multilib
%patch28 -p0 -b .retrans_ms
+%patch29 -p1 -b .libdir
# Do this patch with a perl hack...
perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@@ -150,6 +152,7 @@
%ifarch ia64 x86_64 s390x ppc64
export LDFLAGS="-L%{_libdir}"
%endif
+export LIBDIR="%{_libdir}"
%configure \
--enable-static --enable-shared \
--with-cflags="$RPM_OPT_FLAGS -lcrypto" \
@@ -343,6 +346,9 @@
%{_libdir}/*.a
%changelog
+* Thu Aug 10 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-3
+- fix lib dirs in configure (#197684)
+
* Thu Aug 3 2006 Radek Vokal <rvokal at redhat.com> 5.3.1.0-2
- better patch for depreciated sysctl call
More information about the fedora-cvs-commits
mailing list