Mercurial > mxe-octave

changeset 6047:02d49e038c69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lingsasl: update to v1.10.0 * src/libgsasl.mk: update version, update build rule * src/libgsasl-1-fixes.patch: removed * dist-files.mk: remove ref to deleted file
author John Donoghue <john.donoghue@ieee.org>
date Sun, 09 Jan 2022 07:52:01 -0500
parents 4d276a65f673
children 36680ae529a9
files dist-files.mk src/libgsasl-1-fixes.patch src/libgsasl.mk
diffstat 3 files changed, 5 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sun Jan 09 07:51:58 2022 -0500
+++ b/dist-files.mk	Sun Jan 09 07:52:01 2022 -0500
@@ -253,7 +253,6 @@
   libgomp.mk \
   libgpg_error-1-fixes.patch \
   libgpg_error.mk \
-  libgsasl-1-fixes.patch \
   libgsasl-test.c \
   libgsasl.mk \
   libgsf-1-fixes.patch \
--- a/src/libgsasl-1-fixes.patch	Sun Jan 09 07:51:58 2022 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Mon, 7 Nov 2011 18:01:56 +0100
-Subject: [PATCH] use memxor from nettle
-
-
-diff --git a/gl/memxor.c b/gl/memxor.c
-index 7fec454..d9b62cd 100644
---- a/gl/memxor.c
-+++ b/gl/memxor.c
-@@ -22,7 +22,7 @@
- #include "memxor.h"
- 
- void *
--memxor (void *restrict dest, const void *restrict src, size_t n)
-+gsasl_memxor (void *restrict dest, const void *restrict src, size_t n)
- {
-   char const *s = src;
-   char *d = dest;
-diff --git a/libgsasl.pc.in b/libgsasl.pc.in
-index b0c477d..d8d8ccc 100644
---- a/libgsasl.pc.in
-+++ b/libgsasl.pc.in
-@@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/
- Version: @VERSION@
- Libs: -L${libdir} -lgsasl
- Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@
-+Requires.private: nettle
- Cflags: -I${includedir}
--- 
-1.7.7
-
--- a/src/libgsasl.mk	Sun Jan 09 07:51:58 2022 -0500
+++ b/src/libgsasl.mk	Sun Jan 09 07:52:01 2022 -0500
@@ -3,8 +3,8 @@
 
 PKG             := libgsasl
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.0
-$(PKG)_CHECKSUM := 08fd5dfdd3d88154cf06cb0759a732790c47b4f7
+$(PKG)_VERSION  := 1.10.0
+$(PKG)_CHECKSUM := a16ff428bbf28fcfa681c7edd2cd2bb087bcc4e7
 $(PKG)_SUBDIR   := libgsasl-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgsasl-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE)
@@ -24,13 +24,11 @@
         --prefix='$(HOST_PREFIX)' \
         --disable-nls \
         --with-libgcrypt \
+        --with-libgcrypt-prefix='$(HOST_PREFIX)' \
         --with-libiconv-prefix='$(HOST_PREFIX)' \
         --with-libidn-prefix='$(HOST_PREFIX)' \
         --with-libntlm-prefix='$(HOST_PREFIX)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
-    '$(MXE_CC)' \
-        -W -Wall -Werror -ansi -pedantic \
-        '$(2).c' -o '$(HOST_BINDIR)/test-libgsasl.exe' \
-        `'$(MXE_PKG_CONFIG)' libgsasl --cflags --libs`
+    $(MAKE) -C '$(1)' -j '$(JOBS)' $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS)
+    $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_PROGS) $(MXE_DISABLE_DOCS) DESTDIR='$(3)'
 endef