Subversion Repositories pike

Compare Revisions

Ignore whitespace Rev 38 → Rev 41

/trunk/debian/patches/12_perl_init.dpatch
File deleted
Property changes:
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: 05_install.pike.dpatch
===================================================================
--- 05_install.pike.dpatch (revision 38)
+++ 05_install.pike.dpatch (revision 41)
@@ -5,10 +5,10 @@
## DP: Allow include_prefix to be separately overridden in install.pike
@DPATCH@
-diff -urNad trunk~/src/Makefile.in trunk/src/Makefile.in
---- trunk~/src/Makefile.in 2006-10-20 15:40:28.000000000 +0200
-+++ trunk/src/Makefile.in 2007-09-26 09:51:13.000000000 +0200
-@@ -53,7 +53,7 @@
+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.
@@ -17,12 +17,12 @@
#
# use bison please, yacc isn't good enough.
-@@ -506,7 +506,7 @@
- MANDIR_SRC="$(MANDIR_SRC)" \
+@@ -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)
+ include_prefix="$(include_prefix)" $(INSTALLARGS)
- install_interactive: pike tools
+ install_interactive: pike-complete-stamp tools
@$(RUNPIKE) $(TMP_BINDIR)/install.pike --interactive \
/trunk/debian/patches/07_dynamic_module_makefile.in-libgcc.dpatch
5,14 → 5,13
## DP: Figure out LIBGCC name.
 
@DPATCH@
 
--- 7.6/src/modules/dynamic_module_makefile.in 2005-12-30 14:33:50.110303750 +0100
+++ 7.6.fix/src/modules/dynamic_module_makefile.in 2005-12-30 14:50:03.367128500 +0100
@@ -2,7 +2,7 @@
# $Id: 07_dynamic_module_makefile.in-libgcc.diff,v 1.1 2006/01/03 16:03:38 grendel Exp $
diff -urNad pike7.8-7.8.116~/src/modules/dynamic_module_makefile.in pike7.8-7.8.116/src/modules/dynamic_module_makefile.in
--- pike7.8-7.8.116~/src/modules/dynamic_module_makefile.in 2008-01-10 20:22:27.000000000 -0400
+++ pike7.8-7.8.116/src/modules/dynamic_module_makefile.in 2009-05-04 22:13:11.000000000 -0300
@@ -2,6 +2,7 @@
# $Id: dynamic_module_makefile.in,v 1.124 2008/01/11 00:22:27 grubba Exp $
#
-LIBGCC=@LIBGCC@
+LIBGCC=$(shell gcc -print-libgcc-file-name)
LC_REQ=@LC_REQ@
/trunk/debian/patches/02_smartlink_rpath.dpatch
1,5 → 1,5
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_smartlink_rpath.dpatch by <magnus@proffe.kibibyte.se>
## 02_smartlink_rpath.dpatch
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Make smartlink not use -rpath
6,9 → 6,9
 
@DPATCH@
 
--- pike7.3-7.3.51.orig/bin/smartlink
+++ pike7.3-7.3.51/bin/smartlink
@@ -147,9 +147,8 @@
--- 7.7.orig/bin/smartlink 2006-03-19 18:01:51.000000000 +0100
+++ 7.7/bin/smartlink 2006-08-09 02:07:32.940847999 +0200
@@ -162,9 +162,8 @@ if test x$# != x0 ; then
LDOPTS="$LDOPTS -R$RPATH"
;;
Linux\ 2.*)
20,9 → 20,9
;;
UnixWare\ 7.*)
if test x$LINKING != xno -a "x$RPATH" != x ; then
--- pike7.5-7.5.3/src/smartlink.c.orig 2003-01-17 20:13:38.000000000 +0100
+++ pike7.3-7.5.3/src/smartlink.c 2003-03-20 16:58:02.000000000 +0100
@@ -146,7 +146,7 @@
--- 7.7.orig/src/smartlink.c 2006-08-09 01:30:57.000000000 +0200
+++ 7.7/src/smartlink.c 2006-08-09 02:07:32.940847999 +0200
@@ -151,7 +151,7 @@ int main(int argc, char **argv)
full_rpath = rpath;
#ifdef USE_Wl
31,7 → 31,7
#elif defined(USE_Wl_R)
strcat(rpath, "-Wl,-R");
#elif defined(USE_R)
@@ -258,7 +258,7 @@
@@ -293,7 +293,7 @@ int main(int argc, char **argv)
}
rpath_in_use |= add_path(rpath, ld_lib_path);
}
40,7 → 40,7
if (rpath_in_use) {
/* Delete the terminating ':' */
rpath[strlen(rpath) - 1] = 0;
@@ -305,6 +305,7 @@
@@ -340,6 +340,7 @@ int main(int argc, char **argv)
#error Unknown method
#endif
}
/trunk/debian/patches/00list
5,4 → 5,3
07_dynamic_module_makefile.in-libgcc
10_misplaced_MAXPATHLEN
11_pthread_stub
12_perl_init