JBoss Native SVN: r1410 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 11:58:07 -0500 (Mon, 03 Mar 2008)
New Revision: 1410
Modified:
trunk/build/unix/build.sh
Log:
Arrange openssl build.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-03 11:04:01 UTC (rev 1409)
+++ trunk/build/unix/build.sh 2008-03-03 16:58:07 UTC (rev 1410)
@@ -547,6 +547,10 @@
echo "Using cached openssl in ${ssl_common_dir}"
return 0
fi
+
+ if [ ! -d ${ssl_srcdir} ]; then
+ ssl_srcdir=srclib/`ls srclib | grep openssl-`
+ fi
SSLNUM=`basename ${ssl_srcdir} | awk -F - '{ print $2}' | sed 's:[a-z]::'`
echo "Configuring OpenSSL ${ssl_version} for ${BUILD_TAG} ..."
ssl_common_flags="threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec"
@@ -556,9 +560,6 @@
ssl_build_flags="shared"
fi
ssl_target="--prefix=${ssl_common_dir} --openssldir=${ssl_common_dir}/ssl"
- if [ ! -d ${ssl_srcdir} ]; then
- ssl_srcdir=srclib/`ls srclib | grep openssl-`
- fi
echo "ssl_srcdir: $ssl_srcdir in: `pwd`"
(cd ${ssl_srcdir}
case ${BUILD_TAG} in
@@ -611,21 +612,33 @@
hpux-parisc2)
make install_sw || exit 1
# openssl-0.9.8b is broken (work-around it).
- file ${ssl_common_dir}/lib/libssl.${so_extension}
- if [ $? -ne 0 ]; then
- rm -f ${ssl_common_dir}/lib/libssl.${so_extension}
- cp -p libssl.${so_extension} ${ssl_common_dir}/lib
- rm -f ${ssl_common_dir}/lib/libcrypto.${so_extension}
- cp -p libcrypto.${so_extension} ${ssl_common_dir}/lib
- fi
+ if $ssl_static; then
+ :
+ else
+ cat ${ssl_common_dir}/lib/libssl.${so_extension} > /dev/null
+ if [ $? -ne 0 ]; then
+ rm -f ${ssl_common_dir}/lib/libssl.${so_extension}
+ cp -p libssl.${so_extension} ${ssl_common_dir}/lib
+ rm -f ${ssl_common_dir}/lib/libcrypto.${so_extension}
+ cp -p libcrypto.${so_extension} ${ssl_common_dir}/lib
+ fi
+ fi
;;
*)
make install_sw || exit 1
;;
esac
- if [ ! $ssl_static ] ; then
+ if $ssl_static; then
+ :
+ else
(cd ${ssl_common_dir}/lib
+ if [ ! -f libcrypto.${so_extension}.${SSLNUM} ]; then
+ ln -s libcrypto.${so_extension} libcrypto.${so_extension}.${SSLNUM}
+ fi
ln -s libcrypto.${so_extension}.${SSLNUM} libcrypto.${so_extension}.0
+ if [ ! -f libssl.${so_extension}.${SSLNUM} ]; then
+ ln -s libssl.${so_extension} libssl.${so_extension}.${SSLNUM}
+ fi
ln -s libssl.${so_extension}.${SSLNUM} libssl.${so_extension}.0
)
fi
16 years, 10 months
JBoss Native SVN: r1409 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 06:04:01 -0500 (Mon, 03 Mar 2008)
New Revision: 1409
Modified:
trunk/build/unix/build.sh
Log:
Typo.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-03 10:58:50 UTC (rev 1408)
+++ trunk/build/unix/build.sh 2008-03-03 11:04:01 UTC (rev 1409)
@@ -832,7 +832,7 @@
else
(cd ${zlib_srcdir}
echo "Building in ${zlib_srcdir} ..."
- if $any_static ; then
+ if $zlib_static ; then
add_static=""
else
add_static="--shared"
16 years, 10 months
JBoss Native SVN: r1408 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-03 05:58:50 -0500 (Mon, 03 Mar 2008)
New Revision: 1408
Modified:
trunk/build/unix/build.sh
Log:
work-around for broken openssl-0.9.8b (at least on dev24).
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-01 17:16:19 UTC (rev 1407)
+++ trunk/build/unix/build.sh 2008-03-03 10:58:50 UTC (rev 1408)
@@ -608,6 +608,17 @@
hpux-ia64)
gmake install_sw CFLAGS=DSO_DLHACK || exit 1
;;
+ hpux-parisc2)
+ make install_sw || exit 1
+ # openssl-0.9.8b is broken (work-around it).
+ file ${ssl_common_dir}/lib/libssl.${so_extension}
+ if [ $? -ne 0 ]; then
+ rm -f ${ssl_common_dir}/lib/libssl.${so_extension}
+ cp -p libssl.${so_extension} ${ssl_common_dir}/lib
+ rm -f ${ssl_common_dir}/lib/libcrypto.${so_extension}
+ cp -p libcrypto.${so_extension} ${ssl_common_dir}/lib
+ fi
+ ;;
*)
make install_sw || exit 1
;;
16 years, 10 months
JBoss Native SVN: r1407 - trunk/build/unix/util.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-01 12:16:19 -0500 (Sat, 01 Mar 2008)
New Revision: 1407
Modified:
trunk/build/unix/util/buildroot.hpux.sh
Log:
Add 2 missing libraries.
Modified: trunk/build/unix/util/buildroot.hpux.sh
===================================================================
--- trunk/build/unix/util/buildroot.hpux.sh 2008-02-29 16:42:25 UTC (rev 1406)
+++ trunk/build/unix/util/buildroot.hpux.sh 2008-03-01 17:16:19 UTC (rev 1407)
@@ -23,7 +23,7 @@
#
# Build a chrootable environment.
# $1 : Directory where the chroot will takes place.
-tools="/bin/bash /etc/passwd /etc/group /etc/hosts /etc/netconfig /etc/resolv.conf /usr/lib/dld.sl /usr/lib/hpux32/uld.so /usr/lib/hpux32/dld.so /usr/lib/hpux32/libm.so.1 /usr/lib/hpux32/libpthread.so.1 /usr/lib/hpux32/libnss_dns.so.1"
+tools="/bin/bash /etc/passwd /etc/group /etc/hosts /etc/netconfig /etc/resolv.conf /usr/lib/dld.sl /usr/lib/hpux32/uld.so /usr/lib/hpux32/dld.so /usr/lib/hpux32/libm.so.1 /usr/lib/hpux32/libpthread.so.1 /usr/lib/hpux32/libnss_dns.so.1 /usr/lib/libm.2 /usr/lib/libpthread.1 /usr/lib/libpq.sl.4"
depfiles="/bin/sh /usr/bin/test /usr/bin/dirname /usr/bin/basename /usr/bin/uname /usr/bin/grep /usr/bin/sh /usr/bin/expr /usr/bin/false /usr/bin/true"
# tools are the tools we need for the tests.
# depfiles are files the packages needed (to be generated).
16 years, 10 months