cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct LDFLAGS for pianobar/libpiano linking

Browse Source 
from upstream git
This commit is contained in:
dcoppa 2012-05-10 11:23:18 +00:00
parent 71fad12f22
commit cf4bb2e84b
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/pianobar/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.36 2012/05/07 11:04:21 dcoppa Exp $
# $OpenBSD: Makefile,v 1.37 2012/05/10 11:23:18 dcoppa Exp $
SHARED_ONLY = Yes
COMMENT = console client for pandora
DISTNAME = pianobar-2012.05.06
REVISION = 0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = audio

25
audio/pianobar/patches/patch-Makefile
View File

@ -1,6 +1,13 @@
$OpenBSD: patch-Makefile,v 1.15 2012/05/09 09:35:08 dcoppa Exp $
$OpenBSD: patch-Makefile,v 1.16 2012/05/10 11:23:18 dcoppa Exp $
Use pkg-config for libmad and gnutls
(upstream git commit eee4424677964ddc5b0f01d120db71f160a7c9e1)
Correct LDFLAGS for pianobar/libpiano linking
(upstream git commit c9aff4f4ceddc70b8b98ca8d5d248eac6be2619f)
--- Makefile.orig Sun May 6 16:33:54 2012
+++ Makefile Wed May 9 11:29:37 2012
+++ Makefile Thu May 10 13:12:13 2012
@@ -6,15 +6,8 @@ LIBDIR:=${PREFIX}/lib
INCDIR:=${PREFIX}/include
MANDIR:=${PREFIX}/share/man
@ -34,17 +41,18 @@ $OpenBSD: patch-Makefile,v 1.15 2012/05/09 09:35:08 dcoppa Exp $
LIBGCRYPT_CFLAGS=
LIBGCRYPT_LDFLAGS=-lgcrypt
@@ -87,50 +81,41 @@ LIBJSONC_LDFLAGS=$(shell pkg-config --libs json)
@@ -87,50 +81,40 @@ LIBJSONC_LDFLAGS=$(shell pkg-config --libs json)
# build pianobar
ifeq (${DYNLINK},1)
-pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.so.0
- @echo " LINK $@"
- @${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -lpthread -lm -L. -lpiano \
- ${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} \
- ${LIBGCRYPT_LDFLAGS} ${LIBJSONC_LDFLAGS}
+pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.so.${LIBpiano_VERSION}
+ ${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -pthread -lm -L. -lpiano \
${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} \
${LIBGCRYPT_LDFLAGS} ${LIBJSONC_LDFLAGS}
+ ${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS}
else
pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \
${LIBWAITRESS_HDR}
@ -63,9 +71,10 @@ $OpenBSD: patch-Makefile,v 1.15 2012/05/09 09:35:08 dcoppa Exp $
${LIBWAITRESS_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ}
- @echo " LINK $@"
- @${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} \
+ ${CC} -shared ${CFLAGS} ${LDFLAGS} \
${LIBGNUTLS_LDFLAGS} ${LIBGCRYPT_LDFLAGS} \
- ${LIBGNUTLS_LDFLAGS} ${LIBGCRYPT_LDFLAGS} \
- -o libpiano.so.0.0.0 ${LIBPIANO_RELOBJ} \
+ ${CC} -shared ${CFLAGS} ${LDFLAGS} \
+ ${LIBGNUTLS_LDFLAGS} ${LIBGCRYPT_LDFLAGS} ${LIBJSONC_LDFLAGS} \
+ -o libpiano.so.${LIBpiano_VERSION} ${LIBPIANO_RELOBJ} \
${LIBWAITRESS_RELOBJ}
- @ln -s libpiano.so.0.0.0 libpiano.so.0
@ -98,7 +107,7 @@ $OpenBSD: patch-Makefile,v 1.15 2012/05/09 09:35:08 dcoppa Exp $
${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} pianobar libpiano.so* \
libpiano.a waitress-test
@@ -177,17 +162,15 @@ else
@@ -177,17 +161,15 @@ else
install: pianobar
endif
install -d ${DESTDIR}/${BINDIR}/