infra: Move --enable/--disable-debug to package/Makefile.in
PATCH v2 1/3 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.
---
v2: no changes
package/Makefile.in | 2 +- package/alsa-lib/alsa-lib.mk | 4 ---- package/atk/atk.mk | 3 +-- package/directfb/directfb.mk | 1 - package/ffmpeg/ffmpeg.mk | 6 ------ package/gamin/gamin.mk | 1 - package/gstreamer/gst-plugins-good/gst-plugins-good.mk | 1 - package/gstreamer1/gst1-libav/gst1-libav.mk | 5 +---- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 1 - package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 3 +-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 1 - package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 5 +---- package/gstreamer1/gstreamer1/gstreamer1.mk | 1 - package/gtk2-engines/gtk2-engines.mk | 1 - package/lesstif/lesstif.mk | 1 - package/libglib2/libglib2.mk | 1 - package/libgtk2/libgtk2.mk | 7 ++----- package/libndp/libndp.mk | 1 - package/libsoc/libsoc.mk | 1 - package/lzma/lzma.mk | 1 - package/openobex/openobex.mk | 1 - package/openvpn/openvpn.mk | 2 +- package/pango/pango.mk | 4 +--- package/pkg-autotools.mk | 2 ++ package/rsync/rsync.mk | 1 - package/xbmc/xbmc.mk | 1 - package/xenomai/xenomai.mk | 3 +-- 27 files changed, 12 insertions(+), 49 deletions(-)
package/Makefile.in +1 -1
@@ -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)
package/alsa-lib/alsa-lib.mk +0 -4
@@ -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
package/atk/atk.mk +1 -2
@@ -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
package/directfb/directfb.mk +0 -1
@@ -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 \
package/ffmpeg/ffmpeg.mk +0 -6
@@ -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
package/gamin/gamin.mk +0 -1
@@ -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
package/gstreamer/gst-plugins-good/gst-plugins-good.mk +0 -1
@@ -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 \
package/gstreamer1/gst1-libav/gst1-libav.mk +1 -4
@@ -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
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0 -1
@@ -18,7 +18,6 @@ GST1_PLUGINS_BAD_GETTEXTIZE = YES GST1_PLUGINS_BAD_CONF_OPTS = \ --disable-examples \ - --disable-debug \ --disable-valgrind \ --disable-directsound \ --disable-wsapi \
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +1 -2
@@ -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 += \
package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0 -1
@@ -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 \
package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +1 -4
@@ -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 \
package/gstreamer1/gstreamer1/gstreamer1.mk +0 -1
@@ -25,7 +25,6 @@ GSTREAMER1_CONF_OPTS = \ --disable-examples \ --disable-tests \ --disable-failing-tests \ - --disable-debug \ --disable-valgrind \ --disable-benchmarks \ --disable-check \
package/gtk2-engines/gtk2-engines.mk +0 -1
@@ -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 \
package/lesstif/lesstif.mk +0 -1
@@ -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
package/libglib2/libglib2.mk +0 -1
@@ -63,7 +63,6 @@ endif HOST_LIBGLIB2_CONF_OPTS = \ --disable-gtk-doc \ - --enable-debug=no \ --disable-dtrace \ --disable-systemtap \ --disable-gcov \
package/libgtk2/libgtk2.mk +2 -5
@@ -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
package/libndp/libndp.mk +0 -1
@@ -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))
package/libsoc/libsoc.mk +0 -1
@@ -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))
package/lzma/lzma.mk +0 -1
@@ -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))
package/openobex/openobex.mk +0 -1
@@ -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)
package/openvpn/openvpn.mk +1 -1
@@ -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
package/pango/pango.mk +1 -3
@@ -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 \
package/pkg-autotools.mk +2 -0
@@ -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 \
package/rsync/rsync.mk +0 -1
@@ -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
package/xbmc/xbmc.mk +0 -1
@@ -42,7 +42,6 @@ XBMC_CONF_ENV = \ XBMC_CONF_OPTS += \ --with-arch=$(BR2_ARCH) \ --disable-crystalhd \ - --disable-debug \ --disable-dvdcss \ --disable-hal \ --disable-joystick \
package/xenomai/xenomai.mk +1 -2
@@ -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 \
Signature · 1 line
1.7.10.4
PATCH v2 2/3 Remove --disable-gtk-doc from packages, already defined in pkg-autotools.mk
---
v2: rebased
package/libglib2/libglib2.mk | 1 - package/network-manager/network-manager.mk | 1 - package/systemd/systemd.mk | 1 - 3 files changed, 3 deletions(-)
package/libglib2/libglib2.mk +0 -1
@@ -62,7 +62,6 @@ LIBGLIB2_CONF_ENV += ac_cv_header_sys_inotify_h=no endif HOST_LIBGLIB2_CONF_OPTS = \ - --disable-gtk-doc \ --disable-dtrace \ --disable-systemtap \ --disable-gcov \
package/network-manager/network-manager.mk +0 -1
@@ -29,7 +29,6 @@ NETWORK_MANAGER_CONF_OPTS = \ --disable-qt \ --disable-more-warnings \ --without-docs \ - --disable-gtk-doc \ --with-crypto=gnutls \ --with-iptables=/usr/sbin/iptables \ --disable-ifupdown \
package/systemd/systemd.mk +0 -1
@@ -34,7 +34,6 @@ SYSTEMD_CONF_OPTS += \ --disable-selinux \ --disable-pam \ --disable-libcryptsetup \ - --disable-gtk-doc \ --with-dbuspolicydir=/etc/dbus-1/system.d \ --with-dbussessionservicedir=/usr/share/dbus-1/services \ --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
Signature · 1 line
1.7.10.4
PATCH v2 2/3 Remove --disable-gtk-doc from packages, already defined in pkg-autotools.mk
Bernd, All,
On 2014-10-19 11:59 +0200, Bernd Kuhls spake thusly:
Quoted 2 lines
Signed-off-by Bernd Kuhls <[email protected]>
Ditto:
Regards,
Yann E. MORIN.
Quoted 51 lines
---
v2: rebasedpackage/libglib2/libglib2.mk | 1 - package/network-manager/network-manager.mk | 1 - package/systemd/systemd.mk | 1 - 3 files changed, 3 deletions(-)package/libglib2/libglib2.mk +0
-1@@ -62,7 +62,6 @@ LIBGLIB2_CONF_ENV += ac_cv_header_sys_inotify_h=no endif HOST_LIBGLIB2_CONF_OPTS = \ - --disable-gtk-doc \ --disable-dtrace \ --disable-systemtap \ --disable-gcov \package/network-manager/network-manager.mk +0
-1@@ -29,7 +29,6 @@ NETWORK_MANAGER_CONF_OPTS = \ --disable-qt \ --disable-more-warnings \ --without-docs \ - --disable-gtk-doc \ --with-crypto=gnutls \ --with-iptables=/usr/sbin/iptables \ --disable-ifupdown \package/systemd/systemd.mk +0
-1@@ -34,7 +34,6 @@ SYSTEMD_CONF_OPTS += \ --disable-selinux \ --disable-pam \ --disable-libcryptsetup \ - --disable-gtk-doc \ --with-dbuspolicydir=/etc/dbus-1/system.d \ --with-dbussessionservicedir=/usr/share/dbus-1/services \ --with-dbussystemservicedir=/usr/share/dbus-1/system-services \Signature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 3/3 Apply --disable-gtk-doc-html to all packages
In reply to Bernd KuhlsMove this option to package/pkg-autotools.mk so it applies to all packages.
---
v2: no changes
package/pango/pango.mk | 2 +- package/pkg-autotools.mk | 2 ++ package/webkit/webkit.mk | 1 - 3 files changed, 3 insertions(+), 2 deletions(-)
package/pango/pango.mk +1 -1
@@ -40,7 +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-gtk-doc-html +PANGO_CONF_OPTS = --enable-explicit-deps=no PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ host-pkgconf \
package/pkg-autotools.mk +2 -0
@@ -137,6 +137,7 @@ define $(2)_CONFIGURE_CMDS --localstatedir=/var \ --program-prefix="" \ --disable-gtk-doc \ + --disable-gtk-doc-html \ --disable-doc \ --disable-docs \ --disable-documentation \
@@ -170,6 +171,7 @@ define $(2)_CONFIGURE_CMDS --localstatedir="$$(HOST_DIR)/var" \ --enable-shared --disable-static \ --disable-gtk-doc \ + --disable-gtk-doc-html \ --disable-doc \ --disable-docs \ --disable-documentation \
package/webkit/webkit.mk +0 -1
@@ -45,7 +45,6 @@ WEBKIT_CONF_OPTS += \ --disable-webkit2 \ --disable-glibtest \ --disable-video \ - --disable-gtk-doc-html \ --disable-tests # Xorg Dependencies
Signature · 1 line
1.7.10.4
PATCH v2 3/3 Apply --disable-gtk-doc-html to all packages
Bernd, All,
On 2014-10-19 11:59 +0200, Bernd Kuhls spake thusly:
Quoted 3 lines
Move this option to
package/pkg-autotools.mkso it applies to all packages.Signed-off-by Bernd Kuhls <[email protected]>
Ditto:
Regards,
Yann E. MORIN.
Quoted 60 lines
---
v2: no changespackage/pango/pango.mk | 2 +- package/pkg-autotools.mk | 2 ++ package/webkit/webkit.mk | 1 - 3 files changed, 3 insertions(+), 2 deletions(-)package/pango/pango.mk +1
-1@@ -40,7 +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-gtk-doc-html +PANGO_CONF_OPTS = --enable-explicit-deps=no PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ host-pkgconf \package/pkg-autotools.mk +2
-0@@ -137,6 +137,7 @@ define $(2)_CONFIGURE_CMDS --localstatedir=/var \ --program-prefix="" \ --disable-gtk-doc \ + --disable-gtk-doc-html \ --disable-doc \ --disable-docs \ --disable-documentation \@@ -170,6 +171,7 @@ define $(2)_CONFIGURE_CMDS --localstatedir="$$(HOST_DIR)/var" \ --enable-shared --disable-static \ --disable-gtk-doc \ + --disable-gtk-doc-html \ --disable-doc \ --disable-docs \ --disable-documentation \package/webkit/webkit.mk +0
-1@@ -45,7 +45,6 @@ WEBKIT_CONF_OPTS += \ --disable-webkit2 \ --disable-glibtest \ --disable-video \ - --disable-gtk-doc-html \ --disable-tests # Xorg DependenciesSignature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
AppliedPATCH v2 3/3 Apply --disable-gtk-doc-html to all packages
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 3 lines · Bernd Kuhls
Move this option to
package/pkg-autotools.mkso it applies to all packages.Signed-off-by Bernd Kuhls <[email protected]>
Applied, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/3 infra: Move --enable/--disable-debug to package/Makefile.in
In reply to Bernd KuhlsBernd, All,
On 2014-10-19 11:59 +0200, Bernd Kuhls spake thusly:
Quoted 7 lines
A lot of packages ignored
BR2_ENABLE_DEBUG. This patch simplifies the handling of this option by adding the corresponding configure option to the globalMakefilefor target packages.For host packages --disable-debug is added to the global
Makefile.Signed-off-by Bernd Kuhls <[email protected]>
You forgot to propagate my:
Regards,
Yann E. MORIN.
Quoted 409 lines
---
v2: no changespackage/Makefile.in | 2 +- package/alsa-lib/alsa-lib.mk | 4 ---- package/atk/atk.mk | 3 +-- package/directfb/directfb.mk | 1 - package/ffmpeg/ffmpeg.mk | 6 ------ package/gamin/gamin.mk | 1 - package/gstreamer/gst-plugins-good/gst-plugins-good.mk | 1 - package/gstreamer1/gst1-libav/gst1-libav.mk | 5 +---- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 1 - package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 3 +-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 1 - package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 5 +---- package/gstreamer1/gstreamer1/gstreamer1.mk | 1 - package/gtk2-engines/gtk2-engines.mk | 1 - package/lesstif/lesstif.mk | 1 - package/libglib2/libglib2.mk | 1 - package/libgtk2/libgtk2.mk | 7 ++----- package/libndp/libndp.mk | 1 - package/libsoc/libsoc.mk | 1 - package/lzma/lzma.mk | 1 - package/openobex/openobex.mk | 1 - package/openvpn/openvpn.mk | 2 +- package/pango/pango.mk | 4 +--- package/pkg-autotools.mk | 2 ++ package/rsync/rsync.mk | 1 - package/xbmc/xbmc.mk | 1 - package/xenomai/xenomai.mk | 3 +-- 27 files changed, 12 insertions(+), 49 deletions(-)package/Makefile.in +1
-1@@ -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)package/alsa-lib/alsa-lib.mk +0
-4@@ -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 endifpackage/atk/atk.mk +1
-2@@ -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-pkgconfpackage/directfb/directfb.mk +0
-1@@ -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 \package/ffmpeg/ffmpeg.mk +0
-6@@ -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 elsepackage/gamin/gamin.mk +0
-1@@ -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-pythonpackage/gstreamer/gst-plugins-good/gst-plugins-good.mk +0
-1@@ -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 \package/gstreamer1/gst1-libav/gst1-libav.mk +1
-4@@ -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-zlibpackage/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0
-1@@ -18,7 +18,6 @@ GST1_PLUGINS_BAD_GETTEXTIZE = YES GST1_PLUGINS_BAD_CONF_OPTS = \ --disable-examples \ - --disable-debug \ --disable-valgrind \ --disable-directsound \ --disable-wsapi \package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +1
-2@@ -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 += \package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +0
-1@@ -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 \package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +1
-4@@ -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 \package/gstreamer1/gstreamer1/gstreamer1.mk +0
-1@@ -25,7 +25,6 @@ GSTREAMER1_CONF_OPTS = \ --disable-examples \ --disable-tests \ --disable-failing-tests \ - --disable-debug \ --disable-valgrind \ --disable-benchmarks \ --disable-check \package/gtk2-engines/gtk2-engines.mk +0
-1@@ -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 \package/lesstif/lesstif.mk +0
-1@@ -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-recursionpackage/libglib2/libglib2.mk +0
-1@@ -63,7 +63,6 @@ endif HOST_LIBGLIB2_CONF_OPTS = \ --disable-gtk-doc \ - --enable-debug=no \ --disable-dtrace \ --disable-systemtap \ --disable-gcov \package/libgtk2/libgtk2.mk +2
-5@@ -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-cachepackage/libndp/libndp.mk +0
-1@@ -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))package/libsoc/libsoc.mk +0
-1@@ -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))package/lzma/lzma.mk +0
-1@@ -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))package/openobex/openobex.mk +0
-1@@ -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)package/openvpn/openvpn.mk +1
-1@@ -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" placepackage/pango/pango.mk +1
-3@@ -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 \package/pkg-autotools.mk +2
-0@@ -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 \package/rsync/rsync.mk +0
-1@@ -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=nopackage/xbmc/xbmc.mk +0
-1@@ -42,7 +42,6 @@ XBMC_CONF_ENV = \ XBMC_CONF_OPTS += \ --with-arch=$(BR2_ARCH) \ --disable-crystalhd \ - --disable-debug \ --disable-dvdcss \ --disable-hal \ --disable-joystick \package/xenomai/xenomai.mk +1
-2@@ -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 \Signature · 6 lines
1.7.10.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/3 infra: Move --enable/--disable-debug to package/Makefile.in
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 7 lines · Bernd Kuhls
A lot of packages ignored
BR2_ENABLE_DEBUG. This patch simplifies the handling of this option by adding the corresponding configure option to the globalMakefilefor target packages.For host packages --disable-debug is added to the global
Makefile.Signed-off-by Bernd Kuhls <[email protected]>
Patches 1 and 2 applied. For patch 3, I'm a bit hesitant: there are only two packages using --disable-gtk-doc-html. Does it really make sense to factorize that in the package infrastructure?
Cc'ing Yann to get his input, since he Reviewed-by the patc in question.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v2 1/3 infra: Move --enable/--disable-debug to package/Makefile.in
Thomas, All,
On 2014-10-19 17:09 +0200, Thomas Petazzoni spake thusly:
Quoted 7 lines · Bernd Kuhls
Quoted 6 lines
A lot of packages ignored
BR2_ENABLE_DEBUG. This patch simplifies the handling of this option by adding the corresponding configure option to the globalMakefilefor target packages.For host packages --disable-debug is added to the global
Makefile.
Quoted 7 lines
Quoted 1 line
Signed-off-by Bernd Kuhls <[email protected]>Patches 1 and 2 applied. For patch 3, I'm a bit hesitant: there are only two packages using --disable-gtk-doc-html. Does it really make sense to factorize that in the package infrastructure?
Cc'ing Yann to get his input, since he Reviewed-by the patc in question.
Well, my Reviewed-by means just that: I reviewed it, and found it was correct. It does not mean I think it should go in.
However, I do believe it should go in. The more generic stuff we move into the infra, the easier it will get to review packages.
And since we already have four documentation-rleated switches, it makes sense to add another one. Further more, we do have --disable-gtk-doc, so adding --disable-gtk-doc-html really makes sense, for consistency.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH v2 1/3 infra: Move --enable/--disable-debug to package/Makefile.in
Dear Yann E. MORIN,
Quoted 9 lines · Yann E. MORIN
Quoted 5 lines
Patches 1 and 2 applied. For patch 3, I'm a bit hesitant: there are only two packages using --disable-gtk-doc-html. Does it really make sense to factorize that in the package infrastructure?
Cc'ing Yann to get his input, since he Reviewed-by the patc in question.
Well, my Reviewed-by means just that: I reviewed it, and found it was correct. It does not mean I think it should go in.
Quoted 6 lines
However, I do believe it should go in. The more generic stuff we move into the infra, the easier it will get to review packages.
And since we already have four documentation-rleated switches, it makes sense to add another one. Further more, we do have --disable-gtk-doc, so adding --disable-gtk-doc-html really makes sense, for consistency.
Well, my personal opinion is that --disable-gtk-doc already shouldn't have gone to the common package infra. It's far from being a generic autoconf option, and therefore it generates warnings for many many ./configure invocations. But the general opinion didn't agree with mine :)
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com