Bläddra i källkod

package/sdl_sound: actually use the optional CONF_OPTS

Since "57ace26b6c package/sdl_sound: add optional support for
libmodplug" from 2016, optional CONF_OPTS are added but they do not
really take effect because there is an unconditional override below the
conditional append.

Currently this does not cause build failures, but it can lead to wrong
detection of dependencies because many explicit --enable/--disable are
not passed to configure.

Fix this by moving the unconditional code to the top.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit df0d7d1371d2916bf9b48968f0a2dcd471ea6d85)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Ricardo Martincoski 6 år sedan
förälder
incheckning
b3d7918195
1 ändrade filer med 5 tillägg och 6 borttagningar
  1. 5 6
      package/sdl_sound/sdl_sound.mk

+ 5 - 6
package/sdl_sound/sdl_sound.mk

@@ -11,6 +11,11 @@ SDL_SOUND_LICENSE = LGPL-2.1+
 SDL_SOUND_LICENSE_FILES = COPYING
 SDL_SOUND_LICENSE_FILES = COPYING
 SDL_SOUND_INSTALL_STAGING = YES
 SDL_SOUND_INSTALL_STAGING = YES
 SDL_SOUND_DEPENDENCIES = sdl
 SDL_SOUND_DEPENDENCIES = sdl
+SDL_SOUND_CONF_OPTS = \
+	--with-sdl-prefix=$(STAGING_DIR)/usr \
+	--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
+	--disable-sdltest \
+	--enable-static
 
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
 ifneq ($(BR2_ENABLE_LOCALE),y)
 SDL_SOUND_DEPENDENCIES += libiconv
 SDL_SOUND_DEPENDENCIES += libiconv
@@ -52,12 +57,6 @@ else
 SDL_SOUND_CONF_OPTS += --disable-physfs
 SDL_SOUND_CONF_OPTS += --disable-physfs
 endif
 endif
 
 
-SDL_SOUND_CONF_OPTS = \
-	--with-sdl-prefix=$(STAGING_DIR)/usr \
-	--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
-	--disable-sdltest \
-	--enable-static
-
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
 SDL_SOUND_CONF_OPTS += --enable-mmx
 SDL_SOUND_CONF_OPTS += --enable-mmx
 else
 else