cheng/mpir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to fix libtool issue on MSYS.

Browse Source
This commit is contained in:
William Hart 2015-06-09 23:22:14 +00:00
parent 1693a6ef46
commit bceaa9bf4f
3 changed files with 54 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.guess vendored
View File

@ -134,10 +134,6 @@ EOF
;; ;;
*-pc-mingw64) *-pc-mingw64)
guess_rest="-w64-mingw64";; guess_rest="-w64-mingw64";;
x86_64-pc-msys)
guess_rest="-w64-mingw64";;
i686-pc-msys)
guess_rest="-w64-mingw64";;
esac esac

54
configure vendored
View File

@ -4873,43 +4873,43 @@ echo "include_mpn(\`sparc32/sparc-defs.m4')" >> $gmp_tmpconfigm4i
case $host in case $host in
# NOTE x86_64w and x86_64 paths MUST be the same , for the fat structure # NOTE x86_64w and x86_64 paths MUST be the same , for the fat structure
x86_64-w64-mingw*|x86_64-*-cygwin*) x86_64-pc-msys|x86_64-w64-mingw*|x86_64-*-cygwin*)
path_64="x86_64w" ;; path_64="x86_64w" ;;
netburst-w64-mingw*|netburst-*-cygwin*) netburst-pc-msys|netburst-w64-mingw*|netburst-*-cygwin*)
path_64="x86_64w/netburst x86_64w" ;; path_64="x86_64w/netburst x86_64w" ;;
netburstlahf-w64-mingw*|netburstlahf-*-cygwin*) netburstlahf-pc-msys|netburstlahf-w64-mingw*|netburstlahf-*-cygwin*)
path_64="x86_64w/netburst x86_64w" ;; path_64="x86_64w/netburst x86_64w" ;;
k8-w64-mingw*|k8-*-cygwin*) k8-pc-msys|k8-w64-mingw*|k8-*-cygwin*)
path_64="x86_64w/k8/k8only x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k8only x86_64w/k8 x86_64w" ;;
k10-w64-mingw*|k10-*-cygwin*) k10-pc-msys|k10-w64-mingw*|k10-*-cygwin*)
path_64="x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
k102-w64-mingw*|k102-*-cygwin*) k102-pc-msys|k102-w64-mingw*|k102-*-cygwin*)
path_64="x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
k103-w64-mingw*|k103-*-cygwin*) k103-pc-msys|k103-w64-mingw*|k103-*-cygwin*)
path_64="x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
bulldozer-w64-mingw*|bulldozer-*-cygwin*) bulldozer-pc-msys|bulldozer-w64-mingw*|bulldozer-*-cygwin*)
path_64="x86_64w/bulldozer x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/bulldozer x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
piledriver-w64-mingw*|piledriver-*-cygwin*) piledriver-pc-msys|piledriver-w64-mingw*|piledriver-*-cygwin*)
path_64="x86_64w/bulldozer/piledriver x86_64w/bulldozer x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/bulldozer/piledriver x86_64w/bulldozer x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
bobcat-w64-mingw*|bobcat-*-cygwin*) bobcat-pc-msys|bobcat-w64-mingw*|bobcat-*-cygwin*)
path_64="x86_64w/bobcat x86_64w" ;; path_64="x86_64w/bobcat x86_64w" ;;
core2-w64-mingw*|core2-*-cygwin*) core2-pc-msys|core2-w64-mingw*|core2-*-cygwin*)
path_64="x86_64w/core2 x86_64w" ;; path_64="x86_64w/core2 x86_64w" ;;
penryn-w64-mingw*|penryn-*-cygwin*) penryn-pc-msys|penryn-w64-mingw*|penryn-*-cygwin*)
path_64="x86_64w/core2/penryn x86_64w/core2 x86_64w" ;; path_64="x86_64w/core2/penryn x86_64w/core2 x86_64w" ;;
nehalem-w64-mingw*|nehalem-*-cygwin*) nehalem-pc-msys|nehalem-w64-mingw*|nehalem-*-cygwin*)
path_64="x86_64w/nehalem x86_64w" ;; path_64="x86_64w/nehalem x86_64w" ;;
westmere-w64-mingw*|westmere-*-cygwin*) westmere-pc-msys|westmere-w64-mingw*|westmere-*-cygwin*)
path_64="x86_64w/nehalem/westmere x86_64w/nehalem x86_64w" ;; path_64="x86_64w/nehalem/westmere x86_64w/nehalem x86_64w" ;;
sandybridge-w64-mingw*|sandybridge-*-cygwin*) sandybridge-pc-msys|sandybridge-w64-mingw*|sandybridge-*-cygwin*)
path_64="x86_64w/sandybridge x86_64w" ;; path_64="x86_64w/sandybridge x86_64w" ;;
ivybridge-w64-mingw*|ivybridge-*-cygwin*) ivybridge-pc-msys|ivybridge-w64-mingw*|ivybridge-*-cygwin*)
path_64="x86_64w/sandybridge/ivybridge x86_64w/sandybridge x86_64w" ;; path_64="x86_64w/sandybridge/ivybridge x86_64w/sandybridge x86_64w" ;;
haswell-w64-mingw*|haswell-*-cygwin*) haswell-pc-msys|haswell-w64-mingw*|haswell-*-cygwin*)
path_64="x86_64w/haswell x86_64w/sandybridge x86_64w" ;; path_64="x86_64w/haswell x86_64w/sandybridge x86_64w" ;;
atom-w64-mingw*|atom-*-cygwin*) atom-pc-msys|atom-w64-mingw*|atom-*-cygwin*)
path_64="x86_64w/atom x86_64w" ;; path_64="x86_64w/atom x86_64w" ;;
nano-w64-mingw*|nano-*-cygwin*) nano-pc-msys|nano-w64-mingw*|nano-*-cygwin*)
path_64="x86_64w/k8/k8only x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k8only x86_64w/k8 x86_64w" ;;
x86_64-*-*) x86_64-*-*)
@ -4958,7 +4958,7 @@ echo "include_mpn(\`sparc32/sparc-defs.m4')" >> $gmp_tmpconfigm4i
gcc_64_cflags_arch="" gcc_64_cflags_arch=""
extra_functions_64="$extra_functions_64 fat fat_entry" extra_functions_64="$extra_functions_64 fat fat_entry"
case $host in case $host in
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
path_64="x86_64w x86_64w/fat" path_64="x86_64w x86_64w/fat"
fat_path_64="x86_64w x86_64w/fat x86_64w/netburst x86_64w/k8 x86_64w/k8/k8only x86_64w/k8/k10 x86_64w/k8/k10/k102 x86_64w/core2 x86_64w/core2/penryn x86_64w/nehalem x86_64w/nehalem/westmere x86_64w/atom x86_64w/bobcat x86_64w/sandybridge" ;; fat_path_64="x86_64w x86_64w/fat x86_64w/netburst x86_64w/k8 x86_64w/k8/k8only x86_64w/k8/k10 x86_64w/k8/k10/k102 x86_64w/core2 x86_64w/core2/penryn x86_64w/nehalem x86_64w/nehalem/westmere x86_64w/atom x86_64w/bobcat x86_64w/sandybridge" ;;
*-*-*) *-*-*)
@ -4993,7 +4993,7 @@ esac
# x86s, but allow any CPU here so as to catch "none" too. # x86s, but allow any CPU here so as to catch "none" too.
# #
case $host in case $host in
*-*-mingw*) *-pc-msys|*-*-mingw*)
gcc_cflags_optlist="$gcc_cflags_optlist nocygwin" gcc_cflags_optlist="$gcc_cflags_optlist nocygwin"
gcc_cflags_nocygwin="-mno-cygwin" gcc_cflags_nocygwin="-mno-cygwin"
;; ;;
@ -21975,7 +21975,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
LIBGMP_DLL=0 LIBGMP_DLL=0
case $host in case $host in
*-*-cygwin* | *-*-mingw*) *-pc-msys|*-*-cygwin* | *-*-mingw*)
# By default, build only static. # By default, build only static.
if test -z "$enable_shared"; then if test -z "$enable_shared"; then
enable_shared=no enable_shared=no
@ -23618,7 +23618,7 @@ done
# mingw returns OK on mprotect , but it's broken # mingw returns OK on mprotect , but it's broken
# #
case $host in case $host in
*-*-mingw*) *-pc-msys|*-*-mingw*)
;; ;;
*) *)
for ac_func in mprotect for ac_func in mprotect
@ -24341,7 +24341,7 @@ done
# what follows is not strictly needed and just make gmp_srclinks more # what follows is not strictly needed and just make gmp_srclinks more
# consistent. # consistent.
case $host in case $host in
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
if test "$ABI" = "64"; then if test "$ABI" = "64"; then
old_gmp_srclinks=$gmp_srclinks old_gmp_srclinks=$gmp_srclinks
gmp_srclinks= gmp_srclinks=
@ -25629,7 +25629,7 @@ $as_echo "determined" >&6; }
echo "define(\`JUMPTABSECT',\` .section __DATA,__const')" >> $gmp_tmpconfigm4p echo "define(\`JUMPTABSECT',\` .section __DATA,__const')" >> $gmp_tmpconfigm4p
OBJECT_FORMAT="-f macho64" ;; OBJECT_FORMAT="-f macho64" ;;
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
OBJECT_FORMAT="-f x64" ;; OBJECT_FORMAT="-f x64" ;;
*) *)
OBJECT_FORMAT="-f elf64" ;; OBJECT_FORMAT="-f elf64" ;;
@ -26007,7 +26007,7 @@ subdirs="$subdirs yasm"
#fi #fi
case $host in case $host in
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
if test "$ABI" = "64"; then if test "$ABI" = "64"; then
if test $enable_fat = yes; then if test $enable_fat = yes; then
YASM_MAC_INC=yasm_macwin.inc.fat YASM_MAC_INC=yasm_macwin.inc.fat
@ -28819,7 +28819,7 @@ fi
# now we have created and populated the mpn directory we can rename the files # now we have created and populated the mpn directory we can rename the files
# and post process the "m4 macros" into "yasm macros" # and post process the "m4 macros" into "yasm macros"
case $host in case $host in
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
if test "$ABI" = "64"; then if test "$ABI" = "64"; then
echo "Renaming assembly files on Win64..." echo "Renaming assembly files on Win64..."
for jay in $old_gmp_srclinks; do for jay in $old_gmp_srclinks; do

54
configure.ac
View File

@ -1205,43 +1205,43 @@ case $host in
case $host in case $host in
# NOTE x86_64w and x86_64 paths MUST be the same , for the fat structure # NOTE x86_64w and x86_64 paths MUST be the same , for the fat structure
x86_64-w64-mingw*|x86_64-*-cygwin*) x86_64-pc-msys|x86_64-w64-mingw*|x86_64-*-cygwin*)
path_64="x86_64w" ;; path_64="x86_64w" ;;
netburst-w64-mingw*|netburst-*-cygwin*) netburst-pc-msys|netburst-w64-mingw*|netburst-*-cygwin*)
path_64="x86_64w/netburst x86_64w" ;; path_64="x86_64w/netburst x86_64w" ;;
netburstlahf-w64-mingw*|netburstlahf-*-cygwin*) netburstlahf-pc-msys|netburstlahf-w64-mingw*|netburstlahf-*-cygwin*)
path_64="x86_64w/netburst x86_64w" ;; path_64="x86_64w/netburst x86_64w" ;;
k8-w64-mingw*|k8-*-cygwin*) k8-pc-msys|k8-w64-mingw*|k8-*-cygwin*)
path_64="x86_64w/k8/k8only x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k8only x86_64w/k8 x86_64w" ;;
k10-w64-mingw*|k10-*-cygwin*) k10-pc-msys|k10-w64-mingw*|k10-*-cygwin*)
path_64="x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
k102-w64-mingw*|k102-*-cygwin*) k102-pc-msys|k102-w64-mingw*|k102-*-cygwin*)
path_64="x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
k103-w64-mingw*|k103-*-cygwin*) k103-pc-msys|k103-w64-mingw*|k103-*-cygwin*)
path_64="x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
bulldozer-w64-mingw*|bulldozer-*-cygwin*) bulldozer-pc-msys|bulldozer-w64-mingw*|bulldozer-*-cygwin*)
path_64="x86_64w/bulldozer x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/bulldozer x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
piledriver-w64-mingw*|piledriver-*-cygwin*) piledriver-pc-msys|piledriver-w64-mingw*|piledriver-*-cygwin*)
path_64="x86_64w/bulldozer/piledriver x86_64w/bulldozer x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;; path_64="x86_64w/bulldozer/piledriver x86_64w/bulldozer x86_64w/k8/k10/k102 x86_64w/k8/k10 x86_64w/k8 x86_64w" ;;
bobcat-w64-mingw*|bobcat-*-cygwin*) bobcat-pc-msys|bobcat-w64-mingw*|bobcat-*-cygwin*)
path_64="x86_64w/bobcat x86_64w" ;; path_64="x86_64w/bobcat x86_64w" ;;
core2-w64-mingw*|core2-*-cygwin*) core2-pc-msys|core2-w64-mingw*|core2-*-cygwin*)
path_64="x86_64w/core2 x86_64w" ;; path_64="x86_64w/core2 x86_64w" ;;
penryn-w64-mingw*|penryn-*-cygwin*) penryn-pc-msys|penryn-w64-mingw*|penryn-*-cygwin*)
path_64="x86_64w/core2/penryn x86_64w/core2 x86_64w" ;; path_64="x86_64w/core2/penryn x86_64w/core2 x86_64w" ;;
nehalem-w64-mingw*|nehalem-*-cygwin*) nehalem-pc-msys|nehalem-w64-mingw*|nehalem-*-cygwin*)
path_64="x86_64w/nehalem x86_64w" ;; path_64="x86_64w/nehalem x86_64w" ;;
westmere-w64-mingw*|westmere-*-cygwin*) westmere-pc-msys|westmere-w64-mingw*|westmere-*-cygwin*)
path_64="x86_64w/nehalem/westmere x86_64w/nehalem x86_64w" ;; path_64="x86_64w/nehalem/westmere x86_64w/nehalem x86_64w" ;;
sandybridge-w64-mingw*|sandybridge-*-cygwin*) sandybridge-pc-msys|sandybridge-w64-mingw*|sandybridge-*-cygwin*)
path_64="x86_64w/sandybridge x86_64w" ;; path_64="x86_64w/sandybridge x86_64w" ;;
ivybridge-w64-mingw*|ivybridge-*-cygwin*) ivybridge-pc-msys|ivybridge-w64-mingw*|ivybridge-*-cygwin*)
path_64="x86_64w/sandybridge/ivybridge x86_64w/sandybridge x86_64w" ;; path_64="x86_64w/sandybridge/ivybridge x86_64w/sandybridge x86_64w" ;;
haswell-w64-mingw*|haswell-*-cygwin*) haswell-pc-msys|haswell-w64-mingw*|haswell-*-cygwin*)
path_64="x86_64w/haswell x86_64w/sandybridge x86_64w" ;; path_64="x86_64w/haswell x86_64w/sandybridge x86_64w" ;;
atom-w64-mingw*|atom-*-cygwin*) atom-pc-msys|atom-w64-mingw*|atom-*-cygwin*)
path_64="x86_64w/atom x86_64w" ;; path_64="x86_64w/atom x86_64w" ;;
nano-w64-mingw*|nano-*-cygwin*) nano-pc-msys|nano-w64-mingw*|nano-*-cygwin*)
path_64="x86_64w/k8/k8only x86_64w/k8 x86_64w" ;; path_64="x86_64w/k8/k8only x86_64w/k8 x86_64w" ;;
x86_64-*-*) x86_64-*-*)
@ -1290,7 +1290,7 @@ case $host in
gcc_64_cflags_arch="" gcc_64_cflags_arch=""
extra_functions_64="$extra_functions_64 fat fat_entry" extra_functions_64="$extra_functions_64 fat fat_entry"
case $host in case $host in
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
path_64="x86_64w x86_64w/fat" path_64="x86_64w x86_64w/fat"
fat_path_64="x86_64w x86_64w/fat x86_64w/netburst x86_64w/k8 x86_64w/k8/k8only x86_64w/k8/k10 x86_64w/k8/k10/k102 x86_64w/core2 x86_64w/core2/penryn x86_64w/nehalem x86_64w/nehalem/westmere x86_64w/atom x86_64w/bobcat x86_64w/sandybridge" ;; fat_path_64="x86_64w x86_64w/fat x86_64w/netburst x86_64w/k8 x86_64w/k8/k8only x86_64w/k8/k10 x86_64w/k8/k10/k102 x86_64w/core2 x86_64w/core2/penryn x86_64w/nehalem x86_64w/nehalem/westmere x86_64w/atom x86_64w/bobcat x86_64w/sandybridge" ;;
*-*-*) *-*-*)
@ -1325,7 +1325,7 @@ esac
# x86s, but allow any CPU here so as to catch "none" too. # x86s, but allow any CPU here so as to catch "none" too.
# #
case $host in case $host in
*-*-mingw*) *-pc-msys|*-*-mingw*)
gcc_cflags_optlist="$gcc_cflags_optlist nocygwin" gcc_cflags_optlist="$gcc_cflags_optlist nocygwin"
gcc_cflags_nocygwin="-mno-cygwin" gcc_cflags_nocygwin="-mno-cygwin"
;; ;;
@ -1897,7 +1897,7 @@ LT_INIT([win32-dll])
AC_SUBST(LIBGMP_DLL,0) AC_SUBST(LIBGMP_DLL,0)
case $host in case $host in
*-*-cygwin* | *-*-mingw*) *-pc-msys|*-*-cygwin* | *-*-mingw*)
# By default, build only static. # By default, build only static.
if test -z "$enable_shared"; then if test -z "$enable_shared"; then
enable_shared=no enable_shared=no
@ -2113,7 +2113,7 @@ AC_CHECK_FUNCS(alarm attr_get clock clock_gettime cputime getpagesize getrusage
# mingw returns OK on mprotect , but it's broken # mingw returns OK on mprotect , but it's broken
# #
case $host in case $host in
*-*-mingw*) *-pc-msys|*-*-mingw*)
;; ;;
*) *)
AC_CHECK_FUNCS(mprotect) AC_CHECK_FUNCS(mprotect)
@ -2632,7 +2632,7 @@ done
# what follows is not strictly needed and just make gmp_srclinks more # what follows is not strictly needed and just make gmp_srclinks more
# consistent. # consistent.
case $host in case $host in
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
if test "$ABI" = "64"; then if test "$ABI" = "64"; then
old_gmp_srclinks=$gmp_srclinks old_gmp_srclinks=$gmp_srclinks
gmp_srclinks= gmp_srclinks=
@ -2850,7 +2850,7 @@ if test "$gmp_asm_syntax_testing" != no; then
# hardcoded just for ELF, so redefine it here for Mach-O: # hardcoded just for ELF, so redefine it here for Mach-O:
GMP_DEFINE_RAW(["define(\`JUMPTABSECT',\` .section __DATA,__const')"],POST) GMP_DEFINE_RAW(["define(\`JUMPTABSECT',\` .section __DATA,__const')"],POST)
OBJECT_FORMAT="-f macho64" ;; OBJECT_FORMAT="-f macho64" ;;
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
OBJECT_FORMAT="-f x64" ;; OBJECT_FORMAT="-f x64" ;;
*) *)
OBJECT_FORMAT="-f elf64" ;; OBJECT_FORMAT="-f elf64" ;;
@ -3012,7 +3012,7 @@ AC_CONFIG_SUBDIRS([yasm])
#fi #fi
case $host in case $host in
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
if test "$ABI" = "64"; then if test "$ABI" = "64"; then
if test $enable_fat = yes; then if test $enable_fat = yes; then
YASM_MAC_INC=yasm_macwin.inc.fat YASM_MAC_INC=yasm_macwin.inc.fat
@ -3055,7 +3055,7 @@ AC_OUTPUT
# now we have created and populated the mpn directory we can rename the files # now we have created and populated the mpn directory we can rename the files
# and post process the "m4 macros" into "yasm macros" # and post process the "m4 macros" into "yasm macros"
case $host in case $host in
*-w64-mingw*|*-*-cygwin*) *-pc-msys|*-w64-mingw*|*-*-cygwin*)
if test "$ABI" = "64"; then if test "$ABI" = "64"; then
echo "Renaming assembly files on Win64..." echo "Renaming assembly files on Win64..."
for jay in $old_gmp_srclinks; do for jay in $old_gmp_srclinks; do