Date: Thu, 16 Jan 2003 11:56:22 +0100 From: "Simon 'corecode' Schubert" <corecode@corecode.ath.cx> To: roman@xpert.com Cc: edwin@freebsd.org, ports@freebsd.org, Jens Rehsack <rehsack@liwing.de> Subject: experimental unbreak of audio/id3lib for -CURRENT Message-ID: <20030116115622.00cd3b47.corecode@corecode.ath.cx>
next in thread | raw e-mail | index | archive | help
--=.U0zo,e3SLT7f7N
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
hey,
as there ist a breakage of id3lib for -CURRENT because of this ugly
std::char_traits<wchar_t> thing, i made a patch to get this adressed;
please review, test and comment. it works good here, both icc and gcc
compiled versions
cheers
simon
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/id3lib/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 7 Jan 2003 04:56:14 -0000 1.6
+++ Makefile 16 Jan 2003 10:40:34 -0000
@@ -16,14 +16,27 @@
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
INSTALLS_SHLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+USE_LIBTOOL= yes
+
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+ LDFLAGS="${LDFLAGS}"
+
+LDFLAGS= -L${LOCALBASE}/lib
+
+.if ${CC} == cc || ${CC} == gcc
+COMPILER?= gcc
+.else
+COMPILER?= ${CC}
+.endif
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500000
-BROKEN= "Doesn't link properly, std::char_traits<wchar_t> thingie"
+RUN_DEPENDS= ${LOCALBASE}/lib/libstlport_${COMPILER}.so:${PORTSDIR}/devel/stlport${COMPILER:C/^/-/:S/-gcc//}
+BUILD_DEPENDS:= ${RUN_DEPENDS}
+
+LDFLAGS+= -lstlport_${COMPILER}
+CPPFLAGS+= -I${LOCALBASE}/include/stlport
.endif
post-extract:
--
/"\ http://corecode.ath.cx/#donate
\ /
\ ASCII Ribbon Campaign
/ \ Against HTML Mail and News
--=.U0zo,e3SLT7f7N
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE+Jo/br5S+dk6z85oRAtI4AJ4oy2gPbfBmucO12gSfBflll/VnxgCbBubW
xX0FZgNu1B8hQPqvkM6rnvs=
=6c8A
-----END PGP SIGNATURE-----
--=.U0zo,e3SLT7f7N--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030116115622.00cd3b47.corecode>