Browse Source

libgcrypt: Improved cross-compile support

Note: By now the libgcrypt tests will be build again while cross-compiling
      but we have to explicitely disable MPI assembler modules, which leads
      to unresolved symbols otherwise. In general this shouldn't cause any
      troubles as it seems that assembler modules aren't even used while
      compiling natively. At least I couldn't find any related symbols in
      any natively compiled libgcrypt binaries I have access to currently.
crossperl
Christian Wiese 17 years ago committed by Alejandro Mery
parent
commit
34f923cbd4
  1. 29
      security/libgcrypt/disable-tests.patch.cross
  2. 31
      security/libgcrypt/libgcrypt-1.4.0-tests-fix.patch.cross
  3. 5
      security/libgcrypt/libgcrypt.conf

29
security/libgcrypt/disable-tests.patch.cross

@ -1,29 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../libgcrypt/disable-tests.patch.cross
# Copyright (C) 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- libgcrypt-1.4.0/Makefile.in.orig 2007-12-10 11:05:13.000000000 +0200
+++ libgcrypt-1.4.0/Makefile.in 2008-03-15 19:27:24.000000000 +0200
@@ -236,8 +236,8 @@
DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
-DIST_SUBDIRS = m4 mpi cipher src doc tests
-SUBDIRS = mpi cipher src doc tests
+DIST_SUBDIRS = m4 mpi cipher src doc
+SUBDIRS = mpi cipher src doc
EXTRA_DIST = BUGS autogen.sh README.SVN
DISTCLEANFILES =
all: config.h

31
security/libgcrypt/libgcrypt-1.4.0-tests-fix.patch.cross

@ -0,0 +1,31 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../libgcrypt/libgcrypt-1.4.0-tests-fix.patch.cross
# Copyright (C) 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Author: Nicolas Thill
Origin: OpenWRT (https://dev.openwrt.org/browser/packages/libs/libgcrypt/)
Description: Fix libgcrypt tests to build while cross-compiling.
--- libgcrypt-1.4.0/tests/Makefile.in.orig 2008-03-17 02:40:20.000000000 +0200
+++ libgcrypt-1.4.0/tests/Makefile.in 2008-03-17 02:40:41.000000000 +0200
@@ -313,7 +313,7 @@
# a built header.
AM_CPPFLAGS = -I../src -I$(top_srcdir)/src
AM_CFLAGS = $(GPG_ERROR_CFLAGS)
-LDADD = ../src/libgcrypt.la
+LDADD = ../src/libgcrypt.la @LTLIBOBJS@ @GPG_ERROR_LIBS@
# pkbench uses mmap for no good reason. Needs to be fixed. Code for
# this can be found in libksba/tests.

5
security/libgcrypt/libgcrypt.conf

@ -16,3 +16,8 @@
# one from the sandbox while cross-compiling # one from the sandbox while cross-compiling
pkgprefix -t libgpg-error pkgprefix -t libgpg-error
var_append confopt ' ' "--with-gpg-error-prefix=$root/$( pkgprefix libgpg-error )" var_append confopt ' ' "--with-gpg-error-prefix=$root/$( pkgprefix libgpg-error )"
# explicitely disable MPI assembler modules while cross-compiling
if atstage cross; then
var_append extraconfopt ' ' "--disable-asm"
fi

Loading…
Cancel
Save