cirros-testvm/src-cirros/buildroot-2015.05/package/libiscsi/0006-configure-only-build-the-test-tool-and-ld-iscsi-iff-.patch

   1 Only build the test tool and ld-iscsi if we have shared libraries
   2
   3 Backporting an upstream patch to fix a failure when doing a static
   4 build:
   5
   6 /br/output/host/usr/bin/mipsel-ctng-linux-uclibc-gcc -shared -o
   7 ld_iscsi.so ld_iscsi.o -ldl
   8 /br/output/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-ctng-linux-uclibc/4.8.2/../../../../mipsel-ctng-linux-uclibc/bin/ld:
   9 ld_iscsi.o: relocation R_MIPS_HI16 against `__gnu_local_gp' can not be
  10 used when making a shared object; recompile with -fPIC
  11 ld_iscsi.o: could not read symbols: Bad value
  12 collect2: error: ld returned 1 exit status
  13
  14 Upstream commit:
  15   https://github.com/sahlberg/libiscsi/commit/3d6c2be3428d88682cecfa2a4ad172aaacffb318
  16
  17 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  18
  19 From 3d6c2be3428d88682cecfa2a4ad172aaacffb318 Mon Sep 17 00:00:00 2001
  20 From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
  21 Date: Wed, 22 Oct 2014 17:44:03 -0700
  22 Subject: [PATCH] configure: only build the test tool and ld-iscsi iff we have shared libraries
  23
  24 Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
  25 ---
  26  configure.ac |    5 ++---
  27  1 files changed, 2 insertions(+), 3 deletions(-)
  28
  29 diff --git a/configure.ac b/configure.ac
  30 index 5e18ff4..e9c5c93 100644
  31 --- a/configure.ac
  32 +++ b/configure.ac
  33 @@ -10,8 +10,6 @@ AM_PROG_AR
  34  LT_INIT
  35
  36  AC_CANONICAL_HOST
  37 -AM_CONDITIONAL(LD_ISCSI,
  38 -               [expr "$host_os" : linux > /dev/null 2>&1])
  39  AM_PROG_CC_C_O
  40
  41  enable_write_strings="yes"
  42 @@ -108,8 +106,9 @@ else
  43    AC_MSG_NOTICE(You need libcunit to build the test suite.)
  44    AC_MSG_NOTICE(The scsi/iscsi test suite will not be built.)
  45  fi
  46 -AM_CONDITIONAL(ISCSITEST, [test "$ac_cv_have_cunit" = yes])
  47 +AM_CONDITIONAL(ISCSITEST, [test "$ac_cv_have_cunit" = yes -a "$enable_shared" = "yes"])
  48
  49 +AM_CONDITIONAL(LD_ISCSI, [expr "(" "$host_os" : "linux" ")" "&" "$enable_shared" "=" "yes"])
  50
  51  AC_CHECK_MEMBER([struct CU_SuiteInfo.pSetUpFunc],
  52                 [AC_DEFINE([HAVE_CU_SUITEINFO_PSETUPFUNC], 1,
  53 --
  54 1.7.1
  55