Attachment #137815 for bug #183529

View | Details | Raw Unified | Return to bug 183529
Collapse All | Expand All




# $FreeBSD: www/mod_spdy/Makefile 331947 2013-10-29 13:49:29Z brooks $

PORTNAME=	mod_spdy
PORTVERSION=	0.9.4.1
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \
		${MASTER_SITE_APACHE_HTTPD}:apache22
		http://www.openssl.org/source/:openssl
DISTFILES=	mod_spdy_source_${PORTVERSION}.tar.xz:mod_spdy \
		httpd-2.2.22.tar.gz:apache22
		openssl-1.0.1c.tar.gz:openssl
DIST_SUBDIR=	${PORTNAME}
EXTRACT_ONLY=	mod_spdy_source_${PORTVERSION}.tar.xz

MAINTAINER=	masaki@club.kyutech.ac.jp
COMMENT=	SPDY module for the Apache HTTP server v2.2

LICENSE=	AL2

BUILD_DEPENDS=	greadlink:${PORTSDIR}/sysutils/coreutils \
		flock:${PORTSDIR}/sysutils/flock \
		svn:${PORTSDIR}/devel/subversion \
		curl:${PORTSDIR}/ftp/curl \
		bash:${PORTSDIR}/shells/bash
LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo

ONLY_FOR_ARCHS=	amd64 i386
USE_XZ=		yes
USE_OPENSSL=	yes
USE_APACHE=	22
USE_PYTHON=	2.6-2.7
USE_GMAKE=	yes
ONLY_FOR_ARCHS=	amd64 i386
REINPLACE_ARGS=	-i ""

WRKSRC=		${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_spdy/src
CFLAGS+=	-fno-stack-protector -Wno-unknown-warning-option -Wno-c++11-extensions -I${OPENSSLINC}
LDFLAGS+=	-L${LOCALBASE}/lib -L${OPENSSLLIB}
GYP_DEFINES+=	\
		use_system_apache_dev=1 \
		use_system_zlib=1 \

		system_include_path_execinfo=${LOCALBASE}/include \
		include_dirs=${LOCALBASE}/include

SUB_FILES+=	mod_spdy.conf
SUB_LIST+=	APACHEMODDIR=${APACHEMODDIR}
DEBUG_DESC=	Compile with debug symbols and verbose output

OPTIONS_DEFINE=	GCC DEBUG
GCC_DESC=	Build mod_spdy with GCC 4.6+

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${OSVERSION} < 900033 || ${PORT_OPTIONS:MGCC}
BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
.endif

.if ${PORT_OPTIONS:MGCC}
USE_GCC?=	yes
GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
.else
.if ${OSVERSION} < 902000
BUILD_DEPENDS+=	${LOCALBASE}/bin/clang32:${PORTSDIR}/lang/clang32
CC=		${LOCALBASE}/bin/clang32
CXX=		${LOCALBASE}/bin/clang++32
.else
CC=		clang
CXX=		clang++
.endif
GYP_DEFINES+=	clang=1
.endif

.if ${OSVERSION} < 1000052
LIB_DEPENDS+=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
.endif

.if ${PORT_OPTIONS:MDEBUG}
BUILDTYPE=	Release
.else
MAKE_ENV+=	V=1
BUILDTYPE=	Debug
.else
BUILDTYPE=	Release
GYP_DEFINES+=	buildtype=Official
.endif

CONFIGURE_ENV+=	CC=${CC} \
		CXX=${CXX} \
		GYP_DEFINES="${GYP_DEFINES}"
# according to portlint the below is passed via bsd.port.mk,
# but 'make -V CONFIGURE_ENV' does not show it:
CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" \
		CPPFLAGS="${CPPFLAGS}" \
		CXXFLAGS="${CXXFLAGS}" \
		LDFLAGS="${LDFLAGS}"
MAKE_ENV+=	BUILDTYPE=${BUILDTYPE}
CFLAGS+=	-Wno-error

SUB_FILES+=	mod_spdy.conf
SUB_LIST+=	APACHEMODDIR=${APACHEMODDIR}

.include <bsd.port.pre.mk>

.if ${ARCH} == i386 && ${OSVERSION} < 901000
BROKEN=	does not link due to libtool not respecting CC
.endif

post-extract:
	@${MKDIR} ${WRKSRC}/temp/progress
	@${CP} ${DISTDIR}/${DIST_SUBDIR}/httpd-2.2.22.tar.gz ${WRKSRC}/temp/ && \
		${TOUCH} ${WRKSRC}/temp/progress/httpd-2.2.22.tar.gz.downloaded
	@${CP} ${DISTDIR}/${DIST_SUBDIR}/openssl-1.0.1c.tar.gz ${WRKSRC}/temp/ && \
		${TOUCH} ${WRKSRC}/temp/progress/openssl-1.0.1c.tar.gz.downloaded

post-patch:
	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
		${WRKSRC}/base/base.gypi
	@${REINPLACE_CMD} -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
		-e 's,%%FILESDIR%%,${FILESDIR},g' \
			-e 's,%%OPENSSLBASE%%,${OPENSSLBASE},g' \
			${WRKSRC}/build_modssl_with_npn.sh
.if ${PORT_OPTIONS:MGCC}
	@${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,-I${LOCALBASE}/lib/gcc${CXX:S/g++//}/include,g' \
		-e 's,%%GCCLDFLAGS%%,-L${LOCALBASE}/lib/gcc${CXX:S/g++//},g' \
			${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,-I${LOCALBASE}/lib/gcc${CXX:S/g++//}/include,g' \
		-e 's,%%GCCLDFLAGS%%,-L${LOCALBASE}/lib/gcc${CXX:S/g++//},g' \
			${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py
.else
	@${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,,g' \
		-e 's,%%GCCLDFLAGS%%,,g' \
			${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,,g' \
		-e 's,%%GCCLDFLAGS%%,,g' \
			${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py
.endif

do-configure:
	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
		../../depot_tools/gclient.py runhooks
			../../depot_tools/gclient.py runhooks

pre-build:
	cd ${WRKSRC} && CONFIGURE_ENV='${CONFIGURE_ENV}' BUILDROOT=${WRKSRC}/temp \
		${WRKSRC}/build_modssl_with_npn.sh

do-install:
	${MKDIR} ${STAGEDIR}/${PREFIX}/${APACHEMODDIR} \
		${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes
	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libmod_spdy.so \
		${STAGEDIR}/${PREFIX}/${APACHEMODDIR}/mod_spdy.so
	${INSTALL_LIB} ${WRKSRC}/mod_ssl.so \
		${STAGEDIR}/${PREFIX}/${APACHEMODDIR}/mod_ssl_with_npn.so
	${INSTALL_DATA} ${WRKDIR}/mod_spdy.conf \
		${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes/mod_spdy.conf

.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)/usr/ports/www/mod_spdy/distinfo (-4 / +2 lines)
1	SHA256 (mod_spdy/mod_spdy_source_0.9.3.3.tar.xz) = 584ab9b3e91ac9d5b5f31ae5ff899eb1739c4dcf50ea572b94a7a9a7e450ccfc	1	SHA256 (mod_spdy/mod_spdy_source_0.9.4.1.tar.xz) = 832ae76219ca4fe4b10ccb989e5fe53b3e5000f1ea505fda55208bded6e672a9
2	SIZE (mod_spdy/mod_spdy_source_0.9.3.3.tar.xz) = 5069100	2	SIZE (mod_spdy/mod_spdy_source_0.9.4.1.tar.xz) = 5465256
3	SHA256 (mod_spdy/httpd-2.2.22.tar.gz) = 74c1ffffefe1a502339b004ad6488fbd858eb425a05968cd67c05695dbc0fe7c	3	SHA256 (mod_spdy/httpd-2.2.22.tar.gz) = 74c1ffffefe1a502339b004ad6488fbd858eb425a05968cd67c05695dbc0fe7c
4	SIZE (mod_spdy/httpd-2.2.22.tar.gz) = 7200529	4	SIZE (mod_spdy/httpd-2.2.22.tar.gz) = 7200529
5	SHA256 (mod_spdy/openssl-1.0.1c.tar.gz) = 2a9eb3cd4e8b114eb9179c0d3884d61658e7d8e8bf4984798a5f5bd48e325ebe
6	SIZE (mod_spdy/openssl-1.0.1c.tar.gz) = 4457113




--- Makefile.orig	2013-10-29 15:19:19.000000000 +0900
+++ Makefile	2013-10-31 18:45:36.000000000 +0900
@@ -54,9 +54,9 @@
 CC.target ?= $(CC)
 CFLAGS.target ?= $(CFLAGS)
 CXX.target ?= $(CXX)
-CXXFLAGS.target ?= $(CXXFLAGS)
+CXXFLAGS.target ?= %%GCCCXXFLAGS%% $(CXXFLAGS)
 LINK.target ?= $(LINK)
-LDFLAGS.target ?= $(LDFLAGS)
+LDFLAGS.target ?= %%GCCLDFLAGS%% $(LDFLAGS)
 AR.target ?= $(AR)
 ARFLAGS.target ?= crs
 
@@ -64,12 +64,12 @@
 # in gyp's make.py where ARFLAGS.host etc. is computed.
 # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
 # to replicate this environment fallback in make as well.
-CC.host ?= gcc
-CFLAGS.host ?=
-CXX.host ?= g++
-CXXFLAGS.host ?=
-LINK.host ?= g++
-LDFLAGS.host ?=
+CC.host ?= $(CC)
+CFLAGS.host ?= $(CFLAGS)
+CXX.host ?= $(CXX)
+CXXFLAGS.host ?= %%GCCCXXFLAGS%% $(CXXFLAGS)
+LINK.host ?= $(LINK)
+LDFLAGS.host ?= %%GCCLDFLAGS%% $(LDFLAGS)
 AR.host ?= ar
 ARFLAGS.host := crs
 




--- build_modssl_with_npn.sh.orig	2013-10-29 15:17:22.000000000 +0900
+++ build_modssl_with_npn.sh	2013-10-30 16:12:09.000000000 +0900
@@ -33,7 +33,7 @@
 fi
 

       echo "md5sum mismatch for $2"
       do_cleanup
     fi
@@ -93,31 +93,22 @@
   fi
 }
 
-OPENSSL_SRC_TGZ_URL="http://www.openssl.org/source/openssl-1.0.1c.tar.gz"
 APACHE_HTTPD_SRC_TGZ_URL="http://archive.apache.org/dist/httpd/httpd-2.2.22.tar.gz"
 APACHE_HTTPD_MODSSL_NPN_PATCH_PATH="$(dirname $0)/scripts/mod_ssl_with_npn.patch"
 
-OPENSSL_SRC_TGZ=$(basename $OPENSSL_SRC_TGZ_URL)
 APACHE_HTTPD_SRC_TGZ=$(basename $APACHE_HTTPD_SRC_TGZ_URL)
 APACHE_HTTPD_MODSSL_NPN_PATCH="mod_ssl_npn.patch"
 
-OPENSSL_SRC_ROOT=${OPENSSL_SRC_TGZ%.tar.gz}
-OPENSSL_INST_ROOT=${OPENSSL_SRC_ROOT}_install
 APACHE_HTTPD_SRC_ROOT=${APACHE_HTTPD_SRC_TGZ%.tar.gz}
 
-OPENSSL_BUILDLOG=$(mktemp -p /tmp openssl_buildlog.XXXXXXXXXX)

 cp $APACHE_HTTPD_MODSSL_NPN_PATCH_PATH $BUILDROOT/$APACHE_HTTPD_MODSSL_NPN_PATCH
 
 pushd $BUILDROOT >/dev/null
 
-download_file $OPENSSL_SRC_TGZ_URL $OPENSSL_SRC_TGZ ae412727c8c15b67880aef7bd2999b2e
 download_file $APACHE_HTTPD_SRC_TGZ_URL $APACHE_HTTPD_SRC_TGZ d77fa5af23df96a8af68ea8114fa6ce1
 
 echo ""
 
-uncompress_file $OPENSSL_SRC_TGZ
 uncompress_file $APACHE_HTTPD_SRC_TGZ
 
 if [ ! -f "$PROGRESS_DIR/modssl_patched" ]; then
@@ -137,45 +128,6 @@
 
 echo ""
 
-if [ ! -f "$PROGRESS_DIR/openssl_configured" ]; then
-  pushd $OPENSSL_SRC_ROOT >/dev/null
-  echo -n "Configuring OpenSSL ... "
-  ./config no-shared -fPIC --openssldir=$BUILDROOT/$OPENSSL_INST_ROOT >> $OPENSSL_BUILDLOG
-  if [ $? -ne 0 ]; then
   if [ $? -ne 0 ]; then
-    echo "Failed. Build log at $OPENSSL_BUILDLOG."
-    do_cleanup
-  fi
-  echo "done"
-  popd >/dev/null  # $OPENSSL_SRC_ROOT
-  touch "$PROGRESS_DIR/openssl_configured"
-else
-  echo "Already configured OpenSSL."
-fi
-
-if [ ! -f "$PROGRESS_DIR/openssl_built" ]; then
-  pushd $OPENSSL_SRC_ROOT >/dev/null
-  echo -n "Building OpenSSL (this may take a while) ... "
-  make install >> $OPENSSL_BUILDLOG 2>&1
-  if [ $? -ne 0 ]; then
   if [ $? -ne 0 ]; then
-    echo "Failed. Build log at $OPENSSL_BUILDLOG."
-    do_cleanup
-  fi
-  # A hacky fix that helps things build on CentOS:
-  if grep -q CentOS /etc/issue; then
-    sed --in-place 's/^Libs\.private: -ldl$/& -lcrypto/' \
-      $BUILDROOT/$OPENSSL_INST_ROOT/lib/pkgconfig/openssl.pc
-  fi
-  echo "done"
-  popd >/dev/null  # $OPENSSL_SRC_ROOT
-  touch "$PROGRESS_DIR/openssl_built"
-else
-  echo "Already built OpenSSL."
-fi
-
-rm -f "$OPENSSL_BUILDLOG"
-
-echo ""
-
 if [ ! -f "$PROGRESS_DIR/modssl_configured" ]; then
   pushd $APACHE_HTTPD_SRC_ROOT >/dev/null
   echo -n "Configuring Apache mod_ssl ... "
@@ -190,11 +142,11 @@
   # not only libraries in Libs, but also those in Libs.private:
   mv configure configure.bak
   sed 's/--libs-only-l openssl/--libs-only-l --static openssl/' configure.bak > configure

+  chmod 755 configure
 
-  ./configure --enable-ssl=shared --with-ssl=$BUILDROOT/$OPENSSL_INST_ROOT >> $APACHE_HTTPD_BUILDLOG
+  eval ${CONFIGURE_ENV} ./configure --enable-ssl=shared --with-ssl=%%OPENSSLBASE%%
   if [ $? -ne 0 ]; then
-    echo "Failed. Build log at $APACHE_HTTPD_BUILDLOG."
+    echo "Failed at configuring Apache mod_ssl."
     do_cleanup
   fi
   echo "done"
@@ -207,9 +159,9 @@
 if [ ! -f "$PROGRESS_DIR/modssl_built" ]; then
   pushd $APACHE_HTTPD_SRC_ROOT >/dev/null
   echo -n "Building Apache mod_ssl (this may take a while) ... "

     do_cleanup
   fi
   echo "done"
@@ -219,8 +171,6 @@
   echo "Already built Apache mod_ssl."
 fi
 

Line 0 Link Here

(-)/usr/ports/www/mod_spdy/files/patch-logging.h (+11 lines)
	1	--- third_party/chromium/src/base/logging.h.org 2013-10-29 15:17:59.000000000 +0900
	2	+++ third_party/chromium/src/base/logging.h 2013-10-29 23:39:25.000000000 +0900
	3	@@ -5,6 +5,8 @@
	4	#ifndef BASE_LOGGING_H_
	5	#define BASE_LOGGING_H_
	6
	7	+#undef strtoul
	8	+
	9	#include <cassert>
	10	#include <string>
	11	#include <cstring>




--- tools/gyp/pylib/gyp/generator/make.py.orig	2013-10-29 15:18:11.000000000 +0900
+++ tools/gyp/pylib/gyp/generator/make.py	2013-10-31 18:48:40.000000000 +0900
@@ -86,7 +86,7 @@
   else:
     operating_system = flavor
     if flavor == 'android':
-      operating_system = 'linux'  # Keep this legacy behavior for now.
+      operating_system = 'freebsd'  # Keep this legacy behavior for now.
     default_variables.setdefault('OS', operating_system)
     default_variables.setdefault('SHARED_LIB_SUFFIX', '.so')
     default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)')
@@ -258,9 +258,9 @@
 CC.target ?= $(CC)
 CFLAGS.target ?= $(CFLAGS)
 CXX.target ?= $(CXX)
-CXXFLAGS.target ?= $(CXXFLAGS)
+CXXFLAGS.target ?= %%GCCCXXFLAGS%% $(CXXFLAGS)
 LINK.target ?= $(LINK)
-LDFLAGS.target ?= $(LDFLAGS)
+LDFLAGS.target ?= %%GCCLDFLAGS%% $(LDFLAGS)
 AR.target ?= $(AR)
 ARFLAGS.target ?= %(ARFLAGS.target)s
 
@@ -268,12 +268,12 @@
 # in gyp's make.py where ARFLAGS.host etc. is computed.
 # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
 # to replicate this environment fallback in make as well.
-CC.host ?= gcc
-CFLAGS.host ?=
 CFLAGS.host ?=
-CXX.host ?= g++
-CXXFLAGS.host ?=
 CXXFLAGS.host ?=
-LINK.host ?= g++
-LDFLAGS.host ?=
+CC.host ?= $(CC)
+CFLAGS.host ?= $(CFLAGS)
+CXX.host ?= $(CXX)
+CXXFLAGS.host ?= %%GCCCXXFLAGS%% $(CXXFLAGS)
+LINK.host ?= $(LINK)
+LDFLAGS.host ?= %%GCCLDFLAGS%% $(LDFLAGS)
 AR.host ?= ar
 ARFLAGS.host := %(ARFLAGS.host)s
 
@@ -1750,7 +1750,7 @@
       return modules
 
     # Retrieve the default value of 'SHARED_LIB_SUFFIX'
-    params = {'flavor': 'linux'}
+    params = {'flavor': 'freebsd'}
     default_variables = {}
     CalculateVariables(default_variables, params)
 

Lines 3-6 Link Here

(-)/usr/ports/www/mod_spdy/pkg-descr (-1 / +1 lines)
3	loaded into currently deployed Apache HTTPD 2.x web servers using mod_so.	3	loaded into currently deployed Apache HTTPD 2.x web servers using mod_so.
4		4
5		5
6	WWW: http://code.google.com/p/mod-spdy/	6	WWW: http://code.google.com/p/mod-spdy/

Return to bug 183529

Lines 2-37 Link Here

(-)/usr/ports/www/mod_spdy/Makefile (-48 / +78 lines)
2	# $FreeBSD: www/mod_spdy/Makefile 331947 2013-10-29 13:49:29Z brooks $	2	# $FreeBSD: www/mod_spdy/Makefile 331947 2013-10-29 13:49:29Z brooks $
3		3
4	PORTNAME= mod_spdy	4	PORTNAME= mod_spdy
5	PORTVERSION= 0.9.3.3	5	PORTVERSION= 0.9.4.1
6	PORTREVISION= 1
7	CATEGORIES= www	6	CATEGORIES= www
8	MASTER_SITES= http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \	7	MASTER_SITES= http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \
9	${MASTER_SITE_APACHE_HTTPD}:apache22 \	8	${MASTER_SITE_APACHE_HTTPD}:apache22
10	http://www.openssl.org/source/:openssl
11	DISTFILES= mod_spdy_source_${PORTVERSION}.tar.xz:mod_spdy \	9	DISTFILES= mod_spdy_source_${PORTVERSION}.tar.xz:mod_spdy \
12	httpd-2.2.22.tar.gz:apache22 \	10	httpd-2.2.22.tar.gz:apache22
13	openssl-1.0.1c.tar.gz:openssl
14	DIST_SUBDIR= ${PORTNAME}	11	DIST_SUBDIR= ${PORTNAME}
15	EXTRACT_ONLY= mod_spdy_source_${PORTVERSION}.tar.xz	12	EXTRACT_ONLY= mod_spdy_source_${PORTVERSION}.tar.xz
16		13
17	MAINTAINER= masaki@club.kyutech.ac.jp	14	MAINTAINER= masaki@club.kyutech.ac.jp
18	COMMENT= A SPDY module for the Apache HTTP server v2.2	15	COMMENT= SPDY module for the Apache HTTP server v2.2
		16
		17	LICENSE= AL2
19		18
20	BUILD_DEPENDS= greadlink:${PORTSDIR}/sysutils/coreutils \	19	BUILD_DEPENDS= greadlink:${PORTSDIR}/sysutils/coreutils \
21	flock:${PORTSDIR}/sysutils/flock \	20	flock:${PORTSDIR}/sysutils/flock \
22	svn:${PORTSDIR}/devel/subversion \	21	svn:${PORTSDIR}/devel/subversion \
23	curl:${PORTSDIR}/ftp/curl \	22	curl:${PORTSDIR}/ftp/curl \
24	bash:${PORTSDIR}/shells/bash	23	bash:${PORTSDIR}/shells/bash
25	LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo
26		24
		25	ONLY_FOR_ARCHS= amd64 i386
27	USE_XZ= yes	26	USE_XZ= yes
		27	USE_OPENSSL= yes
28	USE_APACHE= 22	28	USE_APACHE= 22
29	USE_PYTHON= 2.6+	29	USE_PYTHON= 2.6-2.7
30	USE_GMAKE= yes	30	USE_GMAKE= yes
31	ONLY_FOR_ARCHS= amd64 i386
32	REINPLACE_ARGS= -i ""	31	REINPLACE_ARGS= -i ""
33	LDFLAGS+= -L${LOCALBASE}/lib	32
34	WRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_spdy/src	33	WRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_spdy/src
		34	CFLAGS+= -fno-stack-protector -Wno-unknown-warning-option -Wno-c++11-extensions -I${OPENSSLINC}
		35	LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB}
35	GYP_DEFINES+= \	36	GYP_DEFINES+= \
36	use_system_apache_dev=1 \	37	use_system_apache_dev=1 \
37	use_system_zlib=1 \	38	use_system_zlib=1 \
Lines 41-119 Link Here
41	system_include_path_execinfo=${LOCALBASE}/include \	42	system_include_path_execinfo=${LOCALBASE}/include \
42	include_dirs=${LOCALBASE}/include	43	include_dirs=${LOCALBASE}/include
43		44
44	OPTIONS_DEFINE= CLANG DEBUG	45	SUB_FILES+= mod_spdy.conf
45	CLANG_DESC= Build with Clang instead of GCC 4.6+	46	SUB_LIST+= APACHEMODDIR=${APACHEMODDIR}
46	DEBUG_DESC= Compile with debug symbols and verbose output
47		47
48	OPTIONS_DEFAULT= CLANG	48	OPTIONS_DEFINE= GCC DEBUG
		49	GCC_DESC= Build mod_spdy with GCC 4.6+
49		50
50	NO_STAGE= yes
51	.include <bsd.port.options.mk>	51	.include <bsd.port.options.mk>
52		52
53	.if ${OSVERSION} < 900033 \|\| ! ${PORT_OPTIONS:MCLANG}	53	.if ${OSVERSION} < 900033 \|\| ${PORT_OPTIONS:MGCC}
54	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils	54	BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
55	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin	55	CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
56	MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin	56	MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
57	.endif	57	.endif
58		58
59	.if ${PORT_OPTIONS:MCLANG}	59	.if ${PORT_OPTIONS:MGCC}
60	.if ${OSVERSION} < 900033 \|\| !exists(/usr/bin/clang)	60	USE_GCC?= yes
61	BUILD_DEPENDS+= clang33:${PORTSDIR}/lang/clang33	61	GYP_DEFINES+= gcc_version=${CXX:S/g++//}
62	CC= clang33	62	.else
63	CXX= clang++33	63	.if ${OSVERSION} < 902000
		64	BUILD_DEPENDS+= ${LOCALBASE}/bin/clang32:${PORTSDIR}/lang/clang32
		65	CC= ${LOCALBASE}/bin/clang32
		66	CXX= ${LOCALBASE}/bin/clang++32
64	.else	67	.else
65	CC= clang	68	CC= clang
66	CXX= clang++	69	CXX= clang++
67	.endif	70	.endif
68	GYP_DEFINES+= clang=1	71	GYP_DEFINES+= clang=1
69	.else	72	.endif
70	USE_GCC?= yes	73
71	GYP_DEFINES+= gcc_version=${CXX:S/g++//}	74	.if ${OSVERSION} < 1000052
		75	LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
72	.endif	76	.endif
73		77
74	.if ${PORT_OPTIONS:MDEBUG}	78	.if ${PORT_OPTIONS:MDEBUG}
75	BUILDTYPE= Release
76	.else
77	MAKE_ENV+= V=1	79	MAKE_ENV+= V=1
78	BUILDTYPE= Debug	80	BUILDTYPE= Debug
		81	.else
		82	BUILDTYPE= Release
		83	GYP_DEFINES+= buildtype=Official
79	.endif	84	.endif
80		85
		86	CONFIGURE_ENV+= CC=${CC} \
		87	CXX=${CXX} \
		88	GYP_DEFINES="${GYP_DEFINES}"
		89	# according to portlint the below is passed via bsd.port.mk,
		90	# but 'make -V CONFIGURE_ENV' does not show it:
		91	CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \
		92	CPPFLAGS="${CPPFLAGS}" \
		93	CXXFLAGS="${CXXFLAGS}" \
		94	LDFLAGS="${LDFLAGS}"
81	MAKE_ENV+= BUILDTYPE=${BUILDTYPE}	95	MAKE_ENV+= BUILDTYPE=${BUILDTYPE}
82	CFLAGS+= -Wno-error
83
84	SUB_FILES+= mod_spdy.conf
85	SUB_LIST+= APACHEMODDIR=${APACHEMODDIR}
86		96
87	.include <bsd.port.pre.mk>	97	.include <bsd.port.pre.mk>
88		98
		99	.if ${ARCH} == i386 && ${OSVERSION} < 901000
		100	BROKEN= does not link due to libtool not respecting CC
		101	.endif
		102
89	post-extract:	103	post-extract:
90	@${MKDIR} ${WRKSRC}/temp/progress	104	@${MKDIR} ${WRKSRC}/temp/progress
91	@${CP} ${DISTDIR}/${DIST_SUBDIR}/httpd-2.2.22.tar.gz ${WRKSRC}/temp/ && \	105	@${CP} ${DISTDIR}/${DIST_SUBDIR}/httpd-2.2.22.tar.gz ${WRKSRC}/temp/ && \
92	${TOUCH} ${WRKSRC}/temp/progress/httpd-2.2.22.tar.gz.downloaded	106	${TOUCH} ${WRKSRC}/temp/progress/httpd-2.2.22.tar.gz.downloaded
93	@${CP} ${DISTDIR}/${DIST_SUBDIR}/openssl-1.0.1c.tar.gz ${WRKSRC}/temp/ && \
94	${TOUCH} ${WRKSRC}/temp/progress/openssl-1.0.1c.tar.gz.downloaded
95		107
96	post-patch:	108	post-patch:
97	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \	109	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
98	${WRKSRC}/base/base.gypi	110	${WRKSRC}/base/base.gypi
99	@${REINPLACE_CMD} -e 's\|#!/bin/bash\|#!${LOCALBASE}/bin/bash\|' \	111	@${REINPLACE_CMD} -e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
100	${WRKSRC}/build_modssl_with_npn.sh	112	-e 's,%%FILESDIR%%,${FILESDIR},g' \
		113	-e 's,%%OPENSSLBASE%%,${OPENSSLBASE},g' \
		114	${WRKSRC}/build_modssl_with_npn.sh
		115	.if ${PORT_OPTIONS:MGCC}
		116	@${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,-I${LOCALBASE}/lib/gcc${CXX:S/g++//}/include,g' \
		117	-e 's,%%GCCLDFLAGS%%,-L${LOCALBASE}/lib/gcc${CXX:S/g++//},g' \
		118	${WRKSRC}/Makefile
		119	@${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,-I${LOCALBASE}/lib/gcc${CXX:S/g++//}/include,g' \
		120	-e 's,%%GCCLDFLAGS%%,-L${LOCALBASE}/lib/gcc${CXX:S/g++//},g' \
		121	${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py
		122	.else
		123	@${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,,g' \
		124	-e 's,%%GCCLDFLAGS%%,,g' \
		125	${WRKSRC}/Makefile
		126	@${REINPLACE_CMD} -e 's,%%GCCCXXFLAGS%%,,g' \
		127	-e 's,%%GCCLDFLAGS%%,,g' \
		128	${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py
		129	.endif
101		130
102	do-configure:	131	do-configure:
103	@cd ${WRKSRC} && \	132	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
104	GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} \	133	../../depot_tools/gclient.py runhooks
105	../../depot_tools/gclient.py runhooks
106		134
107	pre-build:	135	pre-build:
108	@cd ${WRKSRC} && \	136	cd ${WRKSRC} && CONFIGURE_ENV='${CONFIGURE_ENV}' BUILDROOT=${WRKSRC}/temp \
109	BUILDROOT=${WRKSRC}/temp ${WRKSRC}/build_modssl_with_npn.sh	137	${WRKSRC}/build_modssl_with_npn.sh
110		138
111	do-install:	139	do-install:
112	@${INSTALL} ${WRKSRC}/out/${BUILDTYPE}/libmod_spdy.so ${PREFIX}/${APACHEMODDIR}/mod_spdy.so	140	${MKDIR} ${STAGEDIR}/${PREFIX}/${APACHEMODDIR} \
113	@${INSTALL} ${WRKSRC}/mod_ssl.so ${PREFIX}/${APACHEMODDIR}/mod_ssl_with_npn.so	141	${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes
114	@${INSTALL_DATA} ${WRKDIR}/mod_spdy.conf ${PREFIX}/${APACHEETCDIR}/Includes	142	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libmod_spdy.so \
115		143	${STAGEDIR}/${PREFIX}/${APACHEMODDIR}/mod_spdy.so
116	post-install:	144	${INSTALL_LIB} ${WRKSRC}/mod_ssl.so \
117	@${REINPLACE_CMD} -e 's/mod_ssl.so/mod_ssl_with_npn.so/g' ${PREFIX}/${APACHEETCDIR}/httpd.conf	145	${STAGEDIR}/${PREFIX}/${APACHEMODDIR}/mod_ssl_with_npn.so
		146	${INSTALL_DATA} ${WRKDIR}/mod_spdy.conf \
		147	${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes/mod_spdy.conf
118		148
119	.include <bsd.port.post.mk>	149	.include <bsd.port.post.mk>

Line 0 Link Here

(-)/usr/ports/www/mod_spdy/files/patch-Makefile (+33 lines)
	1	--- Makefile.orig 2013-10-29 15:19:19.000000000 +0900
	2	+++ Makefile 2013-10-31 18:45:36.000000000 +0900
	3	@@ -54,9 +54,9 @@
	4	CC.target ?= $(CC)
	5	CFLAGS.target ?= $(CFLAGS)
	6	CXX.target ?= $(CXX)
	7	-CXXFLAGS.target ?= $(CXXFLAGS)
	8	+CXXFLAGS.target ?= %%GCCCXXFLAGS%% $(CXXFLAGS)
	9	LINK.target ?= $(LINK)
	10	-LDFLAGS.target ?= $(LDFLAGS)
	11	+LDFLAGS.target ?= %%GCCLDFLAGS%% $(LDFLAGS)
	12	AR.target ?= $(AR)
	13	ARFLAGS.target ?= crs
	14
	15	@@ -64,12 +64,12 @@
	16	# in gyp's make.py where ARFLAGS.host etc. is computed.
	17	# TODO(evan): move all cross-compilation logic to gyp-time so we don't need
	18	# to replicate this environment fallback in make as well.
	19	-CC.host ?= gcc
	20	-CFLAGS.host ?=
	21	-CXX.host ?= g++
	22	-CXXFLAGS.host ?=
	23	-LINK.host ?= g++
	24	-LDFLAGS.host ?=
	25	+CC.host ?= $(CC)
	26	+CFLAGS.host ?= $(CFLAGS)
	27	+CXX.host ?= $(CXX)
	28	+CXXFLAGS.host ?= %%GCCCXXFLAGS%% $(CXXFLAGS)
	29	+LINK.host ?= $(LINK)
	30	+LDFLAGS.host ?= %%GCCLDFLAGS%% $(LDFLAGS)
	31	AR.host ?= ar
	32	ARFLAGS.host := crs
	33

Lines 1-5 Link Here

(-)/usr/ports/www/mod_spdy/files/patch-build_modssl_with_npn.sh (-35 / +71 lines)
1	--- build_modssl_with_npn.sh.org 2012-03-31 16:28:55.660831000 +0900	1	--- build_modssl_with_npn.sh.orig 2013-10-29 15:17:22.000000000 +0900
2	+++ build_modssl_with_npn.sh 2012-03-31 21:14:56.155134872 +0900	2	+++ build_modssl_with_npn.sh 2013-10-30 16:12:09.000000000 +0900
3	@@ -33,7 +33,7 @@	3	@@ -33,7 +33,7 @@
4	fi	4	fi
5		5
Lines 18-25 Link Here
18	echo "md5sum mismatch for $2"	18	echo "md5sum mismatch for $2"
19	do_cleanup	19	do_cleanup
20	fi	20	fi
21	@@ -105,9 +105,6 @@	21	@@ -93,31 +93,22 @@
22	OPENSSL_INST_ROOT=${OPENSSL_SRC_ROOT}_install	22	fi
		23	}
		24
		25	-OPENSSL_SRC_TGZ_URL="http://www.openssl.org/source/openssl-1.0.1c.tar.gz"
		26	APACHE_HTTPD_SRC_TGZ_URL="http://archive.apache.org/dist/httpd/httpd-2.2.22.tar.gz"
		27	APACHE_HTTPD_MODSSL_NPN_PATCH_PATH="$(dirname $0)/scripts/mod_ssl_with_npn.patch"
		28
		29	-OPENSSL_SRC_TGZ=$(basename $OPENSSL_SRC_TGZ_URL)
		30	APACHE_HTTPD_SRC_TGZ=$(basename $APACHE_HTTPD_SRC_TGZ_URL)
		31	APACHE_HTTPD_MODSSL_NPN_PATCH="mod_ssl_npn.patch"
		32
		33	-OPENSSL_SRC_ROOT=${OPENSSL_SRC_TGZ%.tar.gz}
		34	-OPENSSL_INST_ROOT=${OPENSSL_SRC_ROOT}_install
23	APACHE_HTTPD_SRC_ROOT=${APACHE_HTTPD_SRC_TGZ%.tar.gz}	35	APACHE_HTTPD_SRC_ROOT=${APACHE_HTTPD_SRC_TGZ%.tar.gz}
24		36
25	-OPENSSL_BUILDLOG=$(mktemp -p /tmp openssl_buildlog.XXXXXXXXXX)	37	-OPENSSL_BUILDLOG=$(mktemp -p /tmp openssl_buildlog.XXXXXXXXXX)
Lines 28-66 Link Here
28	cp $APACHE_HTTPD_MODSSL_NPN_PATCH_PATH $BUILDROOT/$APACHE_HTTPD_MODSSL_NPN_PATCH	40	cp $APACHE_HTTPD_MODSSL_NPN_PATCH_PATH $BUILDROOT/$APACHE_HTTPD_MODSSL_NPN_PATCH
29		41
30	pushd $BUILDROOT >/dev/null	42	pushd $BUILDROOT >/dev/null
31	@@ -140,9 +137,9 @@	43
32	if [ ! -f "$PROGRESS_DIR/openssl_configured" ]; then	44	-download_file $OPENSSL_SRC_TGZ_URL $OPENSSL_SRC_TGZ ae412727c8c15b67880aef7bd2999b2e
33	pushd $OPENSSL_SRC_ROOT >/dev/null	45	download_file $APACHE_HTTPD_SRC_TGZ_URL $APACHE_HTTPD_SRC_TGZ d77fa5af23df96a8af68ea8114fa6ce1
34	echo -n "Configuring OpenSSL ... "	46
		47	echo ""
		48
		49	-uncompress_file $OPENSSL_SRC_TGZ
		50	uncompress_file $APACHE_HTTPD_SRC_TGZ
		51
		52	if [ ! -f "$PROGRESS_DIR/modssl_patched" ]; then
		53	@@ -137,45 +128,6 @@
		54
		55	echo ""
		56
		57	-if [ ! -f "$PROGRESS_DIR/openssl_configured" ]; then
		58	- pushd $OPENSSL_SRC_ROOT >/dev/null
		59	- echo -n "Configuring OpenSSL ... "
35	- ./config no-shared -fPIC --openssldir=$BUILDROOT/$OPENSSL_INST_ROOT >> $OPENSSL_BUILDLOG	60	- ./config no-shared -fPIC --openssldir=$BUILDROOT/$OPENSSL_INST_ROOT >> $OPENSSL_BUILDLOG
36	+ ./config no-shared -fPIC --openssldir=$BUILDROOT/$OPENSSL_INST_ROOT	61	- if [ $? -ne 0 ]; then
37	if [ $? -ne 0 ]; then
38	- echo "Failed. Build log at $OPENSSL_BUILDLOG."	62	- echo "Failed. Build log at $OPENSSL_BUILDLOG."
39	+ echo "Failed at configuring OpenSSL."	63	- do_cleanup
40	do_cleanup	64	- fi
41	fi	65	- echo "done"
42	echo "done"	66	- popd >/dev/null # $OPENSSL_SRC_ROOT
43	@@ -155,9 +152,9 @@	67	- touch "$PROGRESS_DIR/openssl_configured"
44	if [ ! -f "$PROGRESS_DIR/openssl_built" ]; then	68	-else
45	pushd $OPENSSL_SRC_ROOT >/dev/null	69	- echo "Already configured OpenSSL."
46	echo -n "Building OpenSSL (this may take a while) ... "	70	-fi
		71	-
		72	-if [ ! -f "$PROGRESS_DIR/openssl_built" ]; then
		73	- pushd $OPENSSL_SRC_ROOT >/dev/null
		74	- echo -n "Building OpenSSL (this may take a while) ... "
47	- make install >> $OPENSSL_BUILDLOG 2>&1	75	- make install >> $OPENSSL_BUILDLOG 2>&1
48	+ make install	76	- if [ $? -ne 0 ]; then
49	if [ $? -ne 0 ]; then
50	- echo "Failed. Build log at $OPENSSL_BUILDLOG."	77	- echo "Failed. Build log at $OPENSSL_BUILDLOG."
51	+ echo "Failed at building OpenSSL."	78	- do_cleanup
52	do_cleanup	79	- fi
53	fi	80	- # A hacky fix that helps things build on CentOS:
54	echo "done"	81	- if grep -q CentOS /etc/issue; then
55	@@ -167,7 +164,6 @@	82	- sed --in-place 's/^Libs\.private: -ldl$/& -lcrypto/' \
56	echo "Already built OpenSSL."	83	- $BUILDROOT/$OPENSSL_INST_ROOT/lib/pkgconfig/openssl.pc
57	fi	84	- fi
58		85	- echo "done"
		86	- popd >/dev/null # $OPENSSL_SRC_ROOT
		87	- touch "$PROGRESS_DIR/openssl_built"
		88	-else
		89	- echo "Already built OpenSSL."
		90	-fi
		91	-
59	-rm -f "$OPENSSL_BUILDLOG"	92	-rm -f "$OPENSSL_BUILDLOG"
60		93	-
61	echo ""	94	-echo ""
62		95	-
63	@@ -185,11 +181,11 @@	96	if [ ! -f "$PROGRESS_DIR/modssl_configured" ]; then
		97	pushd $APACHE_HTTPD_SRC_ROOT >/dev/null
		98	echo -n "Configuring Apache mod_ssl ... "
		99	@@ -190,11 +142,11 @@
64	# not only libraries in Libs, but also those in Libs.private:	100	# not only libraries in Libs, but also those in Libs.private:
65	mv configure configure.bak	101	mv configure configure.bak
66	sed 's/--libs-only-l openssl/--libs-only-l --static openssl/' configure.bak > configure	102	sed 's/--libs-only-l openssl/--libs-only-l --static openssl/' configure.bak > configure
Lines 68-81 Link Here
68	+ chmod 755 configure	104	+ chmod 755 configure
69		105
70	- ./configure --enable-ssl=shared --with-ssl=$BUILDROOT/$OPENSSL_INST_ROOT >> $APACHE_HTTPD_BUILDLOG	106	- ./configure --enable-ssl=shared --with-ssl=$BUILDROOT/$OPENSSL_INST_ROOT >> $APACHE_HTTPD_BUILDLOG
71	+ ./configure --enable-ssl=shared --with-ssl=$BUILDROOT/$OPENSSL_INST_ROOT	107	+ eval ${CONFIGURE_ENV} ./configure --enable-ssl=shared --with-ssl=%%OPENSSLBASE%%
72	if [ $? -ne 0 ]; then	108	if [ $? -ne 0 ]; then
73	- echo "Failed. Build log at $APACHE_HTTPD_BUILDLOG."	109	- echo "Failed. Build log at $APACHE_HTTPD_BUILDLOG."
74	+ echo "Failed at configuring Apache mod_ssl."	110	+ echo "Failed at configuring Apache mod_ssl."
75	do_cleanup	111	do_cleanup
76	fi	112	fi
77	echo "done"	113	echo "done"
78	@@ -202,9 +198,9 @@	114	@@ -207,9 +159,9 @@
79	if [ ! -f "$PROGRESS_DIR/modssl_built" ]; then	115	if [ ! -f "$PROGRESS_DIR/modssl_built" ]; then
80	pushd $APACHE_HTTPD_SRC_ROOT >/dev/null	116	pushd $APACHE_HTTPD_SRC_ROOT >/dev/null
81	echo -n "Building Apache mod_ssl (this may take a while) ... "	117	echo -n "Building Apache mod_ssl (this may take a while) ... "
Lines 87-93 Link Here
87	do_cleanup	123	do_cleanup
88	fi	124	fi
89	echo "done"	125	echo "done"
90	@@ -214,8 +210,6 @@	126	@@ -219,8 +171,6 @@
91	echo "Already built Apache mod_ssl."	127	echo "Already built Apache mod_ssl."
92	fi	128	fi
93		129

Lines 1-17 Link Here

(-)/usr/ports/www/mod_spdy/files/patch-make.py (-9 / +43 lines)
1	--- tools/gyp/pylib/gyp/generator/make.py.org 2012-03-31 16:29:12.063738000 +0900	1	--- tools/gyp/pylib/gyp/generator/make.py.orig 2013-10-29 15:18:11.000000000 +0900
2	+++ tools/gyp/pylib/gyp/generator/make.py 2012-03-31 16:59:21.541770196 +0900	2	+++ tools/gyp/pylib/gyp/generator/make.py 2013-10-31 18:48:40.000000000 +0900
3	@@ -129,11 +129,11 @@	3	@@ -86,7 +86,7 @@
		4	else:
		5	operating_system = flavor
		6	if flavor == 'android':
		7	- operating_system = 'linux' # Keep this legacy behavior for now.
		8	+ operating_system = 'freebsd' # Keep this legacy behavior for now.
		9	default_variables.setdefault('OS', operating_system)
		10	default_variables.setdefault('SHARED_LIB_SUFFIX', '.so')
		11	default_variables.setdefault('SHARED_LIB_DIR','$(builddir)/lib.$(TOOLSET)')
		12	@@ -258,9 +258,9 @@
		13	CC.target ?= $(CC)
		14	CFLAGS.target ?= $(CFLAGS)
		15	CXX.target ?= $(CXX)
		16	-CXXFLAGS.target ?= $(CXXFLAGS)
		17	+CXXFLAGS.target ?= %%GCCCXXFLAGS%% $(CXXFLAGS)
		18	LINK.target ?= $(LINK)
		19	-LDFLAGS.target ?= $(LDFLAGS)
		20	+LDFLAGS.target ?= %%GCCLDFLAGS%% $(LDFLAGS)
		21	AR.target ?= $(AR)
		22	ARFLAGS.target ?= %(ARFLAGS.target)s
		23
		24	@@ -268,12 +268,12 @@
4	# in gyp's make.py where ARFLAGS.host etc. is computed.	25	# in gyp's make.py where ARFLAGS.host etc. is computed.
5	# TODO(evan): move all cross-compilation logic to gyp-time so we don't need	26	# TODO(evan): move all cross-compilation logic to gyp-time so we don't need
6	# to replicate this environment fallback in make as well.	27	# to replicate this environment fallback in make as well.
7	-CC.host ?= gcc	28	-CC.host ?= gcc
8	+CC.host ?= cc	29	-CFLAGS.host ?=
9	CFLAGS.host ?=
10	-CXX.host ?= g++	30	-CXX.host ?= g++
11	+CXX.host ?= c++	31	-CXXFLAGS.host ?=
12	CXXFLAGS.host ?=
13	-LINK.host ?= g++	32	-LINK.host ?= g++
14	+LINK.host ?= c++	33	-LDFLAGS.host ?=
15	LDFLAGS.host ?=	34	+CC.host ?= $(CC)
		35	+CFLAGS.host ?= $(CFLAGS)
		36	+CXX.host ?= $(CXX)
		37	+CXXFLAGS.host ?= %%GCCCXXFLAGS%% $(CXXFLAGS)
		38	+LINK.host ?= $(LINK)
		39	+LDFLAGS.host ?= %%GCCLDFLAGS%% $(LDFLAGS)
16	AR.host ?= ar	40	AR.host ?= ar
17	ARFLAGS.host := %(ARFLAGS.host)s	41	ARFLAGS.host := %(ARFLAGS.host)s
		42
		43	@@ -1750,7 +1750,7 @@
		44	return modules
		45
		46	# Retrieve the default value of 'SHARED_LIB_SUFFIX'
		47	- params = {'flavor': 'linux'}
		48	+ params = {'flavor': 'freebsd'}
		49	default_variables = {}
		50	CalculateVariables(default_variables, params)
		51