!5 update libdnet to 1.14
From: @haochenstar Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot
Gitee
commit
7e04576086
@ -1,12 +0,0 @@
|
||||
diff -Nuar libdnet-1.12/python/setup.py.in libdnet-1.12.new/python/setup.py.in
|
||||
--- libdnet-1.12/python/setup.py.in 2006-01-18 23:50:29.000000000 -0500
|
||||
+++ libdnet-1.12.new/python/setup.py.in 2019-04-11 07:38:27.901000000 -0400
|
||||
@@ -20,7 +20,7 @@
|
||||
# XXX - can't build on Cygwin+MinGW yet.
|
||||
#if sys.platform == 'cygwin':
|
||||
# dnet_extargs.append('-mno-cygwin')
|
||||
- dnet_extobj.extend(glob.glob('@top_builddir@/src/.libs/*.o'))
|
||||
+ dnet_extobj.extend(sorted(glob.glob('@top_builddir@/src/.libs/*.o')))
|
||||
|
||||
dnet = Extension('dnet',
|
||||
dnet_srcs,
|
||||
@ -1,15 +0,0 @@
|
||||
--- libdnet-1.12/dnet-config.in.old 2014-03-14 11:40:27.332135003 +0000
|
||||
+++ libdnet-1.12/dnet-config.in 2014-03-14 11:41:08.624931401 +0000
|
||||
@@ -45,10 +45,10 @@
|
||||
done
|
||||
|
||||
if test "$echo_cflags" = "yes"; then
|
||||
- echo -I@includedir@
|
||||
+ echo
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes"; then
|
||||
- echo -L@libdir@ -ldnet @LIBS@
|
||||
+ echo -ldnet @LIBS@
|
||||
fi
|
||||
|
||||
BIN
libdnet-1.12.tgz
BIN
libdnet-1.12.tgz
Binary file not shown.
BIN
libdnet-1.14.tar.gz
Normal file
BIN
libdnet-1.14.tar.gz
Normal file
Binary file not shown.
@ -1,327 +0,0 @@
|
||||
diff -urN libdnet-1.12/configure libdnet-1.12-patched/configure
|
||||
--- libdnet-1.12/configure 2007-01-20 05:39:54.000000000 -0600
|
||||
+++ libdnet-1.12-patched/configure 2007-02-15 09:06:27.000000000 -0600
|
||||
@@ -7053,7 +7053,7 @@
|
||||
# Tell ltmain to make .lib files, not .a files.
|
||||
libext=lib
|
||||
# Tell ltmain to make .dll files, not .so files.
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
# FIXME: Setting linknames here is a bad hack.
|
||||
archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
|
||||
# The linker will automatically build a .lib file if we build a DLL.
|
||||
@@ -7580,7 +7580,7 @@
|
||||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
-shrext=".so"
|
||||
+shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
@@ -7693,7 +7693,7 @@
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@@ -7761,7 +7761,7 @@
|
||||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
@@ -7830,7 +7830,7 @@
|
||||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
- shrext='.so'
|
||||
+ shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -7845,7 +7845,7 @@
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
- shrext='.sl'
|
||||
+ shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
@@ -7856,7 +7856,7 @@
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
- shrext='.sl'
|
||||
+ shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
@@ -7992,7 +7992,7 @@
|
||||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
@@ -9201,7 +9201,7 @@
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
-shrext='$shrext'
|
||||
+shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@@ -11257,7 +11257,7 @@
|
||||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
-shrext=".so"
|
||||
+shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
@@ -11370,7 +11370,7 @@
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@@ -11438,7 +11438,7 @@
|
||||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
@@ -11507,7 +11507,7 @@
|
||||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
- shrext='.so'
|
||||
+ shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -11522,7 +11522,7 @@
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
- shrext='.sl'
|
||||
+ shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
@@ -11533,7 +11533,7 @@
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
- shrext='.sl'
|
||||
+ shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
@@ -11669,7 +11669,7 @@
|
||||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
@@ -12751,7 +12751,7 @@
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
-shrext='$shrext'
|
||||
+shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@@ -13832,7 +13832,7 @@
|
||||
# Tell ltmain to make .lib files, not .a files.
|
||||
libext=lib
|
||||
# Tell ltmain to make .dll files, not .so files.
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
# FIXME: Setting linknames here is a bad hack.
|
||||
archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
|
||||
# The linker will automatically build a .lib file if we build a DLL.
|
||||
@@ -14359,7 +14359,7 @@
|
||||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
-shrext=".so"
|
||||
+shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
@@ -14472,7 +14472,7 @@
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@@ -14540,7 +14540,7 @@
|
||||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
@@ -14609,7 +14609,7 @@
|
||||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
- shrext='.so'
|
||||
+ shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -14624,7 +14624,7 @@
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
- shrext='.sl'
|
||||
+ shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
@@ -14635,7 +14635,7 @@
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
- shrext='.sl'
|
||||
+ shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
@@ -14771,7 +14771,7 @@
|
||||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
@@ -15047,7 +15047,7 @@
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
-shrext='$shrext'
|
||||
+shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@@ -16130,7 +16130,7 @@
|
||||
# Tell ltmain to make .lib files, not .a files.
|
||||
libext=lib
|
||||
# Tell ltmain to make .dll files, not .so files.
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
# FIXME: Setting linknames here is a bad hack.
|
||||
archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
|
||||
# The linker will automatically build a .lib file if we build a DLL.
|
||||
@@ -16657,7 +16657,7 @@
|
||||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
soname_spec=
|
||||
-shrext=".so"
|
||||
+shrext_cmds=".so"
|
||||
postinstall_cmds=
|
||||
postuninstall_cmds=
|
||||
finish_cmds=
|
||||
@@ -16770,7 +16770,7 @@
|
||||
|
||||
cygwin* | mingw* | pw32*)
|
||||
version_type=windows
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
need_version=no
|
||||
need_lib_prefix=no
|
||||
|
||||
@@ -16838,7 +16838,7 @@
|
||||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
+ shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
|
||||
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
|
||||
if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
|
||||
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
|
||||
@@ -16907,7 +16907,7 @@
|
||||
need_version=no
|
||||
case "$host_cpu" in
|
||||
ia64*)
|
||||
- shrext='.so'
|
||||
+ shrext_cmds='.so'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.so"
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
@@ -16922,7 +16922,7 @@
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
hppa*64*)
|
||||
- shrext='.sl'
|
||||
+ shrext_cmds='.sl'
|
||||
hardcode_into_libs=yes
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
|
||||
@@ -16933,7 +16933,7 @@
|
||||
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
|
||||
;;
|
||||
*)
|
||||
- shrext='.sl'
|
||||
+ shrext_cmds='.sl'
|
||||
dynamic_linker="$host_os dld.sl"
|
||||
shlibpath_var=SHLIB_PATH
|
||||
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
|
||||
@@ -17069,7 +17069,7 @@
|
||||
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
- shrext=".dll"
|
||||
+ shrext_cmds=".dll"
|
||||
need_lib_prefix=no
|
||||
library_names_spec='$libname${shared_ext} $libname.a'
|
||||
dynamic_linker='OS/2 ld.exe'
|
||||
@@ -18151,7 +18151,7 @@
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
-shrext='$shrext'
|
||||
+shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
@@ -18595,7 +18595,7 @@
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally ".so").
|
||||
-shrext='$shrext'
|
||||
+shrext_cmds='$shrext_cmds'
|
||||
|
||||
# Executable file suffix (normally "").
|
||||
exeext="$exeext"
|
||||
25
libdnet.spec
25
libdnet.spec
@ -1,17 +1,14 @@
|
||||
Name: libdnet
|
||||
Version: 1.12
|
||||
Release: 30
|
||||
Version: 1.14
|
||||
Release: 1
|
||||
Summary: Simple portable interface work with low-level networking routines
|
||||
|
||||
License: BSD
|
||||
URL: https://github.com/dugsong/%{name}/
|
||||
Source: http://src.fedoraproject.org/repo/pkgs/libdnet/libdnet-1.12.tgz/9253ef6de1b5e28e9c9a62b882e44cc9/libdnet-1.12.tgz
|
||||
URL: https://github.com/ofalk/%{name}
|
||||
Source: https://github.com/ofalk/libdnet/archive/%{name}-%{version}.tar.gz
|
||||
|
||||
Patch0: %{name}-shrext.patch
|
||||
Patch1: dnet-config-multilib.patch
|
||||
Patch2: add-sorted-function-remove-differences.patch
|
||||
Patch3: remove-python2-support-and-add-python3-support.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: python3-Cython
|
||||
|
||||
%description
|
||||
%{name} provides a simplified, portable interface to several low-level networking
|
||||
@ -48,7 +45,7 @@ Python3 package for python-%{name}
|
||||
%package_help
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
%autosetup -n %{name}-%{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
@ -95,11 +92,17 @@ popd
|
||||
|
||||
%files help
|
||||
%defattr(-,root,root)
|
||||
%doc README THANKS TODO
|
||||
%doc THANKS TODO
|
||||
%{_mandir}/man3/*.3*
|
||||
%{_mandir}/man8/*.8*
|
||||
|
||||
%changelog
|
||||
* Wed Jan 27 2021 xihaochen <xihaochen@huawei.com> - 1.14-1
|
||||
- Type:requirements
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: update libdnet to 1.14
|
||||
|
||||
* Thu Oct 29 2020 gaihuiying <gaihuiying1@huawei.com> - 1.12 - 30
|
||||
- Type:rquirement
|
||||
- ID:NA
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user