Juanjo,
this patchlet fixes a typo in src/Makefile.in that breaks "make install".
-- Gaby
Index: src/configure.in
===================================================================
RCS file: /cvsroot/ecls/ecl/src/configure.in,v
retrieving revision 1.241
diff -p -r1.241 configure.in
*** src/configure.in 3 Oct 2010 20:35:02 -0000 1.241
--- src/configure.in 4 Oct 2010 19:19:07 -0000
*************** AC_PROG_RANLIB # sets variable RA
*** 321,326 ****
--- 321,328 ----
AC_PROG_INSTALL # sets variables INSTALL, INSTALL_DATA, INSTALL_PROGRAM
AC_PROG_LN_S # sets variable LN_S
AC_PROG_MAKE_SET # set $(MAKE) if needed
+ AC_PROG_RANLIB # set variable RANLIB
+ AC_CHECK_TOOL([AR],[ar]) # set variable AR to appropriate `ar' program
dnl -----------------------------------------------------------------------
dnl Checks which do not come with autoconf (must be after AC_PROG_CC)
Index: src/cmp/cmpdefs.lsp
===================================================================
RCS file: /cvsroot/ecls/ecl/src/cmp/cmpdefs.lsp,v
retrieving revision 1.97
diff -p -r1.97 cmpdefs.lsp
*** src/cmp/cmpdefs.lsp 3 Jun 2010 18:42:47 -0000 1.97
--- src/cmp/cmpdefs.lsp 4 Oct 2010 19:19:07 -0000
*************** coprocessor).")
*** 29,34 ****
--- 29,40 ----
(defvar *ld* "@ECL_CC@"
"This variable controls the linker which is used by ECL.")
+ (defvar *ranlib* "@RANLIB@"
+ "Name of the `ranlib' program on the hosting platform.")
+
+ (defvar *ar* "@AR@"
+ "Name of the `AR' program on the hosting platform.")
+
(defvar *cc-flags* "@CPPFLAGS@ @CFLAGS@ @ECL_CFLAGS@")
(defvar *cc-optimize* #-msvc "-O2"
Index: src/cmp/cmpmain.lsp
===================================================================
RCS file: /cvsroot/ecls/ecl/src/cmp/cmpmain.lsp,v
retrieving revision 1.186
diff -p -r1.186 cmpmain.lsp
*** src/cmp/cmpmain.lsp 23 Jul 2010 22:01:09 -0000 1.186
--- src/cmp/cmpmain.lsp 4 Oct 2010 19:19:07 -0000
*************** the environment variable TMPDIR to a dif
*** 123,129 ****
(format nil
*ld-format*
*ld*
! (si::coerce-to-filename o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
--- 123,129 ----
(format nil
*ld-format*
*ld*
! (brief-namestring o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
*************** the environment variable TMPDIR to a dif
*** 154,160 ****
(format nil
*ld-format*
*ld*
! (si::coerce-to-filename o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
--- 154,160 ----
(format nil
*ld-format*
*ld*
! (brief-namestring o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
*************** the environment variable TMPDIR to a dif
*** 168,175 ****
(let ((lib-file (compile-file-pathname o-pathname :type :lib)))
(safe-system
(format nil
! "gcc -shared -o ~S -L~S ~{~S ~} ~...@[~s~]~{ '~A'~} ~...@?"
! (si::coerce-to-filename o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
--- 168,176 ----
(let ((lib-file (compile-file-pathname o-pathname :type :lib)))
(safe-system
(format nil
! "~S -shared -o ~S -L~S ~{~S ~} ~...@[~s~]~{ '~A'~} ~...@?"
! *cc*
! (brief-namestring o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
*************** the environment variable TMPDIR to a dif
*** 198,204 ****
(format nil
*ld-format*
*ld*
! (si::coerce-to-filename o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
--- 199,205 ----
(format nil
*ld-format*
*ld*
! (brief-namestring o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
*************** the environment variable TMPDIR to a dif
*** 212,218 ****
(safe-system
(format nil
"gcc -shared -o ~S -Wl,--export-all-symbols -L~S ~{~S ~} ~...@[~s~]~{ '~A'~} ~A"
! (si::coerce-to-filename o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
--- 213,219 ----
(safe-system
(format nil
"gcc -shared -o ~S -Wl,--export-all-symbols -L~S ~{~S ~} ~...@[~s~]~{ '~A'~} ~A"
! (brief-namestring o-pathname)
(fix-for-mingw (ecl-library-directory))
options
*ld-rpath*
*************** or a loadable module."
*** 326,338 ****
"Given a file name, return the compiler command line argument to link this file in."
(case kind
((:object :c)
! (si::coerce-to-filename pathname))
((:fasl :fas)
nil)
((:static-library :lib)
! (si::coerce-to-filename pathname))
((:shared-library :dll)
! (si::coerce-to-filename pathname))
((:program)
nil)
(otherwise
--- 327,339 ----
"Given a file name, return the compiler command line argument to link this file in."
(case kind
((:object :c)
! (brief-namestring pathname))
((:fasl :fas)
nil)
((:static-library :lib)
! (brief-namestring pathname))
((:shared-library :dll)
! (brief-namestring pathname))
((:program)
nil)
(otherwise
*************** static cl_object VV[VM];
*** 489,497 ****
(when (probe-file output-name) (delete-file output-name))
#-msvc
(progn
! (safe-system (format nil "ar cr ~S ~S ~{~S ~}"
! (namestring output-name) (namestring o-name) ld-flags))
! (safe-system (format nil "ranlib ~S" (namestring output-name))))
#+msvc
(unwind-protect
(progn
--- 490,499 ----
(when (probe-file output-name) (delete-file output-name))
#-msvc
(progn
! (safe-system (format nil "~S cr ~S ~S ~{~S ~}"
! *ar* (namestring output-name)
! (brief-namestring o-name) ld-flags))
! (safe-system (format nil "~S ~S" *ranlib* (namestring output-name))))
#+msvc
(unwind-protect
(progn
*************** from the C language code. NIL means \"d
*** 915,922 ****
*cc*
(fix-for-mingw (ecl-include-directory))
*cc-flags* (>= (cmp-env-optimization 'speed) 2) *cc-optimize*
! (si::coerce-to-filename c-pathname)
! (si::coerce-to-filename o-pathname)
*user-cc-flags*)
; Since the SUN4 assembler loops with big files, you might want to use this:
; (format nil
--- 917,924 ----
*cc*
(fix-for-mingw (ecl-include-directory))
*cc-flags* (>= (cmp-env-optimization 'speed) 2) *cc-optimize*
! (brief-namestring c-pathname)
! (brief-namestring o-pathname)
*user-cc-flags*)
; Since the SUN4 assembler loops with big files, you might want to use this:
; (format nil
Index: src/cmp/cmptop.lsp
===================================================================
RCS file: /cvsroot/ecls/ecl/src/cmp/cmptop.lsp,v
retrieving revision 1.147
diff -p -r1.147 cmptop.lsp
*** src/cmp/cmptop.lsp 4 Oct 2010 19:00:21 -0000 1.147
--- src/cmp/cmptop.lsp 4 Oct 2010 19:19:08 -0000
***************
*** 113,119 ****
;(let ((*print-level* 3)) (pprint *top-level-forms*))
(setq *top-level-forms* (nreverse *top-level-forms*))
! (wt-nl1 "#include \"" (si::coerce-to-filename h-pathname) "\"")
;; VV might be needed by functions in CLINES.
(wt-nl-h "#ifdef ECL_DYNAMIC_VV")
--- 113,119 ----
;(let ((*print-level* 3)) (pprint *top-level-forms*))
(setq *top-level-forms* (nreverse *top-level-forms*))
! (wt-nl1 "#include \"" (brief-namestring h-pathname) "\"")
;; VV might be needed by functions in CLINES.
(wt-nl-h "#ifdef ECL_DYNAMIC_VV")
***************
*** 135,141 ****
(*emitted-local-funs* nil)
(*compiler-declared-globals* (make-hash-table)))
(unless shared-data
! (wt-nl1 "#include \"" (si::coerce-to-filename data-pathname) "\""))
(wt-nl1 "#ifdef __cplusplus")
(wt-nl1 "extern \"C\"")
(wt-nl1 "#endif")
--- 135,141 ----
(*emitted-local-funs* nil)
(*compiler-declared-globals* (make-hash-table)))
(unless shared-data
! (wt-nl1 "#include \"" (brief-namestring data-pathname) "\""))
(wt-nl1 "#ifdef __cplusplus")
(wt-nl1 "extern \"C\"")
(wt-nl1 "#endif")
Index: src/cmp/cmputil.lsp
===================================================================
RCS file: /cvsroot/ecls/ecl/src/cmp/cmputil.lsp,v
retrieving revision 1.63
diff -p -r1.63 cmputil.lsp
*** src/cmp/cmputil.lsp 21 Sep 2010 07:14:10 -0000 1.63
--- src/cmp/cmputil.lsp 4 Oct 2010 19:19:08 -0000
***************
*** 22,27 ****
--- 22,33 ----
(defconstant +error-format+ "~&~@< * ~;~?~;~:@>")
(defconstant +fatal-format+ "~&~@< ** ~;~?~;~:@>")
+ ;; Return a namestring for a path that is sufficiently
+ ;; unambiguous (hopefully) for the C compiler (and associates)
+ ;; to decipher.
+ (defun brief-namestring (path)
+ (enough-namestring (si::coerce-to-filename path)))
+
(defun innermost-non-expanded-form (form)
(when (listp form)
(loop with output = nil
------------------------------------------------------------------------------
Virtualization is moving to the mainstream and overtaking non-virtualized
environment for deploying applications. Does it make network security
easier or more difficult to achieve? Read this whitepaper to separate the
two and get a better understanding.
http://p.sf.net/sfu/hp-phase2-d2d
_______________________________________________
Ecls-list mailing list
Ecls-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ecls-list
