infra: Move --enable/--disable-debug to package/Makefile.in

A lot of packages ignored BR2_ENABLE_DEBUG. This patch simplifies the handling of
this option by adding the corresponding configure option to the global Makefile
for target packages.

For host packages --disable-debug is added to the global Makefile.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/Makefile.in b/package/Makefile.in
index ab59b54e50561a2aafc80ce82b28fb3361e0d198..02ddaa716b312a9f9f8519ef8b6f63c7b3237804 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -370,7 +370,7 @@ endif
 ifeq ($(BR2_ENABLE_DEBUG),y)
 ENABLE_DEBUG := --enable-debug
 else
-ENABLE_DEBUG :=
+ENABLE_DEBUG := --disable-debug
 endif
 
 ifeq ($(BR2_PREFER_STATIC_LIB),y)

diff --git a/package/alsa-lib/alsa-lib.mk b/package/alsa-lib/alsa-lib.mk
index 7d8056690ccfcfe84100689e31e0e3dcde6d9250..0b329cd4b43aa38e251a18eb2a469fa660ef3112 100644 (file)
--- a/package/alsa-lib/alsa-lib.mk
+++ b/package/alsa-lib/alsa-lib.mk
@@ -49,10 +49,6 @@ ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y)
 ALSA_LIB_CONF_OPTS += --disable-old-symbols
 endif
 
-ifeq ($(BR2_ENABLE_DEBUG),y)
-ALSA_LIB_CONF_OPTS += --enable-debug
-endif
-
 ifeq ($(BR2_avr32),y)
 ALSA_LIB_CFLAGS += -DAVR32_INLINE_BUG
 endif

diff --git a/package/atk/atk.mk b/package/atk/atk.mk
index 690770b063a8919df2a21e26d40c305286be3255..18fe68876e991764a3a44f1914dd70315532fe8d 100644 (file)
--- a/package/atk/atk.mk
+++ b/package/atk/atk.mk
@@ -41,8 +41,7 @@ ATK_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes \
                jm_cv_func_working_re_compile_pattern=yes ac_use_included_regex=no \
                gl_cv_c_restrict=no ac_cv_prog_F77=no
 
-ATK_CONF_OPTS =  --disable-glibtest --enable-explicit-deps=no \
-               --disable-debug
+ATK_CONF_OPTS =  --disable-glibtest --enable-explicit-deps=no
 
 ATK_DEPENDENCIES = libglib2 host-pkgconf
 

diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index eb0328cbed9fc21973eacd062569c199cbff1d62..7f1c8d7d2e53f7958742e4e4d6f44481e7b20498 100644 (file)
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -144,7 +144,6 @@ endif
 
 HOST_DIRECTFB_DEPENDENCIES = host-pkgconf host-libpng
 HOST_DIRECTFB_CONF_OPTS = \
-               --disable-debug \
                --disable-multi \
                --enable-png \
                --with-gfxdrivers=none \

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index af4e1f66680c73937554911f27dfddc31a8cfafd..166b5cea3c4393dcbda35275cd5e0fab1e925719 100644 (file)
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -66,12 +66,6 @@ FFMPEG_CONF_OPTS = \
 
 FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
 
-ifeq ($(BR2_ENABLE_DEBUG),y)
-FFMPEG_CONF_OPTS += --enable-debug
-else
-FFMPEG_CONF_OPTS += --disable-debug
-endif
-
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
 FFMPEG_CONF_OPTS += --enable-gpl
 else

diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index 2a85b759675d42821304925ac408bff5711434a6..443dd48b9eecad4c141a52dbf03281a8a647a9af 100644 (file)
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -10,7 +10,6 @@ GAMIN_AUTORECONF = YES
 GAMIN_INSTALL_STAGING = YES
 GAMIN_LICENSE = LGPLv2+
 GAMIN_LICENSE_FILES = COPYING
-GAMIN_CONF_OPTS = --disable-debug
 
 # python support broken
 GAMIN_CONF_OPTS += --without-python

diff --git a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
index 4ab5371f3bc01c83c2a9d020b187cb2e9d64d601..2c2706a6a67a377f2086da2ebade69310e1e9e26 100644 (file)
--- a/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
+++ b/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
@@ -9,7 +9,6 @@ GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz
 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
 
 GST_PLUGINS_GOOD_CONF_OPTS = \
-               --disable-debug \
                --disable-examples \
                --disable-directsound \
                --disable-sunaudio \

diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk
index b903da2d0bc40c6f8bc5fb3866a2416c10a96d78..6fdf0914544fa71f591640f2c272af35fe0db586 100644 (file)
--- a/package/gstreamer1/gst1-libav/gst1-libav.mk
+++ b/package/gstreamer1/gst1-libav/gst1-libav.mk
@@ -10,10 +10,7 @@ GST1_LIBAV_SITE = http://gstreamer.freedesktop.org/src/gst-libav
 
 GST1_LIBAV_DEPENDENCIES = host-pkgconf gstreamer1 gst1-plugins-base
 
-GST1_LIBAV_CONF_EXTRA_OPTS = \
-       --cross-prefix=$(TARGET_CROSS) \
-       --target-os=linux \
-       $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
+GST1_LIBAV_CONF_EXTRA_OPTS = --cross-prefix=$(TARGET_CROSS) --target-os=linux
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 GST1_LIBAV_CONF_EXTRA_OPTS += --enable-zlib

diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index cf4648d80b0fe2d39adecd2683626b4cdaa3feab..a8dbd53aca755214369a39060db283d69f512319 100644 (file)
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -18,7 +18,6 @@ GST1_PLUGINS_BAD_GETTEXTIZE = YES
 
 GST1_PLUGINS_BAD_CONF_OPTS = \
        --disable-examples \
-       --disable-debug \
        --disable-valgrind \
        --disable-directsound \
        --disable-wsapi \

diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index bc19bac385e9ff9ca3dd7b11997d508abb1f89ec..15368a2dc4c2248a6f89f09c51a59b43b8758405 100644 (file)
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -23,8 +23,7 @@ GST1_PLUGINS_BASE_CONF_OPTS = \
        --disable-oggtest \
        --disable-vorbistest \
        --disable-freetypetest \
-       --disable-valgrind \
-       --disable-debug
+       --disable-valgrind
 
 # Options which require currently unpackaged libraries
 GST1_PLUGINS_BASE_CONF_OPTS += \

diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
index 0167e4fe968e591fb693ca2772227c15a51cdbd0..7c40b9952f678d2bc9f5b8868aea1397fae18474 100644 (file)
--- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
+++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
@@ -11,7 +11,6 @@ GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
 GST1_PLUGINS_GOOD_LICENSE = LGPLv2.1+
 
 GST1_PLUGINS_GOOD_CONF_OPTS = \
-       --disable-debug \
        --disable-valgrind \
        --disable-examples \
        --disable-directsound \

diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
index 656189d7e5e6ba964a1caceda6d3a9c3975cfe73..34558322eb8ed092d43e8e028bf21caf21f5abb5 100644 (file)
--- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -11,10 +11,7 @@ GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
 # GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled.
 GST1_PLUGINS_UGLY_LICENSE = LGPLv2.1+
 
-GST1_PLUGINS_UGLY_CONF_OPTS = \
-       --disable-examples \
-       --disable-debug \
-       --disable-valgrind
+GST1_PLUGINS_UGLY_CONF_OPTS = --disable-examples --disable-valgrind
 
 GST_PLUGINS_BAD1_CONF_OPTS += \
        --disable-a52dec \

diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk
index 9d49e6da29309ddb256ac5d782b63bbcddd2572d..be84d5be97889bd159827aed131313bc502edf61 100644 (file)
--- a/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -25,7 +25,6 @@ GSTREAMER1_CONF_OPTS = \
        --disable-examples \
        --disable-tests \
        --disable-failing-tests \
-       --disable-debug \
        --disable-valgrind \
        --disable-benchmarks \
        --disable-check \

diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk
index 11cd7aa064f8ebffc0a5eacd3e7573ccdf514f2d..e89b9787bd41ebe046d9f954fa454500e906b1aa 100644 (file)
--- a/package/gtk2-engines/gtk2-engines.mk
+++ b/package/gtk2-engines/gtk2-engines.mk
@@ -71,7 +71,6 @@ GTK2_ENGINES_CONF_OPTS = \
                --x-libraries=$(STAGING_DIR)/usr/lib \
                --disable-glibtest \
                --enable-explicit-deps=no \
-               --disable-debug \
                --enable-clearlooks \
                --disable-crux \
                --disable-hc \

diff --git a/package/lesstif/lesstif.mk b/package/lesstif/lesstif.mk
index bc046c5376d9897b35b827f7f515c1f55b2b22a5..6ce2339b38f32baec82f946fd4055090420ff5a5 100644 (file)
--- a/package/lesstif/lesstif.mk
+++ b/package/lesstif/lesstif.mk
@@ -16,7 +16,6 @@ LESSTIF_LICENSE_FILES = COPYING.LIB
 LESSTIF_CONF_OPTS = \
        --with-gnu-ld \
        --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \
-       --enable-debug=no \
        --enable-production=yes \
        --enable-build-tests=no \
        --no-recursion

diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index dfcf610326d5946d31144286befd569a0140f0fc..d7836a5bc4460e4b88308d9d7ae83d3e8b015857 100644 (file)
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -63,7 +63,6 @@ endif
 
 HOST_LIBGLIB2_CONF_OPTS = \
                --disable-gtk-doc \
-               --enable-debug=no \
                --disable-dtrace \
                --disable-systemtap \
                --disable-gcov \

diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
index 9e79e605f2d5a2d761e6c1d0720ad2b9ee088330..7bd7b4e3804e25900776ce5cf68a976316f19472 100644 (file)
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -69,9 +69,7 @@ LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
                ac_cv_prog_F77=no \
                ac_cv_path_CUPS_CONFIG=no
 
-LIBGTK2_CONF_OPTS = --disable-glibtest \
-               --enable-explicit-deps=no \
-               --disable-debug
+LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
 
 LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf
 
@@ -164,8 +162,7 @@ HOST_LIBGTK2_CONF_OPTS = \
                --without-libtiff \
                --without-libjpeg \
                --with-gdktarget=none \
-               --disable-cups \
-               --disable-debug
+               --disable-cups
 
 define HOST_LIBGTK2_BUILD_CMDS
  $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache

diff --git a/package/libndp/libndp.mk b/package/libndp/libndp.mk
index 413c3da57aa43b23244857acc1069d6fd3d3ee6d..c40a0172229cebaa3e38010e295fc5de6d94e834 100644 (file)
--- a/package/libndp/libndp.mk
+++ b/package/libndp/libndp.mk
@@ -10,6 +10,5 @@ LIBNDP_LICENSE = LGPLv2.1+
 LIBNDP_LICENSE_FILES = COPYING
 LIBNDP_AUTORECONF = YES
 LIBNDP_INSTALL_STAGING = YES
-LIBNDP_CONF_OPTS = --disable-debug
 
 $(eval $(autotools-package))

diff --git a/package/libsoc/libsoc.mk b/package/libsoc/libsoc.mk
index eb2a3ff50c08b5d70c7f7a9df237f2bcec17c08b..3253c5022e8b3e3122a4a2d2bfa68e911f56cb2d 100644 (file)
--- a/package/libsoc/libsoc.mk
+++ b/package/libsoc/libsoc.mk
@@ -10,6 +10,5 @@ LIBSOC_LICENSE = LGPLv2.1
 LIBSOC_LICENSE_FILES = COPYING
 LIBSOC_AUTORECONF = YES
 LIBSOC_INSTALL_STAGING = YES
-LIBSOC_CONF_OPTS = --disable-debug
 
 $(eval $(autotools-package))

diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index 4d4e82e14665775bd866990e36ffd79de71dcc20..90f0771780582e344d7197d68c79ac2be2866310 100644 (file)
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -7,7 +7,6 @@
 LZMA_VERSION = 4.32.7
 LZMA_SOURCE = lzma-$(LZMA_VERSION).tar.xz
 LZMA_SITE = http://tukaani.org/lzma
-LZMA_CONF_OPTS = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 
 $(eval $(host-autotools-package))
 

diff --git a/package/openobex/openobex.mk b/package/openobex/openobex.mk
index 90f1765285bc616506ff0c5f8d0c47d30a380ac8..82bfd4366a69e8cbdd0f37acbc72590abdad1b8a 100644 (file)
--- a/package/openobex/openobex.mk
+++ b/package/openobex/openobex.mk
@@ -16,7 +16,6 @@ OPENOBEX_AUTORECONF = YES
 OPENOBEX_INSTALL_STAGING = YES
 
 OPENOBEX_CONF_OPTS += \
-       $(if $(BR2_ENABLE_DEBUG),--enable-debug) \
        $(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
        $(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
        $(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)

diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk
index 6b904efe23d87b56cdc8e025b329b11e8625c5fa..2ab29b8d88717a2ffd89cb34fded6f57a5302a8c 100644 (file)
--- a/package/openvpn/openvpn.mk
+++ b/package/openvpn/openvpn.mk
@@ -18,7 +18,7 @@ OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
 
 ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y)
 OPENVPN_CONF_OPTS += --enable-small --disable-plugins \
-       --disable-debug --disable-eurephia
+       --disable-eurephia
 endif
 
 # BusyBox 1.21+ places the ip applet in the "correct" place

diff --git a/package/pango/pango.mk b/package/pango/pango.mk
index bc2eb20307ec01e30e8731786383c1922f69dd8b..46490c17d1b237615823f646382587a4d6163331 100644 (file)
--- a/package/pango/pango.mk
+++ b/package/pango/pango.mk
@@ -40,9 +40,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
                ac_use_included_regex=no gl_cv_c_restrict=no \
                ac_cv_path_FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
 
-PANGO_CONF_OPTS = --enable-explicit-deps=no \
-       --disable-debug \
-       --disable-gtk-doc-html
+PANGO_CONF_OPTS = --enable-explicit-deps=no --disable-gtk-doc-html
 
 PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
        host-pkgconf \

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 3c5430f7d859f80d1b7055982efceb4620086b1b..80adc8bf74ff440024884ef8614019021d8b87b9 100644 (file)
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -146,6 +146,7 @@ define $(2)_CONFIGURE_CMDS
                $$(DISABLE_NLS) \
                $$(DISABLE_LARGEFILE) \
                $$(DISABLE_IPV6) \
+               $$(ENABLE_DEBUG) \
                $$(SHARED_STATIC_LIBS_OPTS) \
                $$(QUIET) $$($$(PKG)_CONF_OPTS) \
        )
@@ -172,6 +173,7 @@ define $(2)_CONFIGURE_CMDS
                --disable-doc \
                --disable-docs \
                --disable-documentation \
+               --disable-debug \
                --with-xmlto=no \
                --with-fop=no \
                --disable-dependency-tracking \

diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk
index 8887b67eca5c70247e24caaafa65d8b0ffcd12b0..70fae85b18072b67eb019dfbf176a80ef0be563f 100644 (file)
--- a/package/rsync/rsync.mk
+++ b/package/rsync/rsync.mk
@@ -10,7 +10,6 @@ RSYNC_LICENSE = GPLv3+
 RSYNC_LICENSE_FILES = COPYING
 RSYNC_DEPENDENCIES = zlib popt
 RSYNC_CONF_OPTS = \
-       $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) \
        --with-included-zlib=no \
        --with-included-popt=no
 

diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk
index 0101ad77479f647a32122a18faa559e6c0daa98f..86a9721f7390d5914e9981f299767b57668c9806 100644 (file)
--- a/package/xbmc/xbmc.mk
+++ b/package/xbmc/xbmc.mk
@@ -42,7 +42,6 @@ XBMC_CONF_ENV = \
 XBMC_CONF_OPTS +=  \
        --with-arch=$(BR2_ARCH) \
        --disable-crystalhd \
-       --disable-debug \
        --disable-dvdcss \
        --disable-hal \
        --disable-joystick \

diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index a1697d348471c672dc8c9d1f3b2c63e40735844e..740a40b96e49060035171da56f21bdeae19a39c3 100644 (file)
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -19,8 +19,7 @@ XENOMAI_INSTALL_STAGING = YES
 XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
 XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
 
-XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install \
-       $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
+XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install
 
 define XENOMAI_REMOVE_DEVFILES
        for i in xeno-config xeno-info wrap-link.sh ; do \