diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-01-03 05:30:39 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-01-03 05:30:39 +0000 |
| commit | 1a15139d2aa511d63046ecdad09b91fd2d85cf25 (patch) | |
| tree | c462210b02a0e0ab2a28dacbe0331eff2222f018 /x11 | |
| parent | Update to 0.3.1. (diff) | |
Apparently, gcc-3.2.1 on Alpha doesn't like our little libtool recipe when it
comes to gdm2. Change USE_LIBTOOL back to GNU_CONFIGURE, and remove the
associated configure hack. This fixes an ld crash on Alpha, and doesn't seem
to have any adverse effects on x86, either.
Special thanks to Aaron Schroeder <Aaron.Schroeder@qg.com> for letting
me use his Alpha workstation to track this down.
The RELEASE_5_0_0 tag should be adjusted to take this change.
Reported by: bento
Notes
Notes:
svn path=/head/; revision=72335
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm2/Makefile | 2 | ||||
| -rw-r--r-- | x11/gdm2/files/patch-configure | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 1ebd55524914..922e4f9401e1 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -23,7 +23,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gnomehier -USE_LIBTOOL= yes +GNU_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/x11/gdm2/files/patch-configure b/x11/gdm2/files/patch-configure index f0917807b6b8..c7e1c3d22e11 100644 --- a/x11/gdm2/files/patch-configure +++ b/x11/gdm2/files/patch-configure @@ -1,13 +1,5 @@ --- configure.orig Wed Jul 17 17:49:15 2002 +++ configure Wed Jul 17 17:51:03 2002 -@@ -7396,6 +7396,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -8531,6 +8532,8 @@ cat >conftest.$ac_ext <<_ACEOF #line 8532 "configure" |