Commit b6806fb0 authored by chrfranke's avatar chrfranke
Browse files

Windows: Use '.win64' in names of 64-bit binary packages.

Use correct 'strip' program when cross-compiling.

git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@3074 4ea69e1a-61f1-4043-bf83-b5c94c648137
parent 3ac98357
...@@ -43,6 +43,9 @@ NOTES FOR FUTURE RELEASES: see TODO file. ...@@ -43,6 +43,9 @@ NOTES FOR FUTURE RELEASES: see TODO file.
<DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE> <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
[CF] Windows: Use '.win64' in names of 64-bit binary packages.
Use correct 'strip' program when cross-compiling.
[CF] Add update script to make targets 'dist' and 'clean', [CF] Add update script to make targets 'dist' and 'clean',
set +x permission, update svn:ignore. set +x permission, update svn:ignore.
......
...@@ -459,9 +459,7 @@ To cross-compile on Debian Linux with gcc-mingw32: ...@@ -459,9 +459,7 @@ To cross-compile on Debian Linux with gcc-mingw32:
To compile statically linked 64-bit version with MinGW-w64: To compile statically linked 64-bit version with MinGW-w64:
./configure --build=$(./config.guess) \ ./configure --build=$(./config.guess) \
--host=x86_64-pc-mingw32 \ --host=x86_64-w64-mingw32 \
CC=x86_64-w64-mingw32-gcc \
CXX=x86_64-w64-mingw32-g++ \
LDFLAGS=-static LDFLAGS=-static
Tested on Cygwin and Linux with MinGW-w64 from Tested on Cygwin and Linux with MinGW-w64 from
......
...@@ -520,9 +520,15 @@ check: ...@@ -520,9 +520,15 @@ check:
if OS_WIN32_MINGW if OS_WIN32_MINGW
# Definitions for Windows distribution # Definitions for Windows distribution
distdir_win32 = $(PACKAGE)-$(VERSION).win32 if OS_WIN64
distzip_win32 = $(PACKAGE)-$(VERSION).win32.zip win_bits = 64
distinst_win32= $(PACKAGE)-$(VERSION).win32-setup.exe else
win_bits = 32
endif
distdir_win32 = $(PACKAGE)-$(VERSION).win$(win_bits)
distzip_win32 = $(PACKAGE)-$(VERSION).win$(win_bits).zip
distinst_win32 = $(PACKAGE)-$(VERSION).win$(win_bits)-setup.exe
exedir_win32 = $(distdir_win32)/bin exedir_win32 = $(distdir_win32)/bin
docdir_win32 = $(distdir_win32)/doc docdir_win32 = $(distdir_win32)/doc
...@@ -605,7 +611,7 @@ syslogevt.check: ...@@ -605,7 +611,7 @@ syslogevt.check:
$(exedir_win32)/%.exe: %.exe $(exedir_win32)/%.exe: %.exe
cp -p $< $@ cp -p $< $@
strip -s $@ if test -n '$(STRIP)'; then $(STRIP) -s $@; else strip -s $@; fi
touch -r $< $@ touch -r $< $@
$(docdir_win32)/%.html: %.html $(docdir_win32)/%.html: %.html
......
...@@ -38,7 +38,7 @@ case "${host}" in ...@@ -38,7 +38,7 @@ case "${host}" in
# to select MinGW gcc. This does no longer work for gcc 4.x. # to select MinGW gcc. This does no longer work for gcc 4.x.
if test "${build}" = "${host}" && test -x /usr/bin/uname && \ if test "${build}" = "${host}" && test -x /usr/bin/uname && \
/usr/bin/uname | grep -i '^CYGWIN' >/dev/null; then /usr/bin/uname | grep -i '^CYGWIN' >/dev/null; then
AC_MSG_CHECKING([whether C and C++ compiler support -mno-cygwin]) AC_MSG_CHECKING([whether $CC and $CXX support -mno-cygwin])
gcc_support_m_no_cygwin=no gcc_support_m_no_cygwin=no
if $CC -v -mno-cygwin >/dev/null 2>&1 && \ if $CC -v -mno-cygwin >/dev/null 2>&1 && \
$CXX -v -mno-cygwin >/dev/null 2>&1; then $CXX -v -mno-cygwin >/dev/null 2>&1; then
...@@ -138,7 +138,7 @@ AC_MSG_RESULT([$libc_have_working_snprintf]) ...@@ -138,7 +138,7 @@ AC_MSG_RESULT([$libc_have_working_snprintf])
# check for __attribute__((packed)) # check for __attribute__((packed))
AH_TEMPLATE(HAVE_ATTR_PACKED, [Define to 1 if C++ compiler supports __attribute__((packed))]) AH_TEMPLATE(HAVE_ATTR_PACKED, [Define to 1 if C++ compiler supports __attribute__((packed))])
AC_MSG_CHECKING([whether C++ compiler supports __attribute__((packed))]) AC_MSG_CHECKING([whether $CXX supports __attribute__((packed))])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [[struct a { int b; } __attribute__((packed));]])], AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [[struct a { int b; } __attribute__((packed));]])],
[gcc_have_attr_packed=yes], [gcc_have_attr_packed=no]) [gcc_have_attr_packed=yes], [gcc_have_attr_packed=no])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [[#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [[#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
...@@ -269,6 +269,7 @@ AC_SUBST(smartmontools_release_time) ...@@ -269,6 +269,7 @@ AC_SUBST(smartmontools_release_time)
AC_MSG_CHECKING([for OS dependent modules and libraries]) AC_MSG_CHECKING([for OS dependent modules and libraries])
dnl if OS not recognized, then use the os_generic modules dnl if OS not recognized, then use the os_generic modules
os_win64=no
case "${host}" in case "${host}" in
*-*-linux*) *-*-linux*)
AC_SUBST([os_deps], ['os_linux.o cciss.o']) AC_SUBST([os_deps], ['os_linux.o cciss.o'])
...@@ -302,7 +303,8 @@ case "${host}" in ...@@ -302,7 +303,8 @@ case "${host}" in
AC_SUBST([os_libs], ['']) ;; AC_SUBST([os_libs], ['']) ;;
*-*-mingw*) *-*-mingw*)
AC_SUBST([os_deps], ['os_win32.o']) AC_SUBST([os_deps], ['os_win32.o'])
AC_SUBST([os_libs], ['']) ;; AC_SUBST([os_libs], [''])
test "$host_cpu" = "x86_64" && os_win64=yes ;;
*-*-darwin*) *-*-darwin*)
AC_SUBST([os_deps], ['os_darwin.o']) AC_SUBST([os_deps], ['os_darwin.o'])
AC_SUBST([os_libs], ['-framework CoreFoundation -framework IOKit']) ;; AC_SUBST([os_libs], ['-framework CoreFoundation -framework IOKit']) ;;
...@@ -345,6 +347,7 @@ dnl Define platform-specific symbol. ...@@ -345,6 +347,7 @@ dnl Define platform-specific symbol.
AM_CONDITIONAL(OS_DARWIN, [echo $host_os | grep '^darwin' > /dev/null]) AM_CONDITIONAL(OS_DARWIN, [echo $host_os | grep '^darwin' > /dev/null])
AM_CONDITIONAL(OS_SOLARIS, [echo $host_os | grep '^solaris' > /dev/null]) AM_CONDITIONAL(OS_SOLARIS, [echo $host_os | grep '^solaris' > /dev/null])
AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null]) AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
AM_CONDITIONAL(OS_WIN64, [test "$os_win64" = "yes"])
AM_CONDITIONAL(OS_FREEBSD, [echo $host_os | grep '^freebsd' > /dev/null]) AM_CONDITIONAL(OS_FREEBSD, [echo $host_os | grep '^freebsd' > /dev/null])
dnl Add -Wall and -W if using g++ and its not already specified. dnl Add -Wall and -W if using g++ and its not already specified.
...@@ -364,7 +367,7 @@ if test "$GXX" = "yes"; then ...@@ -364,7 +367,7 @@ if test "$GXX" = "yes"; then
# Disable strict aliasing rules by default (see ticket #23). # Disable strict aliasing rules by default (see ticket #23).
if test -z "`echo "$CXXFLAGS" | grep "\-f[[no-]]*strict-aliasing" 2> /dev/null`" ; then if test -z "`echo "$CXXFLAGS" | grep "\-f[[no-]]*strict-aliasing" 2> /dev/null`" ; then
AC_MSG_CHECKING([whether g++ supports -fno-strict-aliasing]) AC_MSG_CHECKING([whether $CXX supports -fno-strict-aliasing])
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="-fno-strict-aliasing" CXXFLAGS="-fno-strict-aliasing"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment