0009-libtool-2.4.2.418-msysize-mod.patch 16 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444
  1. diff --git a/build-aux/config.guess b/build-aux/config.guess
  2. index f50dcdb6..cd89e459 100755
  3. --- a/build-aux/config.guess
  4. +++ b/build-aux/config.guess
  5. @@ -883,6 +883,9 @@ EOF
  6. amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
  7. echo x86_64-unknown-cygwin
  8. exit ;;
  9. + amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
  10. + echo x86_64-unknown-msys
  11. + exit ;;
  12. prep*:SunOS:5.*:*)
  13. echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
  14. exit ;;
  15. diff -Naur libtool-2.4.2.418-orig/build-aux/ltmain.sh libtool-2.4.2.418/build-aux/ltmain.sh
  16. --- libtool-2.4.2.418-orig/build-aux/ltmain.sh 2013-10-27 02:53:58.000000000 +0400
  17. +++ libtool-2.4.2.418/build-aux/ltmain.sh 2014-09-02 10:29:08.840800000 +0400
  18. @@ -2315,7 +2315,7 @@
  19. case $host in
  20. # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
  21. # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
  22. - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
  23. + *cygwin* | *msys* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
  24. # don't eliminate duplications in $postdeps and $predeps
  25. opt_duplicate_compiler_generated_deps=:
  26. ;;
  27. @@ -3328,7 +3328,7 @@
  28. # On Cygwin there's no "real" PIC flag so we must build both object types
  29. case $host_os in
  30. - cygwin* | mingw* | pw32* | os2* | cegcc*)
  31. + cygwin* | msys* | mingw* | pw32* | os2* | cegcc*)
  32. pic_mode=default
  33. ;;
  34. esac
  35. @@ -4201,7 +4201,7 @@
  36. 'exit $?'
  37. tstripme=$stripme
  38. case $host_os in
  39. - cygwin* | mingw* | pw32* | cegcc*)
  40. + cygwin* | msys* | mingw* | pw32* | cegcc*)
  41. case $realname in
  42. *.dll.a)
  43. tstripme=
  44. @@ -4307,7 +4307,7 @@
  45. # Do a test to see if this is really a libtool program.
  46. case $host in
  47. - *cygwin* | *mingw*)
  48. + *cygwin* | *msys* | *mingw*)
  49. if func_ltwrapper_executable_p "$file"; then
  50. func_ltwrapper_scriptname "$file"
  51. wrapper=$func_ltwrapper_scriptname_result
  52. @@ -4382,7 +4382,7 @@
  53. # remove .exe since cygwin /usr/bin/install will append another
  54. # one anyway
  55. case $install_prog,$host in
  56. - */usr/bin/install*,*cygwin*)
  57. + */usr/bin/install*,*cygwin* | */usr/bin/install*,*msys*)
  58. case $file:$destfile in
  59. *.exe:*.exe)
  60. # this is ok
  61. @@ -4535,7 +4535,7 @@
  62. $RM $export_symbols
  63. eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
  64. case $host in
  65. - *cygwin* | *mingw* | *cegcc* )
  66. + *cygwin* | *msys* | *mingw* | *cegcc* )
  67. eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
  68. eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
  69. ;;
  70. @@ -4547,7 +4547,7 @@
  71. eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
  72. eval '$MV "$nlist"T "$nlist"'
  73. case $host in
  74. - *cygwin* | *mingw* | *cegcc* )
  75. + *cygwin* | *msys* | *mingw* | *cegcc* )
  76. eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
  77. eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
  78. ;;
  79. @@ -4561,7 +4561,7 @@
  80. func_basename "$dlprefile"
  81. name=$func_basename_result
  82. case $host in
  83. - *cygwin* | *mingw* | *cegcc* )
  84. + *cygwin* | *msys* | *mingw* | *cegcc* )
  85. # if an import library, we need to obtain dlname
  86. if func_win32_import_lib_p "$dlprefile"; then
  87. func_tr_sh "$dlprefile"
  88. @@ -4736,7 +4736,7 @@
  89. # Transform the symbol file into the correct name.
  90. symfileobj=$output_objdir/${my_outputname}S.$objext
  91. case $host in
  92. - *cygwin* | *mingw* | *cegcc* )
  93. + *cygwin* | *msys* | *mingw* | *cegcc* )
  94. if test -f "$output_objdir/$my_outputname.def"; then
  95. compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
  96. finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
  97. @@ -5629,7 +5629,7 @@
  98. {
  99. EOF
  100. case $host in
  101. - *mingw* | *cygwin* )
  102. + *mingw* | *cygwin* | *msys* )
  103. # make stdout use "unix" line endings
  104. echo " setmode(1,_O_BINARY);"
  105. ;;
  106. @@ -6350,7 +6350,7 @@
  107. $debug_cmd
  108. case $host in
  109. - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
  110. + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
  111. # It is impossible to link a dll without this setting, and
  112. # we shouldn't force the makefile maintainer to figure out
  113. # what system we are compiling for in order to pass an extra
  114. @@ -6843,7 +6843,7 @@
  115. ;;
  116. esac
  117. case $host in
  118. - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
  119. + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
  120. testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
  121. case :$dllsearchpath: in
  122. *":$dir:"*) ;;
  123. @@ -6863,7 +6863,7 @@
  124. -l*)
  125. if test X-lc = "X$arg" || test X-lm = "X$arg"; then
  126. case $host in
  127. - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
  128. + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
  129. # These systems don't actually have a C or math library (as such)
  130. continue
  131. ;;
  132. @@ -6946,7 +6946,7 @@
  133. -no-install)
  134. case $host in
  135. - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
  136. + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
  137. # The PATH hackery in wrapper scripts is required on Windows
  138. # and Darwin in order for the loader to find any dlls it needs.
  139. func_warning "'-no-install' is ignored for $host"
  140. @@ -7812,7 +7812,7 @@
  141. fi
  142. case $host in
  143. # special handling for platforms with PE-DLLs.
  144. - *cygwin* | *mingw* | *cegcc* )
  145. + *cygwin* | *msys* | *mingw* | *cegcc* )
  146. # Linker will automatically link against shared library if both
  147. # static and shared are present. Therefore, ensure we extract
  148. # symbols from the import library if a shared library is present
  149. @@ -7956,7 +7956,7 @@
  150. if test -n "$library_names" &&
  151. { test no = "$use_static_libs" || test -z "$old_library"; }; then
  152. case $host in
  153. - *cygwin* | *mingw* | *cegcc* | *os2*)
  154. + *cygwin* | *msys* | *mingw* | *cegcc* | *os2*)
  155. # No point in relinking DLLs because paths are not encoded
  156. func_append notinst_deplibs " $lib"
  157. need_relink=no
  158. @@ -8026,7 +8026,7 @@
  159. elif test -n "$soname_spec"; then
  160. # bleh windows
  161. case $host in
  162. - *cygwin* | mingw* | *cegcc* | *os2*)
  163. + *cygwin* | *msys* | mingw* | *cegcc* | *os2*)
  164. func_arith $current - $age
  165. major=$func_arith_result
  166. versuffix=-$major
  167. @@ -8899,7 +8899,7 @@
  168. if test yes = "$build_libtool_libs"; then
  169. if test -n "$rpath"; then
  170. case $host in
  171. - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
  172. + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
  173. # these systems don't actually have a c library (as such)!
  174. ;;
  175. *-*-rhapsody* | *-*-darwin1.[012])
  176. @@ -9413,7 +9413,7 @@
  177. orig_export_symbols=
  178. case $host_os in
  179. - cygwin* | mingw* | cegcc*)
  180. + cygwin* | *msys* | mingw* | cegcc*)
  181. if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
  182. # exporting using user supplied symfile
  183. func_dll_def_p "$export_symbols" || {
  184. @@ -9970,7 +9970,7 @@
  185. prog)
  186. case $host in
  187. - *cygwin*) func_stripname '' '.exe' "$output"
  188. + *cygwin* | *msys*) func_stripname '' '.exe' "$output"
  189. output=$func_stripname_result.exe;;
  190. esac
  191. test -n "$vinfo" && \
  192. @@ -10081,7 +10081,7 @@
  193. esac
  194. fi
  195. case $host in
  196. - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
  197. + *-*-cygwin* | *-*-msys* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
  198. testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
  199. case :$dllsearchpath: in
  200. *":$libdir:"*) ;;
  201. @@ -10159,7 +10159,7 @@
  202. # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
  203. wrappers_required=false
  204. ;;
  205. - *cygwin* | *mingw* )
  206. + *cygwin* | *msys* | *mingw* )
  207. test yes = "$build_libtool_libs" || wrappers_required=false
  208. ;;
  209. *)
  210. @@ -10305,14 +10305,14 @@
  211. esac
  212. # test for cygwin because mv fails w/o .exe extensions
  213. case $host in
  214. - *cygwin*)
  215. + *cygwin* | *msys*)
  216. exeext=.exe
  217. func_stripname '' '.exe' "$outputname"
  218. outputname=$func_stripname_result ;;
  219. *) exeext= ;;
  220. esac
  221. case $host in
  222. - *cygwin* | *mingw* )
  223. + *cygwin* | *msys* | *mingw* )
  224. func_dirname_and_basename "$output" "" "."
  225. output_name=$func_basename_result
  226. output_path=$func_dirname_result
  227. @@ -10644,7 +10644,7 @@
  228. # tests/bindir.at for full details.
  229. tdlname=$dlname
  230. case $host,$output,$installed,$module,$dlname in
  231. - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
  232. + *cygwin*,*lai,yes,no,*.dll | *msys*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
  233. # If a -bindir argument was supplied, place the dll there.
  234. if test -n "$bindir"; then
  235. func_relative_path "$install_libdir" "$bindir"
  236. diff -Naur libtool-2.4.2.418-orig/m4/libtool.m4 libtool-2.4.2.418/m4/libtool.m4
  237. --- libtool-2.4.2.418-orig/m4/libtool.m4 2013-10-26 03:37:46.000000000 +0400
  238. +++ libtool-2.4.2.418/m4/libtool.m4 2014-09-02 10:19:40.084800000 +0400
  239. @@ -1665,7 +1665,7 @@
  240. lt_cv_sys_max_cmd_len=-1;
  241. ;;
  242. - cygwin* | mingw* | cegcc*)
  243. + cygwin* | msys* | mingw* | cegcc*)
  244. # On Win9x/ME, this test blows up -- it succeeds, but takes
  245. # about 5 minutes as the teststring grows exponentially.
  246. # Worse, since 9x/ME are not pre-emptively multitasking,
  247. @@ -1913,7 +1913,7 @@
  248. lt_cv_dlopen_libs=
  249. ;;
  250. - cygwin*)
  251. + cygwin* | msys*)
  252. lt_cv_dlopen=dlopen
  253. lt_cv_dlopen_libs=
  254. ;;
  255. @@ -2399,7 +2399,7 @@
  256. # libtool to hard-code these into programs
  257. ;;
  258. -cygwin* | mingw* | pw32* | cegcc*)
  259. +cygwin* | msys* | mingw* | pw32* | cegcc*)
  260. version_type=windows
  261. shrext_cmds=.dll
  262. need_version=no
  263. @@ -2431,6 +2431,12 @@
  264. m4_if([$1], [],[
  265. sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
  266. ;;
  267. + msys*)
  268. + # MSYS DLLs use 'msys-' prefix rather than 'lib'
  269. + soname_spec='`echo $libname | sed -e 's/^lib/msys-/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
  270. +m4_if([$1], [],[
  271. + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
  272. + ;;
  273. mingw* | cegcc*)
  274. # MinGW DLLs use traditional 'lib' prefix
  275. soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
  276. @@ -2465,7 +2471,7 @@
  277. # Convert to MSYS style.
  278. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
  279. ;;
  280. - cygwin*)
  281. + cygwin* | msys*)
  282. # Convert to unix form, then to dos form, then back to unix form
  283. # but this time dos style (no spaces!) so that the unix form looks
  284. # like /cygdrive/c/PROGRA~1:/cygdr...
  285. @@ -3203,7 +3209,7 @@
  286. esac
  287. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  288. case $host_os in
  289. - cygwin* | mingw* | pw32* | cegcc*)
  290. + cygwin* | msys* | mingw* | pw32* | cegcc*)
  291. if test yes != "$GCC"; then
  292. reload_cmds=false
  293. fi
  294. @@ -3259,7 +3265,7 @@
  295. lt_cv_file_magic_test_file=/shlib/libc.so
  296. ;;
  297. -cygwin*)
  298. +cygwin* | msys*)
  299. # func_win32_libid is a shell function defined in ltmain.sh
  300. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  301. lt_cv_file_magic_cmd='func_win32_libid'
  302. @@ -3564,7 +3570,7 @@
  303. [lt_cv_sharedlib_from_linklib_cmd='unknown'
  304. case $host_os in
  305. -cygwin* | mingw* | pw32* | cegcc*)
  306. +cygwin* | msys* | mingw* | pw32* | cegcc*)
  307. # two different shell functions defined in ltmain.sh;
  308. # decide which one to use based on capabilities of $DLLTOOL
  309. case `$DLLTOOL --help 2>&1` in
  310. @@ -3634,7 +3640,7 @@
  311. [AC_REQUIRE([AC_CANONICAL_HOST])dnl
  312. LIBM=
  313. case $host in
  314. -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
  315. +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-msys* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
  316. # These system don't have libm, or don't need it
  317. ;;
  318. *-ncr-sysv4.3*)
  319. @@ -3709,7 +3715,7 @@
  320. aix*)
  321. symcode='[[BCDT]]'
  322. ;;
  323. -cygwin* | mingw* | pw32* | cegcc*)
  324. +cygwin* | msys* | mingw* | pw32* | cegcc*)
  325. symcode='[[ABCDGISTW]]'
  326. ;;
  327. hpux*)
  328. @@ -4015,7 +4021,7 @@
  329. beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
  330. # PIC is the default for these OSes.
  331. ;;
  332. - mingw* | cygwin* | os2* | pw32* | cegcc*)
  333. + mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
  334. # This hack is so that the source file can tell whether it is being
  335. # built for inclusion in a dll (and should export symbols for example).
  336. # Although the cygwin gcc ignores -fPIC, still need this for old-style
  337. @@ -4086,7 +4092,7 @@
  338. ;;
  339. esac
  340. ;;
  341. - mingw* | cygwin* | os2* | pw32* | cegcc*)
  342. + mingw* | cygwin* | msys* | os2* | pw32* | cegcc*)
  343. # This hack is so that the source file can tell whether it is being
  344. # built for inclusion in a dll (and should export symbols for example).
  345. m4_if([$1], [GCJ], [],
  346. @@ -4334,7 +4340,7 @@
  347. # PIC is the default for these OSes.
  348. ;;
  349. - mingw* | cygwin* | pw32* | os2* | cegcc*)
  350. + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
  351. # This hack is so that the source file can tell whether it is being
  352. # built for inclusion in a dll (and should export symbols for example).
  353. # Although the cygwin gcc ignores -fPIC, still need this for old-style
  354. @@ -4433,7 +4439,7 @@
  355. esac
  356. ;;
  357. - mingw* | cygwin* | pw32* | os2* | cegcc*)
  358. + mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
  359. # This hack is so that the source file can tell whether it is being
  360. # built for inclusion in a dll (and should export symbols for example).
  361. m4_if([$1], [GCJ], [],
  362. @@ -4699,7 +4705,7 @@
  363. pw32*)
  364. _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
  365. ;;
  366. - cygwin* | mingw* | cegcc*)
  367. + cygwin* | msys* | mingw* | cegcc*)
  368. case $cc_basename in
  369. cl*)
  370. _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
  371. @@ -4757,7 +4763,7 @@
  372. extract_expsyms_cmds=
  373. case $host_os in
  374. - cygwin* | mingw* | pw32* | cegcc*)
  375. + cygwin* | msys* | mingw* | pw32* | cegcc*)
  376. # FIXME: the MSVC++ port hasn't been tested in a loooong time
  377. # When not using gcc, we currently assume that we are using
  378. # Microsoft Visual C++.
  379. @@ -4872,7 +4878,7 @@
  380. fi
  381. ;;
  382. - cygwin* | mingw* | pw32* | cegcc*)
  383. + cygwin* | msys* | mingw* | pw32* | cegcc*)
  384. # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
  385. # as there is no search path for DLLs.
  386. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  387. @@ -5247,7 +5253,7 @@
  388. _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
  389. ;;
  390. - cygwin* | mingw* | pw32* | cegcc*)
  391. + cygwin* | msys* | mingw* | pw32* | cegcc*)
  392. # When not using gcc, we currently assume that we are using
  393. # Microsoft Visual C++.
  394. # hardcode_libdir_flag_spec is actually meaningless, as there is
  395. @@ -6241,7 +6247,7 @@
  396. esac
  397. ;;
  398. - cygwin* | mingw* | pw32* | cegcc*)
  399. + cygwin* | msys* | mingw* | pw32* | cegcc*)
  400. case $GXX,$cc_basename in
  401. ,cl* | no,cl*)
  402. # Native MSVC
  403. @@ -7937,7 +7943,7 @@
  404. *-*-mingw* ) # actually msys
  405. lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  406. ;;
  407. - *-*-cygwin* )
  408. + *-*-cygwin* | *-*-msys* )
  409. lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  410. ;;
  411. * ) # otherwise, assume *nix
  412. @@ -7945,12 +7951,12 @@
  413. ;;
  414. esac
  415. ;;
  416. - *-*-cygwin* )
  417. + *-*-cygwin* | *-*-msys* )
  418. case $build in
  419. *-*-mingw* ) # actually msys
  420. lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  421. ;;
  422. - *-*-cygwin* )
  423. + *-*-cygwin* | *-*-msys* )
  424. lt_cv_to_host_file_cmd=func_convert_file_noop
  425. ;;
  426. * ) # otherwise, assume *nix