Re: gcj libtool patches so far

[Albert Chin]

On Mon, Mar 11, 2002 at 04:11:13PM -0600, Robert Boehne wrote:
> I've re-generated this patch against head using the "Libtool format"
> for patches.  Anyone object to this being committed?
> 
> 2002-03-11  Anthony Green  <address@hidden>
> 
>       * libtool.m4 (AC_LIBTOOL_PROG_CC_C_O): Albert Chin's gcj fix.
>       (AC_LIBTOOL_PROG_COMPILER_PIC): Per Bothner's change for not
>       using -DPIC with gcj.

Ugh. I dislike Per's patch. Ideally, we should keep tag-specific
information outside of the macros. What's being done is a kludge.

> Robert Boehne             Software Engineer
> Ricardo Software   Chicago Technical Center
> TEL: (630)789-0003 x. 238
> FAX: (630)789-0127
> email:  address@hidden
> ? install-sh
> ? mkinstalldirs
> ? missing
> ? INSTALL
> ? COPYING
> ? gcj.patch
> ? demo/hell_static
> ? depdemo/depdemo_static
> ? libltdl/config-h.in
> ? mdemo/mdemo_static
> Index: ChangeLog
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/ChangeLog,v
> retrieving revision 1.1091
> diff -u -r1.1091 ChangeLog
> --- ChangeLog 3 Mar 2002 03:19:54 -0000       1.1091
> +++ ChangeLog 11 Mar 2002 22:09:34 -0000
> @@ -1,3 +1,9 @@
> +2002-03-11  Anthony Green  <address@hidden>
> +
> +     * libtool.m4 (AC_LIBTOOL_PROG_CC_C_O): Albert Chin's gcj fix.
> +     (AC_LIBTOOL_PROG_COMPILER_PIC): Per Bothner's change for not
> +     using -DPIC with gcj.
> +
>  2002-02-09  Gary V. Vaughan  <address@hidden>
>  
>       * NEWS: Updated.
> Index: libtool.m4
> ===================================================================
> RCS file: /cvsroot/libtool/libtool/libtool.m4,v
> retrieving revision 1.249
> diff -u -r1.249 libtool.m4
> --- libtool.m4        3 Mar 2002 03:19:54 -0000       1.249
> +++ libtool.m4        11 Mar 2002 22:09:34 -0000
> @@ -832,8 +832,8 @@
>                  CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"],
>         [$1],[CXX],[save_CXXFLAGS="$CXXFLAGS"
>                  CXXFLAGS="$CXXFLAGS -o out/conftest2.$ac_objext"],
> -       [$1],[GCJ],[save_GCJFLAGS="$GCJFLAGS"
> -                GCJFLAGS="$GCJFLAGS -o out/conftest2.$ac_objext"])
> +       [$1],[GCJ],[save_GCJFLAGS="$CFLAGS"
> +                CFLAGS="$GCJFLAGS -o out/conftest2.$ac_objext"])
>     echo "$lt_simple_compile_test_code" > conftest.$ac_ext
>  
>     # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
> @@ -856,7 +856,7 @@
>     fi
>     ifelse([$1],[],[CFLAGS="$save_CFLAGS"],
>         [$1],[CXX],[CXXFLAGS="$save_CXXFLAGS"],
> -       [$1],[GCJ],[GCJFLAGS="$save_GCJFLAGS"])
> +       [$1],[GCJ],[CFLAGS="$save_CFLAGS"])
>     chmod u+w .
>     $rm conftest* out/*
>     rmdir out
> @@ -3177,7 +3177,7 @@
>  _LT_AC_TAGVAR(objext, $1)=$objext
>  
>  # Code to be used in simple compile tests
> -lt_simple_compile_test_code="class foo {}"
> +lt_simple_compile_test_code="class foo {};"
>  
>  # Code to be used in simple link tests
>  lt_simple_link_test_code='public class conftest { public static void 
> main(String[] argv) {}; }'
> @@ -4316,7 +4316,7 @@
>  if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
>    AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag 
> $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
>      _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
> -    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -DPIC], [],
> +    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[GCJ],[],[ 
> -DPIC])], [],
>      [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
>       "" | " "*) ;;
>       *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" 
> $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
> @@ -4330,7 +4330,7 @@
>      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>      ;;
>    *)
> -    _LT_AC_TAGVAR(lt_prog_compiler_pic, 
> $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) -DPIC"
> +    _LT_AC_TAGVAR(lt_prog_compiler_pic, 
> $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[GCJ],[],[ -DPIC])"
>      ;;
>  esac
>  ])


-- 
albert chin (address@hidden)