Date: Tue, 4 Apr 2006 15:33:30 +0200 From: Jean-Baptiste Quenot <jbq@caraldi.com> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org, Sam Lawrance <lawrance@FreeBSD.org> Subject: Re: ports/93289: Maintainer update: www/resin2 and www/resin3: honour PTHREAD_LIBS to fix build failure on FreeBSD 7 Message-ID: <20060404133330.GP28452@vision.anyware> In-Reply-To: <200602131450.k1DEo7bQ085930@freefall.freebsd.org> References: <20060213144243.1CE6F61DD@vision.anyware> <200602131450.k1DEo7bQ085930@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--NKoe5XOeduwbEQHU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Please find attached an updated patch for www/resin2, and a
ultimate fix for www/resin3 to allow OpenSSL.
Thanks for your help!
--
Jean-Baptiste Quenot
aka John Banana Qwerty
http://caraldi.com/jbq/
--NKoe5XOeduwbEQHU
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch-resin2
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/Makefile ./Makefile
--- /usr/ports/www/resin2/Makefile Sat Mar 4 00:14:52 2006
+++ ./Makefile Tue Apr 4 15:32:44 2006
@@ -7,6 +7,7 @@
PORTNAME= resin
PORTVERSION= 2.1.17
+PORTREVISION= 1
CATEGORIES= www java
MASTER_SITES= http://www.caucho.com/download/
@@ -20,8 +21,6 @@
USE_REINPLACE= yes
USE_OPENSSL= yes
-BROKEN= Hard-codes libc_r linkage
-
# Customizable settings
RUNASUSER?= www
RUNASUID?= 80
@@ -62,6 +61,9 @@
--with-openssl-lib=${OPENSSLLIB} \
--with-openssl-include=${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
+# We need to link with cc instead of ld for the FreeBSD specific options used
+# by threading libraries
+CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}"
# Install the Apache plugin if needed
.if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
@@ -96,16 +98,16 @@
-e "s|%%APXS%%|${APXS}|g" \
-e "s|%%COPYDIRS%%|${COPYDIRS}|g" \
-e "s|%%FILESDIR%%|${FILESDIR}|g" \
- -e "s|%%GROUP%%|${GROUP}|g" \
-e "s|%%GID%%|${GID}|g" \
- -e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
+ -e "s|%%GROUP%%|${GROUP}|g" \
-e "s|%%JAVA%%|${JAVA}|g" \
+ -e "s|%%JAVA_HOME%%|${JAVA_HOME}|g" \
-e "s|%%LOG_FILE%%|${LOG_FILE}|g" \
- -e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \
-e "s|%%PID_FILE%%|${PID_FILE}|g" \
-e "s|%%PORT%%|${PORT}|g" \
-e "s|%%PORTNAME%%|${PORTNAME}|g" \
-e "s|%%PREFIX%%|${PREFIX}|g" \
+ -e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|g" \
-e "s|%%RUNASUID%%|${RUNASUID}|g" \
-e "s|%%RUNASUSER%%|${RUNASUSER}|g" \
-e "s|%%WRKDIR%%|${WRKDIR}|g" \
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/patch-configure ./files/patch-configure
--- /usr/ports/www/resin2/files/patch-configure Thu Jan 1 01:00:00 1970
+++ ./files/patch-configure Tue Apr 4 15:18:44 2006
@@ -0,0 +1,11 @@
+--- configure.orig Fri Dec 9 00:09:15 2005
++++ configure Mon Apr 3 11:06:18 2006
+@@ -3671,7 +3671,7 @@
+ ;;
+
+ *freebsd*)
+- PROXY_LIBS='-lc_r'
++ PROXY_LIBS="${PTHREAD_LIBS}"
+ jni_os=freebsd
+ ;;
+
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin2/files/patch-src_c_plugin_common_Makefile.in ./files/patch-src_c_plugin_common_Makefile.in
--- /usr/ports/www/resin2/files/patch-src_c_plugin_common_Makefile.in Thu Jan 1 01:00:00 1970
+++ ./files/patch-src_c_plugin_common_Makefile.in Tue Apr 4 15:17:45 2006
@@ -0,0 +1,15 @@
+--- src/c/plugin/common/Makefile.in.orig Fri Dec 9 10:09:13 2005
++++ src/c/plugin/common/Makefile.in Tue Apr 4 23:01:30 2006
+@@ -14,10 +14,10 @@
+ all : common.o common.lo
+
+ common.o : $(OBJ)
+- $(LD) -r -o $@ $(OBJ)
++ $(LD) $(LDFLAGS_SHLIB) -o $@ $(OBJ)
+
+ common.lo : $(OBJ_PICS)
+- $(LD) -r -o $@ $(OBJ_PICS)
++ $(LD) $(LDFLAGS_SHLIB) -o $@ $(OBJ_PICS)
+
+ .c.lo :
+ $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo
--NKoe5XOeduwbEQHU
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment; filename=patch-resin3
Content-Transfer-Encoding: 8bit
Binary files /usr/ports/www/resin3/.Makefile.swp and ./.Makefile.swp differ
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/Makefile ./Makefile
--- /usr/ports/www/resin3/Makefile Tue Apr 4 00:15:30 2006
+++ ./Makefile Tue Apr 4 15:24:00 2006
@@ -61,7 +61,7 @@
LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl
# We need to link with cc instead of ld for the FreeBSD specific options used
# by threading libraries
-CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV= LD=${CC} PTHREAD_LIBS=${PTHREAD_LIBS} LDFLAGS="${LDFLAGS}"
# Install the Apache plugin if needed
.if defined(WITH_APACHE) && (${WITH_APACHE} == yes || ${WITH_APACHE} == YES)
Binary files /usr/ports/www/resin3/files/.patch-configure-cflags.swp and ./files/.patch-configure-cflags.swp differ
Binary files /usr/ports/www/resin3/files/.patch-configure.swp and ./files/.patch-configure.swp differ
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/www/resin3/files/pkg-message.in ./files/pkg-message.in
--- /usr/ports/www/resin3/files/pkg-message.in Sun Jan 8 00:12:46 2006
+++ ./files/pkg-message.in Fri Dec 16 13:11:27 2005
@@ -41,7 +41,7 @@
%%APP_NAME%%_flags="-Djava.awt.headless=true"
# Increase memory limit of the Java virtual machine
- %%APP_NAME%%_flags="-Xms32m -Xmx256m"
+ %%APP_NAME%%_flags="-Xms32m -Xmx256m"
# Run Java with remote debugging turned on on port 8000
%%APP_NAME%%_flags="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
--NKoe5XOeduwbEQHU--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060404133330.GP28452>