From 7aa6f1b01481c1d0f1a12f56ad197c797056c37b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 3 Apr 2013 21:04:16 +0300 Subject: Remove Mac OS X for PowerPC support Change-Id: I10b15141e6a5f93365e1cfa6fbc0c7cc3ea49b15 --- libxmlsec/UnpackedTarball_xmlsec.mk | 6 -- libxmlsec/xmlsec1-1.2.14_old_automake.patch | 126 ---------------------------- 2 files changed, 132 deletions(-) delete mode 100644 libxmlsec/xmlsec1-1.2.14_old_automake.patch (limited to 'libxmlsec') diff --git a/libxmlsec/UnpackedTarball_xmlsec.mk b/libxmlsec/UnpackedTarball_xmlsec.mk index fc2ed16a5336..7860295c4e68 100644 --- a/libxmlsec/UnpackedTarball_xmlsec.mk +++ b/libxmlsec/UnpackedTarball_xmlsec.mk @@ -42,10 +42,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\ )) endif -ifeq ($(OS)$(CPU),MACOSXP) -$(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\ - libxmlsec/xmlsec1-1.2.14_old_automake.patch \ -)) -endif - # vim: set noet sw=4 ts=4: diff --git a/libxmlsec/xmlsec1-1.2.14_old_automake.patch b/libxmlsec/xmlsec1-1.2.14_old_automake.patch deleted file mode 100644 index a80265903b07..000000000000 --- a/libxmlsec/xmlsec1-1.2.14_old_automake.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- misc/xmlsec1-1.2.14/configure.in 2012-09-12 19:15:56.000000000 +0200 -+++ misc/build/xmlsec1-1.2.14/configure.in 2012-09-12 18:56:01.000000000 +0200 -@@ -21,8 +21,8 @@ - AC_SUBST(XMLSEC_VERSION_INFO) - - AC_CONFIG_MACRO_DIR(m4) --AM_INIT_AUTOMAKE([1.7 tar-ustar]) --AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE([1.6.3]) -+AM_CONFIG_HEADER([config.h]) - AM_MAINTAINER_MODE - - dnl ---- misc/xmlsec1-1.2.14/src/gnutls/Makefile.am 2009-12-05 22:19:18.000000000 +0100 -+++ misc/build/xmlsec1-1.2.14/src/gnutls/Makefile.am 2012-09-12 19:09:38.000000000 +0200 -@@ -18,7 +18,11 @@ - $(LIBXML_CFLAGS) \ - $(NULL) - --libxmlsec1_gnutls_la_SOURCES =\ -+if SHAREDLIB_HACK -+SHAREDLIBHACKDEP = ../strings.c -+endif -+ -+libxmlsec1_gnutls_la_SOURCES = $(SHAREDLIBHACKDEP) \ - app.c \ - ciphers.c \ - crypto.c \ -@@ -28,10 +32,6 @@ - globals.h \ - $(NULL) - --if SHAREDLIB_HACK --libxmlsec1_gnutls_la_SOURCES += ../strings.c --endif -- - libxmlsec1_gnutls_la_LIBADD = \ - ../libxmlsec1.la \ - $(GNUTLS_LIBS) \ ---- misc/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2012-09-12 19:15:56.000000000 +0200 -+++ misc/build/xmlsec1-1.2.14/src/mscrypto/Makefile.am 2012-09-12 19:10:52.000000000 +0200 -@@ -19,7 +19,11 @@ - $(LIBXML_CFLAGS) \ - $(NULL) - --libxmlsec1_mscrypto_la_SOURCES =\ -+if SHAREDLIB_HACK -+SHAREDLIBHACKDEP = ../strings.c -+endif -+ -+libxmlsec1_mscrypto_la_SOURCES = $(SHAREDLIBHACKDEP) \ - app.c \ - certkeys.c \ - ciphers.c \ -@@ -38,10 +42,6 @@ - akmngr.c \ - $(NULL) - --if SHAREDLIB_HACK --libxmlsec1_mscrypto_la_SOURCES += ../strings.c --endif -- - libxmlsec1_mscrypto_la_LIBADD = \ - ../libxmlsec1.la \ - $(MSCRYPTO_LIBS) \ ---- misc/xmlsec1-1.2.14/src/nss/Makefile.am 2012-09-12 19:15:56.000000000 +0200 -+++ misc/build/xmlsec1-1.2.14/src/nss/Makefile.am 2012-09-12 19:11:58.000000000 +0200 -@@ -8,7 +8,7 @@ - libxmlsec1-nss.la \ - $(NULL) - --libxmlsec1_nss_la_CPPFLAGS = \ -+libxmlsec1_nss_la_CFLAGS = \ - -DPACKAGE=\"@PACKAGE@\" \ - -I../../include \ - -I$(top_srcdir)/include \ -@@ -18,7 +18,11 @@ - $(LIBXML_CFLAGS) \ - $(NULL) - --libxmlsec1_nss_la_SOURCES =\ -+if SHAREDLIB_HACK -+SHAREDLIBHACKDEP = ../strings.c -+endif -+ -+libxmlsec1_nss_la_SOURCES = $(SHAREDLIBHACKDEP) \ - app.c \ - bignum.c \ - ciphers.c \ -@@ -40,10 +44,6 @@ - tokens.c \ - $(NULL) - --if SHAREDLIB_HACK --libxmlsec1_nss_la_SOURCES += ../strings.c --endif -- - libxmlsec1_nss_la_LIBADD = \ - ../libxmlsec1.la \ - $(NSS_LIBS) \ ---- misc/xmlsec1-1.2.14/src/openssl/Makefile.am 2009-12-05 22:19:18.000000000 +0100 -+++ misc/build/xmlsec1-1.2.14/src/openssl/Makefile.am 2012-09-12 19:12:55.000000000 +0200 -@@ -18,7 +18,11 @@ - $(LIBXML_CFLAGS) \ - $(NULL) - --libxmlsec1_openssl_la_SOURCES =\ -+if SHAREDLIB_HACK -+SHAREDLIBHACKDEP = ../strings.c -+endif -+ -+libxmlsec1_openssl_la_SOURCES = $(SHAREDLIBHACKDEP) \ - app.c \ - bn.c \ - ciphers.c \ -@@ -36,10 +40,6 @@ - globals.h \ - $(NULL) - --if SHAREDLIB_HACK --libxmlsec1_openssl_la_SOURCES += ../strings.c --endif -- - libxmlsec1_openssl_la_LIBADD = \ - ../libxmlsec1.la \ - $(OPENSSL_LIBS) \ -- cgit