Skip to contentSkip to conversation

pakage/rpi-userland: add and install our bcm_host.pc

PATCH New Yann E. MORIN 2 participants 3 messages Oct 5, 2013 – Oct 6, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pakage/rpi-userland: add and install our bcm_host.pc

From: "Yann E. MORIN" <[email protected]>

This allows pkg-config-aware packages to include headers from, and link against Broadcom VideoCore host API library.

bcm_host.pc copied almost as-is from:
http://cgit.collabora.com/git/user/pq/android-pc-files.git/tree/pkgconfig?h=raspberrypi
with only a fix to the prefix (we're using /usr).

---
 package/rpi-userland/bcm_host.pc     | 11 +++++++++++
 package/rpi-userland/rpi-userland.mk |  7 ++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 package/rpi-userland/bcm_host.pc
package/rpi-userland/bcm_host.pc new file +11 -0
new file mode 100644
index 0000000..28bbe96
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: bcm_host
+Description: Broadcom VideoCore host API library
+Version: 1
+Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
+Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
+
package/rpi-userland/rpi-userland.mk +6 -1
index c3ea43a..575b0c9 100644
@@ -14,7 +14,12 @@ RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
 define RPI_USERLAND_POST_TARGET_CLEANUP
     rm -Rf $(TARGET_DIR)/usr/src
 endef
-
 RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP
 
+define RPI_USERLAND_POST_TARGET_PC_FILE
+	install -D -m 0644 package/rpi-userland/bcm_host.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/bcm_host.pc
+endef
+RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_PC_FILE
+
 $(eval $(cmake-package))
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 pakage/rpi-userland: add and install our bcm_host.pc

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Yann> From: "Yann E. MORIN" <[email protected]>
Yann> This allows pkg-config-aware packages to include headers from, and Yann> link against Broadcom VideoCore host API library.

Yann> bcm_host.pc copied almost as-is from:
Yann> http://cgit.collabora.com/git/user/pq/android-pc-files.git/tree/pkgconfig?h=raspberrypi
Yann> with only a fix to the prefix (we're using /usr).

Yann> Signed-off-by: "Yann E. MORIN" <[email protected]> Yann> ---

 Yann>  package/rpi-userland/bcm_host.pc     | 11 +++++++++++
 Yann>  package/rpi-userland/rpi-userland.mk |  7 ++++++-

Yann> 2 files changed, 17 insertions(+), 1 deletion(-) Yann> create mode 100644 package/rpi-userland/bcm_host.pc

Yann> diff --git a/package/rpi-userland/bcm_host.pc b/package/rpi-userland/bcm_host.pc
Yann> new file mode 100644
Yann> index 0000000..28bbe96
Yann> --- /dev/null
Yann> +++ b/package/rpi-userland/bcm_host.pc
Yann> @@ -0,0 +1,11 @@
Yann> +prefix=/usr
Yann> +exec_prefix=${prefix}
Yann> +libdir=${exec_prefix}/lib
Yann> +includedir=${prefix}/include
Yann> +
Yann> +Name: bcm_host
Yann> +Description: Broadcom VideoCore host API library
Yann> +Version: 1
Yann> +Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
Yann> +Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM Yann> +
Yann> diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk
Yann> index c3ea43a..575b0c9 100644
Yann> --- a/package/rpi-userland/rpi-userland.mk
Yann> +++ b/package/rpi-userland/rpi-userland.mk
Yann> @@ -14,7 +14,12 @@ RPI_USERLAND_CONF_OPT = -DVMCS_INSTALL_PREFIX=/usr
Yann> define RPI_USERLAND_POST_TARGET_CLEANUP
Yann> rm -Rf $(TARGET_DIR)/usr/src
Yann> endef
Yann> -
Yann> RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP

Yann> +define RPI_USERLAND_POST_TARGET_PC_FILE
Yann> + install -D -m 0644 package/rpi-userland/bcm_host.pc \
Yann> + $(STAGING_DIR)/usr/lib/pkgconfig/bcm_host.pc
Yann> +endef
Yann> +RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_PC_FILE

It installs into staging so it should be
RPI_USERLAND_POST_INSTALL_STAGING_HOOKS.

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 pakage/rpi-userland: add and install our bcm_host.pc

Peter, All,

On 2013-10-06 20:47 +0200, Peter Korsgaard spake thusly:

Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Yann> From: "Yann E. MORIN" <[email protected]>
Yann> This allows pkg-config-aware packages to include headers from, and Yann> link against Broadcom VideoCore host API library.

Yann> bcm_host.pc copied almost as-is from:
Yann> http://cgit.collabora.com/git/user/pq/android-pc-files.git/tree/pkgconfig?h=raspberrypi
Yann> with only a fix to the prefix (we're using /usr).

Yann> Signed-off-by: "Yann E. MORIN" <[email protected]>

[--SNIP--]

Quoted 2 lines

It installs into staging so it should be
RPI_USERLAND_POST_INSTALL_STAGING_HOOKS.

Doh.. Stupid me... :-/

Quoted 1 line

Committed with that fixed, thanks.

Thanks!

Regards,
Yann E. MORIN.

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.  |
'------------------------------^-------^------------------^--------------------'