Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 115 → Rev 116

/trunk/debian/control
4,7 → 4,7
Maintainer: Magnus Holmgren <holmgren@debian.org>
Uploaders: Henrik Andreasson <debian@han.pp.se>
Standards-Version: 3.9.1
Build-Depends: debhelper (>= 5), dpatch, bison, sharutils, bc, pkg-config,
Build-Depends: debhelper (>= 5), bison, sharutils, bc, pkg-config,
libgmp3-dev, nettle-dev,
zlib1g-dev | libz-dev, libbz2-dev,
libgdbm-dev, libiodbc2-dev, libmysqlclient-dev, libpq-dev, libsqlite3-dev,
/trunk/debian/patches/04_make_variables_fpic.dpatch
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch
===================================================================
--- debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch (revision 115)
+++ debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch (nonexistent)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_dynamic_module_makefile.in-libgcc.dpatch by <magnus@proffe.kibibyte.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Figure out LIBGCC name.
-
-@DPATCH@
-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
-@@ -2,6 +2,7 @@
- # $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $
- #
-
-+LIBGCC=$(shell gcc -print-libgcc-file-name)
- LC_REQ=@LC_REQ@
-
- LINKAGE_CPPFLAGS=
/debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/11_pthread_stub.dpatch
===================================================================
--- debian/patches/11_pthread_stub.dpatch (revision 115)
+++ debian/patches/11_pthread_stub.dpatch (nonexistent)
@@ -1,32 +0,0 @@
-#! /bin/sh
-## 11_pthread_stub.dpatch by Magnus Holmgren <holmgren@debian.org>
-##
-## DP: Add check for stubbiness of pthread_atfork().
-
-dpatch_patch() {
- perl -pi - src/configure <<'END_PERL'
-$already_patched = 1 if (/^\Q#if defined(__stub_pthread_atfork)\E/);
-if (/\Qpthread_atfork(0,0,0)\E/ && !$already_patched) {
- $found = 1; print <<'EOT';
-#if defined(__stub_pthread_atfork) || defined(__stub___pthread_atfork)
-#error pthread_atfork is just a stub
-#endif
-EOT
-}
-END { exit !$found }
-END_PERL
-}
-
-dpatch_unpatch() {
- perl -pi - src/configure <<'END_PERL'
-if (/\Q#if defined(__stub_pthread_atfork)\E/ .. /#endif/) {
- $found = 1; $_ = '';
-}
-END { exit !$found }
-END_PERL
-}
-
-
-DPATCH_LIB_NO_DEFAULT=1
-
-. /usr/share/dpatch/dpatch.lib.sh
/debian/patches/11_pthread_stub.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/module-layout.dpatch
===================================================================
--- debian/patches/module-layout.dpatch (revision 115)
+++ debian/patches/module-layout.dpatch (nonexistent)
@@ -1,92 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_master.in.dpatch by <magnus@kibibyte.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add local site-pike directories to master.pike.in
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/master.pike.in trunk/lib/master.pike.in
---- trunk~/lib/master.pike.in 2009-09-19 12:08:35.000000000 +0200
-+++ trunk/lib/master.pike.in 2010-04-11 21:02:58.000000000 +0200
-@@ -2094,6 +2094,10 @@
- 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");
-+
- #if "#cflags# "[0]!='#'
- cflags = "#cflags#";
- #endif
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike
---- trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike 2008-07-08 14:59:17.000000000 +0200
-+++ trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike 2010-04-11 21:35:20.000000000 +0200
-@@ -25,9 +25,8 @@
- // this is not the ideal location for all systems, but it's a start.
- string local_module_path=combine_path(getenv("HOME")||"","lib/pike/modules");
- bool old_style_module = false;
--// we prefer the last element, because if there are more than one
--// 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";
-
- // where do we install the documentation?
- string system_doc_path = master()->doc_prefix;
-@@ -183,7 +182,7 @@
- extra_args = ({
- "PIKE="+run_pike,
- "SRCDIR="+fix("$src"),
-- "MODULE_INSTALL_DIR="+combine_path(__FILE__,"../../.."),
-+ "MODULE_INSTALL_DIR="+system_module_path,
- "LOCAL_MODULE_PATH=" + lmp,
- });
- }
-@@ -240,6 +239,7 @@
- ({"all",Getopt.NO_ARG,({"--all"}) }),
- ({"make",Getopt.NO_ARG,({"--make"}) }),
- ({"auto",Getopt.NO_ARG,({"--auto"}) }),
-+ ({"debian",Getopt.NO_ARG,({"--debian"}) }),
- ({"source",Getopt.HAS_ARG,({"--source"}) }),
- ({"query",Getopt.HAS_ARG,({"--query"}) }),
- ({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }),
-@@ -276,6 +276,9 @@
- case "auto":
- run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO;
- break;
-+
-+ case "debian":
-+ system_module_path=master()->system_module_path[-1];
- }
- }
-
-@@ -405,7 +408,7 @@
- run_or_fail( ([ "env":getenv()|
- ([
- "PIKE":run_pike,
-- "MODULE_INSTALL_DIR":combine_path(__FILE__,"../../.."),
-+ "MODULE_INSTALL_DIR":system_module_path,
- "LOCAL_MODULE_PATH":local_module_path,
- ])
- ]),
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 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 2010-04-11 22:37:28.000000000 +0200
-@@ -90,13 +90,13 @@
- #
- install: $(MODULE_INSTALL)
- @if test "x$(OBJS)" != "x" ; then \
-- $(TMP_BINDIR)/install_module module.so $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX)$(MODNAME).so && \
-+ $(TMP_BINDIR)/install_module module.so $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX)$(MODNAME).so && \
- if [ -f $(MODNAME).pdb ]; then \
-- cp $(MODNAME).pdb $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX); \
-+ cp $(MODNAME).pdb $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX); \
- else :; fi; \
- fi; \
- if test "x$(MODULE_PMOD_IN)" != "x"; then \
-- $(TMP_BINDIR)/install_module module.pmod $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod ;\
-+ $(TMP_BINDIR)/install_module module.pmod $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod ;\
- fi;
-
- #
/debian/patches/module-layout.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/05_install.pike.dpatch
===================================================================
--- debian/patches/05_install.pike.dpatch (revision 115)
+++ debian/patches/05_install.pike.dpatch (nonexistent)
@@ -1,69 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_install.pike.dpatch by <magnus@proffe.kibibyte.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow share_prefix to be separately overridden in install.pike
-
-@DPATCH@
-diff -urNad pike7.8-7.8.116~/src/Makefile.in pike7.8-7.8.116/src/Makefile.in
---- pike7.8-7.8.116~/src/Makefile.in 2008-11-18 15:16:56.000000000 -0400
-+++ pike7.8-7.8.116/src/Makefile.in 2009-05-04 21:50:17.000000000 -0300
-@@ -57,7 +57,7 @@
- # TESTARGS = -F -a
-
- # Arguments for install.pike used by the install targets.
--INSTALLARGS = --new-style
-+INSTALLARGS ?= --new-style
-
- #
- # use bison please, yacc isn't good enough.
-@@ -658,7 +658,7 @@
- man_prefix="$(man_prefix)" pike_name=$(pike_name) \
- fakeroot="$(buildroot)" PIKE_MODULE_RELOC="$(PIKE_MODULE_RELOC)" \
- cflags="@DYNAMIC_MODULE_FLAGS@" ldflags="" \
-- $(INSTALLARGS)
-+ share_prefix="$(share_prefix)" $(INSTALLARGS)
-
- install_interactive: pike-complete-stamp tools
- @$(RUNPIKE) $(TMP_BINDIR)/install.pike --interactive \
---- a/bin/install.pike 2009-06-08 23:51:36.000000000 +0200
-+++ b/bin/install.pike 2009-08-22 15:46:55.000000000 +0200
-@@ -1904,6 +1904,7 @@
- string exec_prefix;
- string lib_prefix;
- string include_prefix;
-+string share_prefix;
- string doc_prefix;
- string man_prefix;
- string cflags;
-@@ -1946,6 +1947,8 @@
- lib_prefix=vars->lib_prefix||(prefix+"/lib/pike/");
- include_prefix =
- vars->include_prefix || combine_path(prefix,"include","pike");
-+ share_prefix =
-+ vars->share_prefix || lib_prefix;
- doc_prefix =
- vars->doc_prefix || combine_path(prefix, "doc", "pike");
- man_prefix=vars->man_prefix||(prefix+"/share/man/");
-@@ -2128,7 +2131,7 @@
- lib_prefix = combine_path(prefix, "lib");
- include_prefix = combine_path(prefix,"include","pike");
- make_master("lib/master.pike", "lib/master.pike.in",
-- lib_prefix, include_prefix, UNDEFINED, cflags, ldflags);
-+ lib_prefix, include_prefix, share_prefix, cflags, ldflags);
- status1("Installing master done.");
- return 0;
-
-@@ -2853,10 +2856,10 @@
- }
- else
- make_master(combine_path(vars->TMP_LIBDIR,"master.pike"), master_src,
-- lib_prefix, include_prefix, UNDEFINED, cflags, ldflags);
-+ lib_prefix, include_prefix, share_prefix, cflags, ldflags);
-
- install_dir(vars->TMP_LIBDIR,lib_prefix,1);
-- install_dir(vars->LIBDIR_SRC,lib_prefix,1);
-+ install_dir(vars->LIBDIR_SRC,share_prefix,1);
-
- install_header_files(vars->SRCDIR,include_prefix);
- install_header_files(combine_path(vars->SRCDIR,"code"),
/debian/patches/05_install.pike.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/dumping_problems.dpatch
===================================================================
--- debian/patches/dumping_problems.dpatch (revision 115)
+++ debian/patches/dumping_problems.dpatch (nonexistent)
@@ -1,138 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## dumping_problems.dpatch by Martin Stjernholm <mast@roxen.com>
-##
-## DP: Encode references to all ex-masters as if they are to the current
-## DP: master.
-## DP:
-## DP: That since we cannot hope to eradicate all references to the old
-## DP: master when replacing it, and in any case the decoder cannot hope to
-## DP: find the same ex-master again.
-## DP:
-## DP: If this creates a problem for someone using replace_master then it's
-## DP: always possible to clear the is_pike_master variable in the old
-## DP: master.
-
-@DPATCH@
-
---- trunk/lib/master.pike.in 28 Jul 2010 10:29:59 -0000 1.474
-+++ cvs/lib/master.pike.in 28 Jul 2010 22:58:01 -0000 1.476
-@@ -85,6 +85,13 @@
- //!
- int show_if_constant_errors = 0;
-
-+int is_pike_master = 0;
-+// This integer variable should exist in any object that aspires to be
-+// the master. It gets set to 1 when the master is installed, and is
-+// therefore set in any object that is or has been the master. That
-+// makes the Encoder class encode references to the master and all
-+// ex-masters as references to the current master object.
-+
- // --- Functions begin here.
-
- // Have to access some stuff without going through the resolver.
-@@ -5092,6 +5099,11 @@
- }
- }
-
-+ else if (what->is_pike_master) {
-+ ENC_MSG (" is a master object\n");
-+ ENC_RETURN ("o/master");
-+ }
-+
- program prog;
- if ((prog = objects_reverse_lookup (what)))
- ENC_MSG (" found program in objects: %O\n", prog);
---- trunk/src/builtin_functions.c 27 Jul 2010 16:46:01 -0000 1.704
-+++ cvs/src/builtin_functions.c 28 Jul 2010 22:51:00 -0000 1.705
-@@ -7364,22 +7364,28 @@
- */
- PMOD_EXPORT void f_replace_master(INT32 args)
- {
-+ struct object *new_master;
- ASSERT_SECURITY_ROOT("replace_master");
-
- if(!args)
- SIMPLE_TOO_FEW_ARGS_ERROR("replace_master", 1);
- if(Pike_sp[-args].type != T_OBJECT)
- SIMPLE_BAD_ARG_ERROR("replace_master", 1, "object");
-- if(!Pike_sp[-args].u.object->prog)
-+ new_master = Pike_sp[-args].u.object;
-+ if(!new_master->prog)
- bad_arg_error("replace_master", Pike_sp-args, args, 1, "object", Pike_sp-args,
- "Called with destructed object.\n");
-
- if (Pike_sp[-args].subtype)
- bad_arg_error("replace_master", Pike_sp-args, args, 1, "object", Pike_sp-args,
- "Subtyped master objects are not supported yet.\n");
--
-+
-+ push_constant_text ("is_pike_master");
-+ args++;
-+ object_set_index (new_master, 0, Pike_sp - 1, &svalue_int_one);
-+
- free_object(master_object);
-- master_object=Pike_sp[-args].u.object;
-+ master_object=new_master;
- add_ref(master_object);
-
- free_program(master_program);
---- trunk/src/object.c 11 Jul 2010 10:08:02 -0000 1.310
-+++ cvs/src/object.c 28 Jul 2010 22:50:59 -0000 1.311
-@@ -658,6 +658,7 @@
- }
-
- {
-+ int f;
- ONERROR uwp;
-
- /* fprintf(stderr, "Cloning master...\n"); */
-@@ -673,7 +674,11 @@
-
- call_c_initializers(master_object);
- call_pike_initializers(master_object,0);
--
-+
-+ f = find_identifier ("is_pike_master", master_program);
-+ if (f >= 0)
-+ object_low_set_index (master_object, f, &svalue_int_one);
-+
- /* fprintf(stderr, "Master loaded.\n"); */
-
- UNSET_ONERROR (uwp);
---- trunk/src/svalue.c 11 Jul 2010 12:39:10 -0000 1.261
-+++ cvs/src/svalue.c 28 Jul 2010 22:46:39 -0000 1.262
-@@ -30,14 +30,10 @@
-
- #define sp Pike_sp
-
--PMOD_EXPORT const struct svalue svalue_undefined =
-+PMOD_EXPORT struct svalue svalue_undefined =
- SVALUE_INIT (T_INT, NUMBER_UNDEFINED, 0);
--PMOD_EXPORT const struct svalue svalue_int_zero = SVALUE_INIT_INT (0);
--#ifdef HAVE_UNION_INIT
--PMOD_EXPORT const struct svalue svalue_int_one = SVALUE_INIT_INT (1);
--#else
-+PMOD_EXPORT struct svalue svalue_int_zero = SVALUE_INIT_INT (0);
- PMOD_EXPORT struct svalue svalue_int_one = SVALUE_INIT_INT (1);
--#endif
-
- #ifdef PIKE_DEBUG
- PMOD_EXPORT const char msg_type_error[] =
---- trunk/src/svalue.h 18 Feb 2010 08:52:55 -0000 1.172
-+++ cvs/src/svalue.h 28 Jul 2010 22:46:40 -0000 1.173
-@@ -323,13 +323,8 @@
-
- #define FUNCTION_BUILTIN USHRT_MAX
-
--extern PMOD_EXPORT const struct svalue svalue_undefined, svalue_int_zero;
--#ifdef HAVE_UNION_INIT
--extern PMOD_EXPORT const struct svalue svalue_int_one;
--#else
--/* The value 1 is initialized first thing in init_pike. */
--extern PMOD_EXPORT struct svalue svalue_int_one;
--#endif
-+extern PMOD_EXPORT struct svalue svalue_undefined,
-+ svalue_int_zero, svalue_int_one;
-
- #define is_gt(a,b) is_lt(b,a)
- #define is_ge(a,b) is_le(b,a)
Index: debian/patches/unbreak_cross_compilation.dpatch
===================================================================
--- debian/patches/unbreak_cross_compilation.dpatch (revision 115)
+++ debian/patches/unbreak_cross_compilation.dpatch (nonexistent)
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## unbreak_cross_compiling.dpatch by Marc Dirix <marc@electronics-design.nl>
-##
-## DP: Fix various breakage preventing cross compilation:
-## DP: * Use the installed pike when needed, not the newly built one.
-## DP: * Don't disable dynamic module loading just because we're cross-compiling
-## DP: * Don't freak out because a test program cannot be run
-
-@DPATCH@
---- a/src/configure 2009-09-22 20:37:45.000000000 +0000
-+++ b/src/configure 2010-05-04 09:44:55.000000000 +0000
-@@ -8855,7 +8855,7 @@
- RUNTPIKE="USE_PIKE"
- else
- if test "x$cross_compiling" = "xyes"; then
-- RUNPIKE="DEFAULT_RUNPIKE"
-+ RUNPIKE="USE_PIKE"
- RUNTPIKE="USE_PIKE"
- else
- RUNPIKE="DEFAULT_RUNPIKE"
-@@ -106926,7 +106926,7 @@
- ;;
- esac
- if test "$cross_compiling" = yes; then
-- pike_cv_sys_dynamic_loading=no
-+ pike_cv_sys_dynamic_loading=yes
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
---- a/src/modules/Mysql/configure 2010-05-19 10:20:10.745552500 +0000
-+++ b/src/modules/Mysql/configure 2009-09-22 20:38:35.000000000 +0000
-@@ -7018,13 +7018,7 @@
- $as_echo "yes" >&6; }
-
- if test "$cross_compiling" = yes; then
-- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }; }
-+:
- else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
Index: debian/patches/02_smartlink_rpath.dpatch
===================================================================
--- debian/patches/02_smartlink_rpath.dpatch (revision 115)
+++ debian/patches/02_smartlink_rpath.dpatch (nonexistent)
@@ -1,51 +0,0 @@
-#! /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
-
-@DPATCH@
-diff -urNad trunk~/bin/smartlink trunk/bin/smartlink
---- trunk~/bin/smartlink 2008-08-19 13:51:08.000000000 +0200
-+++ trunk/bin/smartlink 2009-08-16 17:18:26.000000000 +0200
-@@ -162,9 +162,8 @@
- LDOPTS="$LDOPTS -R$RPATH"
- ;;
- Linux\ 2.*)
-- if test x$LINKING != xno -a "x$RPATH" != x ; then
-- LDOPTS="$LDOPTS -Wl,-rpath,$RPATH"
-- fi
-+ LD_LIBRARY_PATH="$RPATH"
-+ export LD_LIBRARY_PATH
- ;;
- UnixWare\ 7.*)
- if test x$LINKING != xno -a "x$RPATH" != x ; then
-diff -urNad trunk~/src/smartlink.c trunk/src/smartlink.c
---- trunk~/src/smartlink.c 2008-08-19 17:57:34.000000000 +0200
-+++ trunk/src/smartlink.c 2009-08-16 17:18:26.000000000 +0200
-@@ -160,7 +160,7 @@
- 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)
-@@ -310,7 +310,7 @@
- }
- rpath_in_use |= add_path(rpath, ld_lib_path);
- }
--
-+#if 0
- if (rpath_in_use) {
- /* Delete the terminating ':' */
- rpath[strlen(rpath) - 1] = 0;
-@@ -357,6 +357,7 @@
- #error Unknown method
- #endif
- }
-+#endif
-
- new_argv[new_argc++] = NULL;
-
/debian/patches/02_smartlink_rpath.dpatch
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: debian/patches/00list
===================================================================
--- debian/patches/00list (revision 115)
+++ debian/patches/00list (nonexistent)
@@ -1,10 +0,0 @@
-module-layout
-02_smartlink_rpath
-#04_make_variables_fpic
-#05_install.pike
-no_dump_modules
-07_dynamic_module_makefile.in-libgcc
-10_misplaced_MAXPATHLEN
-11_pthread_stub
-unbreak_cross_compilation
-dumping_problems
Index: debian/patches/no_dump_modules.dpatch
===================================================================
--- debian/patches/no_dump_modules.dpatch (revision 115)
+++ debian/patches/no_dump_modules.dpatch (nonexistent)
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_dump_modules.dpatch
-##
-## DP: Make install.pike not dump modules; we do that in postinst
-
-@DPATCH@
-diff -urNad trunk~/bin/install.pike trunk/bin/install.pike
---- trunk~/bin/install.pike 2008-08-19 13:51:08.000000000 +0200
-+++ trunk/bin/install.pike 2010-07-28 16:12:19.000000000 +0200
-@@ -2942,7 +2942,6 @@
- {
- do_export();
- }else{
-- dump_modules();
-
- // Delete any .pmod files that would shadow the .so
- // files that we just installed. For a new installation
Index: debian/patches/10_misplaced_MAXPATHLEN.dpatch
===================================================================
--- debian/patches/10_misplaced_MAXPATHLEN.dpatch (revision 115)
+++ debian/patches/10_misplaced_MAXPATHLEN.dpatch (nonexistent)
@@ -1,31 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 10_misplaced_MAXPATHLEN.dpatch by Samuel Thibault <samuel.thibault@ens-lyon.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move reserve MAXPATHLEN definition up.
-
-@DPATCH@
-diff -urNad pike7.8-7.8.316~/src/modules/files/efuns.c pike7.8-7.8.316/src/modules/files/efuns.c
---- pike7.8-7.8.316~/src/modules/files/efuns.c 2009-08-15 01:01:23.000000000 +0200
-+++ pike7.8-7.8.316/src/modules/files/efuns.c 2009-08-15 01:02:21.000000000 +0200
-@@ -109,6 +109,10 @@
-
- #endif /* __NT__ */
-
-+#ifndef MAXPATHLEN
-+#define MAXPATHLEN 32768
-+#endif
-+
- struct array *encode_stat(PIKE_STAT_T *s)
- {
- struct array *a;
-@@ -1443,9 +1447,6 @@
- size*=2;
- } while (size < 10000);
- #else
--#ifndef MAXPATHLEN
--#define MAXPATHLEN 32768
--#endif
- tmp=xalloc(MAXPATHLEN+1);
- THREADS_ALLOW_UID();
- e = getwd(tmp);
Index: debian/patches/misplaced_MAXPATHLEN.patch
===================================================================
--- debian/patches/misplaced_MAXPATHLEN.patch (nonexistent)
+++ debian/patches/misplaced_MAXPATHLEN.patch (revision 116)
@@ -0,0 +1,28 @@
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Subject: Move reserve MAXPATHLEN definition up.
+
+@DPATCH@
+diff -urNad pike7.8-7.8.316~/src/modules/files/efuns.c pike7.8-7.8.316/src/modules/files/efuns.c
+--- pike7.8-7.8.316~/src/modules/files/efuns.c 2009-08-15 01:01:23.000000000 +0200
++++ pike7.8-7.8.316/src/modules/files/efuns.c 2009-08-15 01:02:21.000000000 +0200
+@@ -109,6 +109,10 @@
+
+ #endif /* __NT__ */
+
++#ifndef MAXPATHLEN
++#define MAXPATHLEN 32768
++#endif
++
+ struct array *encode_stat(PIKE_STAT_T *s)
+ {
+ struct array *a;
+@@ -1443,9 +1447,6 @@
+ size*=2;
+ } while (size < 10000);
+ #else
+-#ifndef MAXPATHLEN
+-#define MAXPATHLEN 32768
+-#endif
+ tmp=xalloc(MAXPATHLEN+1);
+ THREADS_ALLOW_UID();
+ e = getwd(tmp);
Index: debian/patches/smartlink_rpath.patch
===================================================================
--- debian/patches/smartlink_rpath.patch (nonexistent)
+++ debian/patches/smartlink_rpath.patch (revision 116)
@@ -0,0 +1,51 @@
+#! /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
+
+@DPATCH@
+diff -urNad trunk~/bin/smartlink trunk/bin/smartlink
+--- trunk~/bin/smartlink 2008-08-19 13:51:08.000000000 +0200
++++ trunk/bin/smartlink 2009-08-16 17:18:26.000000000 +0200
+@@ -162,9 +162,8 @@
+ LDOPTS="$LDOPTS -R$RPATH"
+ ;;
+ Linux\ 2.*)
+- if test x$LINKING != xno -a "x$RPATH" != x ; then
+- LDOPTS="$LDOPTS -Wl,-rpath,$RPATH"
+- fi
++ LD_LIBRARY_PATH="$RPATH"
++ export LD_LIBRARY_PATH
+ ;;
+ UnixWare\ 7.*)
+ if test x$LINKING != xno -a "x$RPATH" != x ; then
+diff -urNad trunk~/src/smartlink.c trunk/src/smartlink.c
+--- trunk~/src/smartlink.c 2008-08-19 17:57:34.000000000 +0200
++++ trunk/src/smartlink.c 2009-08-16 17:18:26.000000000 +0200
+@@ -160,7 +160,7 @@
+ 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)
+@@ -310,7 +310,7 @@
+ }
+ rpath_in_use |= add_path(rpath, ld_lib_path);
+ }
+-
++#if 0
+ if (rpath_in_use) {
+ /* Delete the terminating ':' */
+ rpath[strlen(rpath) - 1] = 0;
+@@ -357,6 +357,7 @@
+ #error Unknown method
+ #endif
+ }
++#endif
+
+ new_argv[new_argc++] = NULL;
+
/debian/patches/smartlink_rpath.patch
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: debian/patches/pthread_stub.patch
===================================================================
--- debian/patches/pthread_stub.patch (nonexistent)
+++ debian/patches/pthread_stub.patch (revision 116)
@@ -0,0 +1,24 @@
+--- a/src/configure
++++ b/src/configure
+@@ -90901,6 +90901,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)
++#error pthread_atfork is just a stub
++#endif
+ void foo(void) { pthread_atfork(0,0,0); }
+
+ int
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -3929,6 +3929,9 @@ pthread_t gazonk;
+ AC_MSG_CHECKING(for pthread_atfork)
+ AC_CACHE_VAL(pike_cv_have_pthread_atfork,[
+ AC_TRY_LINK([#include <pthread.h>
++#if defined(__stub_pthread_atfork) || defined(__stub___pthread_atfork)
++#error pthread_atfork is just a stub
++#endif
+ void foo(void) { pthread_atfork(0,0,0); }
+ ],[],[
+ pike_cv_have_pthread_atfork=yes
/debian/patches/pthread_stub.patch
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: debian/patches/dumping_problems.patch
===================================================================
--- debian/patches/dumping_problems.patch (nonexistent)
+++ debian/patches/dumping_problems.patch (revision 116)
@@ -0,0 +1,133 @@
+From: Martin Stjernholm <mast@roxen.com>
+Subject: Encode references to all ex-masters as if they are to the current master.
+
+That since we cannot hope to eradicate all references to the old
+master when replacing it, and in any case the decoder cannot hope to
+find the same ex-master again.
+
+If this creates a problem for someone using replace_master then it's
+always possible to clear the is_pike_master variable in the old
+master.
+
+--- trunk/lib/master.pike.in 28 Jul 2010 10:29:59 -0000 1.474
++++ cvs/lib/master.pike.in 28 Jul 2010 22:58:01 -0000 1.476
+@@ -85,6 +85,13 @@
+ //!
+ int show_if_constant_errors = 0;
+
++int is_pike_master = 0;
++// This integer variable should exist in any object that aspires to be
++// the master. It gets set to 1 when the master is installed, and is
++// therefore set in any object that is or has been the master. That
++// makes the Encoder class encode references to the master and all
++// ex-masters as references to the current master object.
++
+ // --- Functions begin here.
+
+ // Have to access some stuff without going through the resolver.
+@@ -5092,6 +5099,11 @@
+ }
+ }
+
++ else if (what->is_pike_master) {
++ ENC_MSG (" is a master object\n");
++ ENC_RETURN ("o/master");
++ }
++
+ program prog;
+ if ((prog = objects_reverse_lookup (what)))
+ ENC_MSG (" found program in objects: %O\n", prog);
+--- trunk/src/builtin_functions.c 27 Jul 2010 16:46:01 -0000 1.704
++++ cvs/src/builtin_functions.c 28 Jul 2010 22:51:00 -0000 1.705
+@@ -7364,22 +7364,28 @@
+ */
+ PMOD_EXPORT void f_replace_master(INT32 args)
+ {
++ struct object *new_master;
+ ASSERT_SECURITY_ROOT("replace_master");
+
+ if(!args)
+ SIMPLE_TOO_FEW_ARGS_ERROR("replace_master", 1);
+ if(Pike_sp[-args].type != T_OBJECT)
+ SIMPLE_BAD_ARG_ERROR("replace_master", 1, "object");
+- if(!Pike_sp[-args].u.object->prog)
++ new_master = Pike_sp[-args].u.object;
++ if(!new_master->prog)
+ bad_arg_error("replace_master", Pike_sp-args, args, 1, "object", Pike_sp-args,
+ "Called with destructed object.\n");
+
+ if (Pike_sp[-args].subtype)
+ bad_arg_error("replace_master", Pike_sp-args, args, 1, "object", Pike_sp-args,
+ "Subtyped master objects are not supported yet.\n");
+-
++
++ push_constant_text ("is_pike_master");
++ args++;
++ object_set_index (new_master, 0, Pike_sp - 1, &svalue_int_one);
++
+ free_object(master_object);
+- master_object=Pike_sp[-args].u.object;
++ master_object=new_master;
+ add_ref(master_object);
+
+ free_program(master_program);
+--- trunk/src/object.c 11 Jul 2010 10:08:02 -0000 1.310
++++ cvs/src/object.c 28 Jul 2010 22:50:59 -0000 1.311
+@@ -658,6 +658,7 @@
+ }
+
+ {
++ int f;
+ ONERROR uwp;
+
+ /* fprintf(stderr, "Cloning master...\n"); */
+@@ -673,7 +674,11 @@
+
+ call_c_initializers(master_object);
+ call_pike_initializers(master_object,0);
+-
++
++ f = find_identifier ("is_pike_master", master_program);
++ if (f >= 0)
++ object_low_set_index (master_object, f, &svalue_int_one);
++
+ /* fprintf(stderr, "Master loaded.\n"); */
+
+ UNSET_ONERROR (uwp);
+--- trunk/src/svalue.c 11 Jul 2010 12:39:10 -0000 1.261
++++ cvs/src/svalue.c 28 Jul 2010 22:46:39 -0000 1.262
+@@ -30,14 +30,10 @@
+
+ #define sp Pike_sp
+
+-PMOD_EXPORT const struct svalue svalue_undefined =
++PMOD_EXPORT struct svalue svalue_undefined =
+ SVALUE_INIT (T_INT, NUMBER_UNDEFINED, 0);
+-PMOD_EXPORT const struct svalue svalue_int_zero = SVALUE_INIT_INT (0);
+-#ifdef HAVE_UNION_INIT
+-PMOD_EXPORT const struct svalue svalue_int_one = SVALUE_INIT_INT (1);
+-#else
++PMOD_EXPORT struct svalue svalue_int_zero = SVALUE_INIT_INT (0);
+ PMOD_EXPORT struct svalue svalue_int_one = SVALUE_INIT_INT (1);
+-#endif
+
+ #ifdef PIKE_DEBUG
+ PMOD_EXPORT const char msg_type_error[] =
+--- trunk/src/svalue.h 18 Feb 2010 08:52:55 -0000 1.172
++++ cvs/src/svalue.h 28 Jul 2010 22:46:40 -0000 1.173
+@@ -323,13 +323,8 @@
+
+ #define FUNCTION_BUILTIN USHRT_MAX
+
+-extern PMOD_EXPORT const struct svalue svalue_undefined, svalue_int_zero;
+-#ifdef HAVE_UNION_INIT
+-extern PMOD_EXPORT const struct svalue svalue_int_one;
+-#else
+-/* The value 1 is initialized first thing in init_pike. */
+-extern PMOD_EXPORT struct svalue svalue_int_one;
+-#endif
++extern PMOD_EXPORT struct svalue svalue_undefined,
++ svalue_int_zero, svalue_int_one;
+
+ #define is_gt(a,b) is_lt(b,a)
+ #define is_ge(a,b) is_le(b,a)
Index: debian/patches/make_variables_fpic.patch
===================================================================
--- debian/patches/make_variables_fpic.patch (nonexistent)
+++ debian/patches/make_variables_fpic.patch (revision 116)
@@ -0,0 +1,16 @@
+Author: Marek Habersack <grendel@debian.org>
+Description: Add -fPIC to OTHERFLAGS and NOOPTFLAGS in src/make_variables.in
+
+--- pike7.6-7.6.27/src/make_variables.in 2004-04-23 17:41:33.000000000 +0200
++++ pike7.6-7.6.27.new/src/make_variables.in 2005-06-18 04:19:00.278899432 +0200
+@@ -26,8 +26,8 @@ RUNPIKE=$(@RUNPIKE@)
+ OPTIMIZE=@OPTIMIZE@
+ INSTALL=@INSTALL@
+ WARN=@WARN@
+-OTHERFLAGS=@CFLAGS@ $(OSFLAGS) $(OPTIMIZE) $(WARN) $(PROFIL)
+-NOOPTFLAGS=@CFLAGS@ @CPPFLAGS@ $(OSFLAGS) $(WARN) $(PROFIL)
++OTHERFLAGS=@CFLAGS@ $(OSFLAGS) $(OPTIMIZE) $(WARN) $(PROFIL) -fPIC
++NOOPTFLAGS=@CFLAGS@ @CPPFLAGS@ $(OSFLAGS) $(WARN) $(PROFIL) -fPIC
+ AR=@AR@
+ SRCDIR=@srcdir@
+ PMOD_TARGETS=@PMOD_TARGETS@
/debian/patches/make_variables_fpic.patch
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: debian/patches/no_dump_modules.patch
===================================================================
--- debian/patches/no_dump_modules.patch (nonexistent)
+++ debian/patches/no_dump_modules.patch (revision 116)
@@ -0,0 +1,14 @@
+Author: Magnus Holmgren <holmgren@debian.org>
+Description: Make install.pike not dump modules; we do that in postinst
+
+diff -urNad trunk~/bin/install.pike trunk/bin/install.pike
+--- trunk~/bin/install.pike 2008-08-19 13:51:08.000000000 +0200
++++ trunk/bin/install.pike 2010-07-28 16:12:19.000000000 +0200
+@@ -2942,7 +2942,6 @@
+ {
+ do_export();
+ }else{
+- dump_modules();
+
+ // Delete any .pmod files that would shadow the .so
+ // files that we just installed. For a new installation
Index: debian/patches/dynamic_module_makefile.in-libgcc.patch
===================================================================
--- debian/patches/dynamic_module_makefile.in-libgcc.patch (nonexistent)
+++ debian/patches/dynamic_module_makefile.in-libgcc.patch (revision 116)
@@ -0,0 +1,14 @@
+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
+@@ -2,6 +2,7 @@
+ # $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $
+ #
+
++LIBGCC=$(shell gcc -print-libgcc-file-name)
+ LC_REQ=@LC_REQ@
+
+ LINKAGE_CPPFLAGS=
/debian/patches/dynamic_module_makefile.in-libgcc.patch
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: debian/patches/series
===================================================================
--- debian/patches/series (nonexistent)
+++ debian/patches/series (revision 116)
@@ -0,0 +1,10 @@
+module-layout.patch
+smartlink_rpath.patch
+#make_variables_fpic.patch
+#install.pike.patch
+no_dump_modules.patch
+dynamic_module_makefile.in-libgcc.patch
+misplaced_MAXPATHLEN.patch
+pthread_stub.patch
+unbreak_cross_compilation.patch
+dumping_problems.patch
Index: debian/patches/install.pike.patch
===================================================================
--- debian/patches/install.pike.patch (nonexistent)
+++ debian/patches/install.pike.patch (revision 116)
@@ -0,0 +1,65 @@
+Author: Magnus Holmgren <holmgren@debian.org>
+Description: Allow share_prefix to be separately overridden in install.pike
+
+diff -urNad pike7.8-7.8.116~/src/Makefile.in pike7.8-7.8.116/src/Makefile.in
+--- pike7.8-7.8.116~/src/Makefile.in 2008-11-18 15:16:56.000000000 -0400
++++ pike7.8-7.8.116/src/Makefile.in 2009-05-04 21:50:17.000000000 -0300
+@@ -57,7 +57,7 @@
+ # TESTARGS = -F -a
+
+ # Arguments for install.pike used by the install targets.
+-INSTALLARGS = --new-style
++INSTALLARGS ?= --new-style
+
+ #
+ # use bison please, yacc isn't good enough.
+@@ -658,7 +658,7 @@
+ man_prefix="$(man_prefix)" pike_name=$(pike_name) \
+ fakeroot="$(buildroot)" PIKE_MODULE_RELOC="$(PIKE_MODULE_RELOC)" \
+ cflags="@DYNAMIC_MODULE_FLAGS@" ldflags="" \
+- $(INSTALLARGS)
++ share_prefix="$(share_prefix)" $(INSTALLARGS)
+
+ install_interactive: pike-complete-stamp tools
+ @$(RUNPIKE) $(TMP_BINDIR)/install.pike --interactive \
+--- a/bin/install.pike 2009-06-08 23:51:36.000000000 +0200
++++ b/bin/install.pike 2009-08-22 15:46:55.000000000 +0200
+@@ -1904,6 +1904,7 @@
+ string exec_prefix;
+ string lib_prefix;
+ string include_prefix;
++string share_prefix;
+ string doc_prefix;
+ string man_prefix;
+ string cflags;
+@@ -1946,6 +1947,8 @@
+ lib_prefix=vars->lib_prefix||(prefix+"/lib/pike/");
+ include_prefix =
+ vars->include_prefix || combine_path(prefix,"include","pike");
++ share_prefix =
++ vars->share_prefix || lib_prefix;
+ doc_prefix =
+ vars->doc_prefix || combine_path(prefix, "doc", "pike");
+ man_prefix=vars->man_prefix||(prefix+"/share/man/");
+@@ -2128,7 +2131,7 @@
+ lib_prefix = combine_path(prefix, "lib");
+ include_prefix = combine_path(prefix,"include","pike");
+ make_master("lib/master.pike", "lib/master.pike.in",
+- lib_prefix, include_prefix, UNDEFINED, cflags, ldflags);
++ lib_prefix, include_prefix, share_prefix, cflags, ldflags);
+ status1("Installing master done.");
+ return 0;
+
+@@ -2853,10 +2856,10 @@
+ }
+ else
+ make_master(combine_path(vars->TMP_LIBDIR,"master.pike"), master_src,
+- lib_prefix, include_prefix, UNDEFINED, cflags, ldflags);
++ lib_prefix, include_prefix, share_prefix, cflags, ldflags);
+
+ install_dir(vars->TMP_LIBDIR,lib_prefix,1);
+- install_dir(vars->LIBDIR_SRC,lib_prefix,1);
++ install_dir(vars->LIBDIR_SRC,share_prefix,1);
+
+ install_header_files(vars->SRCDIR,include_prefix);
+ install_header_files(combine_path(vars->SRCDIR,"code"),
/debian/patches/install.pike.patch
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: debian/patches/unbreak_cross_compilation.patch
===================================================================
--- debian/patches/unbreak_cross_compilation.patch (nonexistent)
+++ debian/patches/unbreak_cross_compilation.patch (revision 116)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## unbreak_cross_compiling.dpatch by Marc Dirix <marc@electronics-design.nl>
+##
+## DP: Fix various breakage preventing cross compilation:
+## DP: * Use the installed pike when needed, not the newly built one.
+## DP: * Don't disable dynamic module loading just because we're cross-compiling
+## DP: * Don't freak out because a test program cannot be run
+
+@DPATCH@
+--- a/src/configure 2009-09-22 20:37:45.000000000 +0000
++++ b/src/configure 2010-05-04 09:44:55.000000000 +0000
+@@ -8855,7 +8855,7 @@
+ RUNTPIKE="USE_PIKE"
+ else
+ if test "x$cross_compiling" = "xyes"; then
+- RUNPIKE="DEFAULT_RUNPIKE"
++ RUNPIKE="USE_PIKE"
+ RUNTPIKE="USE_PIKE"
+ else
+ RUNPIKE="DEFAULT_RUNPIKE"
+@@ -106926,7 +106926,7 @@
+ ;;
+ esac
+ if test "$cross_compiling" = yes; then
+- pike_cv_sys_dynamic_loading=no
++ pike_cv_sys_dynamic_loading=yes
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+--- a/src/modules/Mysql/configure 2010-05-19 10:20:10.745552500 +0000
++++ b/src/modules/Mysql/configure 2009-09-22 20:38:35.000000000 +0000
+@@ -7018,13 +7018,7 @@
+ $as_echo "yes" >&6; }
+
+ if test "$cross_compiling" = yes; then
+- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }; }
++:
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
Index: debian/patches/module-layout.patch
===================================================================
--- debian/patches/module-layout.patch (nonexistent)
+++ debian/patches/module-layout.patch (revision 116)
@@ -0,0 +1,88 @@
+Author: Magnus Holmgren <holmgren@debian.org>
+Description: Add local site-pike directories to master.pike.in
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/master.pike.in trunk/lib/master.pike.in
+--- trunk~/lib/master.pike.in 2009-09-19 12:08:35.000000000 +0200
++++ trunk/lib/master.pike.in 2010-04-11 21:02:58.000000000 +0200
+@@ -2094,6 +2094,10 @@
+ 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");
++
+ #if "#cflags# "[0]!='#'
+ cflags = "#cflags#";
+ #endif
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike
+--- trunk~/lib/modules/Tools.pmod/Standalone.pmod/module.pike 2008-07-08 14:59:17.000000000 +0200
++++ trunk/lib/modules/Tools.pmod/Standalone.pmod/module.pike 2010-04-11 21:35:20.000000000 +0200
+@@ -25,9 +25,8 @@
+ // this is not the ideal location for all systems, but it's a start.
+ string local_module_path=combine_path(getenv("HOME")||"","lib/pike/modules");
+ bool old_style_module = false;
+-// we prefer the last element, because if there are more than one
+-// 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";
+
+ // where do we install the documentation?
+ string system_doc_path = master()->doc_prefix;
+@@ -183,7 +182,7 @@
+ extra_args = ({
+ "PIKE="+run_pike,
+ "SRCDIR="+fix("$src"),
+- "MODULE_INSTALL_DIR="+combine_path(__FILE__,"../../.."),
++ "MODULE_INSTALL_DIR="+system_module_path,
+ "LOCAL_MODULE_PATH=" + lmp,
+ });
+ }
+@@ -240,6 +239,7 @@
+ ({"all",Getopt.NO_ARG,({"--all"}) }),
+ ({"make",Getopt.NO_ARG,({"--make"}) }),
+ ({"auto",Getopt.NO_ARG,({"--auto"}) }),
++ ({"debian",Getopt.NO_ARG,({"--debian"}) }),
+ ({"source",Getopt.HAS_ARG,({"--source"}) }),
+ ({"query",Getopt.HAS_ARG,({"--query"}) }),
+ ({"config_args",Getopt.HAS_ARG,({"--configure-args"}) }),
+@@ -276,6 +276,9 @@
+ case "auto":
+ run->depend=run->autoheader=run->autoconf=run->configure=run->make=AUTO;
+ break;
++
++ case "debian":
++ system_module_path=master()->system_module_path[-1];
+ }
+ }
+
+@@ -405,7 +408,7 @@
+ run_or_fail( ([ "env":getenv()|
+ ([
+ "PIKE":run_pike,
+- "MODULE_INSTALL_DIR":combine_path(__FILE__,"../../.."),
++ "MODULE_INSTALL_DIR":system_module_path,
+ "LOCAL_MODULE_PATH":local_module_path,
+ ])
+ ]),
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 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 2010-04-11 22:37:28.000000000 +0200
+@@ -90,13 +90,13 @@
+ #
+ install: $(MODULE_INSTALL)
+ @if test "x$(OBJS)" != "x" ; then \
+- $(TMP_BINDIR)/install_module module.so $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX)$(MODNAME).so && \
++ $(TMP_BINDIR)/install_module module.so $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX)$(MODNAME).so && \
+ if [ -f $(MODNAME).pdb ]; then \
+- cp $(MODNAME).pdb $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX); \
++ cp $(MODNAME).pdb $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODULE_WRAPPER_PREFIX); \
+ else :; fi; \
+ fi; \
+ if test "x$(MODULE_PMOD_IN)" != "x"; then \
+- $(TMP_BINDIR)/install_module module.pmod $(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod ;\
++ $(TMP_BINDIR)/install_module module.pmod $(DESTDIR)$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod ;\
+ fi;
+
+ #
/debian/patches/module-layout.patch
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: debian/changelog
===================================================================
--- debian/changelog (revision 115)
+++ debian/changelog (revision 116)
@@ -1,3 +1,9 @@
+pike7.8 (7.8.352-dfsg-5) unstable; urgency=low
+
+ * Convert to source format 3.0 (quilt).
+
+ -- Magnus Holmgren <holmgren@debian.org> Sat, 19 Mar 2011 22:40:26 +0100
+
pike7.8 (7.8.352-dfsg-4) unstable; urgency=low
* Correct description of pike7.8-pcre (Closes: #597867).
/trunk/debian/source/format
0,0 → 1,0
3.0 (quilt)