Revision: 121472 https://trac.macports.org/changeset/121472 Author: mojca@macports.org Date: 2014-06-26 07:42:00 -0700 (Thu, 26 Jun 2014) Log Message: ----------- mojca/cross: various changes, sync between i686 and x86_64 Modified Paths: -------------- users/mojca/ports/cross/i686-w64-mingw32-binutils/Portfile users/mojca/ports/cross/i686-w64-mingw32-gcc/Portfile users/mojca/ports/cross/mingw-w64/Portfile users/mojca/ports/cross/x86_64-w64-mingw32-binutils/Portfile users/mojca/ports/cross/x86_64-w64-mingw32-gcc/Portfile Modified: users/mojca/ports/cross/i686-w64-mingw32-binutils/Portfile =================================================================== --- users/mojca/ports/cross/i686-w64-mingw32-binutils/Portfile 2014-06-26 12:56:36 UTC (rev 121471) +++ users/mojca/ports/cross/i686-w64-mingw32-binutils/Portfile 2014-06-26 14:42:00 UTC (rev 121472) @@ -11,6 +11,9 @@ crossbinutils.setup ${mingw_target} 2.24 +maintainers mojca openmaintainer +homepage http://mingw-w64.sourceforge.net/ + checksums rmd160 b4aa3ea5ba9d0d9f817b2cf136e7f911f692af8d \ sha256 e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 @@ -31,6 +34,3 @@ ln -s "${mingw_prefix}/bin/${file}" "${destroot}${prefix}/bin/" } } - -maintainers mojca openmaintainer -homepage http://mingw-w64.sourceforge.net/ Modified: users/mojca/ports/cross/i686-w64-mingw32-gcc/Portfile =================================================================== --- users/mojca/ports/cross/i686-w64-mingw32-gcc/Portfile 2014-06-26 12:56:36 UTC (rev 121471) +++ users/mojca/ports/cross/i686-w64-mingw32-gcc/Portfile 2014-06-26 14:42:00 UTC (rev 121472) @@ -9,26 +9,24 @@ set mingw_target ${mingw_arch}-${mingw_name} set mingw_prefix ${prefix}/${mingw_target} -# crossgcc.setup ${mingw_arch}-${mingw_name} 4.9.0 crossgcc.setup ${mingw_arch}-${mingw_name} 4.8.3 subport ${mingw_arch}-${mingw_name}-libgcc {} -# name x86_64-w64-mingw32-gcc +# name i686-w64-mingw32-gcc # set branch [join [lrange [split ${version} .] 0 1] .] maintainers mojca openmaintainer -# for 4.9.0 +checksums rmd160 2c7214ff607cbe822282c04d1d6f9fea765c82c5 \ + sha256 6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e +# for 4.9.0 (which doesn't work yet # checksums rmd160 ac561660744127fa009ae75202d1ac81ac8d7668 \ # sha256 b9b047a97bade9c1c89970bc8e211ff57b7b8998a1730a80a653d329f8ed1257 -checksums rmd160 2c7214ff607cbe822282c04d1d6f9fea765c82c5 \ - sha256 6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e depends_lib-append port:${crossgcc.target}-binutils \ port:${crossgcc.target}-headers -# TODO: check the difference in headers installed by MinGW and those by the compiler!!! - +# TODO: check the difference in headers installed by MinGW and those by the compiler configure.args-append \ --prefix=${mingw_prefix} \ --with-sysroot=${mingw_prefix} \ @@ -51,9 +49,12 @@ } } } else { + depends_lib-append port:${crossgcc.target}-crt + # TODO: test if make && make install works even without pthreads support (just temporary) # build.target all-target-libgcc # destroot.target install-target-libgcc + # TODO: remove files already installed by main port (maybe use registry_port_registered) } # TODO: @@ -61,4 +62,4 @@ # - then build CRT # - then libgcc in the same folder as the compiler was being built (make all-target-libgcc, make install-target-libgcc) # - then pthreads -# - and another build of the compiler (make, make install) \ No newline at end of file +# - and another build of the compiler (make, make install) Modified: users/mojca/ports/cross/mingw-w64/Portfile =================================================================== --- users/mojca/ports/cross/mingw-w64/Portfile 2014-06-26 12:56:36 UTC (rev 121471) +++ users/mojca/ports/cross/mingw-w64/Portfile 2014-06-26 14:42:00 UTC (rev 121472) @@ -89,5 +89,5 @@ destroot.violate_mtree yes } else { - # TODO: make just a placeholder, maybe save the docs + # TODO: make just a placeholder, maybe save the docs; don't install anything } Modified: users/mojca/ports/cross/x86_64-w64-mingw32-binutils/Portfile =================================================================== --- users/mojca/ports/cross/x86_64-w64-mingw32-binutils/Portfile 2014-06-26 12:56:36 UTC (rev 121471) +++ users/mojca/ports/cross/x86_64-w64-mingw32-binutils/Portfile 2014-06-26 14:42:00 UTC (rev 121472) @@ -11,16 +11,26 @@ crossbinutils.setup ${mingw_target} 2.24 +maintainers mojca openmaintainer +homepage http://mingw-w64.sourceforge.net/ + checksums rmd160 b4aa3ea5ba9d0d9f817b2cf136e7f911f692af8d \ sha256 e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 +# TODO: try to use ${prefix} for --prefix and --with-sysroot, +# but figure out how to do that consistently configure.pre_args-delete \ --prefix=${prefix} configure.args-append \ --prefix=${mingw_prefix} \ --with-sysroot=${mingw_prefix} \ + --disable-multilib \ --disable-werror -# --enable-targets=x86_64-${mingw_name},i686-${mingw_name} -maintainers mojca openmaintainer -homepage http://mingw-w64.sourceforge.net/ +# TODO: this code should be removed once --prefix gets fixed +post-destroot { + ui_info "path: ${destroot}${mingw_prefix}/bin" + foreach file [glob -tails -directory ${destroot}${mingw_prefix}/bin ${mingw_target}-*] { + ln -s "${mingw_prefix}/bin/${file}" "${destroot}${prefix}/bin/" + } +} Modified: users/mojca/ports/cross/x86_64-w64-mingw32-gcc/Portfile =================================================================== --- users/mojca/ports/cross/x86_64-w64-mingw32-gcc/Portfile 2014-06-26 12:56:36 UTC (rev 121471) +++ users/mojca/ports/cross/x86_64-w64-mingw32-gcc/Portfile 2014-06-26 14:42:00 UTC (rev 121472) @@ -4,39 +4,55 @@ PortSystem 1.0 PortGroup crossgcc 1.0 -set core_name w64-mingw32 +set mingw_name w64-mingw32 +set mingw_arch x86_64 +set mingw_target ${mingw_arch}-${mingw_name} +set mingw_prefix ${prefix}/${mingw_target} -# or 4.9.0? -crossgcc.setup x86_64-${core_name} 4.8.3 +crossgcc.setup ${mingw_arch}-${mingw_name} 4.8.3 +subport ${mingw_arch}-${mingw_name}-libgcc {} # name x86_64-w64-mingw32-gcc # set branch [join [lrange [split ${version} .] 0 1] .] maintainers mojca openmaintainer -checksums gcc-${version}.tar.bz2 \ - rmd160 2c7214ff607cbe822282c04d1d6f9fea765c82c5 \ +checksums rmd160 2c7214ff607cbe822282c04d1d6f9fea765c82c5 \ sha256 6a8e4f11b185f4fe2ed9d7fc053e80f8c7e73f800c045f51f9d8bea33f080f1e +# for 4.9.0 (which doesn't work yet +# checksums rmd160 ac561660744127fa009ae75202d1ac81ac8d7668 \ +# sha256 b9b047a97bade9c1c89970bc8e211ff57b7b8998a1730a80a653d329f8ed1257 depends_lib-append port:${crossgcc.target}-binutils \ port:${crossgcc.target}-headers -# TODO: check the difference in headers installed by MinGW and those by the compiler!!! - +# TODO: check the difference in headers installed by MinGW and those by the compiler configure.args-append \ - --enable-64bit \ - --with-sysroot=${prefix} \ + --prefix=${mingw_prefix} \ + --with-sysroot=${mingw_prefix} \ + --disable-multilib \ --enable-shared \ --with-dwarf \ --enable-fully-dynamic-string \ --enable-libssp \ --enable-lto -build.target all-gcc -destroot.target install-gcc +if {${subport} eq ${name}} { + build.target all-gcc + destroot.target install-gcc -# TODO: -# - after this is done, we need to build CRT -# - then libgcc in the same folder as the compiler was being built (make all-target-libgcc, make install-target-libgcc) -# - then pthreads -# - and another build of the compiler (make, make install) \ No newline at end of file + # TODO: this code should be removed once --prefix gets fixed + post-destroot { + ui_info "path: ${destroot}${mingw_prefix}/bin" + foreach file [glob -tails -directory ${destroot}${mingw_prefix}/bin ${mingw_target}-*] { + ln -s "${mingw_prefix}/bin/${file}" "${destroot}${prefix}/bin/" + } + } +} else { + depends_lib-append port:${crossgcc.target}-crt + + # TODO: test if make && make install works even without pthreads support (just temporary) + # build.target all-target-libgcc + # destroot.target install-target-libgcc + # TODO: remove files already installed by main port (maybe use registry_port_registered) +}