Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] Add package libhackrf
@ 2015-10-11  7:00 Jason Pruitt
  2015-10-11  7:00 ` [Buildroot] [PATCH 2/2] Add package hackrf-tools Jason Pruitt
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Jason Pruitt @ 2015-10-11  7:00 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Jason Pruitt <jrspruitt@gmail.com>
---
 package/Config.in                                  |  1 +
 .../0001-disabled_shared_library_in_build.patch    | 54 ++++++++++++++++++++++
 package/libhackrf/Config.in                        |  9 ++++
 package/libhackrf/libhackrf.mk                     | 21 +++++++++
 4 files changed, 85 insertions(+)
 create mode 100644 package/libhackrf/0001-disabled_shared_library_in_build.patch
 create mode 100644 package/libhackrf/Config.in
 create mode 100644 package/libhackrf/libhackrf.mk

diff --git a/package/Config.in b/package/Config.in
index 1ceb7d6..0184e46 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -866,6 +866,7 @@ menu "Hardware handling"
 	source "package/libftdi/Config.in"
 	source "package/libftdi1/Config.in"
 	source "package/libgudev/Config.in"
+	source "package/libhackrf/Config.in"
 	source "package/libhid/Config.in"
 	source "package/libiio/Config.in"
 	source "package/libinput/Config.in"
diff --git a/package/libhackrf/0001-disabled_shared_library_in_build.patch b/package/libhackrf/0001-disabled_shared_library_in_build.patch
new file mode 100644
index 0000000..98a2af8
--- /dev/null
+++ b/package/libhackrf/0001-disabled_shared_library_in_build.patch
@@ -0,0 +1,54 @@
+diff -rupN hackrf/host/libhackrf/src/CMakeLists.txt libhackrf-v2015.07.2/host/libhackrf/src/CMakeLists.txt
+--- hackrf/host/libhackrf/src/CMakeLists.txt	2015-10-10 13:31:57.754026872 -0700
++++ libhackrf-v2015.07.2/host/libhackrf/src/CMakeLists.txt	2015-10-10 13:30:52.162026628 -0700
+@@ -27,8 +27,10 @@ set(c_sources ${CMAKE_CURRENT_SOURCE_DIR
+ set(c_headers ${CMAKE_CURRENT_SOURCE_DIR}/hackrf.h CACHE INTERNAL "List of C headers")
+ 
+ # Dynamic library
+-add_library(hackrf SHARED ${c_sources})
+-set_target_properties(hackrf PROPERTIES VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.0 SOVERSION 0)
++if(BUILD_SHARED_LIBS)
++        add_library(hackrf SHARED ${c_sources})
++        set_target_properties(hackrf PROPERTIES VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.0 SOVERSION 0)
++endif()
+ 
+ # Static library
+ add_library(hackrf-static STATIC ${c_sources})
+@@ -38,12 +40,17 @@ else()
+ 	set_target_properties(hackrf-static PROPERTIES OUTPUT_NAME "hackrf")
+ endif()
+ 
+-set_target_properties(hackrf PROPERTIES CLEAN_DIRECT_OUTPUT 1)
++if(BUILD_SHARED_LIBS)
++        set_target_properties(hackrf PROPERTIES CLEAN_DIRECT_OUTPUT 1)
++endif()
+ set_target_properties(hackrf-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ 
++
+ # Dependencies
+-target_link_libraries(hackrf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+-   
++if(BUILD_SHARED_LIBS)
++        target_link_libraries(hackrf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++endif()
++
+ # For cygwin just force UNIX OFF and WIN32 ON
+ if( ${CYGWIN} )
+   SET(UNIX OFF)
+@@ -51,10 +58,12 @@ if( ${CYGWIN} )
+ endif( ${CYGWIN} )
+ 
+ if( ${UNIX} )
+-   install(TARGETS hackrf
+-           LIBRARY DESTINATION lib${LIB_SUFFIX}
+-           COMPONENT sharedlibs
+-           )
++   if(BUILD_SHARED_LIBS)
++           install(TARGETS hackrf
++                   LIBRARY DESTINATION lib${LIB_SUFFIX}
++                   COMPONENT sharedlibs
++                   )
++   endif()
+    install(TARGETS hackrf-static
+            ARCHIVE DESTINATION lib${LIB_SUFFIX}
+            COMPONENT staticlibs
diff --git a/package/libhackrf/Config.in b/package/libhackrf/Config.in
new file mode 100644
index 0000000..2666a46
--- /dev/null
+++ b/package/libhackrf/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBHACKRF
+	bool "libhackrf"
+	select BR2_PACKAGE_LIBUSB
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Library for accessing HackRF SDR boards.
+
+	  https://github.com/mossmann/hackrf/host/libhackrf
+
diff --git a/package/libhackrf/libhackrf.mk b/package/libhackrf/libhackrf.mk
new file mode 100644
index 0000000..d7ed919
--- /dev/null
+++ b/package/libhackrf/libhackrf.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# libhackrf 
+#
+################################################################################
+
+LIBHACKRF_VERSION = v2015.07.2
+LIBHACKRF_SITE = $(call github,mossmann,hackrf,$(LIBHACKRF_VERSION))
+LIBHACKRF_LICENSE = GPLv2+
+LIBHACKRF_LICENSE_FILES = COPYING
+LIBHACKRF_DEPENDENCIES = libusb
+LIBHACKRF_SUBDIR = host/libhackrf
+LIBHACKRF_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+LIBHACKRF_CONF_OPTS += -DINSTALL_UDEV_RULES=ON
+else
+LIBHACKRF_CONF_OPTS += -DINSTALL_UDEV_RULES=OFF
+endif
+
+$(eval $(cmake-package))
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] Add package hackrf-tools
  2015-10-11  7:00 [Buildroot] [PATCH 1/2] Add package libhackrf Jason Pruitt
@ 2015-10-11  7:00 ` Jason Pruitt
  2015-10-11  8:12   ` Samuel Martin
  2015-10-11  9:18   ` Thomas Petazzoni
  2015-10-11  8:17 ` [Buildroot] [PATCH 1/2] Add package libhackrf Samuel Martin
  2015-10-11  9:15 ` Thomas Petazzoni
  2 siblings, 2 replies; 6+ messages in thread
From: Jason Pruitt @ 2015-10-11  7:00 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Jason Pruitt <jrspruitt@gmail.com>
---
 package/Config.in                    |  1 +
 package/hackrf-tools/Config.in       |  8 ++++++++
 package/hackrf-tools/hackrf-tools.mk | 14 ++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 package/hackrf-tools/Config.in
 create mode 100644 package/hackrf-tools/hackrf-tools.mk

diff --git a/package/Config.in b/package/Config.in
index 0184e46..fe3f057 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -352,6 +352,7 @@ endif
 	source "package/gpsd/Config.in"
 	source "package/gptfdisk/Config.in"
 	source "package/gvfs/Config.in"
+	source "package/hackrf-tools/Config.in
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/hdparm/Config.in"
 endif
diff --git a/package/hackrf-tools/Config.in b/package/hackrf-tools/Config.in
new file mode 100644
index 0000000..71fced6
--- /dev/null
+++ b/package/hackrf-tools/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HACKRF_TOOLS
+	bool "hackrf-tools"
+    depends on BR2_PACKAGE_LIBHACKRF && (BR2_SHARED_STATIC_LIBS || BR2_SHARED_LIBS)
+	help
+	  Tools for interacting with and updating HackRF boards.
+
+	  https://github.com/mossmann/hackrf/host/hackrf-tools
+
diff --git a/package/hackrf-tools/hackrf-tools.mk b/package/hackrf-tools/hackrf-tools.mk
new file mode 100644
index 0000000..40bccae
--- /dev/null
+++ b/package/hackrf-tools/hackrf-tools.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# hackrf-tools
+#
+################################################################################
+
+HACKRF_TOOLS_VERSION = v2015.07.2
+HACKRF_TOOLS_SITE = $(call github,mossmann,hackrf,$(HACKRF_TOOLS_VERSION))
+HACKRF_TOOLS_LICENSE = GPLv2+
+HACKRF_TOOLS_LICENSE_FILES = COPYING
+HACKRF_TOOLS_DEPENDENCIES = libhackrf
+HACKRF_TOOLS_SUBDIR = host/hackrf-tools
+
+$(eval $(cmake-package))
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] Add package hackrf-tools
  2015-10-11  7:00 ` [Buildroot] [PATCH 2/2] Add package hackrf-tools Jason Pruitt
@ 2015-10-11  8:12   ` Samuel Martin
  2015-10-11  9:18   ` Thomas Petazzoni
  1 sibling, 0 replies; 6+ messages in thread
From: Samuel Martin @ 2015-10-11  8:12 UTC (permalink / raw)
  To: buildroot

Hi Jason,

On Sun, Oct 11, 2015 at 9:00 AM, Jason Pruitt <jrspruitt@gmail.com> wrote:
> Signed-off-by: Jason Pruitt <jrspruitt@gmail.com>
> ---
>  package/Config.in                    |  1 +
>  package/hackrf-tools/Config.in       |  8 ++++++++
>  package/hackrf-tools/hackrf-tools.mk | 14 ++++++++++++++
>  3 files changed, 23 insertions(+)
>  create mode 100644 package/hackrf-tools/Config.in
>  create mode 100644 package/hackrf-tools/hackrf-tools.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 0184e46..fe3f057 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -352,6 +352,7 @@ endif
>         source "package/gpsd/Config.in"
>         source "package/gptfdisk/Config.in"
>         source "package/gvfs/Config.in"
> +       source "package/hackrf-tools/Config.in
>  if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
>         source "package/hdparm/Config.in"
>  endif
> diff --git a/package/hackrf-tools/Config.in b/package/hackrf-tools/Config.in
> new file mode 100644
> index 0000000..71fced6
> --- /dev/null
> +++ b/package/hackrf-tools/Config.in
> @@ -0,0 +1,8 @@
> +config BR2_PACKAGE_HACKRF_TOOLS
> +       bool "hackrf-tools"
> +    depends on BR2_PACKAGE_LIBHACKRF && (BR2_SHARED_STATIC_LIBS || BR2_SHARED_LIBS)
> +       help
> +         Tools for interacting with and updating HackRF boards.
> +
> +         https://github.com/mossmann/hackrf/host/hackrf-tools

The right url seems to be:
https://github.com/mossmann/hackrf/tree/master/host/hackrf-tools

> +
> diff --git a/package/hackrf-tools/hackrf-tools.mk b/package/hackrf-tools/hackrf-tools.mk
> new file mode 100644
> index 0000000..40bccae
> --- /dev/null
> +++ b/package/hackrf-tools/hackrf-tools.mk
> @@ -0,0 +1,14 @@
> +################################################################################
> +#
> +# hackrf-tools
> +#
> +################################################################################
> +
> +HACKRF_TOOLS_VERSION = v2015.07.2
> +HACKRF_TOOLS_SITE = $(call github,mossmann,hackrf,$(HACKRF_TOOLS_VERSION))
> +HACKRF_TOOLS_LICENSE = GPLv2+
> +HACKRF_TOOLS_LICENSE_FILES = COPYING
> +HACKRF_TOOLS_DEPENDENCIES = libhackrf
> +HACKRF_TOOLS_SUBDIR = host/hackrf-tools
> +
> +$(eval $(cmake-package))
> --
> 2.1.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Otherwise, it looks pretty good :)

Regards,

-- 
Samuel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] Add package libhackrf
  2015-10-11  7:00 [Buildroot] [PATCH 1/2] Add package libhackrf Jason Pruitt
  2015-10-11  7:00 ` [Buildroot] [PATCH 2/2] Add package hackrf-tools Jason Pruitt
@ 2015-10-11  8:17 ` Samuel Martin
  2015-10-11  9:15 ` Thomas Petazzoni
  2 siblings, 0 replies; 6+ messages in thread
From: Samuel Martin @ 2015-10-11  8:17 UTC (permalink / raw)
  To: buildroot

Hi Jason,

On Sun, Oct 11, 2015 at 9:00 AM, Jason Pruitt <jrspruitt@gmail.com> wrote:
> Signed-off-by: Jason Pruitt <jrspruitt@gmail.com>
> ---
>  package/Config.in                                  |  1 +
>  .../0001-disabled_shared_library_in_build.patch    | 54 ++++++++++++++++++++++
>  package/libhackrf/Config.in                        |  9 ++++
>  package/libhackrf/libhackrf.mk                     | 21 +++++++++
>  4 files changed, 85 insertions(+)
>  create mode 100644 package/libhackrf/0001-disabled_shared_library_in_build.patch
>  create mode 100644 package/libhackrf/Config.in
>  create mode 100644 package/libhackrf/libhackrf.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 1ceb7d6..0184e46 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -866,6 +866,7 @@ menu "Hardware handling"
>         source "package/libftdi/Config.in"
>         source "package/libftdi1/Config.in"
>         source "package/libgudev/Config.in"
> +       source "package/libhackrf/Config.in"
>         source "package/libhid/Config.in"
>         source "package/libiio/Config.in"
>         source "package/libinput/Config.in"
> diff --git a/package/libhackrf/0001-disabled_shared_library_in_build.patch b/package/libhackrf/0001-disabled_shared_library_in_build.patch
> new file mode 100644
> index 0000000..98a2af8
> --- /dev/null
> +++ b/package/libhackrf/0001-disabled_shared_library_in_build.patch
> @@ -0,0 +1,54 @@
> +diff -rupN hackrf/host/libhackrf/src/CMakeLists.txt libhackrf-v2015.07.2/host/libhackrf/src/CMakeLists.txt
> +--- hackrf/host/libhackrf/src/CMakeLists.txt   2015-10-10 13:31:57.754026872 -0700
> ++++ libhackrf-v2015.07.2/host/libhackrf/src/CMakeLists.txt     2015-10-10 13:30:52.162026628 -0700
> +@@ -27,8 +27,10 @@ set(c_sources ${CMAKE_CURRENT_SOURCE_DIR
> + set(c_headers ${CMAKE_CURRENT_SOURCE_DIR}/hackrf.h CACHE INTERNAL "List of C headers")
> +
> + # Dynamic library
> +-add_library(hackrf SHARED ${c_sources})
> +-set_target_properties(hackrf PROPERTIES VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.0 SOVERSION 0)
> ++if(BUILD_SHARED_LIBS)
> ++        add_library(hackrf SHARED ${c_sources})
> ++        set_target_properties(hackrf PROPERTIES VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.0 SOVERSION 0)
> ++endif()
> +
> + # Static library
> + add_library(hackrf-static STATIC ${c_sources})
> +@@ -38,12 +40,17 @@ else()
> +       set_target_properties(hackrf-static PROPERTIES OUTPUT_NAME "hackrf")
> + endif()
> +
> +-set_target_properties(hackrf PROPERTIES CLEAN_DIRECT_OUTPUT 1)
> ++if(BUILD_SHARED_LIBS)
> ++        set_target_properties(hackrf PROPERTIES CLEAN_DIRECT_OUTPUT 1)
> ++endif()
> + set_target_properties(hackrf-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
> +
> ++
> + # Dependencies
> +-target_link_libraries(hackrf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
> +-
> ++if(BUILD_SHARED_LIBS)
> ++        target_link_libraries(hackrf ${LIBUSB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
> ++endif()
> ++
> + # For cygwin just force UNIX OFF and WIN32 ON
> + if( ${CYGWIN} )
> +   SET(UNIX OFF)
> +@@ -51,10 +58,12 @@ if( ${CYGWIN} )
> + endif( ${CYGWIN} )
> +
> + if( ${UNIX} )
> +-   install(TARGETS hackrf
> +-           LIBRARY DESTINATION lib${LIB_SUFFIX}
> +-           COMPONENT sharedlibs
> +-           )
> ++   if(BUILD_SHARED_LIBS)
> ++           install(TARGETS hackrf
> ++                   LIBRARY DESTINATION lib${LIB_SUFFIX}
> ++                   COMPONENT sharedlibs
> ++                   )
> ++   endif()
> +    install(TARGETS hackrf-static
> +            ARCHIVE DESTINATION lib${LIB_SUFFIX}
> +            COMPONENT staticlibs

So, static libs are always built... Don't know if this is an issue
(some other packages may do the same).

> diff --git a/package/libhackrf/Config.in b/package/libhackrf/Config.in
> new file mode 100644
> index 0000000..2666a46
> --- /dev/null
> +++ b/package/libhackrf/Config.in
> @@ -0,0 +1,9 @@
> +config BR2_PACKAGE_LIBHACKRF
> +       bool "libhackrf"
> +       select BR2_PACKAGE_LIBUSB
> +       depends on BR2_TOOLCHAIN_HAS_THREADS
> +       help
> +         Library for accessing HackRF SDR boards.
> +
> +         https://github.com/mossmann/hackrf/host/libhackrf

The right url seems to be:
https://github.com/mossmann/hackrf/tree/master/host/libhackrf

> +
> diff --git a/package/libhackrf/libhackrf.mk b/package/libhackrf/libhackrf.mk
> new file mode 100644
> index 0000000..d7ed919
> --- /dev/null
> +++ b/package/libhackrf/libhackrf.mk
> @@ -0,0 +1,21 @@
> +################################################################################
> +#
> +# libhackrf
> +#
> +################################################################################
> +
> +LIBHACKRF_VERSION = v2015.07.2
> +LIBHACKRF_SITE = $(call github,mossmann,hackrf,$(LIBHACKRF_VERSION))
> +LIBHACKRF_LICENSE = GPLv2+
> +LIBHACKRF_LICENSE_FILES = COPYING
> +LIBHACKRF_DEPENDENCIES = libusb
> +LIBHACKRF_SUBDIR = host/libhackrf
> +LIBHACKRF_INSTALL_STAGING = YES
> +
> +ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
> +LIBHACKRF_CONF_OPTS += -DINSTALL_UDEV_RULES=ON
> +else
> +LIBHACKRF_CONF_OPTS += -DINSTALL_UDEV_RULES=OFF
> +endif
> +
> +$(eval $(cmake-package))
> --
> 2.1.4
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Otherwise it looks pretty good :)

Regards,

-- 
Samuel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] Add package libhackrf
  2015-10-11  7:00 [Buildroot] [PATCH 1/2] Add package libhackrf Jason Pruitt
  2015-10-11  7:00 ` [Buildroot] [PATCH 2/2] Add package hackrf-tools Jason Pruitt
  2015-10-11  8:17 ` [Buildroot] [PATCH 1/2] Add package libhackrf Samuel Martin
@ 2015-10-11  9:15 ` Thomas Petazzoni
  2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2015-10-11  9:15 UTC (permalink / raw)
  To: buildroot

Dear Jason Pruitt,

Thanks for your contribution!

By convention, the title of the commits for new packages should be:

	<package>: new package

i.e in this case:

	libhackrf: new package

See some other comments below.


On Sun, 11 Oct 2015 00:00:52 -0700, Jason Pruitt wrote:
> diff --git a/package/libhackrf/0001-disabled_shared_library_in_build.patch b/package/libhackrf/0001-disabled_shared_library_in_build.patch
> new file mode 100644
> index 0000000..98a2af8
> --- /dev/null
> +++ b/package/libhackrf/0001-disabled_shared_library_in_build.patch
> @@ -0,0 +1,54 @@
> +diff -rupN hackrf/host/libhackrf/src/CMakeLists.txt libhackrf-v2015.07.2/host/libhackrf/src/CMakeLists.txt
> +--- hackrf/host/libhackrf/src/CMakeLists.txt	2015-10-10 13:31:57.754026872 -0700
> ++++ libhackrf-v2015.07.2/host/libhackrf/src/CMakeLists.txt	2015-10-10 13:30:52.162026628 -0700

All patches should have a description + Signed-off-by. Also, since the
upstream project is using Git, it would be preferable to have a patch
generated with Git. In addition, if you can submit to the upstream
project this change, it would be useful.

> diff --git a/package/libhackrf/Config.in b/package/libhackrf/Config.in
> new file mode 100644
> index 0000000..2666a46
> --- /dev/null
> +++ b/package/libhackrf/Config.in
> @@ -0,0 +1,9 @@
> +config BR2_PACKAGE_LIBHACKRF
> +	bool "libhackrf"
> +	select BR2_PACKAGE_LIBUSB
> +	depends on BR2_TOOLCHAIN_HAS_THREADS

Since you depend on thread support, you need to add a Config.in
"comment", like:

comment "libhackrf needs a toolchain w/ threads"
	depends on !BR2_TOOLCHAIN_HAS_THREADS

> +	help
> +	  Library for accessing HackRF SDR boards.
> +
> +	  https://github.com/mossmann/hackrf/host/libhackrf
> +

This last empty new line is not needed.

> diff --git a/package/libhackrf/libhackrf.mk b/package/libhackrf/libhackrf.mk
> new file mode 100644
> index 0000000..d7ed919
> --- /dev/null
> +++ b/package/libhackrf/libhackrf.mk
> @@ -0,0 +1,21 @@
> +################################################################################
> +#
> +# libhackrf 
> +#
> +################################################################################
> +
> +LIBHACKRF_VERSION = v2015.07.2
> +LIBHACKRF_SITE = $(call github,mossmann,hackrf,$(LIBHACKRF_VERSION))
> +LIBHACKRF_LICENSE = GPLv2+
> +LIBHACKRF_LICENSE_FILES = COPYING

Indeed, the COPYING file says GPLv2, but the library source file itself
(https://github.com/mossmann/hackrf/blob/master/host/libhackrf/src/hackrf.c)
advertise a BSD-3c license.

> +LIBHACKRF_DEPENDENCIES = libusb
> +LIBHACKRF_SUBDIR = host/libhackrf

Why do you have two packages for libhackrf and hackrf-tools if they are
part of the same upstream repository? There should be a single
Buildroot package for both, possibly with sub-options to select only
the library, or the library + the tools. Especially since there is a
host/CMakeLists.txt file that allows to build both.

Thanks,

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] Add package hackrf-tools
  2015-10-11  7:00 ` [Buildroot] [PATCH 2/2] Add package hackrf-tools Jason Pruitt
  2015-10-11  8:12   ` Samuel Martin
@ 2015-10-11  9:18   ` Thomas Petazzoni
  1 sibling, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2015-10-11  9:18 UTC (permalink / raw)
  To: buildroot

Dear Jason Pruitt,

On Sun, 11 Oct 2015 00:00:53 -0700, Jason Pruitt wrote:

> diff --git a/package/hackrf-tools/Config.in b/package/hackrf-tools/Config.in
> new file mode 100644
> index 0000000..71fced6
> --- /dev/null
> +++ b/package/hackrf-tools/Config.in
> @@ -0,0 +1,8 @@
> +config BR2_PACKAGE_HACKRF_TOOLS
> +	bool "hackrf-tools"
> +    depends on BR2_PACKAGE_LIBHACKRF && (BR2_SHARED_STATIC_LIBS || BR2_SHARED_LIBS)

Improper indentation. Besides that, if something doesn't build with
pure static libraries, we normally do:

	depends on !BR2_STATIC_LIBS

and add a comment:

comment "hackrf-tools needs a toolchain w/ dynamic library"
	depends on BR2_STATIC_LIBS

Regarding the "depends on BR2_PACKAGE_LIBHACKRF", it should be a
"select" instead:

	select BR2_PACKAGE_LIBHACKRF

and then you need to propagate the reverse dependencies of libhackrf:

	depends on BR2_TOOLCHAIN_HAS_THREADS

and of course keep a comment about this thread dependency. So the
comment above should in fact be:

comment "hackrf-tools needs a toolchain w/ threads, dynamic library"
	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

However, this is all moot if you merge both packages into one, as
suggested in my review of the libhackrf package.

> +	help
> +	  Tools for interacting with and updating HackRF boards.
> +
> +	  https://github.com/mossmann/hackrf/host/hackrf-tools
> +

Unneeded empty new line.

Thanks!

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-10-11  9:18 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-11  7:00 [Buildroot] [PATCH 1/2] Add package libhackrf Jason Pruitt
2015-10-11  7:00 ` [Buildroot] [PATCH 2/2] Add package hackrf-tools Jason Pruitt
2015-10-11  8:12   ` Samuel Martin
2015-10-11  9:18   ` Thomas Petazzoni
2015-10-11  8:17 ` [Buildroot] [PATCH 1/2] Add package libhackrf Samuel Martin
2015-10-11  9:15 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox