diff options
| author | danw <danw> | 2004-05-20 16:13:05 +0000 |
|---|---|---|
| committer | danw <danw> | 2004-05-20 16:13:05 +0000 |
| commit | 2505f3632ed002a2e4ee00daa5b64e82073803ed (patch) | |
| tree | 05629c8037432704f7f337f1f1213d4f378509e1 | |
| parent | 4029b42399c77966c854d583f3b4934125a6d508 (diff) | |
| download | pkgsrc-2505f3632ed002a2e4ee00daa5b64e82073803ed.tar.gz | |
Revert the change to put -liconv into BUILDLINK_LDFLAGS.iconv (which
breaks some things on Darwin) and fix audio/musicpd so it doesn't need
it (by faking out a configure check that gets confused by the
iconv_open -> libiconv_open renaming)
| -rw-r--r-- | audio/musicpd/Makefile | 3 | ||||
| -rw-r--r-- | converters/libiconv/buildlink3.mk | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index f6ef5910108..d0cb907bcda 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/04/30 10:48:21 grant Exp $ +# $NetBSD: Makefile,v 1.2 2004/05/20 16:13:05 danw Exp $ DISTNAME= mpd-${PKGVERSION} PKGNAME= musicpd-0.10.3 @@ -53,6 +53,7 @@ CONFIGURE_ARGS+= --disable-aac .if ${MUSICPD_WITH_AUDIOFILE} == "YES" . include "../../audio/libaudiofile/buildlink3.mk" CONFIGURE_ARGS+= --with-audiofile=${BUILDLINK_PREFIX.audiofile} +CONFIGURE_ENV+= ac_cv_lib_iconv_iconv_open=yes .else CONFIGURE_ARGS+= --disable-audiofile .endif diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk index ac9f5921f92..978f6225f65 100644 --- a/converters/libiconv/buildlink3.mk +++ b/converters/libiconv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2004/05/17 21:32:34 seb Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2004/05/20 16:13:05 danw Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+ @@ -13,7 +13,6 @@ BUILDLINK_PACKAGES+= iconv .if !empty(ICONV_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.iconv+= libiconv>=1.9.1 BUILDLINK_PKGSRCDIR.iconv?= ../../converters/libiconv -BUILDLINK_LDFLAGS.iconv= ${BUILDLINK_LDADD.iconv} .endif # ICONV_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |