| Message ID | 20241109175509.1364647-1-ju.o@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] package/proj: add an option to build and install apps | expand |
On 2024-11-09 18:55, Julien Olivain wrote: > The proj package includes command line applications. Those have always > been disabled in Buildroot. Those applications can be useful for > scripting, and also for runtime testing the libraries. > > This commit adds a package Kconfig option to enable those apps. > > Signed-off-by: Julien Olivain <ju.o@free.fr> Tested-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de> Acked-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de> > --- > package/proj/Config.in | 12 ++++++++++++ > package/proj/proj.mk | 2 +- > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/package/proj/Config.in b/package/proj/Config.in > index 6d172e2ee9..86966a4d10 100644 > --- a/package/proj/Config.in > +++ b/package/proj/Config.in > @@ -14,6 +14,18 @@ config BR2_PACKAGE_PROJ > > http://proj4.org/ > > +if BR2_PACKAGE_PROJ > + > +config BR2_PACKAGE_PROJ_APPS > + bool "build apps" > + select BR2_PACKAGE_LIBCURL > + help > + Build and install proj command line apps. Those command line > + applications are: cct, cs2cs, geod, gie, invgeod, invproj, > + proj, projinfo, projsync. > + > +endif > + > comment "proj needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar" > depends on !BR2_INSTALL_LIBSTDCPP || \ > !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ > diff --git a/package/proj/proj.mk b/package/proj/proj.mk > index a17a0a1feb..d6457b0e5b 100644 > --- a/package/proj/proj.mk > +++ b/package/proj/proj.mk > @@ -20,7 +20,7 @@ PROJ_CXXFLAGS += -O0 > endif > > PROJ_CONF_OPTS = \ > - -DBUILD_APPS=OFF \ > + -DBUILD_APPS=$(if $(BR2_PACKAGE_PROJ_APPS),ON,OFF) \ > -DCMAKE_C_FLAGS="$(PROJ_CFLAGS)" \ > -DCMAKE_CXX_FLAGS="$(PROJ_CXXFLAGS)"
Hi Zoltan, On 20/12/2024 22:01, Zoltan Gyarmati wrote: > On 2024-11-09 18:55, Julien Olivain wrote: > >> The proj package includes command line applications. Those have always >> been disabled in Buildroot. Those applications can be useful for >> scripting, and also for runtime testing the libraries. >> >> This commit adds a package Kconfig option to enable those apps. >> >> Signed-off-by: Julien Olivain <ju.o@free.fr> > Tested-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de> > Acked-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de> Thanks for testing! I applied this series to master. >> --- >> package/proj/Config.in | 12 ++++++++++++ >> package/proj/proj.mk | 2 +- >> 2 files changed, 13 insertions(+), 1 deletion(-) >> >> diff --git a/package/proj/Config.in b/package/proj/Config.in >> index 6d172e2ee9..86966a4d10 100644 >> --- a/package/proj/Config.in >> +++ b/package/proj/Config.in >> @@ -14,6 +14,18 @@ config BR2_PACKAGE_PROJ >> >> http://proj4.org/ >> >> +if BR2_PACKAGE_PROJ >> + >> +config BR2_PACKAGE_PROJ_APPS >> + bool "build apps" >> + select BR2_PACKAGE_LIBCURL >> + help >> + Build and install proj command line apps. Those command line >> + applications are: cct, cs2cs, geod, gie, invgeod, invproj, >> + proj, projinfo, projsync. >> + >> +endif >> + >> comment "proj needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar" >> depends on !BR2_INSTALL_LIBSTDCPP || \ >> !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ >> diff --git a/package/proj/proj.mk b/package/proj/proj.mk >> index a17a0a1feb..d6457b0e5b 100644 >> --- a/package/proj/proj.mk >> +++ b/package/proj/proj.mk >> @@ -20,7 +20,7 @@ PROJ_CXXFLAGS += -O0 >> endif >> >> PROJ_CONF_OPTS = \ >> - -DBUILD_APPS=OFF \ >> + -DBUILD_APPS=$(if $(BR2_PACKAGE_PROJ_APPS),ON,OFF) \ >> -DCMAKE_C_FLAGS="$(PROJ_CFLAGS)" \ >> -DCMAKE_CXX_FLAGS="$(PROJ_CXXFLAGS)" > > > -- > https://zgyarmati.de Best regards, Julien.
diff --git a/package/proj/Config.in b/package/proj/Config.in index 6d172e2ee9..86966a4d10 100644 --- a/package/proj/Config.in +++ b/package/proj/Config.in @@ -14,6 +14,18 @@ config BR2_PACKAGE_PROJ http://proj4.org/ +if BR2_PACKAGE_PROJ + +config BR2_PACKAGE_PROJ_APPS + bool "build apps" + select BR2_PACKAGE_LIBCURL + help + Build and install proj command line apps. Those command line + applications are: cct, cs2cs, geod, gie, invgeod, invproj, + proj, projinfo, projsync. + +endif + comment "proj needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ diff --git a/package/proj/proj.mk b/package/proj/proj.mk index a17a0a1feb..d6457b0e5b 100644 --- a/package/proj/proj.mk +++ b/package/proj/proj.mk @@ -20,7 +20,7 @@ PROJ_CXXFLAGS += -O0 endif PROJ_CONF_OPTS = \ - -DBUILD_APPS=OFF \ + -DBUILD_APPS=$(if $(BR2_PACKAGE_PROJ_APPS),ON,OFF) \ -DCMAKE_C_FLAGS="$(PROJ_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(PROJ_CXXFLAGS)"
The proj package includes command line applications. Those have always been disabled in Buildroot. Those applications can be useful for scripting, and also for runtime testing the libraries. This commit adds a package Kconfig option to enable those apps. Signed-off-by: Julien Olivain <ju.o@free.fr> --- package/proj/Config.in | 12 ++++++++++++ package/proj/proj.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-)