security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

speedo,w32: Install a native pinentry.

Browse Source 
* build-aux/speedo.mk: Always build pinentry for w32.
(speedo_pkg_pinentry_configure): Adjust to modern pinentry.
* build-aux/speedo/w32/inst.nsi: Install native pinentry under the
name pinentry-basic.exe.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-05-06 11:06:26 +02:00
parent f77fd572db
commit 154abaf3c9
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
build-aux/speedo.mk
View File

@ -187,14 +187,19 @@ speedo_spkgs += \
endif endif
endif endif
ifeq ($(TARGETOS),w32)
speedo_spkgs += pinentry
ifeq ($(WITH_GUI),1)
speedo_spkgs += gpa gpgex
endif
else
ifeq ($(WITH_GUI),1) ifeq ($(WITH_GUI),1)
speedo_spkgs += \ speedo_spkgs += pinentry gpa
pinentry gpa
ifeq ($(TARGETOS),w32)
speedo_spkgs += \
gpgex
endif endif
endif endif
@ -437,14 +442,19 @@ speedo_pkg_gpgme_configure = \
LDFLAGS=-L$(idir)/lib LDFLAGS=-L$(idir)/lib
endif endif
speedo_pkg_pinentry_configure = \
--disable-pinentry-qt --disable-pinentry-qt4 --disable-pinentry-gtk \ ifeq ($(TARGETOS),w32)
--enable-pinentry-gtk2 \ speedo_pkg_pinentry_configure = --disable-pinentry-gtk2
--with-glib-prefix=$(idir) --with-gtk-prefix=$(idir) \ else
speedo_pkg_pinentry_configure = --enable-pinentry-gtk2
endif
speedo_pkg_pinentry_configure += \
--disable-pinentry-qt4 \
CPPFLAGS=-I$(idir)/include \ CPPFLAGS=-I$(idir)/include \
LDFLAGS=-L$(idir)/lib \ LDFLAGS=-L$(idir)/lib \
CXXFLAGS=-static-libstdc++ CXXFLAGS=-static-libstdc++
speedo_pkg_gpa_configure = \ speedo_pkg_gpa_configure = \
--with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \ --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
--with-gpgme-prefix=$(idir) --with-zlib=$(idir) \ --with-gpgme-prefix=$(idir) --with-zlib=$(idir) \

8
build-aux/speedo/w32/inst.nsi
View File

@ -816,12 +816,10 @@ Section "-gtk+" SEC_gtk_
SectionEnd SectionEnd
!endif !endif
!ifdef WITH_GUI
Section "-pinentry" SEC_pinentry Section "-pinentry" SEC_pinentry
SetOutPath "$INSTDIR\bin" SetOutPath "$INSTDIR\bin"
File /oname=pinentry.exe "bin/pinentry-gtk-2.exe" File /oname=pinentry-basic.exe "bin/pinentry-w32.exe"
SectionEnd SectionEnd
!endif
!ifdef WITH_GUI !ifdef WITH_GUI
Section "gpa" SEC_gpa Section "gpa" SEC_gpa
@ -933,11 +931,9 @@ Section "-un.gpa"
SectionEnd SectionEnd
!endif !endif
!ifdef WITH_GUI
Section "-un.pinentry" Section "-un.pinentry"
Delete "$INSTDIR\bin\pinentry.exe" Delete "$INSTDIR\bin\pinentry-basic.exe"
SectionEnd SectionEnd
!endif
!ifdef WITH_GUI !ifdef WITH_GUI
Section "-un.gtk+" Section "-un.gtk+"