source: scripts/patch/gcc/4.4.1/05-java-fixes.patch@ 7314bbe

clfs-3.0.0-systemd systemd
Last change on this file since 7314bbe was ee54da9, checked in by Jim Gifford <clfs@…>, 15 years ago

Updated GCC Script for 4.4.1
  • Property mode set to 100644
File size: 1.8 KB

  • libjava/configure 

    Java can only be built as 1 ABI at the moment. So this switch will all
the disabling of only the java multilib build

diff -Naur gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
    old new  
    10211021                          default=yes
    10221022  --enable-java-maintainer-mode
    10231023                          allow rebuilding of .class and .h files
     1024  --enable-libjava-multilib
     1025                          build libjava as multilib
    10241026  --disable-dependency-tracking  speeds up one-time build
    10251027  --enable-dependency-tracking   do not reject slow dependency extractors
    10261028  --enable-maintainer-mode  enable make rules and dependencies not useful
    … …  
    19731975fi
    19741976
    19751977
     1978# Check whether --enable-libjava-multilib was given.
     1979if test "${enable_libjava_multilib+set}" = set; then
     1980  enableval=$enable_libjava_multilib;
     1981fi
     1982
     1983if test "$enable_libjava_multilib" = no; then
     1984  multilib=no
     1985  ac_configure_args="$ac_configure_args --disable-multilib"
     1986fi
     1987
    19761988# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
    19771989
    19781990

  • libjava/configure.ac 

    diff -Naur gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
    old new  
    139139        [allow rebuilding of .class and .h files]))
    140140AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
    141141
     142AC_ARG_ENABLE(libjava-multilib,
     143        AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
     144if test "$enable_libjava_multilib" = no; then
     145  multilib=no
     146  ac_configure_args="$ac_configure_args --disable-multilib"
     147fi
     148
    142149# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
    143150GCC_NO_EXECUTABLES
    144151
Note: See TracBrowser for help on using the repository browser.