mirror of
https://gitlab.com/embeddable-common-lisp/ecl.git
synced 2026-01-15 05:43:19 -08:00
Include missing changes from Commit 9b083e4d78
This commit is contained in:
Juan Jose Garcia Ripoll
parent
7a5588c3fc
commit
24eb6a44bc
3 changed files with 18 additions and 7 deletions
|
|
@ -112,7 +112,7 @@ bin/ecl-config: bin/ecl-config.pre
|
|||
test -d ecl/gc/private || mkdir ecl/gc/private
|
||||
if (echo $(SUBDIRS) | grep gc); then \
|
||||
cd gc && $(MAKE) install && cd .. && \
|
||||
cp -rf $(srcdir)/gc/include/private/*.h ecl/gc/private/ && \
|
||||
cp -rf $(srcdir)/@ECL_GC_DIR@/include/private/*.h ecl/gc/private/ && \
|
||||
mv @LIBPREFIX@gc.@LIBEXT@ @LIBPREFIX@eclgc.@LIBEXT@; \
|
||||
fi
|
||||
@LIBPREFIX@eclffi.@LIBEXT@:
|
||||
|
|
|
|||
9
src/aclocal.m4
vendored
9
src/aclocal.m4
vendored
|
|
@ -236,6 +236,8 @@ AC_SUBST(OBJEXT)dnl These are set by autoconf
|
|||
AC_SUBST(EXEEXT)
|
||||
AC_SUBST(INSTALL_TARGET)dnl Which type of installation: flat directory or unix like.
|
||||
AC_SUBST(thehost)
|
||||
AC_SUBST(ECL_GC_DIR)dnl Which version of the Boehm-Weiser library to use
|
||||
ECL_GC_DIR=gc
|
||||
ECL_LDRPATH=''
|
||||
SHAREDEXT='so'
|
||||
SHAREDPREFIX='lib'
|
||||
|
|
@ -392,6 +394,9 @@ case "${host_os}" in
|
|||
# The Boehm-Weiser GC library shipped with Fink does not work
|
||||
# well with our signal handler.
|
||||
# enable_boehm=included
|
||||
if test `uname -r | cut -d '.' -f 1` -ge 11; then
|
||||
ECL_GC_DIR=gc-unstable
|
||||
fi
|
||||
SONAME="${SHAREDPREFIX}ecl.SOVERSION.${SHAREDEXT}"
|
||||
SONAME_LDFLAGS="-Wl,-install_name,@libdir\@/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
|
||||
;;
|
||||
|
|
@ -873,7 +878,7 @@ AC_DEFUN([ECL_LIBATOMIC_OPS],[
|
|||
if test "x${enable_threads}" != "xno"; then
|
||||
test -d atomic || mkdir atomic
|
||||
(destdir=`${PWDCMD}`; cd atomic && CC="${CC} ${PICFLAG}" \
|
||||
$srcdir/gc/libatomic*/configure --disable-shared --prefix=${destdir} \
|
||||
$srcdir/${ECL_GC_DIR}/libatomic*/configure --disable-shared --prefix=${destdir} \
|
||||
--infodir=${destdir}/doc --includedir=${destdir}/ecl --with-pic \
|
||||
--libdir=${destdir} --build=${build_alias} --host=${host_alias} \
|
||||
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" CC="${CC} \
|
||||
|
|
@ -936,7 +941,7 @@ if test "${enable_boehm}" = "included"; then
|
|||
test -d gc && rm -rf gc
|
||||
if mkdir gc; then
|
||||
if (destdir=`${PWDCMD}`; cd gc; \
|
||||
$srcdir/gc/configure --disable-shared --prefix=${destdir} \
|
||||
$srcdir/${ECL_GC_DIR}/configure --disable-shared --prefix=${destdir} \
|
||||
--includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
|
||||
--host=${host_alias} --enable-large-config \
|
||||
CC="${CC} ${PICFLAG}" CFLAGS="$CFLAGS" \
|
||||
|
|
|
|||
14
src/configure
vendored
14
src/configure
vendored
|
|
@ -711,6 +711,7 @@ SHAREDEXT
|
|||
SHAREDPREFIX
|
||||
INSTALL_TARGET
|
||||
thehost
|
||||
ECL_GC_DIR
|
||||
INFOEXT
|
||||
INSTALL_INFO
|
||||
GREP
|
||||
|
|
@ -4512,6 +4513,7 @@ MV="mv"
|
|||
|
||||
|
||||
|
||||
ECL_GC_DIR=gc
|
||||
ECL_LDRPATH=''
|
||||
SHAREDEXT='so'
|
||||
SHAREDPREFIX='lib'
|
||||
|
|
@ -4668,6 +4670,9 @@ case "${host_os}" in
|
|||
# The Boehm-Weiser GC library shipped with Fink does not work
|
||||
# well with our signal handler.
|
||||
# enable_boehm=included
|
||||
if test `uname -r | cut -d '.' -f 1` -ge 9; then
|
||||
ECL_GC_DIR=gc-unstable
|
||||
fi
|
||||
SONAME="${SHAREDPREFIX}ecl.SOVERSION.${SHAREDEXT}"
|
||||
SONAME_LDFLAGS="-Wl,-install_name,@libdir\@/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
|
||||
;;
|
||||
|
|
@ -6585,7 +6590,7 @@ echo "$as_me: Configuring included Boehm GC library:" >&6;}
|
|||
test -d gc && rm -rf gc
|
||||
if mkdir gc; then
|
||||
if (destdir=`${PWDCMD}`; cd gc; \
|
||||
$srcdir/gc/configure --disable-shared --prefix=${destdir} \
|
||||
$srcdir/${ECL_GC_DIR}/configure --disable-shared --prefix=${destdir} \
|
||||
--includedir=${destdir}/ecl/ --libdir=${destdir} --build=${build_alias} \
|
||||
--host=${host_alias} --enable-large-config \
|
||||
CC="${CC} ${PICFLAG}" CFLAGS="$CFLAGS" \
|
||||
|
|
@ -14309,7 +14314,7 @@ fi
|
|||
if test "x${enable_threads}" != "xno"; then
|
||||
test -d atomic || mkdir atomic
|
||||
(destdir=`${PWDCMD}`; cd atomic && CC="${CC} ${PICFLAG}" \
|
||||
$srcdir/gc/libatomic*/configure --disable-shared --prefix=${destdir} \
|
||||
$srcdir/${ECL_GC_DIR}/libatomic*/configure --disable-shared --prefix=${destdir} \
|
||||
--infodir=${destdir}/doc --includedir=${destdir}/ecl --with-pic \
|
||||
--libdir=${destdir} --build=${build_alias} --host=${host_alias} \
|
||||
CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" CC="${CC} \
|
||||
|
|
@ -15340,6 +15345,7 @@ _ACEOF
|
|||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
ECL_GC_DIR!$ECL_GC_DIR$ac_delim
|
||||
INFOEXT!$INFOEXT$ac_delim
|
||||
INSTALL_INFO!$INSTALL_INFO$ac_delim
|
||||
GREP!$GREP$ac_delim
|
||||
|
|
@ -15377,7 +15383,7 @@ ECL_INIT_FORM!$ECL_INIT_FORM$ac_delim
|
|||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
@ -15738,7 +15744,7 @@ do
|
|||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
# First, check the format of the line:
|
||||
cat >"\$tmp/defines.sed" <<\\CEOF
|
||||
/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*/b def
|
||||
/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
|
||||
/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
|
||||
b
|
||||
:def
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue