Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 228 → Rev 248

/tags/8.0.240-1/debian/patches/freetype_2.6_typeof.patch
File deleted
/tags/8.0.240-1/debian/patches/smartlink_rpath.patch
14,31 → 14,3
;;
UnixWare\ 7.*)
if test x$LINKING != xno -a "x$RPATH" != x ; then
--- a/src/smartlink.c
+++ b/src/smartlink.c
@@ -162,7 +162,7 @@ int main(int argc, char **argv)
full_rpath = rpath;
#ifdef USE_Wl
- strcat(rpath, "-Wl,-rpath,");
+ /* strcat(rpath, "-Wl,-rpath,"); */
#elif defined(USE_Wl_R)
strcat(rpath, "-Wl,-R");
#elif defined(USE_R)
@@ -312,7 +312,7 @@ int main(int argc, char **argv)
}
rpath_in_use |= add_path(rpath, ld_lib_path);
}
-
+#if 0
if (rpath_in_use) {
/* Delete the terminating ':' */
rpath[strlen(rpath) - 1] = 0;
@@ -359,6 +359,7 @@ int main(int argc, char **argv)
#error Unknown method
#endif
}
+#endif
new_argv[new_argc++] = NULL;
/tags/8.0.240-1/debian/patches/hurd.patch
52,7 → 52,7
#endif
--- a/src/configure.in
+++ b/src/configure.in
@@ -3246,7 +3246,7 @@ AC_CHECK_HEADERS(winsock2.h sys/rusage.h
@@ -3226,7 +3226,7 @@ AC_CHECK_HEADERS(winsock2.h sys/rusage.h
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \
stddef.h sys/termio.h sys/termios.h \
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \
61,7 → 61,7
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \
direct.h CoreServices/CoreServices.h execinfo.h \
mach/mach.h mach/thread_act.h mach/clock.h urcu.h,,,[
@@ -7561,7 +7561,7 @@ if test -z "$LDSHARED" ; then
@@ -7550,7 +7550,7 @@ if test -z "$LDSHARED" ; then
next*) LDSHARED="$REALCC $CFLAGS -nostdlib -r";;
Linux*) LDSHARED="$REALCC -shared";;
GNU/kFreeBSD*) LDSHARED="$REALCC -shared";;
72,7 → 72,7
OpenBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
--- a/src/configure
+++ b/src/configure
@@ -64931,7 +64931,7 @@ fi
@@ -65173,7 +65173,7 @@ fi
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \
stddef.h sys/termio.h sys/termios.h \
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \
81,7 → 81,7
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \
direct.h CoreServices/CoreServices.h execinfo.h \
mach/mach.h mach/thread_act.h mach/clock.h urcu.h
@@ -65034,7 +65034,7 @@ done
@@ -65276,7 +65276,7 @@ done
float.h sys/priocntl.h sys/sched.h winbase.h errno.h \
stddef.h sys/termio.h sys/termios.h \
ws2tcpip.h valgrind/memcheck.h memcheck.h valgrind.h \
90,7 → 90,7
mach/mach_init.h syscall.h sys/syscall.h devices/timer.h \
direct.h CoreServices/CoreServices.h execinfo.h \
mach/mach.h mach/thread_act.h mach/clock.h urcu.h
@@ -77631,7 +77631,7 @@ if test -z "$LDSHARED" ; then
@@ -77944,7 +77944,7 @@ if test -z "$LDSHARED" ; then
next*) LDSHARED="$REALCC $CFLAGS -nostdlib -r";;
Linux*) LDSHARED="$REALCC -shared";;
GNU/kFreeBSD*) LDSHARED="$REALCC -shared";;
101,7 → 101,7
OpenBSD*) LDSHARED="$REALCC -Wl,-Bshareable";;
--- a/src/machine.h.in
+++ b/src/machine.h.in
@@ -894,6 +894,9 @@
@@ -897,6 +897,9 @@
/* Define to 1 if you have the <mach/mach_init.h> header file. */
#undef HAVE_MACH_MACH_INIT_H
/tags/8.0.240-1/debian/patches/undefined_htons.patch
50,7 → 50,7
--- a/src/modules/_Protocols_DNS_SD/configure
+++ b/src/modules/_Protocols_DNS_SD/configure
@@ -3584,7 +3584,7 @@ done
@@ -3691,7 +3691,7 @@ done
fi
59,7 → 59,7
do :
@@ -3611,7 +3611,7 @@ fi
@@ -3718,7 +3718,7 @@ fi
done
else
/tags/8.0.240-1/debian/patches/pthread_stub.patch
1,6 → 1,6
--- a/src/configure
+++ b/src/configure
@@ -69299,6 +69299,9 @@ else
@@ -69337,6 +69337,9 @@ else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <pthread.h>
12,7 → 12,7
int
--- a/src/configure.in
+++ b/src/configure.in
@@ -4062,6 +4062,9 @@ pthread_t gazonk;
@@ -3937,6 +3937,9 @@ pthread_t gazonk;
AC_MSG_CHECKING(for pthread_atfork)
AC_CACHE_VAL(pike_cv_have_pthread_atfork,[
AC_TRY_LINK([#include <pthread.h>
/tags/8.0.240-1/debian/patches/smartlink_verbose.patch
0,0 → 1,13
Description: Make smartlink echo what it's doing to enable build log checking.
 
--- a/bin/smartlink
+++ b/bin/smartlink
@@ -205,7 +205,7 @@ case "$UNAME" in
;;
esac
-#echo $LINKER $LDOPTS
+echo $LINKER $LDOPTS
# exec $LINKER $LDOPTS
# Used to be exec, but Digital-Unix's stupid sh has buggy variable-expansion.
/tags/8.0.240-1/debian/patches/no_dump_modules.patch
3,7 → 3,7
 
--- a/bin/install.pike
+++ b/bin/install.pike
@@ -2988,7 +2988,6 @@ the PRIVATE_CRT stuff in install.pike.\n
@@ -2993,7 +2993,6 @@ the PRIVATE_CRT stuff in install.pike.\n
{
do_export();
}else{
/tags/8.0.240-1/debian/patches/series
2,6 → 2,7
smartlink_rpath.patch
#make_variables_fpic.patch
#install.pike.patch
smartlink_verbose.patch
no_dump_modules.patch
dynamic_module_makefile.in-libgcc.patch
misplaced_MAXPATHLEN.patch
11,4 → 12,4
hurd.patch
undefined_htons.patch
bad_size_t_redef.patch
freetype_2.6_typeof.patch
autodoc.patch
/tags/8.0.240-1/debian/patches/unbreak_cross_compilation.patch
8,7 → 8,7
@DPATCH@
--- a/src/configure
+++ b/src/configure
@@ -7999,7 +7999,7 @@ if test "x$enable_binary" = "xno"; then
@@ -7936,7 +7936,7 @@ if test "x$enable_binary" = "xno"; then
RUNPIKE="USE_PIKE"
RUNTPIKE="USE_PIKE"
elif test "x$cross_compiling" = "xyes"; then
17,7 → 17,7
RUNTPIKE="USE_PIKE"
else
RUNPIKE="DEFAULT_RUNPIKE"
@@ -80177,7 +80177,7 @@ EOF
@@ -79105,7 +79105,7 @@ EOF
;;
esac
if test "$cross_compiling" = yes; then :
/tags/8.0.240-1/debian/patches/autodoc.patch
0,0 → 1,61
Author: Magnus Holmgren <holmgren@debian.org>
Forwarded: yes
Description: Fix the following autodoc errors
ERROR: <Invalid error container: Tools.AutoDoc.AutoDocError(SourcePosition(File: /build/pike8.0-8.0.240/src/modules/Gmp/mpz_glue.c, lines: 668..668), "DocParser", "@exp cannot be used like this: @exp{ ... @}")>
ERROR: <Invalid error container: Tools.AutoDoc.AutoDocError(SourcePosition(File: /build/pike8.0-8.0.240/lib/modules/__builtin.pmod/Nettle.pmod/Sign.pike, lines: 102..102), "DocParser", "@item is not allowed inside @array (allowed children are: @elem)")>
ERROR: <Invalid error container: Tools.AutoDoc.AutoDocError(SourcePosition(File: /build/pike8.0-8.0.240/lib/modules/Crypto.pmod/ECC.pmod, lines: 286..286), "DocParser", "@item is not allowed inside @array (allowed children are: @elem)")>
ERROR: <Invalid error container: Tools.AutoDoc.AutoDocError(SourcePosition(File: /build/pike8.0-8.0.240/lib/modules/Crypto.pmod/RSA.pmod, lines: 368..368), "DocParser", "@item is not allowed inside @array (allowed children are: @elem)")>
 
--- a/lib/modules/Crypto.pmod/ECC.pmod
+++ b/lib/modules/Crypto.pmod/ECC.pmod
@@ -283,9 +283,9 @@ class Curve {
//! @returns
//! Returns @expr{0@} (zero) on failure, and an array
//! @array
- //! @item mapping(string(7bit):string(7bit)|int) 0
+ //! @elem mapping(string(7bit):string(7bit)|int) 0
//! The JOSE header.
- //! @item string(8bit) 1
+ //! @elem string(8bit) 1
//! The signed message.
//! @endarray
//!
--- a/lib/modules/Crypto.pmod/RSA.pmod
+++ b/lib/modules/Crypto.pmod/RSA.pmod
@@ -365,9 +365,9 @@ class State {
//! @returns
//! Returns @expr{0@} (zero) on failure, and an array
//! @array
- //! @item mapping(string(7bit):string(7bit)|int) 0
+ //! @elem mapping(string(7bit):string(7bit)|int) 0
//! The JOSE header.
- //! @item string(8bit) 1
+ //! @elem string(8bit) 1
//! The signed message.
//! @endarray
//!
--- a/lib/modules/__builtin.pmod/Nettle.pmod/Sign.pike
+++ b/lib/modules/__builtin.pmod/Nettle.pmod/Sign.pike
@@ -99,9 +99,9 @@ string(7bit) jose_sign(string(8bit) mess
//! @returns
//! Returns @expr{0@} (zero) on failure, and an array
//! @array
-//! @item mapping(string(7bit):string(7bit)|int) 0
+//! @elem mapping(string(7bit):string(7bit)|int) 0
//! The JOSE header.
-//! @item string(8bit) 1
+//! @elem string(8bit) 1
//! The signed message.
//! @endarray
//!
--- a/src/modules/Gmp/mpz_glue.c
+++ b/src/modules/Gmp/mpz_glue.c
@@ -665,7 +665,7 @@ static void mpzmod_create(INT32 args)
/*! @decl int cast_to_int()
*! Casts the object to an integer.
*! @deprecated
- *! Use @exp{(int)@} instead.
+ *! Use @expr{(int)@} instead.
*/
static void mpzmod_get_int(INT32 args)
{
/tags/8.0.240-1/debian/patches/module-layout.patch
3,7 → 3,7
 
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -2271,6 +2271,10 @@ protected void create()
@@ -1827,6 +1827,10 @@ protected void create()
add_module_path("#lib_prefix#/modules");
#endif