Support both cygwin32 and cygwin64

1 files changed, 114 insertions, 192 deletions

diff --git a/macros.cygwin b/macros.cygwin
index f66a5c4..85aedd6 100644
--- a/macros.cygwin
+++ b/macros.cygwin
@@ -1,202 +1,124 @@
-# RPM macros for Fedora Cygwin.
+# RPM macros for the Fedora MinGW Cross Compiler collection
 
-%_cygwin_target          i686-pc-cygwin
+%cygwin_build_targets        cygwin32 cygwin64
+%cygwin_build_32bit          1
+%cygwin_build_64bit          1
 
-# Paths.
-%_cygwin_sysroot         %{_prefix}/%{_cygwin_target}/sys-root
-%_cygwin_prefix          %{_cygwin_sysroot}/usr
-%_cygwin_exec_prefix     %{_cygwin_prefix}
-%_cygwin_bindir          %{_cygwin_exec_prefix}/bin
-%_cygwin_sbindir         %{_cygwin_exec_prefix}/sbin
-%_cygwin_libexecdir      %{_cygwin_exec_prefix}/lib
-%_cygwin_libdir          %{_cygwin_exec_prefix}/lib
-%_cygwin_datadir         %{_cygwin_prefix}/share
-%_cygwin_docdir          %{_cygwin_prefix}/share/doc
-%_cygwin_infodir         %{_cygwin_prefix}/share/info
-%_cygwin_mandir          %{_cygwin_prefix}/share/man
-%_cygwin_sysconfdir      %{_cygwin_sysroot}/etc
-%_cygwin_sharedstatedir  %{_cygwin_sysroot}/srv
-%_cygwin_localstatedir   %{_cygwin_sysroot}/var
-%_cygwin_includedir      %{_cygwin_prefix}/include
+%cygwin_strip                cygwin-strip
+%cygwin_objdump              cygwin-objdump
+%cygwin_objcopy              cygwin-objcopy
 
-# Build macros.
-%_cygwin_host            %{_cygwin_target}
+%cygwin_findprovides         %{_rpmconfigdir}/cygwin-find-provides.sh %{cygwin_build_targets}
+%cygwin_findrequires         %{_rpmconfigdir}/cygwin-find-requires.sh %{cygwin_build_targets}
+%cygwin_finddebuginfo        %{_rpmconfigdir}/cygwin-find-debuginfo.sh
 
-%_cygwin_cflags          -O2 -g -pipe -Wall
+%cygwin_find_lang            %{_rpmconfigdir}/cygwin-find-lang.sh %{buildroot}
 
-%_cygwin_cc              %{_cygwin_target}-gcc
-%_cygwin_cxx             %{_cygwin_target}-g++
-%_cygwin_cpp             %{_cygwin_target}-gcc -E
-%_cygwin_addr2line       %{_cygwin_target}-addr2line
-%_cygwin_ar              %{_cygwin_target}-ar
-%_cygwin_as              %{_cygwin_target}-as
-%_cygwin_c++             %{_cygwin_target}-c++
-%_cygwin_c++filt         %{_cygwin_target}-c++filt
-%_cygwin_dlltool         %{_cygwin_target}-dlltool
-%_cygwin_dllwrap         %{_cygwin_target}-dllwrap
-%_cygwin_gcov            %{_cygwin_target}-gcov
-%_cygwin_gprof           %{_cygwin_target}-gprof
-%_cygwin_ld              %{_cygwin_target}-ld
-%_cygwin_nm              %{_cygwin_target}-nm
-%_cygwin_objcopy         %{_cygwin_target}-objcopy
-%_cygwin_objdump         %{_cygwin_target}-objdump
-%_cygwin_ranlib          %{_cygwin_target}-ranlib
-%_cygwin_readelf         %{_cygwin_target}-readelf
-%_cygwin_size            %{_cygwin_target}-size
-%_cygwin_strings         %{_cygwin_target}-strings
-%_cygwin_strip           %{_cygwin_target}-strip
-%_cygwin_windmc          %{_cygwin_target}-windmc
-%_cygwin_windres         %{_cygwin_target}-windres
+%cygwin_debug_install_post   %{cygwin_finddebuginfo} %{_builddir}/%{?buildsubdir} %{cygwin_build_targets}
 
-%_cygwin_qmake           %{_cygwin_target}-qmake
-%_cygwin_moc             %{_cygwin_target}-moc
-%_cygwin_rcc             %{_cygwin_target}-rcc
-%_cygwin_uic             %{_cygwin_target}-uic
-%_cygwin_uic3            %{_cygwin_target}-uic3
-%_cygwin_lrelease        %{_cygwin_target}-lrelease
-%_cygwin_lupdate         %{_cygwin_target}-lupdate
-%_cygwin_qdbuscpp2xml    %{_cygwin_target}-qdbuscpp2xml
-%_cygwin_qdbusxml2cpp    %{_cygwin_target}-qdbusxml2cpp
-
-%_cygwin_cache           cygwin-config.cache
-
-%_cygwin_findprovides    /usr/lib/rpm/cygwin-find-provides.sh
-%_cygwin_findrequires    /usr/lib/rpm/cygwin-find-requires.sh
-%_cygwin_finddebuginfo   /usr/lib/rpm/cygwin-find-debuginfo.sh
-
-%_cygwin_debug_install_post   \
-   /usr/lib/rpm/cygwin-find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+%cygwin_debug_package              \
+%if 0%{?cygwin_build_32bit} == 1   \
+%{?cygwin32_debug_package}         \
+%endif                             \
+%if 0%{?cygwin_build_64bit} == 1   \
+%{?cygwin64_debug_package}         \
+%endif                             \
 %{nil}
 
-
-# Template for debug sub-package.
-%_cygwin_debug_package(n:) \
-%package %{-n:-n %{-n*}-}debuginfo \
-Summary: Debug information for package %{name} \
-Group: Development/Debug \
-%description %{-n:-n %{-n*}-}debuginfo \
-This package provides debug information for package %{name}.\
-Debug information is useful when developing applications that use this\
-package or when debugging this package.\
-%files debuginfo -f debugfiles.list\
-%defattr(-,root,root,-)\
+%cygwin_package_header                                        \
+%global __strip %{cygwin_strip}                               \
+%global __objdump %{cygwin_objdump}                           \
+%if 0%{?rhel} == 6                                            \
+%global _use_internal_dependency_generator 0                  \
+%global __find_requires %{cygwin_findrequires}                \
+%global __find_provides %{cygwin_findprovides}                \
+%endif                                                        \
+%global __debug_install_post %%{cygwin_debug_install_post}    \
 %{nil}
 
-%_cygwin_env HOST_CC=gcc; export HOST_CC; \
-  PKG_CONFIG_LIBDIR="%{_cygwin_libdir}/pkgconfig:%{_cygwin_datadir}/pkgconfig:%{_datadir}/pkgconfig"; \
-  export PKG_CONFIG_LIBDIR; \
-  unset PKG_CONFIG_PATH; \
-  _PREFIX="%{_bindir}/%{_cygwin_target}-"; \
-  for i in `ls -1 ${_PREFIX}* | grep -v 'gcc-'`; do \
-    x=`echo $i|sed "s,${_PREFIX},,"|tr "a-z+-\." "A-ZX__"`; \
-    declare -x $x="$i" ; export $x; \
-  done; \
-  unset _PREFIX; \
-  CC="${cygwin_CC:-%_cygwin_cc}"; export CC; \
-  CFLAGS="${cygwin_CFLAGS:-%_cygwin_cflags}"; export CFLAGS; \
-  if [ -x "%{_bindir}/%{_cygwin_cxx}" ]; then \
-    CXX="${cygwin_CXX:-%_cygwin_cxx}"; export CXX; \
-    CXXFLAGS="${cygwin_CXXFLAGS:-%_cygwin_cflags}"; export CXXFLAGS; \
-  else \
-    CXX=; export CXX; \
-    ac_cv_prog_CXX=no; export ac_cv_prog_CXX; \
-    CXXFLAGS=; export CXXFLAGS; \
-  fi; \
-  for i in `ls %{_bindir}/*|grep -- "[-_]config\$"` ; do \
-    case $i in *pkg-config) continue ; esac ; \
-    x=`basename $i|tr "a-z+-\." "A-ZX__"`; \
-    declare -x $x="no" ; export $x; \
-    declare -x ac_cv_path_$x="no" ; export ac_cv_path_$x; \
-  done; \
-  for i in `ls %{_cygwin_bindir}/*|grep -- "[-_]config\$"` ; do \
-    x=`basename $i|tr "a-z+-\." "A-ZX__"`; \
-    declare -x $x="$i" ; export $x; \
-    declare -x ac_cv_path_$x="$i" ; export ac_cv_path_$x; \
-  done; \
-  if [ -x %{_cygwin_bindir}/autopoint ]; then \
-    eval gettext_`grep '^version=' %{_cygwin_bindir}/autopoint`; \
-    AUTOPOINT="%{_cygwin_bindir}/autopoint -V $gettext_version" ; export AUTOPOINT; \
-  fi; \
-  if [ -x %{_cygwin_bindir}/libtoolize ]; then \
-    LIBTOOLIZE=%{_cygwin_bindir}/libtoolize; export LIBTOOLIZE; \
-  fi; \
-  unset x i
-
-%_cygwin_pkg_config \
-  PKG_CONFIG_LIBDIR="%{_cygwin_libdir}/pkgconfig:%{_cygwin_datadir}/pkgconfig:%{_datadir}/pkgconfig"; \
-  export PKG_CONFIG_LIBDIR; \
-  pkg-config
-
-%_cygwin_autoreconf %{_cygwin_env} ; \
-  autoreconf -f -i -I %{_cygwin_datadir}/aclocal
-
-%_cygwin_configure %{_cygwin_env} ; \
-  __cygwin_topdir=.; if ! test -x configure; then __cygwin_topdir=..; fi; \\\
-  $__cygwin_topdir/configure --cache-file=%{_cygwin_cache} \\\
-	--host=%{_cygwin_host} \\\
-	--build=%_build \\\
-	--target=%{_cygwin_target} \\\
-	--prefix=%{_cygwin_prefix} \\\
-	--exec-prefix=%{_cygwin_exec_prefix} \\\
-	--bindir=%{_cygwin_bindir} \\\
-	--sbindir=%{_cygwin_sbindir} \\\
-	--sysconfdir=%{_cygwin_sysconfdir} \\\
-	--datadir=%{_cygwin_datadir} \\\
-	--includedir=%{_cygwin_includedir} \\\
-	--libdir=%{_cygwin_libdir} \\\
-	--libexecdir=%{_cygwin_libexecdir} \\\
-	--localstatedir=%{_cygwin_localstatedir} \\\
-	--sharedstatedir=%{_cygwin_sharedstatedir} \\\
-	--mandir=%{_cygwin_mandir} \\\
-	--infodir=%{_cygwin_infodir}
-
-%_cygwin_make %{_cygwin_env} ; \
-  make \\\
-	prefix=%{_cygwin_prefix} \\\
-	exec_prefix=%{_cygwin_exec_prefix} \\\
-	bindir=%{_cygwin_bindir} \\\
-	sbindir=%{_cygwin_sbindir} \\\
-	sysconfdir=%{_cygwin_sysconfdir} \\\
-	datadir=%{_cygwin_datadir} \\\
-	includedir=%{_cygwin_includedir} \\\
-	libdir=%{_cygwin_libdir} \\\
-	libexecdir=%{_cygwin_libexecdir} \\\
-	localstatedir=%{_cygwin_localstatedir} \\\
-	sharedstatedir=%{_cygwin_sharedstatedir} \\\
-	mandir=%{_cygwin_mandir} \\\
-	infodir=%{_cygwin_infodir}
-
-%_cygwin_makeinstall %{_cygwin_env} ; \
-  make \\\
-	prefix=%{?buildroot:%{buildroot}}%{_cygwin_prefix} \\\
-	exec_prefix=%{?buildroot:%{buildroot}}%{_cygwin_exec_prefix} \\\
-	bindir=%{?buildroot:%{buildroot}}%{_cygwin_bindir} \\\
-	sbindir=%{?buildroot:%{buildroot}}%{_cygwin_sbindir} \\\
-	sysconfdir=%{?buildroot:%{buildroot}}%{_cygwin_sysconfdir} \\\
-	datadir=%{?buildroot:%{buildroot}}%{_cygwin_datadir} \\\
-	includedir=%{?buildroot:%{buildroot}}%{_cygwin_includedir} \\\
-	libdir=%{?buildroot:%{buildroot}}%{_cygwin_libdir} \\\
-	libexecdir=%{?buildroot:%{buildroot}}%{_cygwin_libexecdir} \\\
-	localstatedir=%{?buildroot:%{buildroot}}%{_cygwin_localstatedir} \\\
-	sharedstatedir=%{?buildroot:%{buildroot}}%{_cygwin_sharedstatedir} \\\
-	mandir=%{?buildroot:%{buildroot}}%{_cygwin_mandir} \\\
-	infodir=%{?buildroot:%{buildroot}}%{_cygwin_infodir} \\\
-  install
-
-%_cygwin_cmake %{_cygwin_env} ; \
-  %__cmake \\\
-        -Wno-dev \\\
-        -DCMAKE_VERBOSE_MAKEFILE=ON \\\
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_cygwin_prefix} \\\
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{_cygwin_libdir} \\\
-        -DINCLUDE_INSTALL_DIR:PATH=%{_cygwin_includedir} \\\
-        -DLIB_INSTALL_DIR:PATH=%{_cygwin_libdir} \\\
-        -DSYSCONF_INSTALL_DIR:PATH=%{_cygwin_sysconfdir} \\\
-        -DSHARE_INSTALL_PREFIX:PATH=%{_cygwin_datadir} \\\
-        %{?_cmake_skip_rpath} \\\
-        -DBUILD_SHARED_LIBS:BOOL=ON \\\
-        -DCMAKE_TOOLCHAIN_FILE=/usr/share/cygwin/Toolchain-cygwin.cmake
-
-%_cygwin_description This is the cross-compiled version of this library / tool.\
-You should only install this package if you want to cross-compile programs for \
-Cygwin.
+%cygwin_configure                                      \
+run_cygwin_configure()                                 \
+{                                                      \
+%if 0%{?cygwin_build_32bit} == 1                       \
+mkdir build_32bit$CYGWIN_BUILDDIR_SUFFIX               \
+pushd build_32bit$CYGWIN_BUILDDIR_SUFFIX               \
+    %{?cygwin32_configure} "$@"                        \
+popd                                                   \
+%endif                                                 \
+%if 0%{?cygwin_build_64bit} == 1                       \
+mkdir build_64bit$CYGWIN_BUILDDIR_SUFFIX               \
+pushd build_64bit$CYGWIN_BUILDDIR_SUFFIX               \
+    %{?cygwin64_configure} "$@"                        \
+popd                                                   \
+%endif                                                 \
+}                                                      \
+run_cygwin_configure
+
+%cygwin_make                                                        \
+run_cygwin_make()                                                   \
+{                                                                   \
+%if 0%{?cygwin_build_32bit} == 1                                    \
+make -C build_32bit$CYGWIN_BUILDDIR_SUFFIX "$@" $CYGWIN32_MAKE_ARGS \
+%endif                                                              \
+%if 0%{?cygwin_build_64bit} == 1                                    \
+make -C build_64bit$CYGWIN_BUILDDIR_SUFFIX "$@" $CYGWIN64_MAKE_ARGS \
+%endif                                                              \
+}                                                                   \
+run_cygwin_make
+
+%cygwin_cmake                                          \
+run_cygwin_cmake()                                     \
+{                                                      \
+%if 0%{?cygwin_build_32bit} == 1                       \
+mkdir build_32bit$CYGWIN_BUILDDIR_SUFFIX               \
+pushd build_32bit$CYGWIN_BUILDDIR_SUFFIX               \
+    %{?cygwin32_cmake "$@"}                            \
+popd                                                   \
+%endif                                                 \
+%if 0%{?cygwin_build_64bit} == 1                       \
+mkdir build_64bit$CYGWIN_BUILDDIR_SUFFIX               \
+pushd build_64bit$CYGWIN_BUILDDIR_SUFFIX               \
+    %{?cygwin64_cmake "$@"}                            \
+popd                                                   \
+%endif                                                 \
+}                                                      \
+run_cygwin_cmake
+
+%cygwin_cmake_kde4                                     \
+run_cygwin_cmake_kde4()                                \
+{                                                      \
+%if 0%{?cygwin_build_32bit} == 1                       \
+mkdir build_32bit$CYGWIN_BUILDDIR_SUFFIX               \
+pushd build_32bit$CYGWIN_BUILDDIR_SUFFIX               \
+    %{?cygwin32_cmake_kde4 "$@"}                       \
+popd                                                   \
+%endif                                                 \
+%if 0%{?cygwin_build_64bit} == 1                       \
+mkdir build_64bit$CYGWIN_BUILDDIR_SUFFIX               \
+pushd build_64bit$CYGWIN_BUILDDIR_SUFFIX               \
+    %{?cygwin64_cmake_kde4 "$@"}                       \
+popd                                                   \
+%endif                                                 \
+}                                                      \
+run_cygwin_cmake_kde4
+
+%cygwin_qmake_qt4                                      \
+run_cygwin_qmake_qt4()                                 \
+{                                                      \
+%if 0%{?cygwin_build_32bit} == 1                       \
+mkdir build_32bit$CYGWIN_BUILDDIR_SUFFIX               \
+pushd build_32bit$CYGWIN_BUILDDIR_SUFFIX               \
+    %{?cygwin32_qmake_qt4} "$@"                        \
+popd                                                   \
+%endif                                                 \
+%if 0%{?cygwin_build_64bit} == 1                       \
+mkdir build_64bit$CYGWIN_BUILDDIR_SUFFIX               \
+pushd build_64bit$CYGWIN_BUILDDIR_SUFFIX               \
+    %{?cygwin64_qmake_qt4} "$@"                        \
+popd                                                   \
+%endif                                                 \
+}                                                      \
+run_cygwin_qmake_qt4
+
+# Deprecated:
+%cygwin_make_install         %cygwin_make install