ppc64-diag/ppc64-diag-optflags.patch

128 lines
3.8 KiB
Diff

diff -up ppc64-diag-2.7.1/Makefile.optflags ppc64-diag-2.7.1/Makefile
--- ppc64-diag-2.7.1/Makefile.optflags 2016-05-09 08:26:55.000000000 +0200
+++ ppc64-diag-2.7.1/Makefile 2018-03-07 16:57:02.947694729 +0100
@@ -4,7 +4,6 @@
include rules.mk
-.SILENT:
BUILD_DIR=$(CURDIR)
SUBDIRS = common rtas_errd diags scripts ela lpd opal_errd opal-dump-parse
@@ -16,19 +15,19 @@ TARBALL_FILES += $(DOXYGEN_CFG)
all:
@echo "Building common files..."
- @$(MAKE) -C common
+ $(MAKE) -C common
@echo "Building rtas_errd files..."
- @$(MAKE) -C rtas_errd
+ $(MAKE) -C rtas_errd
@echo "Building diags files..."
- @$(MAKE) -C diags
+ $(MAKE) -C diags
@echo "Building ela files..."
- @$(MAKE) -C ela
+ $(MAKE) -C ela
@echo "Building lpd files..."
- @$(MAKE) -C lpd
+ $(MAKE) -C lpd
@echo "Building opal_errd files..."
- @$(MAKE) -C opal_errd
+ $(MAKE) -C opal_errd
@echo "Building opal-dump-parse files..."
- @$(MAKE) -C opal-dump-parse
+ $(MAKE) -C opal-dump-parse
install: all
diff -up ppc64-diag-2.7.1/common/tests/Makefile.optflags ppc64-diag-2.7.1/common/tests/Makefile
--- ppc64-diag-2.7.1/common/tests/Makefile.optflags 2016-05-09 08:26:55.000000000 +0200
+++ ppc64-diag-2.7.1/common/tests/Makefile 2018-03-07 16:57:02.967695095 +0100
@@ -3,7 +3,6 @@
#
CC = gcc
-CFLAGS = -g -Wall
INCLUDE = -I../
PROGS = spopen
diff -up ppc64-diag-2.7.1/diags/Makefile.optflags ppc64-diag-2.7.1/diags/Makefile
--- ppc64-diag-2.7.1/diags/Makefile.optflags 2016-05-09 08:26:55.000000000 +0200
+++ ppc64-diag-2.7.1/diags/Makefile 2018-03-07 16:57:02.937694546 +0100
@@ -23,12 +23,10 @@ all: $(PROGS)
@$(foreach d,$(SUBDIRS), $(MAKE) -C $d;)
diag_encl: $(DIAG_ENCL_OBJS)
- @echo "LD $(WORK_DIR)/$@"
- @$(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^ $(DIAG_ENCL_LIBS)
+ $(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^ $(DIAG_ENCL_LIBS)
encl_led: $(ENCL_LED_OBJS)
- @echo "LD $(WORK_DIR)/$@"
- @$(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^
+ $(CC) $(CFLAGS) $(INCLUDE) $(COMMON_UTILS_OBJ) -o $@ $^
diag_encl.o: encl_util.h diag_encl.h
diff -up ppc64-diag-2.7.1/rtas_errd/Makefile.optflags ppc64-diag-2.7.1/rtas_errd/Makefile
--- ppc64-diag-2.7.1/rtas_errd/Makefile.optflags 2018-03-07 16:57:02.937694546 +0100
+++ ppc64-diag-2.7.1/rtas_errd/Makefile 2018-03-07 16:57:02.947694729 +0100
@@ -26,16 +26,13 @@ DOXYGEN_CFG = doxygen.config
all: $(CMDS) $(SCRIPTS)
rtas_errd: $(RTAS_ERRD_OBJS) $(COMMON_UTILS_OBJ)
- @echo "LD $(WORK_DIR)/$@"
$(CC) $(CFLAGS) -o $@ $^ $(RTAS_ERRD_LIBS)
convert_dt_node_props: $(DT_NODE_OBJS)
- @echo "LD $(WORK_DIR)/$@"
- @$(CC) $(CFLAGS) -o $@ $^
+ $(CC) $(CFLAGS) -o $@ $^
extract_platdump: $(EXTRACT_PLATDUMP_OBJS)
- @echo "LD $(WORK_DIR)/$@"
- @$(CC) $(CFLAGS) -o $@ $^ $(EXTRACT_PLATDUMP_LIBS)
+ $(CC) $(CFLAGS) -o $@ $^ $(EXTRACT_PLATDUMP_LIBS)
install: all
@$(call install_sbin,$(CMDS),$(DESTDIR))
diff -up ppc64-diag-2.7.1/rules.mk.optflags ppc64-diag-2.7.1/rules.mk
--- ppc64-diag-2.7.1/rules.mk.optflags 2016-05-09 08:26:55.000000000 +0200
+++ ppc64-diag-2.7.1/rules.mk 2018-03-07 16:58:40.219475082 +0100
@@ -85,11 +85,7 @@ BUILD_TARBALL = \
# Current build directory
WORK_DIR = $(patsubst /%,%,$(subst $(ROOT_DIR),,$(PWD)))
-# You should always build with -Wall
-CFLAGS += -Wall
-
-# Uncomment this for debug builds
-CFLAGS += -g -DDEBUG
+CC = gcc
# Build with common directory included
CFLAGS += -I$(COMMON_DIR)
@@ -100,12 +96,6 @@ CFLAGS += -I $(INC_DIR)/ncurses
# Build with version string
AM_CFLAGS = -DVERSION='"$(VERSION)"'
-# You should always build with -Wall
-CXXFLAGS += -Wall
-
-# Uncomment this for debug builds
-CXXFLAGS += -g -DDEBUG
-
# Build with common directory included
CXXFLAGS += -I$(COMMON_DIR)
@@ -211,7 +201,6 @@ CLEAN = @echo ""
# Default target for building object files
%.o: %.c
- @echo "CC $(WORK_DIR)/$@"
- @$(CC) -c $(AM_CFLAGS) $(CFLAGS) $<
+ $(CC) -c $(AM_CFLAGS) $(CFLAGS) $<