918758da63
Add argus-client-fix-build.patch to properly fail build on errors and avoid these (boo#1102408) Note: not completely sure of it. Please review/test OBS-URL: https://build.opensuse.org/request/show/708470 OBS-URL: https://build.opensuse.org/package/show/security/argus-client?expand=0&rev=28
68 lines
2.0 KiB
Diff
68 lines
2.0 KiB
Diff
From: Bernhard M. Wiedemann <bwiedemann suse de>
|
|
To: argus@qosient.com
|
|
Date: 2018-03-27
|
|
|
|
make argus-clients compilation properly fail on errors
|
|
instead of randomly and silently leaving out unrelated binaries
|
|
(unless building with make -k)
|
|
|
|
And fix compilation of radium and others on openSUSE Leap 15.0
|
|
|
|
Index: argus-clients-3.0.8.2/Makefile.in
|
|
===================================================================
|
|
--- argus-clients-3.0.8.2.orig/Makefile.in
|
|
+++ argus-clients-3.0.8.2/Makefile.in
|
|
@@ -63,7 +63,7 @@ all: force
|
|
@for i in $(DIRS) ; do \
|
|
if [ -d $$i ] ; then \
|
|
echo "making in $$i"; \
|
|
- (cd $$i > /dev/null; $(MAKE));\
|
|
+ (cd $$i > /dev/null; $(MAKE)) || exit 50;\
|
|
fi; \
|
|
done
|
|
|
|
@@ -84,7 +84,7 @@ install: force
|
|
@for i in $(INSTDIRS) ; do \
|
|
if [ -d $$i ] ; then \
|
|
echo "making in $$i"; \
|
|
- (cd $$i > /dev/null; $(MAKE) install); \
|
|
+ (cd $$i > /dev/null; $(MAKE) install) || exit 51; \
|
|
fi; \
|
|
done
|
|
$(INSTALL) -m 0644 $(srcdir)/support/Config/rarc $(DESTDIR)$(prefix)/argus/rarc
|
|
@@ -273,7 +273,7 @@ force: /tmp
|
|
depend: $(GENSRC) force
|
|
@for i in $(DIRS) ; do \
|
|
if [ -d $$i ] ; then \
|
|
- (cd $$i > /dev/null; $(MAKE) depend ); \
|
|
+ (cd $$i > /dev/null; $(MAKE) depend ) || exit 52; \
|
|
fi; \
|
|
done
|
|
|
|
Index: argus-clients-3.0.8.2/configure
|
|
===================================================================
|
|
--- argus-clients-3.0.8.2.orig/configure
|
|
+++ argus-clients-3.0.8.2/configure
|
|
@@ -9041,7 +9041,7 @@ if test ! -z "$V_WRAPDEP"; then
|
|
fi
|
|
case "$target_os" in
|
|
linux*)
|
|
- V_WRAPDEP="$V_WRAPDEP -lnsl";;
|
|
+ V_WRAPDEP="$V_WRAPDEP";;
|
|
esac
|
|
fi
|
|
fi
|
|
Index: argus-clients-3.0.8.2/configure.ac
|
|
===================================================================
|
|
--- argus-clients-3.0.8.2.orig/configure.ac
|
|
+++ argus-clients-3.0.8.2/configure.ac
|
|
@@ -173,7 +173,7 @@ if test ! -z "$V_WRAPDEP"; then
|
|
fi
|
|
case "$target_os" in
|
|
linux*)
|
|
- V_WRAPDEP="$V_WRAPDEP -lnsl";;
|
|
+ V_WRAPDEP="$V_WRAPDEP";;
|
|
esac
|
|
fi
|
|
fi
|