2013-04-08 14:07:25 +02:00
|
|
|
From d1a49cccf99373293a88f5bce74857d5bb813e46 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Bernhard Voelker <mail@bernhard-voelker.de>
|
|
|
|
Date: Thu, 10 Jan 2013 09:21:22 +0200
|
|
|
|
Subject: build timeout as PIE
|
|
|
|
|
|
|
|
The OBS requires /usr/bin/timeout to be built as an position
|
|
|
|
independent executable (PIE). This is enforced via RPMLINT.
|
|
|
|
|
|
|
|
* src/local.mk (AM_CFLAGS): Add -fpie option.
|
|
|
|
(timeout_CFLAGS): Likewise.
|
|
|
|
(timeout_LDFLAGS): Add -pie option.
|
|
|
|
|
|
|
|
---
|
|
|
|
src/local.mk | 5 ++++-
|
|
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
Index: src/local.mk
|
|
|
|
===================================================================
|
2014-01-24 14:44:10 +01:00
|
|
|
--- src/local.mk.orig
|
|
|
|
+++ src/local.mk
|
2013-04-08 14:07:25 +02:00
|
|
|
@@ -17,7 +17,7 @@
|
|
|
|
## along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
# FIXME: once lib/ and gnulib-tests/ are also converted, hoist to Makefile.am
|
|
|
|
-AM_CFLAGS = $(WERROR_CFLAGS)
|
|
|
|
+AM_CFLAGS = $(WERROR_CFLAGS) -fpie
|
|
|
|
|
|
|
|
# The list of all programs (separated in different variables to express
|
|
|
|
# the how and when they should be installed) is defined in this makefile
|
2014-08-01 18:10:23 +02:00
|
|
|
@@ -276,6 +276,9 @@ src_factor_LDADD += $(LIB_GMP)
|
2013-04-08 14:07:25 +02:00
|
|
|
# for getloadavg
|
|
|
|
src_uptime_LDADD += $(GETLOADAVG_LIBS)
|
|
|
|
|
|
|
|
+src_timeout_CFLAGS = -fpie
|
|
|
|
+src_timeout_LDFLAGS = -pie
|
|
|
|
+
|
|
|
|
# for various ACL functions
|
|
|
|
copy_ldadd += $(LIB_ACL)
|
2015-07-16 03:29:46 +02:00
|
|
|
src_ls_LDADD += $(LIB_HAS_ACL)
|