pool/fcoe-utils
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Redo the autotools patch to actually fix --as-needed build,

Browse Source 
should be upstreamed.
- Adds patch: fcoe-utils-1.0.29-as-needed.patch
- Removes patch: fcoe-utils-1.0.29-no-as-needed.patch

OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=5
This commit is contained in:
Tomáš Chvátal 2013-10-10 15:22:42 +00:00 committed by Git OBS Bridge
parent 911451494e
commit e0524a2cb6
4 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fcoe-utils-1.0.29-as-needed.patch Normal file
View File

@ -0,0 +1,28 @@
diff -urN fcoe-utils-1.0.29.old/Makefile.am fcoe-utils-1.0.29/Makefile.am
--- fcoe-utils-1.0.29.old/Makefile.am 2013-10-10 17:20:17.341411557 +0200
+++ fcoe-utils-1.0.29/Makefile.am 2013-10-10 17:20:58.284411552 +0200
@@ -9,21 +9,18 @@
## rules for building fcoeadm
fcoeadm_SOURCES = fcoeadm.c fcoeadm_display.c
-fcoeadm_LDADD = lib/libutil.a libopenfcoe.a
+fcoeadm_LDADD = lib/libutil.a libopenfcoe.a $(HBAAPI_LIBS)
fcoeadm_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS)
-fcoeadm_LDFLAGS = $(AM_LDFLAGS) $(HBAAPI_LIBS)
## rules for building fcoemon
fcoemon_SOURCES = fcoemon.c
-fcoemon_LDADD = lib/libutil.a
+fcoemon_LDADD = lib/libutil.a -lrt
fcoemon_CFLAGS = $(AM_CFLAGS) $(DCBD_CFLAGS)
-fcoemon_LDFLAGS = $(AM_LDFLAGS) -lrt
## rules for building fcping
fcping_SOURCES = fcping.c
-fcping_LDADD = lib/libutil.a
+fcping_LDADD = lib/libutil.a $(HBAAPI_LIBS) -lrt
fcping_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS)
-fcping_LDFLAGS = $(AM_LDFLAGS) $(HBAAPI_LIBS) -lrt
## rules for building fipvlan
fipvlan_SOURCES = fipvlan.c

22
fcoe-utils-1.0.29-no-as-needed.patch
View File

@ -1,22 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 5cbc15f..1e8d1cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ AM_CFLAGS = -Wall -Wformat=2 -Werror -Wmissing-prototypes -Wstrict-prototypes
fcoeadm_SOURCES = fcoeadm.c fcoeadm_display.c
fcoeadm_LDADD = lib/libutil.a libopenfcoe.a
fcoeadm_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS)
-fcoeadm_LDFLAGS = $(AM_LDFLAGS) $(HBAAPI_LIBS)
+fcoeadm_LDFLAGS = $(AM_LDFLAGS) -Wl,--no-as-needed $(HBAAPI_LIBS)
## rules for building fcoemon
fcoemon_SOURCES = fcoemon.c
@@ -23,7 +23,7 @@ fcoemon_LDFLAGS = $(AM_LDFLAGS) -lrt
fcping_SOURCES = fcping.c
fcping_LDADD = lib/libutil.a
fcping_CFLAGS = $(AM_CFLAGS) $(HBAAPI_CFLAGS)
-fcping_LDFLAGS = $(AM_LDFLAGS) $(HBAAPI_LIBS) -lrt
+fcping_LDFLAGS = $(AM_LDFLAGS) -Wl,--no-as-needed $(HBAAPI_LIBS) -lrt
## rules for building fipvlan
fipvlan_SOURCES = fipvlan.c

8
fcoe-utils.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Oct 10 15:22:26 UTC 2013 - tchvatal@suse.com
- Redo the autotools patch to actually fix --as-needed build,
should be upstreamed.
- Adds patch: fcoe-utils-1.0.29-as-needed.patch
- Removes patch: fcoe-utils-1.0.29-no-as-needed.patch
-------------------------------------------------------------------
Thu Oct 10 15:16:52 UTC 2013 - tchvatal@suse.com

13
fcoe-utils.spec
View File

@ -44,7 +44,8 @@ Patch1: fcoe-utils-1.0.29-make.patch
Patch2: fcoe-utils-1.0.18-help.patch
Patch3: fcoe-utils-1.0.28-format-strings.patch
Patch4: fcoe-utils-1.0.28-systemd-doc.patch
Patch5: fcoe-utils-1.0.29-no-as-needed.patch
# PATCH-FIX-UPSTREAM: fcoe-utils-1.0.29-as-needed.patch
Patch5: fcoe-utils-1.0.29-as-needed.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -54,11 +55,11 @@ connections.
%prep
%setup -q
%patch1 -p1 -b .make
%patch2 -p1 -b .help
%patch3 -p1 -b .format-strings
%patch4 -p1 -b .systemd-doc
%patch5 -p1 -b .no-as-needed
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
autoreconf -vi