From b20146423caa1cb4ae6cb959ffd25bbe8cc1aac46f0d29564df3bdd289b7fecd Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 18 Apr 2016 05:32:36 +0000 Subject: [PATCH 1/2] Accepting request 390457 from home:msmeissn:branches:devel:libraries:c_c++ - libaio-optflags.diff: readd -stdlib to allow -fstack-protector-strong builds (unclear why it was not allowedlZZ) - 01_link_libgcc.patch, 02_libdevdir.patch: refreshed OBS-URL: https://build.opensuse.org/request/show/390457 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libaio?expand=0&rev=27 --- 01_link_libgcc.patch | 8 ++++---- 02_libdevdir.patch | 2 +- libaio-optflags.diff | 10 ++++++---- libaio.changes | 7 +++++++ libaio.spec | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/01_link_libgcc.patch b/01_link_libgcc.patch index 976c339..d5f41c8 100644 --- a/01_link_libgcc.patch +++ b/01_link_libgcc.patch @@ -2,12 +2,12 @@ src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: libaio-0.3.107/src/Makefile +Index: libaio-0.3.109/src/Makefile =================================================================== ---- libaio-0.3.107.orig/src/Makefile -+++ libaio-0.3.107/src/Makefile +--- libaio-0.3.109.orig/src/Makefile ++++ libaio-0.3.109/src/Makefile @@ -6,7 +6,7 @@ ARCH := $(shell uname -m | sed -e s/i.86 - CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC $(OPTFLAGS) + CFLAGS := -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC $(OPTFLAGS) SO_CFLAGS=-shared $(CFLAGS) L_CFLAGS=$(CFLAGS) -LINK_FLAGS= diff --git a/02_libdevdir.patch b/02_libdevdir.patch index 88556a9..ba64594 100644 --- a/02_libdevdir.patch +++ b/02_libdevdir.patch @@ -45,7 +45,7 @@ Index: libaio-0.3.109/src/Makefile +libdevdir=$(prefix)/lib ARCH := $(shell uname -m | sed -e s/i.86/i386/) - CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC $(OPTFLAGS) + CFLAGS := -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC $(OPTFLAGS) @@ -51,11 +53,11 @@ $(libname): $(libaio_sobjs) libaio.map $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) diff --git a/libaio-optflags.diff b/libaio-optflags.diff index f4a0914..8f9360f 100644 --- a/libaio-optflags.diff +++ b/libaio-optflags.diff @@ -1,11 +1,13 @@ ---- libaio-0.3.104/src/Makefile 2007/08/02 10:44:05 1.1 -+++ libaio-0.3.104/src/Makefile 2007/08/02 10:44:31 -@@ -3,7 +3,7 @@ +Index: libaio-0.3.109/src/Makefile +=================================================================== +--- libaio-0.3.109.orig/src/Makefile ++++ libaio-0.3.109/src/Makefile +@@ -3,7 +3,7 @@ includedir=$(prefix)/include libdir=$(prefix)/lib ARCH := $(shell uname -m | sed -e s/i.86/i386/) -CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC -+CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC $(OPTFLAGS) ++CFLAGS := -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC $(OPTFLAGS) SO_CFLAGS=-shared $(CFLAGS) L_CFLAGS=$(CFLAGS) LINK_FLAGS= diff --git a/libaio.changes b/libaio.changes index 4441b15..e7ff4e2 100644 --- a/libaio.changes +++ b/libaio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Apr 17 16:49:35 UTC 2016 - meissner@suse.com + +- libaio-optflags.diff: readd -stdlib to allow -fstack-protector-strong + builds (unclear why it was not allowedlZZ) +- 01_link_libgcc.patch, 02_libdevdir.patch: refreshed + ------------------------------------------------------------------- Tue Aug 26 11:33:27 UTC 2014 - fcrozat@suse.com diff --git a/libaio.spec b/libaio.spec index fb2547d..ff9fe1c 100644 --- a/libaio.spec +++ b/libaio.spec @@ -1,7 +1,7 @@ # # spec file for package libaio # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From ebf019671070c2b813d3ad9e340b01f7c6f296513907dcae026e64a32f312ee6 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 20 Apr 2016 12:57:45 +0000 Subject: [PATCH 2/2] builds (unclear why it was not allowed) OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libaio?expand=0&rev=28 --- libaio.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libaio.changes b/libaio.changes index e7ff4e2..3e4d22b 100644 --- a/libaio.changes +++ b/libaio.changes @@ -2,7 +2,7 @@ Sun Apr 17 16:49:35 UTC 2016 - meissner@suse.com - libaio-optflags.diff: readd -stdlib to allow -fstack-protector-strong - builds (unclear why it was not allowedlZZ) + builds (unclear why it was not allowed) - 01_link_libgcc.patch, 02_libdevdir.patch: refreshed -------------------------------------------------------------------