From: Sam S. <sd...@gn...> - 2007-11-16 00:55:06
|
> * Michael Kappert <zvp...@tz...g> [2007-11-15 23:54:09 +0100]: > > I noticed that this time variable OBJECTS in buid.test/Makefile does > not mention any of the gllib/*.o. > The previous version did (but malloc.o was not included). this is clearly wrong. what is your HAVE_MALLOC_POSIX ? $ grep HAVE_MALLOC_POSIX build.tst/makemake please also try the appended "new and improved" patch... -- Sam Steingold (http://sds.podval.org/) on Fedora release 7 (Moonshine) http://iris.org.il http://jihadwatch.org http://truepeace.org http://ffii.org http://israelunderattack.slide.com http://thereligionofpeace.com A PC without Windows is like ice cream without ketchup. --- makemake.in.~1.700.~ 2007-11-14 20:23:22.000000000 -0500 +++ makemake.in 2007-11-15 19:53:19.000000000 -0500 @@ -556,6 +556,7 @@ host_os='@host_os@' # something like 'sunos4' MAKE='@MAKE@' # gmake or make GNU_MAKE='@GNU_MAKE@' # yes or no + 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 +628,7 @@ X_CFLAGS='' X_LIBS='' GNU_MAKE='no' + HAVE_MALLOC_POSIX=0 shift 2 ;; esac @@ -1525,9 +1527,15 @@ XCFLAGS="$XCFLAGS -DDYNAMIC_MODULES" fi -GLLIB="gllib/localcharset gllib/uniname/uniname gllib/uniwidth/width" -GLLIB_O="" -for f in ${GLLIB}; do GLLIB_O=${f}${TOBJ}' '${GLLIB_O}; done +if [ ${HAVE_MALLOC_POSIX} = 0 ]; then + # gnulib/stdlib.h will define malloc to rpl_malloc, so we need this + GLLIB_O=gllib/malloc${TOBJ}; GLLIB=gllib/malloc +else GLLIB_O=""; GLLIB="" +fi +for f in localcharset uniname/uniname uniwidth/width; do + GLLIB_O=gllib/${f}${TOBJ}' '${GLLIB_O}; + GLLIB=gllib/${f}' '${GLLIB}; +done FILES=${GLLIB_O}' '${FILES} if [ "${with_readline}" = no ]; then @@ -2450,6 +2458,10 @@ else echol "UTILCC=\$(CC)" fi UTILCOMPILE="\$(UTILCC) \$(CPPFLAGS) \$(CFLAGS) \$(CLFLAGS)" +if [ ${HAVE_MALLOC_POSIX} = 0 ]; then + # gnulib/stdlib.h will define malloc to rpl_malloc, so we need this + UTILCOMPILE=${UTILCOMPILE}' gllib/malloc'${TOBJ}; +fi for util in ${UTILS} ; do case ${util} in ccpaux | deema | txt2c | ccmp2c ) Diffs between working revision and workfile end here. |