/trunk/debian/patches/misplaced_MAXPATHLEN.patch |
---|
14,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 |
/trunk/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> |
/trunk/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{ |
/trunk/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) |
/trunk/debian/patches/series |
---|
7,5 → 7,4 |
misplaced_MAXPATHLEN.patch |
pthread_stub.patch |
unbreak_cross_compilation.patch |
nettle-2.1.patch |
dump_timeout.patch |
/trunk/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. */ |
/trunk/debian/patches/module-layout.patch |
---|
3,7 → 3,7 |
--- 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 |
28,7 → 28,7 |
// 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, |
/trunk/debian/changelog |
---|
4,6 → 4,7 |
* Since the upstream tarball no longer contains Nettle 1.15, which |
contained non-fee IETF documents, but instead Nettle 2.5, we can ship |
it unmodified. |
* Drop nettle-2.1.patch. Refresh remaining patches. |
-- Magnus Holmgren <holmgren@debian.org> Sun, 07 Oct 2012 20:35:46 +0200 |