diff options
| author | clement <clement@FreeBSD.org> | 2004-01-16 08:30:22 +0800 |
|---|---|---|
| committer | clement <clement@FreeBSD.org> | 2004-01-16 08:30:22 +0800 |
| commit | daad5dcb3da5e1e9fe27bac4fb4d4f7762a8e3a6 (patch) | |
| tree | f7cfd244b5573ad753162ad7147e23387b5b6dfc /www | |
| parent | 985f209344cee5ab2e26e531eb13e771a3e3b147 (diff) | |
| download | freebsd-ports-gnome-daad5dcb3da5e1e9fe27bac4fb4d4f7762a8e3a6.tar.gz freebsd-ports-gnome-daad5dcb3da5e1e9fe27bac4fb4d4f7762a8e3a6.tar.zst freebsd-ports-gnome-daad5dcb3da5e1e9fe27bac4fb4d4f7762a8e3a6.zip | |
- Fix compilation for threaded MPM.
This is due to partial revert of apr improvment.
setting LIBS=${PTHREAD_LIBS} conflicts with libtool.
All should be OK now...
If someone can explain me why libtool impose using
-pthread (ltshmain), I'm all ears...
Note:
You CAN NOT override -lc_r (i.e. setting -lkse) at compile time.
I must fix it...
- Move patchset to MASTER_SITE_LOCAL
Noticed by: Martin Nilsson <martin@gneto.com>
Approved by: erwin (mentor) (implicitly)
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile | 9 | ||||
| -rw-r--r-- | www/apache20/Makefile | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index cf67fa794915..2acca795e91f 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -30,8 +30,8 @@ CONFLICTS= apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* # patch files -PATCH_SITES+= http://sheepkiller.nerim.net/ports/apache2/:clement \ - http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/:clement +PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:clement/} +PATCH_SITE_SUBDIR= clement/:clement PATCHFILES+= httpd-2.0.48-buildconf.patch:clement \ httpd-2.0.48-ldap-fix.patch:clement PATCH_DIST_STRIP+= -p1:apache-clem @@ -51,8 +51,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --includedir=${PREFIX_RELDEST}/include/apache2 CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ - CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - LIBS="${PTHREAD_LIBS}" \ + CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" @@ -145,7 +144,7 @@ post-extract: @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif pre-configure: - cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf + @cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf post-patch: @cd ${WRKSRC}/docs/docroot && \ diff --git a/www/apache20/Makefile b/www/apache20/Makefile index cf67fa794915..2acca795e91f 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -30,8 +30,8 @@ CONFLICTS= apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* # patch files -PATCH_SITES+= http://sheepkiller.nerim.net/ports/apache2/:clement \ - http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/:clement +PATCH_SITES+= ${MASTER_SITE_LOCAL:S/$/:clement/} +PATCH_SITE_SUBDIR= clement/:clement PATCHFILES+= httpd-2.0.48-buildconf.patch:clement \ httpd-2.0.48-ldap-fix.patch:clement PATCH_DIST_STRIP+= -p1:apache-clem @@ -51,8 +51,7 @@ CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ --includedir=${PREFIX_RELDEST}/include/apache2 CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ - CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - LIBS="${PTHREAD_LIBS}" \ + CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" CONFIG_SHELL="${SH}" \ LOCALBASE="${LOCALBASE}" @@ -145,7 +144,7 @@ post-extract: @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/powerlogo.gif ${WRKSRC}/docs/icons/freebsd.gif pre-configure: - cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf + @cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ./buildconf post-patch: @cd ${WRKSRC}/docs/docroot && \ |