Skip to contentSkip to conversation

packages/*.mk: Remove duplicate options

PATCH New Maxime Hadjinlian 3 participants 3 messages Oct 18, 2014 – Oct 19, 2014

lore
Share & tools
lore

Maxime Hadjinlian

author
#0 lore raw

PATCH 1/1 packages/*.mk: Remove duplicate options

These flags are already defined in pkg-autotools.mk. There is no need to have them twice.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/audiofile/audiofile.mk           | 2 +-
 package/libexif/libexif.mk               | 1 -
 package/memcached/memcached.mk           | 2 +-
 package/opus/opus.mk                     | 3 +--
 package/x11r7/xlib_libXaw/xlib_libXaw.mk | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)
package/audiofile/audiofile.mk +1 -1
index ac05e6c..c685ce1 100644
@@ -8,7 +8,7 @@ AUDIOFILE_VERSION = 0.3.6
 AUDIOFILE_SITE = http://audiofile.68k.org
 AUDIOFILE_INSTALL_STAGING = YES
 AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-AUDIOFILE_CONF_OPTS = --disable-examples --disable-docs
+AUDIOFILE_CONF_OPTS = --disable-examples
 AUDIOFILE_DEPENDENCIES = host-pkgconf
 # configure is outdated and has old bugs because of it
 AUDIOFILE_AUTORECONF = YES
package/libexif/libexif.mk +0 -1
index 616f953..a71c117 100644
@@ -8,7 +8,6 @@ LIBEXIF_VERSION = 0.6.21
 LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
 LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
 LIBEXIF_INSTALL_STAGING = YES
-LIBEXIF_CONF_OPTS = --disable-docs
 LIBEXIF_DEPENDENCIES = host-pkgconf
 LIBEXIF_LICENSE = LGPLv2.1+
 LIBEXIF_LICENSE_FILES = COPYING
package/memcached/memcached.mk +1 -1
index 0d88985..4efe093 100644
@@ -8,7 +8,7 @@ MEMCACHED_VERSION = 1.4.20
 MEMCACHED_SITE = http://www.memcached.org/files
 MEMCACHED_DEPENDENCIES = libevent
 MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-MEMCACHED_CONF_OPTS = --disable-coverage --disable-docs
+MEMCACHED_CONF_OPTS = --disable-coverage
 MEMCACHED_LICENSE = BSD-3c
 MEMCACHED_LICENSE_FILES = COPYING
package/opus/opus.mk +1 -2
index 04ffa57..c8ba5c6 100644
@@ -9,11 +9,10 @@ OPUS_SITE = http://downloads.xiph.org/releases/opus
 OPUS_LICENSE = BSD-3c
 OPUS_LICENSE_FILES = COPYING
 OPUS_INSTALL_STAGING = YES
-OPUS_CONF_OPTS = --disable-doc
 OPUS_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y)
-OPUS_CONF_OPTS += --enable-fixed-point
+OPUS_CONF_OPTS = --enable-fixed-point
 endif
 
 $(eval $(autotools-package))
package/x11r7/xlib_libXaw/xlib_libXaw.mk +0 -1
index cf6ec2b..ac8684e 100644
@@ -11,6 +11,5 @@ XLIB_LIBXAW_LICENSE = MIT
 XLIB_LIBXAW_LICENSE_FILES = COPYING
 XLIB_LIBXAW_INSTALL_STAGING = YES
 XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto
-XLIB_LIBXAW_CONF_OPTS = --disable-docs
 
 $(eval $(autotools-package))
Signature · 1 line
2.1.1
#1 lore raw

PATCH 1/1 packages/*.mk: Remove duplicate options

Maxime, All,

On 2014-10-18 20:20 +0200, Maxime Hadjinlian spake thusly:

Quoted 4 lines

These flags are already defined in pkg-autotools.mk. There is no need to have them twice.

Signed-off-by Maxime Hadjinlian <[email protected]>

[--SNIP--]

Quoted 5 lines
package/opus/opus.mk +0 -0
index 04ffa57..c8ba5c6 100644

package/opus/opus.mk OPUS_SITE = http://downloads.xiph.org/releases/opus · line 15

Quoted 9 lines
package/opus/opus.mk +1 -2
@@ -9,11 +9,10 @@ OPUS_SITE = http://downloads.xiph.org/releases/opus
 OPUS_LICENSE = BSD-3c
 OPUS_LICENSE_FILES = COPYING
 OPUS_INSTALL_STAGING = YES
-OPUS_CONF_OPTS = --disable-doc
 OPUS_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y)
-OPUS_CONF_OPTS += --enable-fixed-point
+OPUS_CONF_OPTS = --enable-fixed-point

Although technically correct, I would not mind the += to stick. Variables are always initialised to empty, so it is safe to just append to them.

Anyway:

Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 21 lines
package/opus/opus.mk +0 -0
 endif
 
 $(eval $(autotools-package))
package/x11r7/xlib_libXaw/xlib_libXaw.mk +0 -1
index cf6ec2b..ac8684e 100644
@@ -11,6 +11,5 @@ XLIB_LIBXAW_LICENSE = MIT
 XLIB_LIBXAW_LICENSE_FILES = COPYING
 XLIB_LIBXAW_INSTALL_STAGING = YES
 XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto
-XLIB_LIBXAW_CONF_OPTS = --disable-docs
 
 $(eval $(autotools-package))
Signature · 6 lines
2.1.1

_______________________________________________
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.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 packages/*.mk: Remove duplicate options

In reply to Maxime Hadjinlian

Dear Maxime Hadjinlian,

Quoted 11 lines · Maxime Hadjinlian

These flags are already defined in pkg-autotools.mk. There is no need to have them twice.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/audiofile/audiofile.mk           | 2 +-
 package/libexif/libexif.mk               | 1 -
 package/memcached/memcached.mk           | 2 +-
 package/opus/opus.mk                     | 3 +--
 package/x11r7/xlib_libXaw/xlib_libXaw.mk | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

I've changed the = back to += in the opus package, as noted by Yann, and committed your patch.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com