Attachment 630725 Details for Bug 868599 – Patch for git master

[patch] Patch for git master

0001-Add-static-libraries-enable-asm-on-mingw64.patch (text/plain), 2.82 KB, created by Yaakov Selkowitz on 2012-10-21 03:47:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2012-10-21 03:47:47 UTC

Size: 2.82 KB

patch

obsolete

>From d9a2911bc6ccaff07d355e271a1255bab6985ed3 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Sat, 20 Oct 2012 22:45:41 -0500
>Subject: [PATCH] Add static libraries, enable asm on mingw64
>
>---
> mingw-libgcrypt.spec | 32 +++++++++++++++++++++++++++++---
> 1 file changed, 29 insertions(+), 3 deletions(-)
>
>diff --git a/mingw-libgcrypt.spec b/mingw-libgcrypt.spec
>index b43ae0a..f25ec94 100644
>--- a/mingw-libgcrypt.spec
>+++ b/mingw-libgcrypt.spec
>@@ -4,7 +4,7 @@
> 
> Name:           mingw-libgcrypt
> Version:        1.5.0
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        MinGW Windows gcrypt encryption library
> 
> License:        LGPLv2+ and GPLv2+
>@@ -62,6 +62,14 @@ in GNU Privacy Guard.
> 
> This is a Windows cross-compiled version of the library.
> 
>+%package -n mingw32-libgcrypt-static
>+Summary:        Static library for mingw32-libgcrypt development
>+Requires:       mingw32-libgcrypt = %{version}-%{release}
>+Requires:       mingw32-libgpg-error-static
>+
>+%description -n mingw32-libgcrypt-static
>+Static library for mingw32-libgcrypt development.
>+
> # Win64
> %package -n mingw64-libgcrypt
> Summary:        MinGW Windows gcrypt encryption library
>@@ -72,6 +80,14 @@ in GNU Privacy Guard.
> 
> This is a Windows cross-compiled version of the library.
> 
>+%package -n mingw64-libgcrypt-static
>+Summary:        Static library for mingw64-libgcrypt development
>+Requires:       mingw64-libgcrypt = %{version}-%{release}
>+Requires:       mingw64-libgpg-error-static
>+
>+%description -n mingw64-libgcrypt-static
>+Static library for mingw64-libgcrypt development.
>+
> 
> %?mingw_debug_package
> 
>@@ -84,8 +100,8 @@ This is a Windows cross-compiled version of the library.
> 
> 
> %build
>-MINGW64_CONFIGURE_ARGS="--disable-asm"
>-%mingw_configure --disable-static --enable-pubkey-ciphers='dsa elgamal rsa'
>+MINGW64_CONFIGURE_ARGS="ac_cv_sys_symbol_underscore=no"
>+%mingw_configure --enable-shared --enable-static --enable-pubkey-ciphers='dsa elgamal rsa'
> %mingw_make %{?_smp_mflags}
> 
> 
>@@ -128,6 +144,9 @@ rm $RPM_BUILD_ROOT%{mingw64_libdir}/libgcrypt.la
> %{mingw32_includedir}/gcrypt.h
> %{mingw32_datadir}/aclocal/libgcrypt.m4
> 
>+%files -n mingw32-libgcrypt-static
>+%{mingw32_libdir}/libgcrypt.a
>+
> %files -n mingw64-libgcrypt
> %doc COPYING COPYING.LIB
> %{mingw64_bindir}/dumpsexp.exe
>@@ -139,8 +158,15 @@ rm $RPM_BUILD_ROOT%{mingw64_libdir}/libgcrypt.la
> %{mingw64_includedir}/gcrypt.h
> %{mingw64_datadir}/aclocal/libgcrypt.m4
> 
>+%files -n mingw64-libgcrypt-static
>+%{mingw64_libdir}/libgcrypt.a
>+
> 
> %changelog
>+* Sun Oct 20 2012 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1.5.0-5
>+- Add static libraries
>+- Fix compile of assembly code for mingw64
>+
> * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 868599: 630725