[Gpg4win-commits] [git] Gpg4win - branch, gpgex64, updated. gpg4win-2.1.1-7-g40e4d06
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Jun 14 19:45:08 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, gpgex64 has been updated
via 40e4d067bd77c3e5d0c526d11d0c27f71cb5db9e (commit)
via 77c6b38fe4055f3cddf11219768ed873493ed53b (commit)
via 5c425d3c68b355e37caf92c96c2eff484b370737 (commit)
from be612237752d44d30301bfde1ada2bc1d88b2ad0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 40e4d067bd77c3e5d0c526d11d0c27f71cb5db9e
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jun 14 17:23:01 2013 +0000
Add more packages as gpg4win_expkgs
* src/Makefile.am: Add more packages to gpg4win_expkgs
--
Build currently errors out at libassuan
diff --git a/src/Makefile.am b/src/Makefile.am
index f0e097c..b9d76bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,7 +107,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
adns dirmngr w32pth scute paperkey regex libiconv gettext
# Supported source packages to build in an additional architecture
-gpg4win_expkgs = libiconv gettext w32pth
+gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex
# Extra options to configure for individual packages.
# We can use $(idir) here for the installation prefix.
commit 77c6b38fe4055f3cddf11219768ed873493ed53b
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jun 14 17:21:32 2013 +0000
Fix STOW_EX macro to store in idir_ex
* src/gpg4win.mk.in: Add target parameter to stow call for extra
architecture packages.
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 9326435..6a8c349 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -212,7 +212,7 @@ stamps/stamp-$(1)-ex-04-install: stamps/stamp-$(1)-ex-03-make
stamps/stamp-$(1)-ex-05-stow: stamps/stamp-$(1)-ex-04-install
($(call SETVARS_EX,$(1)); \
cd $(ipdir); \
- $(STOW) "$$$${pkg_version}")
+ $(STOW) -t $(ex_idir) "$$$${pkg_version}")
touch stamps/stamp-$(1)-ex-05-stow
stamps/stamp-final-ex-$(1): stamps/stamp-$(1)-ex-05-stow
commit 5c425d3c68b355e37caf92c96c2eff484b370737
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Jun 14 17:15:28 2013 +0000
Add the possibility to change the make directroy
This adds gpg4win_pkg_<name>_make_dir to change the
directory in which make is called. This path is relative
to the packages source directory.
Used for gettext to build only gettext-runtime
* src/Makefile.am: Set make directories for gettext to build
only runtime.
* src/gpg4win.mk.in: Add gpg4win_pkg_<name>_make_dir and
handle it.
--
Gettext-tools are uneccessary for us and don't compile with
mingw-w64 withot patches. And while this adds an additional
config macro it gives us more flexibility in the build process
to handle such things.
diff --git a/src/Makefile.am b/src/Makefile.am
index 440e0cd..f0e097c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,13 +115,20 @@ gpg4win_expkgs = libiconv gettext w32pth
gpg4win_pkg_libiconv_ex_configure = \
--enable-shared=no --enable-static=yes
-# Optimization flags for gettext are neccessary because of
-# http://savannah.gnu.org/bugs/?36443
-# Still some issues with gettext-tools
gpg4win_pkg_gettext_configure = \
--with-lib-prefix=$(idir) --with-libiconv-prefix=$(idir) \
- CPPFLAGS="-I$(idir)/include -O2" CFLAGS=-O2 \
- LDFLAGS=-L$(idir)/lib CCC=$(host)-g++
+ CPPFLAGS=-I$(idir)/include CFLAGS=-O2 LDFLAGS=-L$(idir)/lib
+
+gpg4win_pkg_gettext_ex_configure = \
+ --with-lib-prefix=$(ex_idir) --with-libiconv-prefix=$(ex_idir) \
+ CPPFLAGS=-I$(ex_idir)/include CFLAGS=-O2 LDFLAGS=-L$(ex_idir)/lib
+
+# We only need gettext-runtime and there is sadly no top level
+# configure option for this
+gpg4win_pkg_gettext_make_dir = gettext-runtime
+gpg4win_pkg_gettext_make_dir_inst = gettext-runtime
+gpg4win_pkg_gettext_ex_make_dir = gettext-runtime
+gpg4win_pkg_gettext_ex_make_dir_inst = gettext-runtime
gpg4win_pkg_glib_configure = \
--disable-modular-tests \
diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 6b89692..9326435 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -72,6 +72,8 @@ define SETVARS
pkgextracflags="$(call GETVAR,gpg4win_pkg_$(1)_extracflags)"; \
pkgmkargs="$(call GETVAR,gpg4win_pkg_$(1)_make_args)"; \
pkgmkargs_inst="$(call GETVAR,gpg4win_pkg_$(1)_make_args_inst)";\
+ pkgmkdir="$(call GETVAR,gpg4win_pkg_$(1)_make_dir)"; \
+ pkgmkdir_inst="$(call GETVAR,gpg4win_pkg_$(1)_make_dir)"; \
export PKG_CONFIG="$(tsdir)/src/pkg-config"; \
export PKG_CONFIG_PATH="$(idir)/lib/pkgconfig"; \
export PKG_CONFIG_LIBDIR=""; \
@@ -90,10 +92,12 @@ define SETVARS_EX
pkgpbdir="$(pdir)/$(1)-ex"; \
pkgidir="$(ipdir)/$$$${pkg_version}-ex"; \
pkgidir_dev="$(ipdir)/$$$${pkg_version_dev}"; \
- pkgcfg="$(call GETVAR,gpg4win_pkg_$(1)_configure)"; \
+ pkgcfg="$(call GETVAR,gpg4win_pkg_$(1)_ex_configure)"; \
pkgextracflags="$(call GETVAR,gpg4win_pkg_$(1)_ex_extracflags)"; \
pkgmkargs="$(call GETVAR,gpg4win_pkg_$(1)_ex_make_args)"; \
pkgmkargs_inst="$(call GETVAR,gpg4win_pkg_$(1)_ex_make_args_inst)"; \
+ pkgmkdir="$(call GETVAR,gpg4win_pkg_$(1)_ex_make_dir)"; \
+ pkgmkdir_inst="$(call GETVAR,gpg4win_pkg_$(1)_ex_make_dir)"; \
export PKG_CONFIG="$(tsdir)/src/pkg-config"; \
export PKG_CONFIG_PATH="$(ex_idir)/lib/pkgconfig"; \
export PKG_CONFIG_LIBDIR=""; \
@@ -188,6 +192,7 @@ stamps/stamp-$(1)-ex-02-configure: stamps/stamp-$(1)-ex-01-patch
stamps/stamp-$(1)-ex-03-make: stamps/stamp-$(1)-ex-02-configure
($(call SETVARS_EX,$(1)); \
cd "$$$${pkgbdir}"; \
+ test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
$(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
$(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
@@ -273,6 +278,7 @@ stamps/stamp-$(1)-02-configure: stamps/stamp-$(1)-01-patch
stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
+ test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
$(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
$(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
@@ -283,6 +289,7 @@ stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
($(call SETVARS,$(1)); \
cd "$$$${pkgbdir}"; \
+ cd "$$$${pkgmkdir_inst}"; \
$(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs_inst} install; \
$(call STRIP_macro,"$$$${pkgidir}"); \
rm -f "$$$${pkgidir}/share/info/dir"; \
@@ -339,6 +346,7 @@ stamps/stamp-$(1)-01-patch: stamps/stamp-$(1)-00-unpack
stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-01-patch
($(call SETVARS,$(1)); \
cd "$$$${pkgsdir}"; \
+ test -n "$$$${pkgmkdir}" && cd "$$$${pkgmkdir}"; \
$(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
touch stamps/stamp-$(1)-03-make
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 19 +++++++++++++------
src/gpg4win.mk.in | 12 ++++++++++--
2 files changed, 23 insertions(+), 8 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list