projects / packages / open-iscsi.git / blame
| Commit | Line | Data |
|---|---|---|
| 6ae08450 JR |
1 | From 436ac9074def43ae09d7ecc28eec6cdc77a9d0e2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chris Leech <cleech@redhat.com> | |
| 3 | Date: Fri, 13 Sep 2013 16:56:51 -0700 | |
| 4 | Subject: [PATCH 65/65] fix hardened build of iscsiuio | |
| 5 | ||
| 6 | The new iscsiuio code sets CFLAGS in configure.ac, wiping out the | |
| 7 | environment setup by rpm. Patch that out. | |
| 8 | ||
| 9 | --- | |
| 10 | Makefile | 2 +- | |
| 11 | iscsiuio/configure | 2 +- | |
| 12 | iscsiuio/configure.ac | 2 +- | |
| 13 | 3 files changed, 3 insertions(+), 3 deletions(-) | |
| 14 | mode change 100644 => 100755 iscsiuio/configure | |
| 15 | ||
| 16 | diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac | |
| 17 | index e9a5e32..d9a6bdb 100644 | |
| 18 | --- a/iscsiuio/configure.ac | |
| 19 | +++ b/iscsiuio/configure.ac | |
| 0db1e35b | 20 | @@ -52,7 +52,7 @@ AC_LIBTOOL_DLOPEN |
| 6ae08450 JR |
21 | # libtool stuff |
| 22 | AC_PROG_LIBTOOL | |
| 23 | ||
| 24 | -CFLAGS="-O2 -Wall" | |
| 0db1e35b | 25 | +CFLAGS="${CFLAGS} -O2 -Wall" |
| 6ae08450 JR |
26 | ## check for --enable-debug first before checking CFLAGS before |
| 27 | ## so that we don't mix -O and -g | |
| 28 | AC_ARG_ENABLE(debug, | |
| 29 | -- | |
| 30 | 1.8.1.4 | |
| 31 |