Mercurial > mxe-octave

changeset 1956:ec24966a70b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packages gnutls p11-kit dlfcn-win32: rollback p11-kit support Remove pll-kit support because it's not ready for Windows. Crude hacks are too risky since this is security related. dlfcn-win32 isn't needed anymore.
author Mark Brand <mabrand@mabrand.nl>
date Sat, 20 Aug 2011 09:21:39 +0200
parents e2a680ec2f33
children 56a51a5b74fd
files src/dlfcn-win32-1-fixes.patch src/dlfcn-win32.mk src/gnutls.mk src/guile.mk src/p11-kit-1-fixes.patch src/p11-kit.mk
diffstat 6 files changed, 4 insertions(+), 173 deletions(-) [+]
line wrap: on
line diff
--- a/src/dlfcn-win32-1-fixes.patch	Sat Aug 20 01:01:25 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 5c32340c7e89fc36c881de1ee8872df32e2cb91d Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Wed, 17 Aug 2011 21:58:39 +0200
-Subject: [PATCH] let configure succeed
-
-
-diff --git a/configure b/configure
-index 3ae2f88..a16c7eb 100755
---- a/configure
-+++ b/configure
-@@ -190,3 +190,4 @@ enabled shared && {
-     echo "msvc:   $msvc";
-     echo "strip:  $stripping";
- }
-+true
--- 
-1.7.6
-
--- a/src/dlfcn-win32.mk	Sat Aug 20 01:01:25 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
-
-# dlfcn-win32
-PKG             := dlfcn-win32
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := r19
-$(PKG)_CHECKSUM := a0033e37a547c52059d0bf8664a96ecdeeb66419
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := http://code.google.com/p/dlfcn-win32/
-$(PKG)_URL      := http://$(PKG).googlecode.com/files/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc
-
-define $(PKG)_UPDATE
-    wget -q -O- 'http://code.google.com/p/dlfcn-win32/downloads/list?sort=-uploaded' | \
-    $(SED) -n 's,.*dlfcn-win32-\(r[0-9][^<]*\)\.tar.*,\1,p' | \
-    head -1
-endef
-
-define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --incdir='$(PREFIX)/$(TARGET)/include' \
-        --libdir='$(PREFIX)/$(TARGET)/lib' \
-        --cross-prefix='$(TARGET)-' \
-        --disable-shared \
-        --enable-static
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install
-endef
--- a/src/gnutls.mk	Sat Aug 20 01:01:25 2011 +0200
+++ b/src/gnutls.mk	Sat Aug 20 09:21:39 2011 +0200
@@ -10,7 +10,7 @@
 $(PKG)_WEBSITE  := http://www.gnu.org/software/gnutls/
 $(PKG)_URL      := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.gnupg.org/gcrypt/gnutls/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc zlib libgcrypt p11-kit
+$(PKG)_DEPS     := gcc zlib libgcrypt
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \
@@ -37,6 +37,7 @@
         --with-included-pakchois \
         --with-libgcrypt \
         --without-lzo \
+        --without-p11-kit
         LIBS='-lz'
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
 endef
--- a/src/guile.mk	Sat Aug 20 01:01:25 2011 +0200
+++ b/src/guile.mk	Sat Aug 20 09:21:39 2011 +0200
@@ -10,7 +10,7 @@
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.gnu.org/software/$(PKG)/
 $(PKG)_URL      := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libtool gmp libiconv gettext libunistring gc libffi readline dlfcn-win32
+$(PKG)_DEPS     := gcc libtool gmp libiconv gettext libunistring gc libffi readline
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=$(PKG).git;a=tags' | \
@@ -30,7 +30,7 @@
         --disable-shared \
         --without-threads \
         scm_cv_struct_timespec=no \
-        LIBS='-lunistring -lintl -liconv -ldl' \
+        LIBS='-lunistring -lintl -liconv' \
         CFLAGS='-Wno-unused-but-set-variable'
     $(MAKE) -C '$(1)' -j '$(JOBS)' schemelib_DATA=
     $(MAKE) -C '$(1)' -j 1 install schemelib_DATA=
--- a/src/p11-kit-1-fixes.patch	Sat Aug 20 01:01:25 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-Contains ad hoc patches for cross building.
-
-From 3d4e0e4f8a2dda773cd264b113ac8a61e913a9d5 Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Wed, 17 Aug 2011 21:25:23 +0200
-Subject: [PATCH 1/3] no pwd.h for windows
-
-
-diff --git a/p11-kit/conf.c b/p11-kit/conf.c
-index 55e0268..d9aaf69 100644
---- a/p11-kit/conf.c
-+++ b/p11-kit/conf.c
-@@ -50,7 +50,9 @@
- #include <ctype.h>
- #include <dirent.h>
- #include <errno.h>
-+#ifndef _WIN32
- #include <pwd.h>
-+#endif
- #include <stdarg.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -338,6 +340,7 @@ expand_user_path (const char *path)
- 		env = getenv ("HOME");
- 		if (env && env[0]) {
- 			return strconcat (env, path + 1, NULL);
-+#ifndef _WIN32
- 		} else {
- 			pwd = getpwuid (getuid ());
- 			if (!pwd) {
-@@ -348,6 +351,7 @@ expand_user_path (const char *path)
- 				return NULL;
- 			}
- 			return strconcat (pwd->pw_dir, path + 1, NULL);
-+#endif
- 		}
- 	}
- 
--- 
-1.7.6
-
-
-From db04a7c8720f46f1e30a97033e1368245818ff8c Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Wed, 17 Aug 2011 21:43:11 +0200
-Subject: [PATCH 2/3] no pthread_atfork for windows
-
-
-diff --git a/p11-kit/modules.c b/p11-kit/modules.c
-index 97fb58f..0d22aa5 100644
---- a/p11-kit/modules.c
-+++ b/p11-kit/modules.c
-@@ -522,7 +522,9 @@ init_globals_unlocked (void)
- 	if (once)
- 		return CKR_OK;
- 
-+#ifndef _WIN32
- 	pthread_atfork (NULL, NULL, reinitialize_after_fork);
-+#endif
- 	once = 1;
- 
- 	return CKR_OK;
--- 
-1.7.6
-
-
-From 62cee086ce38db2a2570ae63e6ab4a2fa593aee2 Mon Sep 17 00:00:00 2001
-From: mingw-cross-env
-Date: Wed, 17 Aug 2011 21:41:45 +0200
-Subject: [PATCH 3/3] add Libs.private for static linking
-
-
-diff --git a/p11-kit/p11-kit-1.pc.in b/p11-kit/p11-kit-1.pc.in
-index 9ef67a3..1fcf860 100644
---- a/p11-kit/p11-kit-1.pc.in
-+++ b/p11-kit/p11-kit-1.pc.in
-@@ -15,4 +15,5 @@ Name: p11-kit
- Description: Library and proxy module for properly loading and sharing PKCS#11 modules.
- Version: @VERSION@
- Libs: -L${libdir} -lp11-kit
-+Libs.private: -ldl -lintl -liconv -lpthread
- Cflags: -I${includedir}/p11-kit-1
--- 
-1.7.6
-
--- a/src/p11-kit.mk	Sat Aug 20 01:01:25 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
-
-# p11-kit
-PKG             := p11-kit
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.4
-$(PKG)_CHECKSUM := e12c6918e5de9f26f197bcc1a274bbfbf24efe06
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://p11-glue.freedesktop.org/
-$(PKG)_URL      := http://p11-glue.freedesktop.org/releases/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc dlfcn-win32
-
-define $(PKG)_UPDATE
-    wget -q -O- 'http://cgit.freedesktop.org/p11-glue/p11-kit/refs/tags' | \
-    $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \
-    head -1
-endef
-
-define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --enable-static \
-        --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(1)/p11-kit' -j '$(JOBS)' install
-endef