* [Buildroot] [PATCH] package/shairport-sync: fix static builds
@ 2014-11-29 13:34 Yann E. MORIN
2014-11-29 18:10 ` Baruch Siach
2014-11-30 11:35 ` Yann E. MORIN
0 siblings, 2 replies; 8+ messages in thread
From: Yann E. MORIN @ 2014-11-29 13:34 UTC (permalink / raw)
To: buildroot
Because shairport-sync uses AC_CHECK_LIB to find some of the needed
libraries (opensl, alsa, popt...), it fails to bring in the dependencies
of those libraries; for example, -lssl requires -lz.
When doing a dynamically-linked build, those dependent libraries are
pulled in thansk to the DT_NEEDED ELF tags, but those are not available
in static libraries.
Use PKG_CHECK_MODULES instead of AC_CHECK_LIB, and emulate the results
of AC_CJECK_LIB (i.e. set the HAVE_LIBxxx and the LIBS variable
appropriately) to minimise the amount of code touched.
This should fix:
http://autobuild.buildroot.net/results/1a5/1a56dbff3583bed0d693508dfc16859086846ecd/
http://autobuild.buildroot.net/results/6d5/6d5a8157592f7a2c9469bf71b0453796ef982ab1/
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: J?rg Krause <jkrause@posteo.de>
---
Note: I was not able to rproduce the build failures: the popt check was
sucessfull for me, but failed in the following checks for ssl and alsa.
The fix to popt is just a generalisation of the fix to the other two
libraries.
---
.../0001-fix-static-link-openssl.patch | 37 ++++++++++++++++++++++
.../shairport-sync/0002-fix-static-link-alsa.patch | 23 ++++++++++++++
.../shairport-sync/0003-fix-static-link-popt.patch | 21 ++++++++++++
3 files changed, 81 insertions(+)
create mode 100644 package/shairport-sync/0001-fix-static-link-openssl.patch
create mode 100644 package/shairport-sync/0002-fix-static-link-alsa.patch
create mode 100644 package/shairport-sync/0003-fix-static-link-popt.patch
diff --git a/package/shairport-sync/0001-fix-static-link-openssl.patch b/package/shairport-sync/0001-fix-static-link-openssl.patch
new file mode 100644
index 0000000..80e199f
--- /dev/null
+++ b/package/shairport-sync/0001-fix-static-link-openssl.patch
@@ -0,0 +1,37 @@
+configure: fix static link with openssl
+
+Use pkg-config to find openssl libraries, that will return all the
+dependent libraries of openssl as well (e.g. -lz) that can not be
+deduced in case of a static link.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN shairport-sync-2.1.8.orig/configure.ac shairport-sync-2.1.8/configure.ac
+--- shairport-sync-2.1.8.orig/configure.ac 2014-10-25 18:03:13.000000000 +0200
++++ shairport-sync-2.1.8/configure.ac 2014-11-29 12:52:41.507981720 +0100
+@@ -21,6 +21,8 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+
++PKG_PROG_PKG_CONFIG([0.9.0])
++
+ # Checks for libraries.
+ if test "x${with_os_type}" = xlinux; then
+ AC_CHECK_LIB([rt],[clock_gettime], , AC_MSG_ERROR(librt needed))
+@@ -52,8 +56,14 @@
+ AC_MSG_ERROR(choose either "openssl" or "polarssl" encryption)
+ fi
+ if test "x${with_ssl}" = xopenssl ; then
+- AC_CHECK_LIB([crypto], [MD5_Init], , AC_MSG_ERROR(libcrypto selected, but the library cannot be found!))
+- AC_CHECK_LIB([ssl],[SSL_library_init], , AC_MSG_ERROR(openssl selected but the library cannot be found!))
++ PKG_CHECK_MODULES(
++ [CRYPTO], [libcrypto],
++ [LIBS="${CRYPTO_LIBS} ${LIBS}"
++ AC_DEFINE([HAVE_LIBCRYPTO],[1],[Define to 1 if you have libcrypto])])
++ PKG_CHECK_MODULES(
++ [SSL], [libssl],
++ [LIBS="${SSL_LIBS} ${LIBS}"
++ AC_DEFINE([HAVE_LIBSSL],[1],[Define to 1 if you have libssl])])
+ elif test "x${with_ssl}" = xpolarssl ; then
+ AC_CHECK_LIB([polarssl],[ssl_init], , AC_MSG_ERROR(PolarSSL selected but the library cannot be found!))
+ else
diff --git a/package/shairport-sync/0002-fix-static-link-alsa.patch b/package/shairport-sync/0002-fix-static-link-alsa.patch
new file mode 100644
index 0000000..08f593d
--- /dev/null
+++ b/package/shairport-sync/0002-fix-static-link-alsa.patch
@@ -0,0 +1,23 @@
+configure: fix static link with alsa
+
+Use pkg-config to find the alsa library, that will return all the
+dependent libraries of alsa (e.g. -ldl -lpthread -lrt) as well that
+can not be deduced in case of a static link.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN shairport-sync-2.1.8.orig/configure.ac shairport-sync-2.1.8/configure.ac
+--- shairport-sync-2.1.8.orig/configure.ac 2014-11-29 12:56:11.954118681 +0100
++++ shairport-sync-2.1.8/configure.ac 2014-11-29 13:07:24.941687600 +0100
+@@ -99,7 +99,10 @@
+ HAS_ALSA=1
+ AM_CONDITIONAL([USE_ALSA], [test 0])
+ AC_DEFINE([CONFIG_ALSA], 1, [Needed by the compiler.])
+- AC_CHECK_LIB([asound], [snd_pcm_open], , AC_MSG_ERROR(ALSA support requires the asound library!))], )
++ PKG_CHECK_MODULES(
++ [ALSA], [alsa],
++ [LIBS="${ALSA_LIBS} ${LIBS}"
++ AC_DEFINE([HAVE_LIBASOUND],[1],[Define to 1 if you have ALSA])])])
+ AM_CONDITIONAL([USE_ALSA], [test "x$HAS_ALSA" = "x1"])
+
+ # Look for SNDIO flag
diff --git a/package/shairport-sync/0003-fix-static-link-popt.patch b/package/shairport-sync/0003-fix-static-link-popt.patch
new file mode 100644
index 0000000..8e8c4ca
--- /dev/null
+++ b/package/shairport-sync/0003-fix-static-link-popt.patch
@@ -0,0 +1,21 @@
+configure: fix static link with popt
+
+Use pkg-config to find the popt library.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN shairport-sync-2.1.8.orig/configure.ac shairport-sync-2.1.8/configure.ac
+--- shairport-sync-2.1.8.orig/configure.ac 2014-11-29 14:14:36.655955733 +0100
++++ shairport-sync-2.1.8/configure.ac 2014-11-29 14:16:21.072719327 +0100
+@@ -31,7 +31,10 @@
+ AC_CHECK_LIB([daemon],[daemon_log], , AC_MSG_ERROR(libdaemon needed))
+ AC_CHECK_LIB([pthread],[pthread_create], , AC_MSG_ERROR(pthread library needed))
+ AC_CHECK_LIB([m],[exp], , AC_MSG_ERROR(maths library needed))
+-AC_CHECK_LIB([popt],[poptGetContext], , AC_MSG_ERROR(libpopt needed))
++PKG_CHECK_MODULES(
++ [POPT], [popt],
++ [LIBS="${POPT_LIBS} ${LIBS}"
++ AC_DEFINE([HAVE_LIBPOPT],[1],[Define to 1 if you have popt])])
+
+ # Look for piddir flag
+ AC_ARG_WITH(piddir, [ --with-piddir=<pathname> Specify a pathname to a directory in which to write the PID file.], [
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] package/shairport-sync: fix static builds
2014-11-29 13:34 [Buildroot] [PATCH] package/shairport-sync: fix static builds Yann E. MORIN
@ 2014-11-29 18:10 ` Baruch Siach
2014-11-29 18:15 ` Yann E. MORIN
2014-11-30 11:35 ` Yann E. MORIN
1 sibling, 1 reply; 8+ messages in thread
From: Baruch Siach @ 2014-11-29 18:10 UTC (permalink / raw)
To: buildroot
Hi Yann,
On Sat, Nov 29, 2014 at 02:34:57PM +0100, Yann E. MORIN wrote:
> Because shairport-sync uses AC_CHECK_LIB to find some of the needed
> libraries (opensl, alsa, popt...), it fails to bring in the dependencies
> of those libraries; for example, -lssl requires -lz.
>
> When doing a dynamically-linked build, those dependent libraries are
> pulled in thansk to the DT_NEEDED ELF tags, but those are not available
> in static libraries.
>
> Use PKG_CHECK_MODULES instead of AC_CHECK_LIB, and emulate the results
> of AC_CJECK_LIB (i.e. set the HAVE_LIBxxx and the LIBS variable
> appropriately) to minimise the amount of code touched.
>
> This should fix:
> http://autobuild.buildroot.net/results/1a5/1a56dbff3583bed0d693508dfc16859086846ecd/
> http://autobuild.buildroot.net/results/6d5/6d5a8157592f7a2c9469bf71b0453796ef982ab1/
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: J?rg Krause <jkrause@posteo.de>
SHAIRPORT_SYNC_DEPENDENCIES should now include host-pkgconf, I believe.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] package/shairport-sync: fix static builds
2014-11-29 18:10 ` Baruch Siach
@ 2014-11-29 18:15 ` Yann E. MORIN
0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2014-11-29 18:15 UTC (permalink / raw)
To: buildroot
Baruch, All,
On 2014-11-29 20:10 +0200, Baruch Siach spake thusly:
> On Sat, Nov 29, 2014 at 02:34:57PM +0100, Yann E. MORIN wrote:
> > Because shairport-sync uses AC_CHECK_LIB to find some of the needed
> > libraries (opensl, alsa, popt...), it fails to bring in the dependencies
> > of those libraries; for example, -lssl requires -lz.
> >
> > When doing a dynamically-linked build, those dependent libraries are
> > pulled in thansk to the DT_NEEDED ELF tags, but those are not available
> > in static libraries.
> >
> > Use PKG_CHECK_MODULES instead of AC_CHECK_LIB, and emulate the results
> > of AC_CJECK_LIB (i.e. set the HAVE_LIBxxx and the LIBS variable
> > appropriately) to minimise the amount of code touched.
> >
> > This should fix:
> > http://autobuild.buildroot.net/results/1a5/1a56dbff3583bed0d693508dfc16859086846ecd/
> > http://autobuild.buildroot.net/results/6d5/6d5a8157592f7a2c9469bf71b0453796ef982ab1/
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: J?rg Krause <jkrause@posteo.de>
>
> SHAIRPORT_SYNC_DEPENDENCIES should now include host-pkgconf, I believe.
Yup, good catch. Will fix. Thanks! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] package/shairport-sync: fix static builds
2014-11-29 13:34 [Buildroot] [PATCH] package/shairport-sync: fix static builds Yann E. MORIN
2014-11-29 18:10 ` Baruch Siach
@ 2014-11-30 11:35 ` Yann E. MORIN
2014-11-30 12:09 ` Jörg Krause
1 sibling, 1 reply; 8+ messages in thread
From: Yann E. MORIN @ 2014-11-30 11:35 UTC (permalink / raw)
To: buildroot
All,
On 2014-11-29 14:34 +0100, Yann E. MORIN spake thusly:
> Because shairport-sync uses AC_CHECK_LIB to find some of the needed
> libraries (opensl, alsa, popt...), it fails to bring in the dependencies
> of those libraries; for example, -lssl requires -lz.
>
> When doing a dynamically-linked build, those dependent libraries are
> pulled in thansk to the DT_NEEDED ELF tags, but those are not available
> in static libraries.
>
> Use PKG_CHECK_MODULES instead of AC_CHECK_LIB, and emulate the results
> of AC_CJECK_LIB (i.e. set the HAVE_LIBxxx and the LIBS variable
> appropriately) to minimise the amount of code touched.
>
> This should fix:
> http://autobuild.buildroot.net/results/1a5/1a56dbff3583bed0d693508dfc16859086846ecd/
> http://autobuild.buildroot.net/results/6d5/6d5a8157592f7a2c9469bf71b0453796ef982ab1/
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: J?rg Krause <jkrause@posteo.de>
>
> ---
> Note: I was not able to rproduce the build failures: the popt check was
> sucessfull for me, but failed in the following checks for ssl and alsa.
> The fix to popt is just a generalisation of the fix to the other two
> libraries.
> ---
> .../0001-fix-static-link-openssl.patch | 37 ++++++++++++++++++++++
> .../shairport-sync/0002-fix-static-link-alsa.patch | 23 ++++++++++++++
> .../shairport-sync/0003-fix-static-link-popt.patch | 21 ++++++++++++
All three patches applied upstream:
https://github.com/mikebrady/shairport-sync/commit/2a430ec434674ed8c1959698c061662bb7abc1a1
https://github.com/mikebrady/shairport-sync/commit/e5a74a3ff08134a2b11f07bd850659d7816fb03d
https://github.com/mikebrady/shairport-sync/commit/1f759e57e8c0682613eaaf89a46fdf6db4c6b5cd
There is now a new release with those three patches, but that would make
us bump pass a few releases, from 2.1.8 to 2.1.13, with some new
features along the lines.
So, for the release, I suggest we just apply those three patches, and
I'll send a version bump after the release has been cut.
Is that OK?
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] package/shairport-sync: fix static builds
@ 2014-11-30 11:42 Yann E. MORIN
2014-11-30 23:11 ` Peter Korsgaard
0 siblings, 1 reply; 8+ messages in thread
From: Yann E. MORIN @ 2014-11-30 11:42 UTC (permalink / raw)
To: buildroot
Because shairport-sync uses AC_CHECK_LIB to find some of the needed
libraries (opensl, alsa, popt...), it fails to bring in the dependencies
of those libraries; for example, -lssl requires -lz.
When doing a dynamically-linked build, those dependent libraries are
pulled in thansk to the DT_NEEDED ELF tags, but those are not available
in static libraries.
Use PKG_CHECK_MODULES instead of AC_CHECK_LIB, and emulate the results
of AC_CJECK_LIB (i.e. set the HAVE_LIBxxx and the LIBS variable
appropriately) to minimise the amount of code touched.
This should fix:
http://autobuild.buildroot.net/results/1a5/1a56dbff3583bed0d693508dfc16859086846ecd/
http://autobuild.buildroot.net/results/6d5/6d5a8157592f7a2c9469bf71b0453796ef982ab1/
At the same time, remove a comment at the end of a variable assignment,
since this has proven to cause some problems.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: J?rg Krause <jkrause@posteo.de>
Cc: Baruch Siach <baruch@tkos.co.il>
---
Changes v1 -> v2:
- add missing host-pkgconf (Baruch)
- remove end-of-line comment
Note: I was not able to rproduce the build failures: the popt check was
sucessfull for me, but failed in the following checks for ssl and alsa.
The fix to popt is just a generalisation of the fix to the other two
libraries.
---
.../0001-fix-static-link-openssl.patch | 41 ++++++++++++++++++++++
.../shairport-sync/0002-fix-static-link-alsa.patch | 27 ++++++++++++++
.../shairport-sync/0003-fix-static-link-popt.patch | 25 +++++++++++++
package/shairport-sync/shairport-sync.mk | 7 ++--
4 files changed, 98 insertions(+), 2 deletions(-)
create mode 100644 package/shairport-sync/0001-fix-static-link-openssl.patch
create mode 100644 package/shairport-sync/0002-fix-static-link-alsa.patch
create mode 100644 package/shairport-sync/0003-fix-static-link-popt.patch
diff --git a/package/shairport-sync/0001-fix-static-link-openssl.patch b/package/shairport-sync/0001-fix-static-link-openssl.patch
new file mode 100644
index 0000000..8245b89
--- /dev/null
+++ b/package/shairport-sync/0001-fix-static-link-openssl.patch
@@ -0,0 +1,41 @@
+configure: fix static link with openssl
+
+Use pkg-config to find openssl libraries, that will return all the
+dependent libraries of openssl as well (e.g. -lz) that can not be
+deduced in case of a static link.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch applied upstream:
+ https://github.com/mikebrady/shairport-sync/commit/2a430ec434674ed8c1959698c061662bb7abc1a1
+
+diff -durN shairport-sync-2.1.8.orig/configure.ac shairport-sync-2.1.8/configure.ac
+--- shairport-sync-2.1.8.orig/configure.ac 2014-10-25 18:03:13.000000000 +0200
++++ shairport-sync-2.1.8/configure.ac 2014-11-29 12:52:41.507981720 +0100
+@@ -21,6 +21,8 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+
++PKG_PROG_PKG_CONFIG([0.9.0])
++
+ # Checks for libraries.
+ if test "x${with_os_type}" = xlinux; then
+ AC_CHECK_LIB([rt],[clock_gettime], , AC_MSG_ERROR(librt needed))
+@@ -52,8 +56,14 @@
+ AC_MSG_ERROR(choose either "openssl" or "polarssl" encryption)
+ fi
+ if test "x${with_ssl}" = xopenssl ; then
+- AC_CHECK_LIB([crypto], [MD5_Init], , AC_MSG_ERROR(libcrypto selected, but the library cannot be found!))
+- AC_CHECK_LIB([ssl],[SSL_library_init], , AC_MSG_ERROR(openssl selected but the library cannot be found!))
++ PKG_CHECK_MODULES(
++ [CRYPTO], [libcrypto],
++ [LIBS="${CRYPTO_LIBS} ${LIBS}"
++ AC_DEFINE([HAVE_LIBCRYPTO],[1],[Define to 1 if you have libcrypto])])
++ PKG_CHECK_MODULES(
++ [SSL], [libssl],
++ [LIBS="${SSL_LIBS} ${LIBS}"
++ AC_DEFINE([HAVE_LIBSSL],[1],[Define to 1 if you have libssl])])
+ elif test "x${with_ssl}" = xpolarssl ; then
+ AC_CHECK_LIB([polarssl],[ssl_init], , AC_MSG_ERROR(PolarSSL selected but the library cannot be found!))
+ else
diff --git a/package/shairport-sync/0002-fix-static-link-alsa.patch b/package/shairport-sync/0002-fix-static-link-alsa.patch
new file mode 100644
index 0000000..101ce14
--- /dev/null
+++ b/package/shairport-sync/0002-fix-static-link-alsa.patch
@@ -0,0 +1,27 @@
+configure: fix static link with alsa
+
+Use pkg-config to find the alsa library, that will return all the
+dependent libraries of alsa (e.g. -ldl -lpthread -lrt) as well that
+can not be deduced in case of a static link.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch applied upstream:
+ https://github.com/mikebrady/shairport-sync/commit/e5a74a3ff08134a2b11f07bd850659d7816fb03d
+
+diff -durN shairport-sync-2.1.8.orig/configure.ac shairport-sync-2.1.8/configure.ac
+--- shairport-sync-2.1.8.orig/configure.ac 2014-11-29 12:56:11.954118681 +0100
++++ shairport-sync-2.1.8/configure.ac 2014-11-29 13:07:24.941687600 +0100
+@@ -99,7 +99,10 @@
+ HAS_ALSA=1
+ AM_CONDITIONAL([USE_ALSA], [test 0])
+ AC_DEFINE([CONFIG_ALSA], 1, [Needed by the compiler.])
+- AC_CHECK_LIB([asound], [snd_pcm_open], , AC_MSG_ERROR(ALSA support requires the asound library!))], )
++ PKG_CHECK_MODULES(
++ [ALSA], [alsa],
++ [LIBS="${ALSA_LIBS} ${LIBS}"
++ AC_DEFINE([HAVE_LIBASOUND],[1],[Define to 1 if you have ALSA])])])
+ AM_CONDITIONAL([USE_ALSA], [test "x$HAS_ALSA" = "x1"])
+
+ # Look for SNDIO flag
diff --git a/package/shairport-sync/0003-fix-static-link-popt.patch b/package/shairport-sync/0003-fix-static-link-popt.patch
new file mode 100644
index 0000000..fe4d8f6
--- /dev/null
+++ b/package/shairport-sync/0003-fix-static-link-popt.patch
@@ -0,0 +1,25 @@
+configure: fix static link with popt
+
+Use pkg-config to find the popt library.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Patch applied upstream:
+ https://github.com/mikebrady/shairport-sync/commit/1f759e57e8c0682613eaaf89a46fdf6db4c6b5cd
+
+diff -durN shairport-sync-2.1.8.orig/configure.ac shairport-sync-2.1.8/configure.ac
+--- shairport-sync-2.1.8.orig/configure.ac 2014-11-29 14:14:36.655955733 +0100
++++ shairport-sync-2.1.8/configure.ac 2014-11-29 14:16:21.072719327 +0100
+@@ -31,7 +31,10 @@
+ AC_CHECK_LIB([daemon],[daemon_log], , AC_MSG_ERROR(libdaemon needed))
+ AC_CHECK_LIB([pthread],[pthread_create], , AC_MSG_ERROR(pthread library needed))
+ AC_CHECK_LIB([m],[exp], , AC_MSG_ERROR(maths library needed))
+-AC_CHECK_LIB([popt],[poptGetContext], , AC_MSG_ERROR(libpopt needed))
++PKG_CHECK_MODULES(
++ [POPT], [popt],
++ [LIBS="${POPT_LIBS} ${LIBS}"
++ AC_DEFINE([HAVE_LIBPOPT],[1],[Define to 1 if you have popt])])
+
+ # Look for piddir flag
+ AC_ARG_WITH(piddir, [ --with-piddir=<pathname> Specify a pathname to a directory in which to write the PID file.], [
diff --git a/package/shairport-sync/shairport-sync.mk b/package/shairport-sync/shairport-sync.mk
index da69171..dc5d092 100644
--- a/package/shairport-sync/shairport-sync.mk
+++ b/package/shairport-sync/shairport-sync.mk
@@ -9,9 +9,12 @@ SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VE
SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c
SHAIRPORT_SYNC_LICENSE_FILES = LICENSES
-SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libdaemon popt
+SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libdaemon popt host-pkgconf
+
+# Touching configure.ac with the patches
SHAIRPORT_SYNC_AUTORECONF = YES
-SHAIRPORT_SYNC_CONF_OPTS = --with-alsa # required
+
+SHAIRPORT_SYNC_CONF_OPTS = --with-alsa
# Avahi or tinysvcmdns (shaiport-sync bundles its own version of tinysvcmdns).
# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] package/shairport-sync: fix static builds
2014-11-30 11:35 ` Yann E. MORIN
@ 2014-11-30 12:09 ` Jörg Krause
2014-11-30 13:48 ` Yann E. MORIN
0 siblings, 1 reply; 8+ messages in thread
From: Jörg Krause @ 2014-11-30 12:09 UTC (permalink / raw)
To: buildroot
Yann,
On So, 2014-11-30 at 12:35 +0100, Yann E. MORIN wrote:
>
> All three patches applied upstream:
> https://github.com/mikebrady/shairport-sync/commit/2a430ec434674ed8c1959698c061662bb7abc1a1
> https://github.com/mikebrady/shairport-sync/commit/e5a74a3ff08134a2b11f07bd850659d7816fb03d
> https://github.com/mikebrady/shairport-sync/commit/1f759e57e8c0682613eaaf89a46fdf6db4c6b5cd
>
> There is now a new release with those three patches, but that would make
> us bump pass a few releases, from 2.1.8 to 2.1.13, with some new
> features along the lines.
>
> So, for the release, I suggest we just apply those three patches, and
> I'll send a version bump after the release has been cut.
>
> Is that OK?
First, many thanks for your work! I had a look at the autobuild errors,
but it was beyond my knowledge.
Version 2.1.9 to 2.1.13 include several bugfixes, so I would suggest to
update the package. I can make a run-time test tomorrow.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] package/shairport-sync: fix static builds
2014-11-30 12:09 ` Jörg Krause
@ 2014-11-30 13:48 ` Yann E. MORIN
0 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2014-11-30 13:48 UTC (permalink / raw)
To: buildroot
J?rg, All,
On 2014-11-30 13:09 +0100, J?rg Krause spake thusly:
> On So, 2014-11-30 at 12:35 +0100, Yann E. MORIN wrote:
> >
> > All three patches applied upstream:
> > https://github.com/mikebrady/shairport-sync/commit/2a430ec434674ed8c1959698c061662bb7abc1a1
> > https://github.com/mikebrady/shairport-sync/commit/e5a74a3ff08134a2b11f07bd850659d7816fb03d
> > https://github.com/mikebrady/shairport-sync/commit/1f759e57e8c0682613eaaf89a46fdf6db4c6b5cd
> >
> > There is now a new release with those three patches, but that would make
> > us bump pass a few releases, from 2.1.8 to 2.1.13, with some new
> > features along the lines.
> >
> > So, for the release, I suggest we just apply those three patches, and
> > I'll send a version bump after the release has been cut.
> >
> > Is that OK?
>
> First, many thanks for your work! I had a look at the autobuild errors,
> but it was beyond my knowledge.
>
> Version 2.1.9 to 2.1.13 include several bugfixes, so I would suggest to
> update the package. I can make a run-time test tomorrow.
We are too close to the (Buildroot!) release to do a version bump, which
is due today (last day of the month). And the new shairport-sync release
with those three patches included is not yet available (code has been
updated, but no tg or tarball is available yet).
I plan on doing a version bump right after both the Buildroot and
shairport-sync releases are out, though.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH] package/shairport-sync: fix static builds
2014-11-30 11:42 Yann E. MORIN
@ 2014-11-30 23:11 ` Peter Korsgaard
0 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2014-11-30 23:11 UTC (permalink / raw)
To: buildroot
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> Because shairport-sync uses AC_CHECK_LIB to find some of the needed
> libraries (opensl, alsa, popt...), it fails to bring in the dependencies
> of those libraries; for example, -lssl requires -lz.
> When doing a dynamically-linked build, those dependent libraries are
> pulled in thansk to the DT_NEEDED ELF tags, but those are not available
> in static libraries.
> Use PKG_CHECK_MODULES instead of AC_CHECK_LIB, and emulate the results
> of AC_CJECK_LIB (i.e. set the HAVE_LIBxxx and the LIBS variable
> appropriately) to minimise the amount of code touched.
> This should fix:
> http://autobuild.buildroot.net/results/1a5/1a56dbff3583bed0d693508dfc16859086846ecd/
> http://autobuild.buildroot.net/results/6d5/6d5a8157592f7a2c9469bf71b0453796ef982ab1/
> At the same time, remove a comment at the end of a variable assignment,
> since this has proven to cause some problems.
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: J?rg Krause <jkrause@posteo.de>
> Cc: Baruch Siach <baruch@tkos.co.il>
> ---
> Changes v1 -> v2:
> - add missing host-pkgconf (Baruch)
> - remove end-of-line comment
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-11-30 23:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-29 13:34 [Buildroot] [PATCH] package/shairport-sync: fix static builds Yann E. MORIN
2014-11-29 18:10 ` Baruch Siach
2014-11-29 18:15 ` Yann E. MORIN
2014-11-30 11:35 ` Yann E. MORIN
2014-11-30 12:09 ` Jörg Krause
2014-11-30 13:48 ` Yann E. MORIN
-- strict thread matches above, loose matches on Subject: below --
2014-11-30 11:42 Yann E. MORIN
2014-11-30 23:11 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox