diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2010-11-12 21:27:34 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2010-11-12 21:27:34 +0000 |
| commit | 870a6acfa2498ecb521faab565cbd491a47b700b (patch) | |
| tree | 658a049409cf19fc3641f5fcab0fffedb4505457 /sysutils | |
| parent | Enable amd64 test. (diff) | |
- Libnet11 is only used when SPOOF option is speified.
- Mark broken when SPOOF option is specified on amd64 platform.
- Move inclusion of bsd.port.pre.mk to enalbe amd64 test
Notes
Notes:
svn path=/head/; revision=264466
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/syslog-ng-devel/Makefile | 17 | ||||
| -rw-r--r-- | sysutils/syslog-ng3-devel/Makefile | 17 |
2 files changed, 18 insertions, 16 deletions
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile index d27aa3866ff4..f53a0af163b1 100644 --- a/sysutils/syslog-ng-devel/Makefile +++ b/sysutils/syslog-ng-devel/Makefile @@ -20,15 +20,13 @@ WRKSRC= $(WRKDIR)/$(PORTNAME)-3.2beta1 OPTIONS= SSL "Build with OpenSSL support (from ports)" off \ TCP_WRAPPERS "Build with TCP Wrappers" off \ - SQL "Build with SQL support" off \ + SQL "Build with database (libdbi) support" off \` SPOOF "Build with spoof source support" on \ IPV6 "Build with IPV6 support" on \ - PCRE "Build with PCRE support" on \ - SQL "Build with database (libdbi) support" off + PCRE "Build with PCRE support" on .include <bsd.port.options.mk> -BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog MAN1= pdbtool.1 @@ -41,13 +39,13 @@ USE_GNOME= glib20 USE_GMAKE= yes SUB_FILES= pkg-message -LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config - CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking --with-libnet=${LOCALBASE}/bin CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include ${CFLAGS}" \ LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}" +.include <bsd.port.pre.mk> + .if defined(WITH_SSL) USE_OPENSSL= yes WITH_OPENSSL_PORT= yes @@ -65,6 +63,11 @@ CONFIGURE_ARGS+= --disable-tcp-wrapper .endif .if defined(WITH_SPOOF) +.if ${ARCH} == "amd64" +BROKEN= Does not compile: relocation R_X86_64_32 can not be used when making a shared object +.endif +BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet +LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config CONFIGURE_ARGS+= --enable-spoof-source .else CONFIGURE_ARGS+= --disable-spoof-source @@ -98,8 +101,6 @@ CONFIGURE_ENV+= LIBDBI_CFLAGS="-I/usr/local/include" \ LIBDBI_LIBS=" -ldbi" .endif -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/lib/syslog-ng.h @${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure diff --git a/sysutils/syslog-ng3-devel/Makefile b/sysutils/syslog-ng3-devel/Makefile index d27aa3866ff4..f53a0af163b1 100644 --- a/sysutils/syslog-ng3-devel/Makefile +++ b/sysutils/syslog-ng3-devel/Makefile @@ -20,15 +20,13 @@ WRKSRC= $(WRKDIR)/$(PORTNAME)-3.2beta1 OPTIONS= SSL "Build with OpenSSL support (from ports)" off \ TCP_WRAPPERS "Build with TCP Wrappers" off \ - SQL "Build with SQL support" off \ + SQL "Build with database (libdbi) support" off \` SPOOF "Build with spoof source support" on \ IPV6 "Build with IPV6 support" on \ - PCRE "Build with PCRE support" on \ - SQL "Build with database (libdbi) support" off + PCRE "Build with PCRE support" on .include <bsd.port.options.mk> -BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet LIB_DEPENDS= evtlog.0:${PORTSDIR}/sysutils/eventlog MAN1= pdbtool.1 @@ -41,13 +39,13 @@ USE_GNOME= glib20 USE_GMAKE= yes SUB_FILES= pkg-message -LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config - CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking --with-libnet=${LOCALBASE}/bin CONFIGURE_ENV= CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include ${CFLAGS}" \ LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}" +.include <bsd.port.pre.mk> + .if defined(WITH_SSL) USE_OPENSSL= yes WITH_OPENSSL_PORT= yes @@ -65,6 +63,11 @@ CONFIGURE_ARGS+= --disable-tcp-wrapper .endif .if defined(WITH_SPOOF) +.if ${ARCH} == "amd64" +BROKEN= Does not compile: relocation R_X86_64_32 can not be used when making a shared object +.endif +BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet +LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet11-config CONFIGURE_ARGS+= --enable-spoof-source .else CONFIGURE_ARGS+= --disable-spoof-source @@ -98,8 +101,6 @@ CONFIGURE_ENV+= LIBDBI_CFLAGS="-I/usr/local/include" \ LIBDBI_LIBS=" -ldbi" .endif -.include <bsd.port.pre.mk> - post-patch: @${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/lib/syslog-ng.h @${REINPLACE_CMD} -e 's:libnet-config:libnet11-config:g' ${WRKSRC}/configure |