Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 149 → Rev 163

/tags/7.8.700-4/debian/control
3,10 → 3,10
Priority: optional
Maintainer: Magnus Holmgren <holmgren@debian.org>
Uploaders: Henrik Andreasson <debian@han.pp.se>
Standards-Version: 3.9.3
Standards-Version: 3.9.4
Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 5), bison, sharutils, bc, pkg-config,
libgmp10-dev, nettle-dev (>= 2.1~), zlib1g-dev | libz-dev,
libbz2-dev, libgdbm-dev, libiodbc2-dev, libmysqlclient-dev,
libbz2-dev, libgdbm-dev, unixodbc-dev, libmysqlclient-dev,
libpq-dev, libsqlite3-dev, libpcre3-dev, libsdl-mixer1.2-dev,
libsdl1.2-dev, libsane-dev, x11proto-gl-dev, libxpm-dev,
libglade2-dev, libfreetype6-dev, freeglut3-dev, libjpeg-dev,
129,7 → 129,7
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, pike7.8-core (= ${binary:Version})
Description: ODBC module for Pike
This Pike module provides glue to the iODBC interface.
This Pike module provides glue to the ODBC interface.
.
Pike is an interpreted programming language, for more information
see the description of the pike7.8-core package.
/tags/7.8.700-4/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
/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/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,
/tags/7.8.700-4/debian/changelog
1,3 → 1,47
pike7.8 (7.8.700-4) unstable; urgency=low
 
* reg_enum_conflict.patch: The conflict is with an enum, so we have to
rename our enum constants (really Closes: #708366). Also add DEP-3
header.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 26 May 2013 21:35:09 +0200
 
pike7.8 (7.8.700-3) unstable; urgency=low
 
* Link pike7.8-odbc to unixodbc, not iodbc, since the latter is not
multiarch-aware and not capable of handling the ODBC drivers in
wheezy (Closes: #707911).
* reg_enum_conflict.patch (new): Undefine conflicting REG_* definitions
for now (Closes: #708366).
 
-- Magnus Holmgren <holmgren@debian.org> Thu, 23 May 2013 23:10:42 +0200
 
pike7.8 (7.8.700-2) unstable; urgency=low
 
* Upload to unstable.
* module-layout.patch: Use __REAL_MAJOR__ and __REAL_MINOR__ in
version-specific include and module paths; __REAL_VERSION__, being a
float, could allegedly cause trouble.
* Bump Standards-Version to 3.9.4
 
-- Magnus Holmgren <holmgren@debian.org> Tue, 07 May 2013 23:10:27 +0200
 
pike7.8 (7.8.700-1) experimental; urgency=low
 
* New upstream release.
* 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.
* Override the Lintian warnings about outdated config.guess files in the
bundles directories, as they aren't used.
* Drop nettle-2.1.patch. Refresh remaining patches.
* Exclude the ZXID module for now, until zxid has been packaged for
Debian.
* No longer exclude the PV (picture viewer) tool, as it now supports
GTK+2.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 07 Oct 2012 21:54:26 +0200
 
pike7.8 (7.8.550-dfsg-1) experimental; urgency=low
 
* The latest official upstream "beta" release.
/tags/7.8.700-4/debian/rules
135,7 → 135,7
#{ADT,Array,Audio,Cache,Calendar,Calendar_I,COM,Colors,CommonLog,Crypto,Debug,Filesystem,Error,Float,Function,Geography,Getopt,Gettext,Gmp,Graphics,Gz,HTTPAccept,Int,Kerberos,Languages,Local,Locale,Mapping,Math,MIME,Mird,Multiset,Nettle,Parser,Pike,Pipe,Process,Program,Protocols,Regexp,Remote,SSL,Shuffler,Standards,Stdio,String,System,Thread,Tools,Unicode,Web,Yabu,Yp,_ADT,_Charset,_Roxen,___Gz,___MIME,___Math,___Mird,___Regexp,___Yp,____Charset,__builtin*,spider}.
#usr/lib/pike/*/modules/Sql.pmod/{module,Sql,rsql,sql_*}.*
 
excluded_modules:=Ssleay Mird Msql msql PDF Ffmpeg Oracle oracle sybase DVB Java TTF PV.pike Gnome GDK GTKSupport
excluded_modules:=Ssleay Mird Msql msql PDF Ffmpeg Oracle oracle sybase DVB Java TTF Gnome GDK GTKSupport ZXID
# This is tricky. Note that it's only possible for an exclusion to match the last
# component specified in an .install file or on the command line, and below.
DH_EXCLUDE:=$(addprefix -X,$(excluded_modules))
/tags/7.8.700-4/debian/source/lintian-overrides
0,0 → 1,0
pike7.8 source: outdated-autotools-helper-file bundles/patches/nettle-*/config.guess 2005-03-17