Mercurial > mxe-octave

changeset 4607:e5efd844c4c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update libgcrypy to 1.8.2 * src/libgcrypt.mk: update version, checksum, install pkg.pc file * src/libgpg_error.mk: update version, checksum for v1.27 * src/libidn2.mk: install pkg.pc file
author John Donoghue
date Wed, 28 Feb 2018 11:01:16 -0500
parents 86c3c1fd16f1
children dac40a0ff814
files src/libgcrypt.mk src/libgpg_error.mk src/libidn2.mk
diffstat 3 files changed, 30 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/libgcrypt.mk	Mon Feb 26 10:37:40 2018 -0500
+++ b/src/libgcrypt.mk	Wed Feb 28 11:01:16 2018 -0500
@@ -3,8 +3,8 @@
 
 PKG             := libgcrypt
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.7.6
-$(PKG)_CHECKSUM := d2b9e0f413064cfc67188f80d3cbda887c755a62
+$(PKG)_VERSION  := 1.8.2
+$(PKG)_CHECKSUM := ab8aae5d7a68f8e0988f90e11e7f6a4805af5c8d
 $(PKG)_SUBDIR   := libgcrypt-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgcrypt-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgcrypt/$($(PKG)_FILE)
@@ -18,13 +18,12 @@
 endef
 
 ifeq ($(TARGET),x86_64-w64-mingw32)
-  $(PKG)_TARGET_CONFIGURE_OPTIONS := ac_cv_sys_symbol_underscore=no
+  $(PKG)_TARGET_CONFIGURE_OPTIONS := ac_cv_sys_symbol_underscore=no --disable-padlock-support
 else
   $(PKG)_TARGET_CONFIGURE_OPTIONS :=
 endif
 
 define $(PKG)_BUILD
-    sed -i -e '/^ *;/d' -e '/^ *$$/d' '$(1)/src/libgcrypt.def'
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
@@ -40,4 +39,12 @@
       $(INSTALL) -d '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
       $(INSTALL) -m755 '$(3)$(HOST_BINDIR)/libgcrypt-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)libgcrypt-config'; \
     fi
+    # create pkg-config file
+    $(INSTALL) -d '$(3)$(HOST_LIBDIR)/pkgconfig'
+    (echo 'Name: $(PKG)'; \
+     echo 'Version: $($(PKG)_VERSION)'; \
+     echo 'Description: $(PKG)'; \
+     echo 'Libs: ' "`$(MXE_TOOL_PREFIX)libgcrypt-config --libs`"; \
+     echo 'Cflags: ' "`$(MXE_TOOL_PREFIX)libgcrypt-config --cflags`";) \
+     > '$(3)$(HOST_LIBDIR)/pkgconfig/$(PKG).pc'
 endef
--- a/src/libgpg_error.mk	Mon Feb 26 10:37:40 2018 -0500
+++ b/src/libgpg_error.mk	Wed Feb 28 11:01:16 2018 -0500
@@ -3,12 +3,12 @@
 
 PKG             := libgpg_error
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.26
-$(PKG)_CHECKSUM := 9a926e7ee6309e539313443555535d49a2a5c9f1
+$(PKG)_VERSION  := 1.27
+$(PKG)_CHECKSUM := a428758999ff573e62d06892e3d2c0b0f335787c
 $(PKG)_SUBDIR   := libgpg-error-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgpg-error-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := ftp://ftp.gnupg.org/gcrypt/libgpg-error/$($(PKG)_FILE)
-$(PKG)_DEPS     :=
+$(PKG)_DEPS     := gettext libiconv
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'ftp://ftp.gnupg.org/gcrypt/libgpg-error/' | \
@@ -17,6 +17,8 @@
 endef
 
 define $(PKG)_BUILD
+    cd '$(1)/src/syscfg' && ln -s lock-obj-pub.mingw32.h lock-obj-pub.mingw32.static.h
+    cd '$(1)/src/syscfg' && ln -s lock-obj-pub.mingw32.h lock-obj-pub.mingw32.shared.h
     cd '$(1)' && ./configure \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
@@ -24,6 +26,10 @@
         --prefix='$(HOST_PREFIX)' \
         --disable-nls \
         --disable-languages && $(CONFIGURE_POST_HOOK)
+    if [ $(MXE_WINDOWS_BUILD) = yes ]; then \
+      $(SED) -i 's/-lgpg-error/-lgpg-error -lintl -liconv/;' '$(1)/src/gpg-error-config'; \
+      $(SED) -i 's/host_os = mingw32.*/host_os = mingw32/' '$(1)/src/Makefile'; \
+    fi
     $(MAKE) -C '$(1)/src' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)/src' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= DESTDIR='$(3)'
     if [ $(MXE_NATIVE_BUILD) = no ]; then \
--- a/src/libidn2.mk	Mon Feb 26 10:37:40 2018 -0500
+++ b/src/libidn2.mk	Wed Feb 28 11:01:16 2018 -0500
@@ -26,4 +26,14 @@
         && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) DESTDIR='$(3)'
     $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
+    # create pkg-config files
+    $(INSTALL) -d '$(HOST_LIBDIR)/pkgconfig'
+    (echo 'Name: $(PKG)'; \
+     echo 'Version: $($(PKG)_VERSION)'; \
+     echo 'Description: implementation of IDNA2008/TR46 internationalized domain names'; \
+     echo 'Libs: -lidn2'; \
+     echo 'Libs.private: -lunistring -liconv -lcharset';) \
+     > '$(HOST_LIBDIR)/pkgconfig/$(PKG).pc'
+    # TODO create pc files for iconv and unistring.
+
 endef