You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/06/08 08:25:14 UTC
cvs commit: apr/test Makefile.in
jorton 2004/06/07 23:25:14
Modified: test Makefile.in
Log:
* test/Makefile.in: Revert broken r1.161.
Revision Changes Path
1.162 +0 -4 apr/test/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/test/Makefile.in,v
retrieving revision 1.161
retrieving revision 1.162
diff -d -w -u -r1.161 -r1.162
--- Makefile.in 7 Jun 2004 21:21:35 -0000 1.161
+++ Makefile.in 8 Jun 2004 06:25:13 -0000 1.162
@@ -71,11 +71,7 @@
$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -c $(srcdir)/mod_test.c && touch $@
mod_test.la: mod_test.slo $(LOCAL_LIBS)
-<<<<<<< Makefile.in
- $(LIBTOOL) --mode=link $(COMPILE) -rpath $(srcdir) -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-=======
$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
->>>>>>> 1.159
libmod_test.la: mod_test.slo $(LOCAL_LIBS)
$(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -avoid-version mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
Re: cvs commit: apr/test Makefile.in
Posted by Joe Orton <jo...@redhat.com>.
On Wed, Jun 09, 2004 at 01:35:17PM +0100, David Reid wrote:
> > libmod_test.la: mod_test.slo $(LOCAL_LIBS)
> > $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath
> `pwd` -avoid-version mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
> >
>
> On BeOS we need to add libapr-1 to the link in order to build these. The
> patches I had a while back weren't suitable for all platforms, so any chance
> someone "in the know" could look at it? Basic issue is we need all symbols
> resolvable at link time.
It should work on HEAD now.
joe
Re: cvs commit: apr/test Makefile.in
Posted by David Reid <da...@jetnet.co.uk>.
> Index: Makefile.in
> ===================================================================
> RCS file: /home/cvs/apr/test/Makefile.in,v
> retrieving revision 1.161
> retrieving revision 1.162
> diff -d -w -u -r1.161 -r1.162
> --- Makefile.in 7 Jun 2004 21:21:35 -0000 1.161
> +++ Makefile.in 8 Jun 2004 06:25:13 -0000 1.162
> @@ -71,11 +71,7 @@
> $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -c
$(srcdir)/mod_test.c && touch $@
>
> mod_test.la: mod_test.slo $(LOCAL_LIBS)
> -<<<<<<< Makefile.in
> - $(LIBTOOL) --mode=link $(COMPILE) -rpath
$(srcdir) -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o
$@
> -=======
> $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath
`pwd` -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
> ->>>>>>> 1.159
>
> libmod_test.la: mod_test.slo $(LOCAL_LIBS)
> $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath
`pwd` -avoid-version mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
>
On BeOS we need to add libapr-1 to the link in order to build these. The
patches I had a while back weren't suitable for all platforms, so any chance
someone "in the know" could look at it? Basic issue is we need all symbols
resolvable at link time.
Thanks!
david