385abae
Description: <short summary of the patch>
385abae
 TODO: Put a short summary on the line above and replace this paragraph
385abae
 with a longer explanation of this change. Complete the meta-information
385abae
 with other relevant fields (see below for details). To make it easier, the
385abae
 information below has been extracted from the changelog. Adjust it or drop
385abae
 it.
385abae
 .
385abae
 gcl (2.6.12-62) unstable; urgency=medium
385abae
 .
385abae
   * list_order.22
385abae
Author: Camm Maguire <camm@debian.org>
385abae
385abae
---
385abae
The information above should follow the Patch Tagging Guidelines, please
385abae
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
385abae
are templates for supplementary fields that you might want to add:
385abae
385abae
Origin: <vendor|upstream|other>, <url of original patch>
385abae
Bug: <url in upstream bugtracker>
385abae
Bug-Debian: https://bugs.debian.org/<bugnumber>
385abae
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
385abae
Forwarded: <no|not-needed|url proving that it has been forwarded>
385abae
Reviewed-By: <name and email of someone who approved the patch>
385abae
Last-Update: 2018-02-01
385abae
385abae
--- gcl-2.6.12.orig/cmpnew/gcl_cmpmain.lsp
385abae
+++ gcl-2.6.12/cmpnew/gcl_cmpmain.lsp
385abae
@@ -658,7 +658,7 @@ Cannot compile ~a.~%"
385abae
 (defun make-user-init (files outn)
385abae
 
385abae
   (let* ((c (pathname outn))
385abae
-	 (c (merge-pathnames c (make-pathname :directory '(:current))))
385abae
+	 (c (merge-pathnames c (make-pathname :directory '(:relative))))
385abae
 	 (o (merge-pathnames (make-pathname :type "o") c))
385abae
 	 (c (merge-pathnames (make-pathname :type "c") c)))
385abae
   
385abae
@@ -769,7 +769,7 @@ Cannot compile ~a.~%"
385abae
 
385abae
     (with-open-file (st (namestring map) :direction :output))
385abae
     (safe-system 
385abae
-     (let* ((par (namestring (make-pathname :directory '(:back))))
385abae
+     (let* ((par (namestring (make-pathname :directory '(:relative :back))))
385abae
 	    (i (concatenate 'string " " par))
385abae
 	    (j (concatenate 'string " " si::*system-directory* par)))
385abae
        (format nil "~a ~a ~a ~a -L~a ~a ~a ~a"
385abae
--- gcl-2.6.12.orig/gcl-tk/makefile
385abae
+++ gcl-2.6.12/gcl-tk/makefile
385abae
@@ -38,13 +38,13 @@ clean::
385abae
 	rm -f ${GUIOS} $(OFILES) gcltkaux gcltksrv *.o */*.o demos/index.lsp *.fn demos/*.fn
385abae
 
385abae
 .c.o:
385abae
-	$(GCLTKCC) -c $(CFLAGS1) ${ODIR_DEBUG}  $*.c
385abae
+	$(GCLTKCC) -c $(filter-out -pg,$(CFLAGS1)) -fPIE ${ODIR_DEBUG}  $*.c
385abae
 
385abae
 
385abae
 # for some reason -lieee is on various linux systems in the list of requireds..
385abae
 
385abae
 gcltkaux:  $(GUIOS)
385abae
-	$(LD_ORDINARY_CC) $(GUIOS) $(LDFLAGS) -o gcltkaux  ${TK_LIB_SPEC} ${TCL_LIB_SPEC}
385abae
+	$(LD_ORDINARY_CC) $(GUIOS) $(filter-out %gcl.script,$(LDFLAGS)) -pie -o gcltkaux  ${TK_LIB_SPEC} ${TCL_LIB_SPEC}
385abae
 
385abae
 gcltksrv: makefile
385abae
 	cat gcltksrv.in | sed -e "s!TK_LIBRARY=.*!TK_LIBRARY=${TK_LIBRARY}!g" \
385abae
--- gcl-2.6.12.orig/h/386-gnu.h
385abae
+++ gcl-2.6.12/h/386-gnu.h
385abae
@@ -60,4 +60,4 @@
385abae
 
385abae
 #define NEED_STACK_CHK_GUARD
385abae
 
385abae
-#define DEFINED_REAL_MAXPAGE (1UL<<18) /*FIXME brk probe broken*/
385abae
+#undef HAVE_D_TYPE /*FIXME defined, but not implemented in readdir*/
385abae
--- gcl-2.6.12.orig/o/unixfsys.c
385abae
+++ gcl-2.6.12/o/unixfsys.c
385abae
@@ -307,8 +307,11 @@ DEFUN_NEW("D-TYPE-LIST",object,fSd_type_
385abae
 	       MMcons(make_fixnum(DT_UNKNOWN),make_keyword("UNKNOWN"))
385abae
 	       )
385abae
 #else
385abae
+#undef DT_UNKNOWN
385abae
 #define DT_UNKNOWN 0
385abae
+#undef DT_REG
385abae
 #define DT_REG 1
385abae
+#undef DT_DIR
385abae
 #define DT_DIR 2
385abae
 	  list(3,
385abae
 	       MMcons(make_fixnum(DT_REG),make_keyword("FILE")),