/tags/7.8.700-4/debian/patches/misplaced_MAXPATHLEN.patch |
---|
1,7 → 1,6 |
From: Samuel Thibault <samuel.thibault@ens-lyon.org> |
Subject: Move reserve MAXPATHLEN definition up. |
@DPATCH@ |
--- a/src/modules/files/efuns.c |
+++ b/src/modules/files/efuns.c |
@@ -118,6 +118,10 @@ LINKFUNC(BOOL, movefileex, ( |
15,7 → 14,7 |
struct array *encode_stat(PIKE_STAT_T *s) |
{ |
struct array *a; |
@@ -1520,9 +1524,6 @@ void f_getcwd(INT32 args) |
@@ -1524,9 +1528,6 @@ void f_getcwd(INT32 args) |
size*=2; |
} while (size < 10000); |
#else |
/tags/7.8.700-4/debian/patches/smartlink_rpath.patch |
---|
1,19 → 1,16 |
#! /bin/sh /usr/share/dpatch/dpatch-run |
## 02_smartlink_rpath.dpatch |
## |
## All lines beginning with `## DP:' are a description of the patch. |
## DP: Make smartlink not use -rpath |
Description: Make smartlink not use -rpath |
@DPATCH@ |
--- a/bin/smartlink |
+++ b/bin/smartlink |
@@ -162,9 +162,8 @@ if test x$# != x0 ; then |
@@ -161,10 +161,9 @@ if test x$# != x0 ; then |
SunOS\ 5.*) |
LDOPTS="$LDOPTS -R$RPATH" |
;; |
Linux\ 2.*) |
- Linux\ 2.*) |
- if test x$LINKING != xno -a "x$RPATH" != x ; then |
- LDOPTS="$LDOPTS -Wl,-rpath,$RPATH" |
- fi |
+ Linux\ 2.*|Linux\ 3.*) |
+ LD_LIBRARY_PATH="$RPATH" |
+ export LD_LIBRARY_PATH |
;; |
/tags/7.8.700-4/debian/patches/reg_enum_conflict.patch |
---|
0,0 → 1,117 |
Description: Rename enum constants in src/code/ia32.c |
They conflict with /usr/include/i386-linux-gnu/sys/ucontext.h of newer eglibc |
Author: Magnus Holmgren |
Bug-Debian: http://bugs.debian.org/708366 |
Forwarded: yes |
--- a/src/code/ia32.c |
+++ b/src/code/ia32.c |
@@ -14,14 +14,9 @@ |
#include "object.h" |
#include "builtin_functions.h" |
-/* This is defined on windows */ |
-#ifdef REG_NONE |
-#undef REG_NONE |
-#endif |
- |
-enum ia32_reg {REG_EAX = 0, REG_EBX = 3, REG_ECX = 1, REG_EDX = 2, REG_NONE = 4}; |
+enum ia32_reg {PIKE_REG_EAX = 0, PIKE_REG_EBX = 3, PIKE_REG_ECX = 1, PIKE_REG_EDX = 2, PIKE_REG_NONE = 4}; |
-#define REG_BITMASK ((1 << REG_NONE) - 1) |
+#define REG_BITMASK ((1 << PIKE_REG_NONE) - 1) |
/* #define REGISTER_DEBUG */ |
@@ -71,7 +66,7 @@ static int alloc_regs = 0, valid_regs = |
#define MOV_ABSADDR_TO_REG(ADDR, REG) do { \ |
MAKE_VALID_REG (REG); \ |
/* movl addr,%reg */ \ |
- if ((REG) == REG_EAX) \ |
+ if ((REG) == PIKE_REG_EAX) \ |
add_to_program (0xa1); /* Move dword at address to EAX. */ \ |
else { \ |
add_to_program (0x8b); /* Move r/m32 to r32. */ \ |
@@ -83,7 +78,7 @@ static int alloc_regs = 0, valid_regs = |
#define MOV_REG_TO_ABSADDR(REG, ADDR) do { \ |
CHECK_VALID_REG (REG); \ |
/* movl %reg,addr */ \ |
- if ((REG) == REG_EAX) \ |
+ if ((REG) == PIKE_REG_EAX) \ |
add_to_program (0xa3); /* Move EAX to dword at address. */ \ |
else { \ |
add_to_program (0x89); /* Move r32 to r/m32. */ \ |
@@ -217,7 +212,7 @@ static int alloc_regs = 0, valid_regs = |
add_to_program (0x48 | (REG)); /* Decrement r32. */ \ |
else if (val_ < -128 || val_ > 127) { \ |
/* addl $val,%reg */ \ |
- if ((REG) == REG_EAX) \ |
+ if ((REG) == PIKE_REG_EAX) \ |
add_to_program (0x05); /* Add imm32 to EAX. */ \ |
else { \ |
add_to_program (0x81); /* Add imm32 to r/m32. */ \ |
@@ -334,8 +329,8 @@ ptrdiff_t ia32_prev_stored_pc; /* PROG_P |
void ia32_flush_code_generator(void) |
{ |
- next_reg = REG_EAX; |
- sp_reg = fp_reg = mark_sp_reg = REG_NONE; |
+ next_reg = PIKE_REG_EAX; |
+ sp_reg = fp_reg = mark_sp_reg = PIKE_REG_NONE; |
CLEAR_REGS(); |
ia32_prev_stored_pc = -1; |
} |
@@ -351,7 +346,7 @@ static enum ia32_reg alloc_reg (int avoi |
/* There's a free register. */ |
for (reg = next_reg; (1 << reg) & used_regs;) { |
- reg = (reg + 1) % REG_NONE; |
+ reg = (reg + 1) % PIKE_REG_NONE; |
#ifdef PIKE_DEBUG |
if (reg == next_reg) Pike_fatal ("Failed to find a free register.\n"); |
#endif |
@@ -364,15 +359,15 @@ static enum ia32_reg alloc_reg (int avoi |
* probably be replaced with an LRU strategy. */ |
for (reg = next_reg; (1 << reg) & avoid_regs;) { |
- reg = (reg + 1) % REG_NONE; |
+ reg = (reg + 1) % PIKE_REG_NONE; |
#ifdef PIKE_DEBUG |
if (reg == next_reg) Pike_fatal ("Failed to find a non-excluded register.\n"); |
#endif |
} |
- if (sp_reg == reg) {sp_reg = REG_NONE; DEALLOC_REG (reg);} |
- else if (fp_reg == reg) {fp_reg = REG_NONE; DEALLOC_REG (reg);} |
- else if (mark_sp_reg == reg) {mark_sp_reg = REG_NONE; DEALLOC_REG (reg);} |
+ if (sp_reg == reg) {sp_reg = PIKE_REG_NONE; DEALLOC_REG (reg);} |
+ else if (fp_reg == reg) {fp_reg = PIKE_REG_NONE; DEALLOC_REG (reg);} |
+ else if (mark_sp_reg == reg) {mark_sp_reg = PIKE_REG_NONE; DEALLOC_REG (reg);} |
} |
#ifdef REGISTER_DEBUG |
@@ -386,11 +381,11 @@ static enum ia32_reg alloc_reg (int avoi |
#define DEF_LOAD_REG(REG, SET) \ |
static void PIKE_CONCAT(load_,REG) (int avoid_regs) \ |
{ \ |
- if (REG == REG_NONE) { \ |
+ if (REG == PIKE_REG_NONE) { \ |
REG = alloc_reg (avoid_regs); \ |
/* Update the round robin pointer here so that we disregard */ \ |
/* the direct calls to alloc_reg for temporary registers. */ \ |
- next_reg = (REG + 1) % REG_NONE; \ |
+ next_reg = (REG + 1) % PIKE_REG_NONE; \ |
{SET;} \ |
} \ |
else \ |
@@ -410,8 +405,8 @@ DEF_LOAD_REG (mark_sp_reg, { |
static void ia32_call_c_function(void *addr) |
{ |
CALL_RELATIVE(addr); |
- next_reg = REG_EAX; |
- sp_reg = fp_reg = mark_sp_reg = REG_NONE; |
+ next_reg = PIKE_REG_EAX; |
+ sp_reg = fp_reg = mark_sp_reg = PIKE_REG_NONE; |
CLEAR_REGS(); |
} |
/tags/7.8.700-4/debian/patches/pthread_stub.patch |
---|
1,7 → 1,7 |
--- a/src/configure |
+++ b/src/configure |
@@ -62495,6 +62495,9 @@ else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -90560,6 +90560,9 @@ cat confdefs.h >>conftest.$ac_ext |
cat >>conftest.$ac_ext <<_ACEOF |
/* end confdefs.h. */ |
#include <pthread.h> |
+#if defined(__stub_pthread_atfork) || defined(__stub___pthread_atfork) |
12,7 → 12,7 |
int |
--- a/src/configure.in |
+++ b/src/configure.in |
@@ -3953,6 +3953,9 @@ pthread_t gazonk; |
@@ -3977,6 +3977,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/7.8.700-4/debian/patches/no_dump_modules.patch |
---|
3,7 → 3,7 |
--- a/bin/install.pike |
+++ b/bin/install.pike |
@@ -2945,7 +2945,6 @@ the PRIVATE_CRT stuff in install.pike.\n |
@@ -2980,7 +2980,6 @@ the PRIVATE_CRT stuff in install.pike.\n |
{ |
do_export(); |
}else{ |
/tags/7.8.700-4/debian/patches/dump_timeout.patch |
---|
1,3 → 1,8 |
Author: Magnus Holmgren |
Bug-Debian: http://bugs.debian.org/593436 |
Description: Increase module dumping timeout |
The timeout seems to be too short on architectures such as ARM and Geode. |
--- a/lib/modules/Tools.pmod/Standalone.pmod/dump.pike |
+++ b/lib/modules/Tools.pmod/Standalone.pmod/dump.pike |
@@ -325,7 +325,8 @@ void dump_files() { |
/tags/7.8.700-4/debian/patches/dynamic_module_makefile.in-libgcc.patch |
---|
1,11 → 1,10 |
Author: Marek Habersack <grendel@debian.org> |
Description: Figure out LIBGCC name. |
diff -urNad trunk~/src/modules/dynamic_module_makefile.in trunk/src/modules/dynamic_module_makefile.in |
--- trunk~/src/modules/dynamic_module_makefile.in 2008-01-11 01:22:27.000000000 +0100 |
+++ trunk/src/modules/dynamic_module_makefile.in 2009-08-16 21:49:11.000000000 +0200 |
--- a/src/modules/dynamic_module_makefile.in |
+++ b/src/modules/dynamic_module_makefile.in |
@@ -2,6 +2,7 @@ |
# $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $ |
# $Id: b9e7817a07dab41006a9b1cc92c9ce0193303874 $ |
# |
+LIBGCC=$(shell gcc -print-libgcc-file-name) |
/tags/7.8.700-4/debian/patches/series |
---|
7,5 → 7,5 |
misplaced_MAXPATHLEN.patch |
pthread_stub.patch |
unbreak_cross_compilation.patch |
nettle-2.1.patch |
dump_timeout.patch |
reg_enum_conflict.patch |
/tags/7.8.700-4/debian/patches/unbreak_cross_compilation.patch |
---|
8,7 → 8,7 |
@DPATCH@ |
--- a/src/configure |
+++ b/src/configure |
@@ -7348,7 +7348,7 @@ if test "x$enable_binary" = "xno"; then |
@@ -8718,7 +8718,7 @@ if test "x$enable_binary" = "xno"; then |
RUNPIKE="USE_PIKE" |
RUNTPIKE="USE_PIKE" |
elif test "x$cross_compiling" = "xyes"; then |
17,12 → 17,12 |
RUNTPIKE="USE_PIKE" |
else |
RUNPIKE="DEFAULT_RUNPIKE" |
@@ -73133,7 +73133,7 @@ EOF |
@@ -106150,7 +106150,7 @@ EOF |
;; |
esac |
if test "$cross_compiling" = yes; then : |
if test "$cross_compiling" = yes; then |
- pike_cv_sys_dynamic_loading=no |
+ pike_cv_sys_dynamic_loading=yes |
else |
cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
/* end confdefs.h. */ |
cat >conftest.$ac_ext <<_ACEOF |
/* confdefs.h. */ |
/tags/7.8.700-4/debian/patches/module-layout.patch |
---|
3,13 → 3,13 |
--- a/lib/master.pike.in |
+++ b/lib/master.pike.in |
@@ -2113,6 +2113,10 @@ protected void create() |
@@ -2137,6 +2137,10 @@ protected void create() |
add_module_path("#lib_prefix#/modules"); |
#endif |
+ // Debian paths |
+ add_include_path("/usr/local/lib/pike"+__REAL_VERSION__+"/include"); |
+ add_module_path("/usr/local/lib/pike"+__REAL_VERSION__+"/modules"); |
+ add_include_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/include"); |
+ add_module_path("/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules"); |
+ |
#if "#cflags# "[0]!='#' |
cflags = "#cflags#"; |
24,11 → 24,11 |
-// master() puts the lib/modules path last. |
-string system_module_path=master()->system_module_path[-1]; |
+ |
+string system_module_path="/usr/local/lib/pike"+__REAL_VERSION__+"/modules"; |
+string system_module_path="/usr/local/lib/pike"+__REAL_MAJOR__+"."+__REAL_MINOR__+"/modules"; |
// where do we install the documentation? |
string system_doc_path = master()->doc_prefix; |
@@ -183,7 +182,7 @@ void do_make(array(string) cmd) |
@@ -184,7 +183,7 @@ void do_make(array(string) cmd) |
extra_args = ({ |
"PIKE="+run_pike, |
"SRCDIR="+fix("$src"), |
37,7 → 37,7 |
"LOCAL_MODULE_PATH=" + lmp, |
}); |
} |
@@ -240,6 +239,7 @@ int main(int argc, array(string) argv) |
@@ -241,6 +240,7 @@ int main(int argc, array(string) argv) |
({"all",Getopt.NO_ARG,({"--all"}) }), |
({"make",Getopt.NO_ARG,({"--make"}) }), |
({"auto",Getopt.NO_ARG,({"--auto"}) }), |
45,7 → 45,7 |
({"source",Getopt.HAS_ARG,({"--source"}) }), |
({"query",Getopt.HAS_ARG,({"--query"}) }), |
({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }), |
@@ -276,6 +276,9 @@ int main(int argc, array(string) argv) |
@@ -277,6 +277,9 @@ int main(int argc, array(string) argv) |
case "auto": |
run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO; |
break; |
55,7 → 55,7 |
} |
} |
@@ -405,7 +408,7 @@ int main(int argc, array(string) argv) |
@@ -421,7 +424,7 @@ int main(int argc, array(string) argv) |
run_or_fail( ([ "env":getenv()| |
([ |
"PIKE":run_pike, |