| Message ID | 1390073027-14239-10-git-send-email-s.martin49@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Samuel, All, On 2014-01-18 20:23 +0100, Samuel Martin spake thusly: > Only enable SDL support if SDL and SDL_net are already enabled in the > configuration. > > Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> However, I have a comment, see below... > --- > package/urg/Config.in | 5 ++--- > package/urg/urg.mk | 10 +++++++--- > 2 files changed, 9 insertions(+), 6 deletions(-) > > diff --git a/package/urg/Config.in b/package/urg/Config.in > index ded8204..232f4c4 100644 > --- a/package/urg/Config.in > +++ b/package/urg/Config.in > @@ -1,11 +1,10 @@ > config BR2_PACKAGE_URG > bool "urg" > depends on BR2_INSTALL_LIBSTDCPP > - select BR2_PACKAGE_SDL > - select BR2_PACKAGE_SDL_NET > help > Library to control Hokuyo's URG series sensors. > - Requires SDL & SDL_net. > + > + If SDL and SDL_net are enable, SDL support will be automatically added. I don't think we systematically add such info in the help entries. I wonder if we should. Regards, Yann E. MORIN.
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: > Only enable SDL support if SDL and SDL_net are already enabled in the > configuration. > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > package/urg/Config.in | 5 ++--- > package/urg/urg.mk | 10 +++++++--- > 2 files changed, 9 insertions(+), 6 deletions(-) > diff --git a/package/urg/Config.in b/package/urg/Config.in > index ded8204..232f4c4 100644 > --- a/package/urg/Config.in > +++ b/package/urg/Config.in > @@ -1,11 +1,10 @@ > config BR2_PACKAGE_URG > bool "urg" > depends on BR2_INSTALL_LIBSTDCPP > - select BR2_PACKAGE_SDL > - select BR2_PACKAGE_SDL_NET > help > Library to control Hokuyo's URG series sensors. > - Requires SDL & SDL_net. > + > + If SDL and SDL_net are enable, SDL support will be automatically added. Committed with this line dropped as pointed out by Yann, thanks.
diff --git a/package/urg/Config.in b/package/urg/Config.in index ded8204..232f4c4 100644 --- a/package/urg/Config.in +++ b/package/urg/Config.in @@ -1,11 +1,10 @@ config BR2_PACKAGE_URG bool "urg" depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_SDL - select BR2_PACKAGE_SDL_NET help Library to control Hokuyo's URG series sensors. - Requires SDL & SDL_net. + + If SDL and SDL_net are enable, SDL support will be automatically added. http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/ diff --git a/package/urg/urg.mk b/package/urg/urg.mk index e16393a..075a0b3 100644 --- a/package/urg/urg.mk +++ b/package/urg/urg.mk @@ -12,10 +12,14 @@ URG_LICENSE_FILES = COPYING URG_INSTALL_STAGING = YES -URG_DEPENDENCIES = sdl sdl_net - -URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \ +ifeq ($(BR2_PACKAGE_SDL)$(BR2_PACKAGE_SDL_NET),yy) +URG_DEPENDENCIES += sdl sdl_net +URG_CONF_OPT += --with-sdl-prefix=$(STAGING_DIR)/usr \ --with-sdl-exec-prefix=$(STAGING_DIR)/usr +else +URG_CONF_OPT = --without-sdl +URG_CONF_ENV += ac_cv_path_SDL_CONFIG="" +endif URG_CONFIG_SCRIPTS = c_urg-config urg-config
Only enable SDL support if SDL and SDL_net are already enabled in the configuration. Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- package/urg/Config.in | 5 ++--- package/urg/urg.mk | 10 +++++++--- 2 files changed, 9 insertions(+), 6 deletions(-)