| Message ID | 20190626125900.48230-6-giulio.benetti@micronovasrl.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Microblaze clean up | expand |
On Wed, 26 Jun 2019 14:58:58 +0200 Giulio Benetti <giulio.benetti@micronovasrl.com> wrote: > Package prboom builds using -O2 flag ignoring Buildroot settings, this > is due to the fact that -O2 is appended at the end of compiler flags. > > Remove -O2 from 'configure.ac' file and set PRBOOM_AUTORECONF to YES, > this way CFLAGS_OPTS will contain Buildroot TARGET_CFLAGS. > > Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> Your proposed solution is not ideal, because it really only prevents prboom from adding -O2, but not any other option. A better solution would have been to make sure that CFLAGS passed as ./configure environment or arguments appear *after* the CFLAGS defined by the configure.ac, so they can all be overridden. But well, that is too much effort for a completely unmaintained piece of software, so I applied your patch as-is. Thanks! Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > On Wed, 26 Jun 2019 14:58:58 +0200 > Giulio Benetti <giulio.benetti@micronovasrl.com> wrote: >> Package prboom builds using -O2 flag ignoring Buildroot settings, this >> is due to the fact that -O2 is appended at the end of compiler flags. >> >> Remove -O2 from 'configure.ac' file and set PRBOOM_AUTORECONF to YES, >> this way CFLAGS_OPTS will contain Buildroot TARGET_CFLAGS. >> >> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> > Your proposed solution is not ideal, because it really only prevents > prboom from adding -O2, but not any other option. A better solution > would have been to make sure that CFLAGS passed as ./configure > environment or arguments appear *after* the CFLAGS defined by the > configure.ac, so they can all be overridden. But well, that is too much > effort for a completely unmaintained piece of software, so I applied > your patch as-is. Committed to 2019.02.x and 2019.05.x, thanks.
diff --git a/package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch b/package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch new file mode 100644 index 0000000000..9260cb6314 --- /dev/null +++ b/package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch @@ -0,0 +1,21 @@ +configure: remove predefined -O2 optimization flag + +CFLAGS_OPT variable forces to use -O2 optimization flag denying the +possibility to use different optimization flag values. + +Remove -O2 flag from CFLAGS_OPT. + +Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> +--- +diff -urpN prboom-2.5.0.orig/configure.ac prboom-2.5.0/configure.ac +--- prboom-2.5.0.orig/configure.ac 2019-06-20 14:07:45.058481879 +0200 ++++ prboom-2.5.0/configure.ac 2019-06-20 14:09:05.066238825 +0200 +@@ -48,7 +48,7 @@ else + fi + + dnl --- cph: work out flags to pass to compiler +-CFLAGS_OPT="-O2 -fomit-frame-pointer" ++CFLAGS_OPT="-fomit-frame-pointer" + AC_C_COMPILE_FLAGS(-Wall) + dnl --- Option to enable debugging + AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[turns on various debugging features, like range checking and internal heap diagnostics]),,enable_debug="no") diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk index d370ae3fa5..325bf3eb02 100644 --- a/package/prboom/prboom.mk +++ b/package/prboom/prboom.mk @@ -10,6 +10,7 @@ PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer PRBOOM_LICENSE = GPL-2.0+ PRBOOM_LICENSE_FILES = COPYING +PRBOOM_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBPNG),y) PRBOOM_DEPENDENCIES += libpng
Package prboom builds using -O2 flag ignoring Buildroot settings, this is due to the fact that -O2 is appended at the end of compiler flags. Remove -O2 from 'configure.ac' file and set PRBOOM_AUTORECONF to YES, this way CFLAGS_OPTS will contain Buildroot TARGET_CFLAGS. Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> --- V1->V2: * patch configure.ac instead of configure and autoreconf ...move-predefined-O2-optimization-flag.patch | 21 +++++++++++++++++++ package/prboom/prboom.mk | 1 + 2 files changed, 22 insertions(+) create mode 100644 package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch