mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
Add patches to build and work with Apache-2.4 (which
has special requrements for users of ap_log_error()) and Tcl-8.6 (which uses -fvisibility=hidden if it can). No functional changes for those, who were able to build before, thus no PORTREVISION bump (I wish, previous committer followed this rule too).
This commit is contained in:
parent
10b999c7c4
commit
cb1aab0fd8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=324206
3 changed files with 41 additions and 1 deletions
|
@ -21,7 +21,6 @@ MAKE_JOBS_UNSAFE= yes
|
|||
TCL_DVER= ${TCL_VER:S/.//}
|
||||
|
||||
USE_TCL= 84+
|
||||
INVALID_TCL_VER=86
|
||||
USE_AUTOTOOLS= autoconf
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/unix
|
||||
CONFIGURE_ARGS+=--with-tclinclude=${TCL_INCLUDEDIR} \
|
||||
|
@ -49,6 +48,8 @@ post-patch:
|
|||
`${DIRNAME} $$p`/`${BASENAME} $$p .html`.whtml; \
|
||||
done
|
||||
${REINPLACE_CMD} -e 's,\.html,.whtml,g' ${WRKSRC:H:H}/doc/mod_websh/htdocs/*.ws3
|
||||
${REINPLACE_CMD} -e 's|__declspec(dllexport)|DLLEXPORT|' \
|
||||
${WRKSRC}/../generic/*.[ch]
|
||||
|
||||
post-configure:
|
||||
# Remove the "STUBS" and the PACKAGE_* defines, which may conflict
|
||||
|
|
15
www/websh/files/patch-apache2.4
Normal file
15
www/websh/files/patch-apache2.4
Normal file
|
@ -0,0 +1,15 @@
|
|||
--- ../../src/generic/mod_websh.h 2005-12-12 12:13:55.000000000 -0500
|
||||
+++ ../../src/generic/mod_websh.h 2013-08-03 16:46:07.000000000 -0400
|
||||
@@ -30,4 +30,12 @@
|
||||
#include "util_script.h"
|
||||
|
||||
+/*
|
||||
+ * This is required for Apache-2.4 -- see:
|
||||
+ * http://httpd.apache.org/docs/2.4/developer/new_api_2_4.html
|
||||
+ */
|
||||
+#ifdef APLOG_USE_MODULE
|
||||
+APLOG_USE_MODULE(websh);
|
||||
+#endif
|
||||
+
|
||||
/* define APACHE2 if appropriate */
|
||||
#ifdef AP_SERVER_BASEREVISION
|
24
www/websh/files/patch-dllexport
Normal file
24
www/websh/files/patch-dllexport
Normal file
|
@ -0,0 +1,24 @@
|
|||
--- ../generic/macros.h 2007-03-19 13:18:37.000000000 -0400
|
||||
+++ ../generic/macros.h 2013-08-03 17:39:59.000000000 -0400
|
||||
@@ -29,8 +29,4 @@
|
||||
#endif
|
||||
|
||||
-#ifndef WIN32
|
||||
-#define __declspec(dllexport)
|
||||
-#endif
|
||||
-
|
||||
#include "log.h"
|
||||
|
||||
--- ../generic/mod_websh.c 2009-06-12 09:37:16.000000000 -0400
|
||||
+++ ../generic/mod_websh.c 2013-08-03 17:46:06.000000000 -0400
|
||||
@@ -81,8 +81,8 @@
|
||||
|
||||
#ifndef APACHE2
|
||||
-module MODULE_VAR_EXPORT websh_module;
|
||||
+DLLEXPORT module MODULE_VAR_EXPORT websh_module;
|
||||
#define APPOOL pool
|
||||
#else /* APACHE2 */
|
||||
-module AP_MODULE_DECLARE_DATA websh_module;
|
||||
+DLLEXPORT module AP_MODULE_DECLARE_DATA websh_module;
|
||||
#define APPOOL apr_pool_t
|
||||
#endif /* APACHE2 */
|
Loading…
Add table
Reference in a new issue