HaikuPorts
  • Login
  • Preferences
  • Help/Guide
  • Wiki
  • Timeline
  • Roadmap
  • View Tickets
  • Search
  • Port Log
  • Blog

Context Navigation

  • Back to Ticket #498

Ticket #498: classpath-haiku.patch

File classpath-haiku.patch, 7.1 KB (added by korli, 4 years ago)

raw diff for classpath haiku cross-build on Linux

  • classpath-0.98 

    diff -rupN classpath-0.98/configure classpath-0.98.modified/configure
    old new aix[4-9]*) 
    68826882  lt_cv_deplibs_check_method=pass_all 
    68836883  ;; 
    68846884 
    6885 beos*) 
     6885beos* | haiku*) 
    68866886  lt_cv_deplibs_check_method=pass_all 
    68876887  ;; 
    68886888 
    … … $as_echo_n "checking for $compiler optio 
    93269326      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' 
    93279327      ;; 
    93289328 
    9329     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 
     9329    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 
    93309330      # PIC is the default for these OSes. 
     9331      enable-shared=yes 
    93319332      ;; 
    93329333 
    93339334    mingw* | cygwin* | pw32* | os2*) 
    … … EOF 
    98449845      ld_shlibs=no 
    98459846      ;; 
    98469847 
    9847     beos*) 
     9848    beos* | haiku*) 
    98489849      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 
    98499850        allow_undefined_flag=unsupported 
     9851        archive_cmds_need_lc_CXX=no 
    98509852        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc 
    98519853        # support --undefined.  This deserves some investigation.  FIXME 
    9852         archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 
     9854        archive_cmds='$CC -Xlinker --no-undefined -nostart -nostdlib $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 
    98539855      else 
    98549856        ld_shlibs=no 
    98559857      fi 
    … … if test -z "$aix_libpath"; then aix_libp 
    1028010282      ld_shlibs=no 
    1028110283      ;; 
    1028210284 
     10285    beos* | haiku*) 
     10286      archive_cmds_need_lc=no 
     10287      ;; 
     10288 
    1028310289    bsdi[45]*) 
    1028410290      export_dynamic_flag_spec=-rdynamic 
    1028510291      ;; 
    … … amigaos*) 
    1090610912  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' 
    1090710913  ;; 
    1090810914 
    10909 beos*) 
     10915beos* | haiku*) 
    1091010916  library_names_spec='${libname}${shared_ext}' 
    1091110917  dynamic_linker="$host_os ld.so" 
    1091210918  shlibpath_var=LIBRARY_PATH 
    … … else 
    1148711493  lt_cv_dlopen_libs= 
    1148811494 
    1148911495  case $host_os in 
    11490   beos*) 
     11496  beos* | haiku*) 
    1149111497    lt_cv_dlopen="load_add_on" 
    1149211498    lt_cv_dlopen_libs= 
    1149311499    lt_cv_dlopen_self=yes 
    … … if test -z "$aix_libpath"; then aix_libp 
    1339013396    fi 
    1339113397    ;; 
    1339213398 
    13393   beos*) 
     13399  beos* | haiku*) 
    1339413400    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 
    1339513401      allow_undefined_flag_CXX=unsupported 
     13402      archive_cmds_need_lc=no 
    1339613403      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc 
    1339713404      # support --undefined.  This deserves some investigation.  FIXME 
    13398       archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 
     13405      archive_cmds_CXX='$CC -Xlinker -nostart -nostdlib $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` $compiler_flags ${wl}-soname $wl$soname -o $lib' 
    1339913406    else 
    1340013407      ld_shlibs_CXX=no 
    1340113408    fi 
    … … $as_echo_n "checking for $compiler optio 
    1429914306      # like `-m68040'. 
    1430014307      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' 
    1430114308      ;; 
    14302     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 
     14309    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 
    1430314310      # PIC is the default for these OSes. 
    1430414311      ;; 
    1430514312    mingw* | cygwin* | os2* | pw32*) 
    … … amigaos*) 
    1491914926  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' 
    1492014927  ;; 
    1492114928 
    14922 beos*) 
     14929beos* | haiku*) 
    1492314930  library_names_spec='${libname}${shared_ext}' 
    1492414931  dynamic_linker="$host_os ld.so" 
    1492514932  shlibpath_var=LIBRARY_PATH 
    … … $as_echo_n "checking for $compiler optio 
    1605216059      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' 
    1605316060      ;; 
    1605416061 
    16055     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 
     16062    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 
    1605616063      # PIC is the default for these OSes. 
    1605716064      ;; 
    1605816065 
    … … EOF 
    1657016577      ld_shlibs_F77=no 
    1657116578      ;; 
    1657216579 
    16573     beos*) 
     16580    beos* | haiku*) 
    1657416581      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 
    1657516582        allow_undefined_flag_F77=unsupported 
    1657616583        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc 
    … … amigaos*) 
    1756117568  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' 
    1756217569  ;; 
    1756317570 
    17564 beos*) 
     17571beos* | haiku*) 
    1756517572  library_names_spec='${libname}${shared_ext}' 
    1756617573  dynamic_linker="$host_os ld.so" 
    1756717574  shlibpath_var=LIBRARY_PATH 
    … … $as_echo_n "checking for $compiler optio 
    1867418681      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' 
    1867518682      ;; 
    1867618683 
    18677     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 
     18684    beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 
    1867818685      # PIC is the default for these OSes. 
    1867918686      ;; 
    1868018687 
    … … EOF 
    1919219199      ld_shlibs_GCJ=no 
    1919319200      ;; 
    1919419201 
    19195     beos*) 
     19202    beos* | haiku*) 
    1919619203      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then 
    1919719204        allow_undefined_flag_GCJ=unsupported 
    1919819205        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc 
    … … amigaos*) 
    2020320210  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' 
    2020420211  ;; 
    2020520212 
    20206 beos*) 
     20213beos* | haiku*) 
    2020720214  library_names_spec='${libname}${shared_ext}' 
    2020820215  dynamic_linker="$host_os ld.so" 
    2020920216  shlibpath_var=LIBRARY_PATH 

  • native/jni/java-net/java_net_VMNetworkInterface.c 

    diff -rupN classpath-0.98/native/jni/java-net/java_net_VMNetworkInterface.c classpath-0.98.modified/native/jni/java-net/java_net_VMNetworkInterface.c
    old new Java_java_net_VMNetworkInterface_isUp (J 
    315315  } 
    316316  else 
    317317  { 
    318     retval = (flags & (IFF_UP | IFF_RUNNING)) 
     318    retval = (flags & (IFF_UP /*| IFF_RUNNING*/)) 
    319319             ? JNI_TRUE 
    320320             : JNI_FALSE; 
    321321  } 

  • resource/META-INF/services/javax.sound.sampled.spi.MixerProvider 

    diff -rupN classpath-0.98/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider classpath-0.98.modified/resource/META-INF/services/javax.sound.sampled.spi.MixerProvider
    old new  
    1  

Download in other formats:

  • Original Format
Trac Powered

Powered by Trac 0.13dev-r10686
By Edgewall Software.

Visit the Trac open source project at
http://trac.edgewall.org/