This is the mail archive of the
gcc-bugs@gcc.gnu.org
mailing list for the GCC project.
A new patch for libg++ (was: Re: Patch for configuring/building in ${srcdir}...)
On Thu, 5 March 1998, 09:30:56, manfred@s-direktnet.de wrote:
> On Wed, 4 March 1998, 22:51:14, law@hurl.cygnus.com wrote:
>
> >
> > In message <9803030750.AA02457@lts.sel.alcatel.de>you write:
> > > OK, I tested the same procedure, but didn't choose the same
> > > configuration :-( My one wasn't multilib'ed. The appended patch should
> > > fix all your build problems now.
> > >
> > > ChangeLog in libiberty/:
> > >
> > > Tue Mar 3 08:26:10 1998 Manfred Hollstein <manfred@s-direktnet.de>
> > >
> > > * config.table: Make locating frag files failsafe even for the
> > > special case if configuring and building in srcdir.
> > >
> > > ChangeLog in libio/:
> > >
> > > Tue Mar 3 08:26:10 1998 Manfred Hollstein <manfred@s-direktnet.de>
> > >
> > > * configure.in: Make locating frag files failsafe even for the
> > > special case if configuring and building in srcdir.
> > >
> > > ChangeLog in libstdc++/:
> > >
> > > Tue Mar 3 08:26:10 1998 Manfred Hollstein <manfred@s-direktnet.de>
> > >
> > > * configure.in: Make locating frag files failsafe even for the
> > > special case if configuring and building in srcdir.
> > This looks fine. Please install it.
>
> Done.
>
> >
> > Will libg++ need a similar change?
> >
>
> Yes, I'll send one to H.J.
Here it is:
In libg++/ChangeLog.hjl:
Tue Mar 3 08:26:10 1998 Manfred Hollstein <manfred@s-direktnet.de>
* configure.in: Make locating frag files failsafe even for the
special case if configuring and building in srcdir.
In librx/ChangeLog.hjl:
Tue Mar 3 08:26:10 1998 Manfred Hollstein <manfred@s-direktnet.de>
* configure.in: Make locating frag files failsafe even for the
special case if configuring and building in srcdir.
* configure: Re-build.
diff --context --recursive --show-c-function -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-1.0.2.orig/libg++/configure.in egcs-1.0.2/libg++/configure.in
*** egcs-1.0.2.orig/libg++/configure.in Thu Jan 29 02:07:54 1998
--- egcs-1.0.2/libg++/configure.in Tue Mar 3 11:35:12 1998
*************** if [ "${shared}" = "yes" ]; then
*** 124,129 ****
--- 124,137 ----
fi
for frag in ${my_target}.mt ${frags}; do
+ case ${frag} in
+ ../* )
+ if [ ${srcdir} = . ]; then
+ [ -n "${with_target_subdir}" ] && frag=../${frag}
+ [ -n "${with_multisrctop}" ] && frag=${with_multisrctop}${frag}
+ fi
+ ;;
+ esac
frag=${srcdir}/config/$frag
if [ -f ${frag} ]; then
echo "Appending ${frag} to target-mkfrag"
diff --context --recursive --show-c-function -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-1.0.2.orig/librx/configure.in egcs-1.0.2/librx/configure.in
*** egcs-1.0.2.orig/librx/configure.in Fri Feb 6 18:15:25 1998
--- egcs-1.0.2/librx/configure.in Tue Mar 3 11:37:08 1998
*************** if test "${shared}" = "yes" ; then
*** 46,51 ****
--- 46,59 ----
i[3456]86-*-*) target_frag=../config/mh-x86pic ;;
*-*-*) target_frag=../config/mh-${target_cpu}pic ;;
esac
+ case ${target_frag} in
+ ../* )
+ if [ ${srcdir} = . ]; then
+ [ -n "${with_target_subdir}" ] && target_frag=../${target_frag}
+ [ -n "${with_multisrctop}" ] && target_frag=${with_multisrctop}${target_frag}
+ fi
+ ;;
+ esac
target_frag=${srcdir}/${target_frag}
fi
if test ! -f "${target_frag}"; then
diff --context --recursive --show-c-function -x CVS -x RCS -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-1.0.2.orig/librx/configure egcs-1.0.2/librx/configure
*** egcs-1.0.2.orig/librx/configure Fri Feb 6 18:15:25 1998
--- egcs-1.0.2/librx/configure Tue Mar 3 11:37:40 1998
*************** if test "${shared}" = "yes" ; then
*** 1303,1308 ****
--- 1303,1316 ----
i345686-*-*) target_frag=../config/mh-x86pic ;;
*-*-*) target_frag=../config/mh-${target_cpu}pic ;;
esac
+ case ${target_frag} in
+ ../* )
+ if [ ${srcdir} = . ]; then
+ [ -n "${with_target_subdir}" ] && target_frag=../${target_frag}
+ [ -n "${with_multisrctop}" ] && target_frag=${with_multisrctop}${target_frag}
+ fi
+ ;;
+ esac
target_frag=${srcdir}/${target_frag}
fi
if test ! -f "${target_frag}"; then