Christian Wiese
14 years ago
3 changed files with 353 additions and 40 deletions
@ -1,36 +0,0 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../libdnet/gcc4.patch
|
||||
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
diff -Nur libdnet-1.10.orig/python/dnet.c libdnet-1.10/python/dnet.c
|
||||
--- libdnet-1.10.orig/python/dnet.c 2005-02-26 01:06:02.000000000 +0200
|
||||
+++ libdnet-1.10/python/dnet.c 2005-11-01 14:12:38.000000000 +0200
|
||||
@@ -2552,7 +2552,7 @@
|
||||
PyObject *__pyx_3 = 0;
|
||||
unsigned short __pyx_4;
|
||||
Py_INCREF(__pyx_v_self);
|
||||
- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
|
||||
+ __pyx_v_next = Py_None; Py_INCREF(((PyObject*)__pyx_v_next));
|
||||
|
||||
/* "/misc/projects/libdnet/python/./dnet.pyx":628 */
|
||||
__pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max);
|
||||
@@ -2564,7 +2564,7 @@
|
||||
Py_DECREF(__pyx_2); __pyx_2 = 0;
|
||||
if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 629; goto __pyx_L1;}
|
||||
Py_DECREF(((PyObject *)__pyx_v_next));
|
||||
- ((PyObject *)__pyx_v_next) = __pyx_3;
|
||||
+ __pyx_v_next = __pyx_3;
|
||||
__pyx_3 = 0;
|
||||
|
||||
/* "/misc/projects/libdnet/python/./dnet.pyx":630 */
|
||||
@ -0,0 +1,348 @@
|
||||
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# Filename: package/.../libdnet/libdnet-1.12-shrext.patch
|
||||
# Copyright (C) 2011 The OpenSDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- SDE-COPYRIGHT-NOTE-END ---
|
||||
|
||||
Description: Fix to get the right shared library extension
|
||||
Origin: Fedora Project
|
||||
|
||||
http://pkgs.fedoraproject.org/gitweb/?p=libdnet.git;a=blob_plain;f=libdnet-shrext.patch;h=6d8df2319d109ec48e201d4e980ed053380a0bdb;hb=HEAD
|
||||
|
||||
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"
|
||||
Loading…
Reference in new issue