|
 |
9e7985 |
From 5c24d725d5a5f50f0544fbcc544f08a3f9e90e5d Mon Sep 17 00:00:00 2001
|
|
|
9e7985 |
From: Peter Jones <pjones@redhat.com>
|
|
|
9e7985 |
Date: Thu, 8 Aug 2019 05:41:36 -0400
|
|
|
9e7985 |
Subject: [PATCH] Add 'RPMOPTFLAGS' to CFLAGS for some stuff.
|
|
|
9e7985 |
|
|
|
9e7985 |
---
|
|
|
9e7985 |
extlinux/Makefile | 4 ++--
|
|
|
9e7985 |
linux/Makefile | 4 ++--
|
|
|
9e7985 |
mtools/Makefile | 4 ++--
|
|
|
9e7985 |
utils/Makefile | 4 ++--
|
|
|
9e7985 |
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
9e7985 |
|
|
|
9e7985 |
diff --git a/extlinux/Makefile b/extlinux/Makefile
|
|
|
9e7985 |
index 1721ee54aff..d504e23133e 100644
|
|
|
9e7985 |
--- a/extlinux/Makefile
|
|
|
9e7985 |
+++ b/extlinux/Makefile
|
|
|
9e7985 |
@@ -18,9 +18,9 @@ include $(MAKEDIR)/syslinux.mk
|
|
|
9e7985 |
|
|
|
9e7985 |
OPTFLAGS = -g -Os
|
|
|
9e7985 |
INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libinstaller
|
|
|
9e7985 |
-CFLAGS = $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \
|
|
|
9e7985 |
+CFLAGS = $(RPMCFLAGS) $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \
|
|
|
9e7985 |
$(OPTFLAGS) $(INCLUDES)
|
|
|
9e7985 |
-LDFLAGS =
|
|
|
9e7985 |
+LDFLAGS = $(RPMLDFLAGS)
|
|
|
9e7985 |
|
|
|
9e7985 |
SRCS = main.c \
|
|
|
9e7985 |
mountinfo.c \
|
|
|
9e7985 |
diff --git a/linux/Makefile b/linux/Makefile
|
|
|
9e7985 |
index 5a49d813de1..9fed68d02c6 100644
|
|
|
9e7985 |
--- a/linux/Makefile
|
|
|
9e7985 |
+++ b/linux/Makefile
|
|
|
9e7985 |
@@ -18,8 +18,8 @@ include $(MAKEDIR)/syslinux.mk
|
|
|
9e7985 |
|
|
|
9e7985 |
OPTFLAGS = -g -Os
|
|
|
9e7985 |
INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libinstaller
|
|
|
9e7985 |
-CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
|
|
|
9e7985 |
-LDFLAGS =
|
|
|
9e7985 |
+CFLAGS = $(RPMCFLAGS) $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
|
|
|
9e7985 |
+LDFLAGS = $(RPMLDFLAGS)
|
|
|
9e7985 |
|
|
|
9e7985 |
SRCS = syslinux.c \
|
|
|
9e7985 |
../libinstaller/syslxopt.c \
|
|
|
9e7985 |
diff --git a/mtools/Makefile b/mtools/Makefile
|
|
|
9e7985 |
index 632b185ba2f..b6e5ebdba6b 100755
|
|
|
9e7985 |
--- a/mtools/Makefile
|
|
|
9e7985 |
+++ b/mtools/Makefile
|
|
|
9e7985 |
@@ -2,8 +2,8 @@ include $(MAKEDIR)/syslinux.mk
|
|
|
9e7985 |
|
|
|
9e7985 |
OPTFLAGS = -g -Os
|
|
|
9e7985 |
INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libfat -I$(SRC)/../libinstaller
|
|
|
9e7985 |
-CFLAGS = $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
|
|
|
9e7985 |
-LDFLAGS =
|
|
|
9e7985 |
+CFLAGS = $(RPMCFLAGS) $(GCCWARN) -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES)
|
|
|
9e7985 |
+LDFLAGS = $(RPMLDFLAGS)
|
|
|
9e7985 |
|
|
|
9e7985 |
SRCS = syslinux.c \
|
|
|
9e7985 |
../libinstaller/fs.c \
|
|
|
9e7985 |
diff --git a/utils/Makefile b/utils/Makefile
|
|
|
9e7985 |
index dfe625902ce..b4962353f20 100644
|
|
|
9e7985 |
--- a/utils/Makefile
|
|
|
9e7985 |
+++ b/utils/Makefile
|
|
|
9e7985 |
@@ -17,8 +17,8 @@
|
|
|
9e7985 |
VPATH = $(SRC)
|
|
|
9e7985 |
include $(MAKEDIR)/syslinux.mk
|
|
|
9e7985 |
|
|
|
9e7985 |
-CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC)
|
|
|
9e7985 |
-LDFLAGS = -O2
|
|
|
9e7985 |
+CFLAGS = $(RPMCFLAGS) $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC)
|
|
|
9e7985 |
+LDFLAGS = $(RPMLDFLAGS) -O2
|
|
|
9e7985 |
|
|
|
9e7985 |
C_TARGETS = isohybrid gethostip memdiskfind
|
|
|
9e7985 |
SCRIPT_TARGETS = mkdiskimage
|
|
|
9e7985 |
--
|
|
|
9e7985 |
2.21.0
|
|
|
9e7985 |
|