<short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.12-62) unstable; urgency=medium

  * list_order.22

Gbp-Pq: Name list_order.23

diff --git a/cmpnew/gcl_cmpmain.lsp b/cmpnew/gcl_cmpmain.lsp
index d8205375fe21412897d5edfa820df1781cccef25..c8f356fc496f0d3fec7e166cab5c8444cbd5f7f7 100755 (executable)
--- a/cmpnew/gcl_cmpmain.lsp
+++ b/cmpnew/gcl_cmpmain.lsp
@@ -658,7 +658,7 @@ Cannot compile ~a.~%"
 (defun make-user-init (files outn)
 
   (let* ((c (pathname outn))
-        (c (merge-pathnames c (make-pathname :directory '(:current))))
+        (c (merge-pathnames c (make-pathname :directory '(:relative))))
         (o (merge-pathnames (make-pathname :type "o") c))
         (c (merge-pathnames (make-pathname :type "c") c)))
   
@@ -769,7 +769,7 @@ Cannot compile ~a.~%"
 
     (with-open-file (st (namestring map) :direction :output))
     (safe-system 
-     (let* ((par (namestring (make-pathname :directory '(:back))))
+     (let* ((par (namestring (make-pathname :directory '(:relative :back))))
            (i (concatenate 'string " " par))
            (j (concatenate 'string " " si::*system-directory* par)))
        (format nil "~a ~a ~a ~a -L~a ~a ~a ~a"

diff --git a/gcl-tk/makefile b/gcl-tk/makefile
index 0535541b5c24c75430b25a1d58c4db1fd8929754..037d730287a997d66d1045f215d5ba2adf02216f 100644 (file)
--- a/gcl-tk/makefile
+++ b/gcl-tk/makefile
@@ -38,13 +38,13 @@ clean::
        rm -f ${GUIOS} $(OFILES) gcltkaux gcltksrv *.o */*.o demos/index.lsp *.fn demos/*.fn
 
 .c.o:
-       $(GCLTKCC) -c $(CFLAGS1) ${ODIR_DEBUG}  $*.c
+       $(GCLTKCC) -c $(filter-out -pg,$(CFLAGS1)) -fPIE ${ODIR_DEBUG}  $*.c
 
 
 # for some reason -lieee is on various linux systems in the list of requireds..
 
 gcltkaux:  $(GUIOS)
-       $(LD_ORDINARY_CC) $(GUIOS) $(LDFLAGS) -o gcltkaux  ${TK_LIB_SPEC} ${TCL_LIB_SPEC}
+       $(LD_ORDINARY_CC) $(GUIOS) $(filter-out %gcl.script,$(LDFLAGS)) -pie -o gcltkaux  ${TK_LIB_SPEC} ${TCL_LIB_SPEC}
 
 gcltksrv: makefile
        cat gcltksrv.in | sed -e "s!TK_LIBRARY=.*!TK_LIBRARY=${TK_LIBRARY}!g" \

diff --git a/h/386-gnu.h b/h/386-gnu.h
index da78e8335b54bcd58976b3b36878e692b36d7141..8158695ca8ac5fb99d8052b8baccbdca676afeac 100755 (executable)
--- a/h/386-gnu.h
+++ b/h/386-gnu.h
@@ -60,4 +60,4 @@
 
 #define NEED_STACK_CHK_GUARD
 
-#define DEFINED_REAL_MAXPAGE (1UL<<18) /*FIXME brk probe broken*/
+#undef HAVE_D_TYPE /*FIXME defined, but not implemented in readdir*/

diff --git a/o/unixfsys.c b/o/unixfsys.c
index 196aeea145711cc0b378630f84a2c9824ff356f9..25f9275d2f8cdab3f178ee2e860f829dbfc8f0c3 100755 (executable)
--- a/o/unixfsys.c
+++ b/o/unixfsys.c
@@ -307,8 +307,11 @@ DEFUN_NEW("D-TYPE-LIST",object,fSd_type_list,SI,0,0,NONE,OI,OO,OO,OO,(void),"")
               MMcons(make_fixnum(DT_UNKNOWN),make_keyword("UNKNOWN"))
               )
 #else
+#undef DT_UNKNOWN
 #define DT_UNKNOWN 0
+#undef DT_REG
 #define DT_REG 1
+#undef DT_DIR
 #define DT_DIR 2
          list(3,
               MMcons(make_fixnum(DT_REG),make_keyword("FILE")),