diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-09-06 16:00:40 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-09-06 22:13:19 +0200 |
| commit | c05c751a257f4f11ea84a007ea570416dd842fc7 (patch) | |
| tree | 39cfd4b8e73eb08253a2cf208f18e3a663b37a04 /package/libiscsi/libiscsi-0001-Fix-warnings-related-to-subdir-objects.patch | |
| parent | 9a9d64bb496215a8dfbfe23960141ee7bf86c203 (diff) | |
| download | buildroot-c05c751a257f4f11ea84a007ea570416dd842fc7.tar.gz buildroot-c05c751a257f4f11ea84a007ea570416dd842fc7.zip | |
libiscsi: bump version to 1.12.0
This commit bumps libiscsi to version 1.12.0, which requires a few
changes:
- A number of patches to get libiscsi to build properly.
- The removal of the popt dependency, which is no longer needed.
- The removal of unnecessary spaces for alignment of variable
definitions in libiscsi.mk.
Fixes:
http://autobuild.buildroot.org/results/72f/72f389edf9c5a7e35d01dc4f76fd6dd0d8110f20/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libiscsi/libiscsi-0001-Fix-warnings-related-to-subdir-objects.patch')
| -rw-r--r-- | package/libiscsi/libiscsi-0001-Fix-warnings-related-to-subdir-objects.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/package/libiscsi/libiscsi-0001-Fix-warnings-related-to-subdir-objects.patch b/package/libiscsi/libiscsi-0001-Fix-warnings-related-to-subdir-objects.patch new file mode 100644 index 0000000000..7ccdc53c32 --- /dev/null +++ b/package/libiscsi/libiscsi-0001-Fix-warnings-related-to-subdir-objects.patch @@ -0,0 +1,46 @@ +From e801ccb2633e3f5842ed6d160af0e6e5cce44c77 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Tue, 2 Sep 2014 22:38:55 +0200 +Subject: [PATCH 1/4] Fix warnings related to subdir-objects + +Use AM_INIT_AUTOMAKE in configure.ac to define options such as +subdir-objects, instead of AUTOMAKE_OPTIONS in Makefile.am, as it +allows to avoid warnings during autoreconf: + +examples/Makefile.am:25: warning: source file '../lib/connect.c' is in a subdirectory, +examples/Makefile.am:25: but option 'subdir-objects' is disabled + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + Makefile.am | 1 - + configure.ac | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 7023988..f9de08c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,6 @@ + SUBDIRS = lib doc utils test-tool examples + + ACLOCAL_AMFLAGS =-I m4 +-AUTOMAKE_OPTIONS = foreign subdir-objects + AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \ + "-D_R_(A,B)=__attribute__((format(printf,A,B)))" + AM_CFLAGS=$(WARN_CFLAGS) +diff --git a/configure.ac b/configure.ac +index e1d01c6..6d29af0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ AC_INIT(libiscsi, m4_esyscmd([grep 'Version:' ./packaging/RPM/libiscsi.spec.in 2 + AC_CONFIG_SRCDIR([lib/init.c]) + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) + AM_SILENT_RULES + LT_INIT + +-- +2.0.0 + |
