mirror of
https://gitlab.com/embeddable-common-lisp/ecl.git
synced 2026-01-05 00:40:48 -08:00
Rename the libraries produced by ECL in order to avoid conflicts with locally installed ones
This commit is contained in:
parent
a85c392142
commit
bed391b149
3 changed files with 912 additions and 395 deletions
|
|
@ -43,7 +43,7 @@
|
|||
"~A -o ~S -L\"@true_builddir@\"~* ~{~S ~} ~@?")
|
||||
#-dlopen
|
||||
(setf c::*ld-flags*
|
||||
"@LDFLAGS@ @LDRPATH@ @LIBPREFIX@ecl.@LIBEXT@ -lgmp @GCLIB@ @CLIBS@")
|
||||
"@LDFLAGS@ @LDRPATH@ @LIBPREFIX@ecl.@LIBEXT@ @STATICLIBS@ @CLIBS@")
|
||||
#+dlopen
|
||||
(setf c::*ld-flags*
|
||||
"@LDFLAGS@ @LDRPATH@ @SHAREDPREFIX@ecl.@SHAREDEXT@ @CLIBS@"
|
||||
|
|
@ -74,10 +74,12 @@
|
|||
(c::build-static-library "lsp" :lisp-files lsp-objects))
|
||||
|
||||
#-dlopen
|
||||
(si::system "sh -c 'mkdir tmp; rm -f tmp/*; ~
|
||||
cp @LIBPREFIX@eclmin.@LIBEXT@ @LIBPREFIX@ecl.@LIBEXT@
|
||||
for i in lsp/*.@OBJEXT@ clos/*.@OBJEXT@; do mv $i tmp/lsp_`basename $i`; done; ar -r ../@LIBPREFIX@ecl.@LIBEXT@ tmp/*.@OBJEXT@; rm tmp/*.@OBJEXT@; ~
|
||||
ranlib ../@LIBPREFIX@ecl.@LIBEXT@")
|
||||
(si::system "sh -c 'mkdir tmp; rm -f tmp/*;
|
||||
cp @LIBPREFIX@eclmin.@LIBEXT@ @LIBPREFIX@ecl.@LIBEXT@;
|
||||
cd tmp; ar -x ../@LIBPREFIX@lsp.@LIBEXT@;
|
||||
for i in *.@OBJEXT@; do mv $i lsp_`basename $i`; done;
|
||||
ar -r ../@LIBPREFIX@ecl.@LIBEXT@ *.@OBJEXT@; rm *.@OBJEXT@;
|
||||
ranlib ../@LIBPREFIX@ecl.@LIBEXT@'")
|
||||
|
||||
#+dlopen
|
||||
;;;
|
||||
|
|
@ -89,8 +91,7 @@ ranlib ../@LIBPREFIX@ecl.@LIBEXT@")
|
|||
"c/main.@OBJEXT@"
|
||||
"@LIBPREFIX@lsp.@LIBEXT@"
|
||||
"@LIBPREFIX@eclmin.@LIBEXT@"
|
||||
"-lgmp"
|
||||
"@GCLIB@"
|
||||
"@STATICLIBS@"
|
||||
. #.(unless (equalp "@LDINSTALLNAME@" "")
|
||||
'("@LDINSTALLNAME@"))))
|
||||
|
||||
|
|
|
|||
1273
src/configure
vendored
1273
src/configure
vendored
File diff suppressed because it is too large
Load diff
|
|
@ -114,8 +114,8 @@ AC_EXEEXT dnl Guess whether .exe is needed for executables
|
|||
AC_SUBST(ECL_CC)dnl Which compiler should we use for building ECL
|
||||
AC_SUBST(CFLAGS)dnl Flags for the compiler
|
||||
AC_SUBST(ECL_CFLAGS)dnl Similar, but specific to ECL (see src/util/ecl-config)
|
||||
AC_SUBST(CLIBS)dnl System libraries to be linked in
|
||||
AC_SUBST(GCLIB)dnl Library for the Boehm-Weiser garbage collector
|
||||
AC_SUBST(CLIBS)dnl System & ECL libraries to be linked in
|
||||
AC_SUBST(STATICLIBS)dnl Libraries used when linking ECL statically
|
||||
AC_SUBST(LDFLAGS)dnl Flags for program linker
|
||||
AC_SUBST(SHARED_LDFLAGS)dnl Flags for shared libraries linker
|
||||
AC_SUBST(BUNDLE_LDFLAGS)dnl Flags for FASL files linker
|
||||
|
|
@ -180,18 +180,22 @@ TARGETS="ecl${EXEEXT}"
|
|||
LIBRARIES=""
|
||||
SUBDIR=c
|
||||
CLIBS="${CLIBS} -lm"
|
||||
STATICLIBS=""
|
||||
if test ${boehm} = "no" ; then
|
||||
EXTRA_OBJS="${EXTRA_OBJS} alloc.${OBJEXT} gbc.${OBJEXT}"
|
||||
GCLIB=""
|
||||
else
|
||||
if test ${local_boehm} = "no"; then
|
||||
SUBDIR="${SUBDIR} gc"
|
||||
BOEHM_HEADERS="-I../include"
|
||||
STATICLIBS="-leclgc"
|
||||
if test ${shared} = "no"; then
|
||||
LIBRARIES="${LIBRARIES} ${LIBPREFIX}eclgc.${LIBEXT}"
|
||||
fi
|
||||
else
|
||||
BOEHM_HEADERS=""
|
||||
CLIBS="-lgc ${CLIBS}"
|
||||
fi
|
||||
EXTRA_OBJS="${EXTRA_OBJS} alloc_2.${OBJEXT}"
|
||||
GCLIB="-lgc"
|
||||
AC_DEFINE(GBC_BOEHM)
|
||||
fi
|
||||
if test ${shared} = "yes"; then
|
||||
|
|
@ -202,8 +206,13 @@ else
|
|||
LDRPATH='~*'
|
||||
fi
|
||||
if test ${local_gmp} = "no" ; then
|
||||
LIBRARIES="${LIBRARIES} ${LIBPREFIX}gmp.${LIBEXT}"
|
||||
SUBDIR="${SUBDIR} gmp"
|
||||
STATICLIBS="-leclgmp ${STATICLIBS}"
|
||||
if test ${shared} = "no"; then
|
||||
LIBRARIES="${LIBRARIES} ${LIBPREFIX}eclgmp.${LIBEXT}"
|
||||
fi
|
||||
else
|
||||
CLIBS="-lgmp ${CLIBS}"
|
||||
fi
|
||||
if test ${runtime} ; then
|
||||
AC_DEFINE(RUNTIME)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue