![Thomas Petazzoni](/assets/img/avatar_default.png)
Until now, libaio contained some architecture specific code to do the syscalls. In fact, it contained a generic variant of the code called syscall-generic.h, but it was showing a warning when it was used, as if it was "not safe". Consequently, in Buildroot, we had chosen to support libaio only on a the subset of architectures that were explicitly handled by libaio. However, between 0.3.110 and 0.3.111, libaio upstream entirely dropped the architecture-specific code: https://pagure.io/libaio/c/97fd3fc0195500e616e34047cba4846164c411d9?branch=master Consequently, in this patch, we: - Bump libaio to 0.3.111. - Switch to the new upstream at https://pagure.io/libaio/. - Drop the 0001-arches.patch patch, which was adding support for MIPS, since we no longer need architecture-specific code. - Update the remaining patches, and Git-format one of them which wasn't Git-formatted. - Drop the BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS option and all its uses. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
From 4dc04ef55710f7f5c1e55ebb5cba8e22a126404e Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Mon, 29 Aug 2016 22:14:26 +0200
|
|
Subject: [PATCH] src/Makefile: add ENABLE_SHARED boolean to allow static-only
|
|
build
|
|
|
|
Currently, the libaio builds sytem builds a shared library
|
|
unconditionally. In some environments, this is not possible or
|
|
desirable. This commit adds a new Makefile variable, ENABLE_SHARED,
|
|
which defaults to "1" (i.e shared library enabled) and that allows to
|
|
override this behavior, and therefore to disable the build and
|
|
installation of the shared library.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
src/Makefile | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/Makefile b/src/Makefile
|
|
index eadb336..cfab240 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -8,12 +8,17 @@ SO_CFLAGS=-shared $(CFLAGS)
|
|
L_CFLAGS=$(CFLAGS)
|
|
LINK_FLAGS=
|
|
LINK_FLAGS+=$(LDFLAGS)
|
|
+ENABLE_SHARED ?= 1
|
|
|
|
soname=libaio.so.1
|
|
minor=0
|
|
micro=1
|
|
libname=$(soname).$(minor).$(micro)
|
|
-all_targets += libaio.a $(libname)
|
|
+all_targets += libaio.a
|
|
+
|
|
+ifeq ($(ENABLE_SHARED),1)
|
|
+all_targets += $(libname)
|
|
+endif
|
|
|
|
all: $(all_targets)
|
|
|
|
@@ -55,9 +60,11 @@ $(libname): $(libaio_sobjs) libaio.map
|
|
install: $(all_targets)
|
|
install -D -m 644 libaio.h $(includedir)/libaio.h
|
|
install -D -m 644 libaio.a $(libdir)/libaio.a
|
|
+ifeq ($(ENABLE_SHARED),1)
|
|
install -D -m 755 $(libname) $(libdir)/$(libname)
|
|
ln -sf $(libname) $(libdir)/$(soname)
|
|
ln -sf $(libname) $(libdir)/libaio.so
|
|
+endif
|
|
|
|
$(libaio_objs): libaio.h
|
|
|
|
--
|
|
2.14.4
|
|
|