From: Sam S. <sd...@gn...> - 2007-11-15 21:15:07
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Michael Kappert wrote: > Sam Steingold wrote: > >>> 1. does gllib/.libs/libgnu.a contain rpl_malloc? > Ah! nm it is. I only remembered strings. > Anyway, looks OK: > > $ nm gllib/.libs/libgnu.a | grep malloc > U __rpl_malloc > malloc.o: > U _malloc > 00000000 T _rpl_malloc > U __rpl_malloc OK, let us try to link the object file instead: - --- makemake.in.~1.700.~ 2007-11-13 14:45:24.000000000 -0500 +++ makemake.in 2007-11-15 16:13:18.000865000 -0500 @@ -556,6 +556,8 @@ case $# in host_os='@host_os@' # something like 'sunos4' MAKE='@MAKE@' # gmake or make GNU_MAKE='@GNU_MAKE@' # yes or no + GNULIB_MALLOC_POSIX='@GNULIB_MALLOC_POSIX@' # 1 or 0 + HAVE_MALLOC_POSIX='@HAVE_MALLOC_POSIX@' # 1 or 0 # Important: Don't rely on this host classification. # 1. GNU's database config.guess is not always up to date. # 2. New operating systems are emerging at every corner. @@ -627,6 +629,8 @@ case $# in X_CFLAGS='' X_LIBS='' GNU_MAKE='no' + GNULIB_MALLOC_POSIX=1 + HAVE_MALLOC_POSIX=0 shift 2 ;; esac @@ -2449,7 +2453,13 @@ UTILCC=gcc EOF else echol "UTILCC=\$(CC)" fi +# adding the whole gnulib should not hurt - after all we are not +# optimizing the utilities, all we care about is that they compile +# and we cannot disable rpl_malloc for them like we do in lispbibl.d UTILCOMPILE="\$(UTILCC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" +if [ ${GNULIB_MALLOC_POSIX} = 1 && ${HAVE_MALLOC_POSIX} = 0 ]; then + UTILCOMPILE=${UTILCOMPILE}' gllib/malloc.o'; +fi for util in ${UTILS} ; do case ${util} in ccpaux | deema | txt2c | ccmp2c ) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHPLbTPp1Qsf2qnMcRAsIZAJ9TaVDCZcF34jPC8eqi8bhmwh3t2wCdGgAw Fbxeb+1FUzWPmCrlzC5NgaM= =Pd00 -----END PGP SIGNATURE----- |