diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-07-12 04:10:48 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-07-12 04:10:48 +0000 |
commit | 1eb9db07beb817256d706ee22f43dcd675171570 (patch) | |
tree | 043706048e3f953ebcda4a76104aa2f751bbd201 /dev-libs | |
parent | use -c rather than -S when testing flags so that we can check for assembler f... (diff) | |
download | historical-1eb9db07beb817256d706ee22f43dcd675171570.tar.gz historical-1eb9db07beb817256d706ee22f43dcd675171570.tar.bz2 historical-1eb9db07beb817256d706ee22f43dcd675171570.zip |
Add more mingw support -- respect RC/WINDRES settings, check ming64 hosts, and only use --noexecstack if the toolchain supports it #373743 by Bertrand Jacquin.
Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/openssl/ChangeLog | 8 | ||||
-rw-r--r-- | dev-libs/openssl/Manifest | 15 | ||||
-rwxr-xr-x | dev-libs/openssl/files/gentoo.config-1.0.0 | 23 | ||||
-rw-r--r-- | dev-libs/openssl/files/openssl-1.0.0d-windres.patch | 69 | ||||
-rw-r--r-- | dev-libs/openssl/openssl-1.0.0d.ebuild | 7 |
5 files changed, 100 insertions, 22 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index fff541c8c1f4..5c1cd5b3040b 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.398 2011/07/07 23:50:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.399 2011/07/12 04:10:48 vapier Exp $ + + 12 Jul 2011; Mike Frysinger <vapier@gentoo.org> files/gentoo.config-1.0.0, + openssl-1.0.0d.ebuild, +files/openssl-1.0.0d-windres.patch: + Add more mingw support -- respect RC/WINDRES settings, check ming64 hosts, + and only use --noexecstack if the toolchain supports it #373743 by Bertrand + Jacquin. 07 Jul 2011; Alexis Ballier <aballier@gentoo.org> openssl-1.0.0d.ebuild, +files/openssl-1.0.0d-fbsd-amd64.patch: diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index b8a74cb3e951..291cb22acbba 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX gentoo.config-0.9.8 4249 RMD160 a63c08a30dd294429c562b8e24bf2b13ba220f63 SHA1 737dbd27e39726c49e44f5e92e46bdf8a8ff9b4d SHA256 c14ff861759f4ebaeb57f37ae7df63af4dea1767eae07ef0eb42abd43cebc4a1 -AUX gentoo.config-1.0.0 4625 RMD160 7c9d485844496bed4923c2394d1538dd624a5818 SHA1 600d934959e0eb1b25c0783e031848aefb2c3fdd SHA256 24df6f92b56aa5434f37c1d14751ca626e38e631dee45a5b64dc7ed0b5e6bcb5 +AUX gentoo.config-1.0.0 4699 RMD160 d0ec1c6aed0f0282d273532de68f53548dd78186 SHA1 faeca9aba6223d4ea71251beb83ba01081fab07a SHA256 7e7251bb0f97a8b28870b5fb28d54af9ee2997639d91cb90810333d4a9668407 AUX openssl-0.9.8e-bsd-sparc64.patch 1484 RMD160 dd3d18caccd8167673a438cc83fa44f2e993949b SHA1 d07542663f934d5dc2f8f8b8985bde9b033aafdb SHA256 8a79f022a17a7fadb4eb708538b41a7a034e21ad84162beb1f7fa7cff5eb487e AUX openssl-0.9.8h-ldflags.patch 1000 RMD160 1e87b16d841360d790f06d714ea5f0111e83ca97 SHA1 72e7ccca848425d7cfc3f58f4476fb8fda4ec2d1 SHA256 00179ad3dc3fecc9193658202d7bb5c81169bbb2be59e8a90201ed43eacec805 AUX openssl-0.9.8l-binutils.patch 2655 RMD160 d801d719b4fc4a6818313c27def8e7a184f40b99 SHA1 f7aaae0d3a0163105d495661c3a48673655a3b82 SHA256 c81d8b70e7ccbe3e7ee2fc81a4658d058301d0129adcc380c24066aa42cb390c @@ -10,17 +10,18 @@ AUX openssl-0.9.8m-binutils.patch 684 RMD160 78ee10d906423a77aff91aac2166bb5f58c AUX openssl-1.0.0a-ldflags.patch 914 RMD160 1e057330b3fc84d7f799976c0ba5cce02f505f57 SHA1 9bada0fb576b4f78b046b77b77248b352e1953a6 SHA256 33f5d39e2b6464ed33654214a0148a6f6546fe319793ae04f54d2106422ddba1 AUX openssl-1.0.0d-alpha-typo.patch 235 RMD160 0cccd47a97bbcc9feddec767de61cba3fd7fdfd1 SHA1 03242d4019182608537a8b9019898a23949fbfcf SHA256 60d2cb4cae47b5d61aeca2b6e0ae45d82c3b2ba698df72d10ee26370abd354ab AUX openssl-1.0.0d-fbsd-amd64.patch 417 RMD160 a75ca3b792caa64e32732598f97872153db61464 SHA1 f196432d6ebac143cb39268ef65c3efd9fbc736f SHA256 c72d33d0ac88280fb444574f236fefd73db4b968d342b0fb4530cdffbe2fff5a +AUX openssl-1.0.0d-windres.patch 2586 RMD160 b4fe79439aac0aa0febb027b0ace52fbf5b0a349 SHA1 4dfdaee0d15a947b054cf35e44e7dcc0f0913357 SHA256 15103c5e22a78c1f34dc83adad90636ad510df6eb1661e0063a221d8c3fd8bae DIST openssl-0.9.8r.tar.gz 3773698 RMD160 9bc8024bf7af229c5024887d6f6a368cd8b93728 SHA1 a02411e5f4d463cac4a2a4a357a4a0b93bf65e72 SHA256 42b2368f786b05ed3be846838dce126b4e8e3dba8fb2e0ce83102df28c102fad DIST openssl-1.0.0d.tar.gz 4025484 RMD160 0c6cdf0659d88bf4dbc6d0394059a47a01fe6846 SHA1 32ca934f380a547061ddab7221b1a34e4e07e8d5 SHA256 92511d1f0caaa298dba250426f8e7d5d00b271847886d1adc62422778d6320db DIST openssl-c_rehash.sh.1.7 4167 RMD160 c87f12c5421593d160f0cc650921c2e3412869ab SHA1 54493c80be245f2da9b7d303e49d613d376d9609 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 EBUILD openssl-0.9.8r.ebuild 4217 RMD160 78dfdc61cab7217adee5b3444d704cd12210b8cf SHA1 64db1d963327532b5e11d87619be5ed0ed6f9a63 SHA256 6dae15ddd4b6fa2262745747fcd623631024baba79ebf115fc6b94370835dbb0 -EBUILD openssl-1.0.0d.ebuild 5919 RMD160 ecc2a1794edf7e4af981416bf973ff36013b5a86 SHA1 20d1aabbcf9669a182dd38cd2ea860d96a8a49eb SHA256 f461e20729f9885f541bfe3501b1af4ec91d5513e7d622e896d598c205729c84 -MISC ChangeLog 59473 RMD160 8dd6ecc18d836814c5a7b280c18dc8ca03f6f6ac SHA1 35c6f3dbc2f4ccf165b27a86e4f228ded5376b3c SHA256 f07da1344c5e742a848c739d1ec9de71d5b376f72043c11807240305471b345b +EBUILD openssl-1.0.0d.ebuild 5994 RMD160 fe303beb183407ba0bc0b6ea84a227fa7b40936e SHA1 95e69af5f91476408b71d9025982529ced674851 SHA256 4b22d87e41fe5d308fac4cc77f827530eede9550aa786ab9dd8f344c76970fd5 +MISC ChangeLog 59777 RMD160 bd763de650d2033ebeae8bdcf940403e6174a590 SHA1 54a3e7452d4557fbc62002edd75871e60328c143 SHA256 7004a5e071349aa4ed42455d7c411144e0a830db31dad35fbb6fc0257c0b1b7f MISC metadata.xml 290 RMD160 5aee06348916e9fbcdab233e8babb0ed08260ca5 SHA1 f798e6a59f370931dc151fcff9a473eabda44ab9 SHA256 828c7b974fc1bbac92f75490c85897b27cd3cacce021f56ad1b4ef06d28fe7bd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4WRkcACgkQvFcC4BYPU0qM9ACffmomLPc7NsHxA0fBu8eSCM2n -+BEAn07X2SfG4A6VlyQMSE26b3TSbt5t -=CFrI +iF4EAREIAAYFAk4byVAACgkQaC/OocHi7Jb4rQEAiGpe5LFPBzpoCTD/b9+8e4OS +jygNtPTiJ5bxWr2sO9cA/RaSJtxgVpXsZWs1tObLC6nW1Wn8m3dR/MjnyXGbVMs9 +=7IwQ -----END PGP SIGNATURE----- diff --git a/dev-libs/openssl/files/gentoo.config-1.0.0 b/dev-libs/openssl/files/gentoo.config-1.0.0 index e7dd012f7ed2..61cf89d84c1a 100755 --- a/dev-libs/openssl/files/gentoo.config-1.0.0 +++ b/dev-libs/openssl/files/gentoo.config-1.0.0 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.0,v 1.2 2011/07/05 07:01:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/files/gentoo.config-1.0.0,v 1.3 2011/07/12 04:10:48 vapier Exp $ # # Openssl doesn't play along nicely with cross-compiling # like autotools based projects, so let's teach it new tricks. @@ -54,15 +54,16 @@ fi # Detect the operating system case ${CHOST} in - *-aix*) system="aix";; - *-darwin*) system="darwin";; - *-freebsd*) system="BSD";; - *-hpux*) system="hpux";; - *-linux*) system="linux";; - *-solaris*) system="solaris";; - *-winnt*) system="winnt";; - *mingw*) system="mingw";; - *) exit 0;; + *-aix*) system="aix";; + *-darwin*) system="darwin";; + *-freebsd*) system="BSD";; + *-hpux*) system="hpux";; + *-linux*) system="linux";; + *-solaris*) system="solaris";; + *-winnt*) system="winnt";; + x86_64-*-mingw*) system="mingw64";; + *mingw*) system="mingw";; + *) exit 0;; esac @@ -145,7 +146,7 @@ solaris) winnt) machine=parity ;; -mingw) +mingw*) # special case ... no xxx-yyy style name echo ${system} ;; diff --git a/dev-libs/openssl/files/openssl-1.0.0d-windres.patch b/dev-libs/openssl/files/openssl-1.0.0d-windres.patch new file mode 100644 index 000000000000..2fdd3305319b --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.0.0d-windres.patch @@ -0,0 +1,69 @@ +Index: Configure +=================================================================== +RCS file: /usr/local/src/openssl/CVSROOT/openssl/Configure,v +retrieving revision 1.621.2.40 +diff -u -p -r1.621.2.40 Configure +--- Configure 30 Nov 2010 22:19:26 -0000 1.621.2.40 ++++ Configure 4 Jul 2011 23:12:32 -0000 +@@ -1094,6 +1094,7 @@ my $shared_extension = $fields[$idx_shar + my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib]; + my $ar = $ENV{'AR'} || "ar"; + my $arflags = $fields[$idx_arflags]; ++my $windres = $ENV{'RC'} || $ENV{'WINDRES'} || "windres"; + my $multilib = $fields[$idx_multilib]; + + # if $prefix/lib$multilib is not an existing directory, then +@@ -1511,12 +1512,14 @@ while (<IN>) + s/^AR=\s*/AR= \$\(CROSS_COMPILE\)/; + s/^NM=\s*/NM= \$\(CROSS_COMPILE\)/; + s/^RANLIB=\s*/RANLIB= \$\(CROSS_COMPILE\)/; ++ s/^WINDRES=\s*/WINDRES= \$\(CROSS_COMPILE\)/; + s/^MAKEDEPPROG=.*$/MAKEDEPPROG= \$\(CROSS_COMPILE\)$cc/ if $cc eq "gcc"; + } + else { + s/^CC=.*$/CC= $cc/; + s/^AR=\s*ar/AR= $ar/; + s/^RANLIB=.*/RANLIB= $ranlib/; ++ s/^WINDRES=.*/WINDRES= $windres/; + s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc"; + } + s/^CFLAG=.*$/CFLAG= $cflags/; +Index: Makefile.org +=================================================================== +RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.org,v +retrieving revision 1.295.2.10 +diff -u -p -r1.295.2.10 Makefile.org +--- Makefile.org 27 Jan 2010 16:06:58 -0000 1.295.2.10 ++++ Makefile.org 4 Jul 2011 23:13:08 -0000 +@@ -66,6 +66,7 @@ EXE_EXT= + ARFLAGS= + AR=ar $(ARFLAGS) r + RANLIB= ranlib ++WINDRES= windres + NM= nm + PERL= perl + TAR= tar +@@ -180,6 +181,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESS + CC='$(CC)' CFLAG='$(CFLAG)' \ + AS='$(CC)' ASFLAG='$(CFLAG) -c' \ + AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ ++ WINDRES='$(WINDRES)' \ + CROSS_COMPILE='$(CROSS_COMPILE)' \ + PERL='$(PERL)' ENGDIRS='$(ENGDIRS)' \ + SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \ +Index: Makefile.shared +=================================================================== +RCS file: /usr/local/src/openssl/CVSROOT/openssl/Makefile.shared,v +retrieving revision 1.72.2.4 +diff -u -p -r1.72.2.4 Makefile.shared +--- Makefile.shared 21 Aug 2010 11:36:49 -0000 1.72.2.4 ++++ Makefile.shared 4 Jul 2011 23:13:52 -0000 +@@ -293,7 +293,7 @@ link_a.cygwin: + fi; \ + dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ + $(PERL) util/mkrc.pl $$dll_name | \ +- $(CROSS_COMPILE)windres -o rc.o; \ ++ $(WINDRES) -o rc.o; \ + extras="$$extras rc.o"; \ + ALLSYMSFLAGS='-Wl,--whole-archive'; \ + NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ diff --git a/dev-libs/openssl/openssl-1.0.0d.ebuild b/dev-libs/openssl/openssl-1.0.0d.ebuild index bb9ea84b915f..ad384aceadc8 100644 --- a/dev-libs/openssl/openssl-1.0.0d.ebuild +++ b/dev-libs/openssl/openssl-1.0.0d.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0d.ebuild,v 1.12 2011/07/07 23:50:26 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0d.ebuild,v 1.13 2011/07/12 04:10:48 vapier Exp $ EAPI="2" @@ -36,6 +36,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 epatch "${FILESDIR}"/${PN}-1.0.0d-alpha-typo.patch #364699 epatch "${FILESDIR}"/${PN}-1.0.0d-fbsd-amd64.patch #363089 + epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 epatch_user #332661 # disable fips in the build @@ -58,7 +59,7 @@ src_prepare() { chmod a+rx gentoo.config append-flags -fno-strict-aliasing - append-flags -Wa,--noexecstack + append-flags $(test-flags-CC -Wa,--noexecstack) sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906 ./config --test-sanity || die "I AM NOT SANE" @@ -68,7 +69,7 @@ src_configure() { unset APPS #197996 unset SCRIPTS #312551 - tc-export CC AR RANLIB + tc-export CC AR RANLIB RC # Clean out patent-or-otherwise-encumbered code # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) |