diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2007-06-17 14:48:39 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2007-06-17 14:48:39 +0000 |
| commit | efe2c5a8e09bc052938ad3321c0761316c7da25c (patch) | |
| tree | 496e5213cbdfc63b413a8be7be68931363915ca3 /net | |
| parent | - Update to 2.4 (diff) | |
Always use -fPIC, when building shared libraries. Apparently, this is
not always required on i386.
While here, remove requirements for particular shlib-versions of the
dependencies.
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=193723
Diffstat (limited to 'net')
| -rw-r--r-- | net/opal/Makefile | 16 | ||||
| -rw-r--r-- | net/opal3/Makefile | 16 |
2 files changed, 14 insertions, 18 deletions
diff --git a/net/opal/Makefile b/net/opal/Makefile index 3f9a39f14257..f6aefcd8e7cb 100644 --- a/net/opal/Makefile +++ b/net/opal/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= tar.gz MAINTAINER= jbq@caraldi.com COMMENT= VoIP abstraction library -LIB_DEPENDS= pt_r.1:${PORTSDIR}/devel/pwlib +LIB_DEPENDS= pt_r:${PORTSDIR}/devel/pwlib WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g} @@ -34,22 +34,20 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} .include <bsd.port.pre.mk> -# Avoid build error on 64-bit architectures -.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64") +# Be sure to compile position-independent objects for the shared libraries CFLAGS+= -fPIC -.endif .ifdef (WITH_FFMPEG) -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg -CONFIGURE_ARGS+= --enable-h263avcodec=${LOCALBASE}/include/ffmpeg +LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg +CONFIGURE_ARGS+=--enable-h263avcodec=${LOCALBASE}/include/ffmpeg .endif .ifdef (WITH_SPEEX) -LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex +LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex BUILD_DEPENDS+= ${LOCALBASE}/include/speex/speex_echo.h:${PORTSDIR}/audio/speex -CONFIGURE_ARGS+= --enable-localspeex=no +CONFIGURE_ARGS+=--enable-localspeex=no .else -CONFIGURE_ARGS+= --enable-localspeex=yes +CONFIGURE_ARGS+=--enable-localspeex=yes .endif .include <bsd.port.post.mk> diff --git a/net/opal3/Makefile b/net/opal3/Makefile index 3f9a39f14257..f6aefcd8e7cb 100644 --- a/net/opal3/Makefile +++ b/net/opal3/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= tar.gz MAINTAINER= jbq@caraldi.com COMMENT= VoIP abstraction library -LIB_DEPENDS= pt_r.1:${PORTSDIR}/devel/pwlib +LIB_DEPENDS= pt_r:${PORTSDIR}/devel/pwlib WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g} @@ -34,22 +34,20 @@ PLIST_SUB= PORTVERSION=${PORTVERSION} .include <bsd.port.pre.mk> -# Avoid build error on 64-bit architectures -.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64") +# Be sure to compile position-independent objects for the shared libraries CFLAGS+= -fPIC -.endif .ifdef (WITH_FFMPEG) -LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg -CONFIGURE_ARGS+= --enable-h263avcodec=${LOCALBASE}/include/ffmpeg +LIB_DEPENDS+= avcodec:${PORTSDIR}/multimedia/ffmpeg +CONFIGURE_ARGS+=--enable-h263avcodec=${LOCALBASE}/include/ffmpeg .endif .ifdef (WITH_SPEEX) -LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex +LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex BUILD_DEPENDS+= ${LOCALBASE}/include/speex/speex_echo.h:${PORTSDIR}/audio/speex -CONFIGURE_ARGS+= --enable-localspeex=no +CONFIGURE_ARGS+=--enable-localspeex=no .else -CONFIGURE_ARGS+= --enable-localspeex=yes +CONFIGURE_ARGS+=--enable-localspeex=yes .endif .include <bsd.port.post.mk> |