Other shared files
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 

141 lines
6.6 KiB

  1. --- admin/libtool.m4.in.orig Fri Feb 7 13:54:41 2003
  2. +++ admin/libtool.m4.in Fri Feb 7 13:55:58 2003
  3. @@ -1020,6 +1020,7 @@
  4. aix4* | aix5*)
  5. version_type=linux
  6. + hardcode_into_libs=yes
  7. if test "$host_cpu" = ia64; then
  8. # AIX 5 supports IA64
  9. library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
  10. @@ -2463,20 +2464,8 @@
  11. exp_sym_flag='-Bexport'
  12. no_entry_flag=""
  13. else
  14. - aix_use_runtimelinking=no
  15. -
  16. - # Test if we are trying to use run time linking or normal
  17. - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
  18. - # need to do runtime linking.
  19. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
  20. - for ld_flag in $LDFLAGS; do
  21. - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
  22. - aix_use_runtimelinking=yes
  23. - break
  24. - fi
  25. - done
  26. - esac
  27. -
  28. + # KDE requires run time linking. Make it the default.
  29. + aix_use_runtimelinking=yes
  30. exp_sym_flag='-bexport'
  31. no_entry_flag='-bnoentry'
  32. fi
  33. @@ -2522,16 +2511,15 @@
  34. shared_flag='-G'
  35. else
  36. if test "$aix_use_runtimelinking" = yes; then
  37. - shared_flag='${wl}-G'
  38. + shared_flag='-qmkshrobj ${wl}-G'
  39. else
  40. - shared_flag='${wl}-bM:SRE'
  41. + shared_flag='-qmkshrobj'
  42. fi
  43. fi
  44. fi
  45. - # It seems that -bexpall does not export symbols beginning with
  46. - # underscore (_), so it is better to generate a list of symbols to export.
  47. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
  48. + # Let the compiler handle the export list.
  49. + _LT_AC_TAGVAR(always_export_symbols, $1)=no
  50. if test "$aix_use_runtimelinking" = yes; then
  51. # Warning - without using the other runtime loading flags (-brtl),
  52. # -berok will link without error, but may produce a broken library.
  53. @@ -2540,7 +2528,8 @@
  54. _LT_AC_SYS_LIBPATH_AIX
  55. _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  56. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  57. + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
  58. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  59. else
  60. if test "$host_cpu" = ia64; then
  61. _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
  62. @@ -4636,20 +4625,9 @@
  63. else
  64. _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
  65. fi
  66. - aix_use_runtimelinking=no
  67. -
  68. - # Test if we are trying to use run time linking or normal
  69. - # AIX style linking. If -brtl is somewhere in LDFLAGS, we
  70. - # need to do runtime linking.
  71. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
  72. - for ld_flag in $LDFLAGS; do
  73. - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
  74. - aix_use_runtimelinking=yes
  75. - break
  76. - fi
  77. - done
  78. - esac
  79. + # KDE requires run time linking. Make it the default.
  80. + aix_use_runtimelinking=yes
  81. exp_sym_flag='-bexport'
  82. no_entry_flag='-bnoentry'
  83. fi
  84. @@ -4695,24 +4673,24 @@
  85. shared_flag='-G'
  86. else
  87. if test "$aix_use_runtimelinking" = yes; then
  88. - shared_flag='${wl}-G'
  89. + shared_flag='-qmkshrobj ${wl}-G'
  90. else
  91. - shared_flag='${wl}-bM:SRE'
  92. + shared_flag='-qmkshrobj'
  93. fi
  94. fi
  95. fi
  96. - # It seems that -bexpall does not export symbols beginning with
  97. - # underscore (_), so it is better to generate a list of symbols to export.
  98. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes
  99. + # Let the compiler handle the export list.
  100. + _LT_AC_TAGVAR(always_export_symbols, $1)=no
  101. if test "$aix_use_runtimelinking" = yes; then
  102. # Warning - without using the other runtime loading flags (-brtl),
  103. # -berok will link without error, but may produce a broken library.
  104. _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
  105. # Determine the default libpath from the value encoded in an empty executable.
  106. - _LT_AC_SYS_LIBPATH_AIX
  107. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  108. - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  109. + _LT_AC_SYS_LIBPATH_AIX
  110. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  111. + _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
  112. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  113. else
  114. if test "$host_cpu" = ia64; then
  115. _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
  116. --- admin/ltmain.sh.orig Fri Feb 7 13:54:46 2003
  117. +++ admin/ltmain.sh Fri Feb 7 13:54:57 2003
  118. @@ -3919,6 +3919,17 @@
  119. finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
  120. fi
  121. + # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
  122. + # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
  123. + # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
  124. + # This does not apply on AIX for ia64, which uses a SysV linker.
  125. + case "$host" in
  126. + ia64-*-aix5*) ;;
  127. + *-*-aix4* | *-*-aix5*)
  128. + compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
  129. + finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
  130. + esac
  131. +
  132. if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
  133. # Replace the output file specification.
  134. compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`