JBoss Native SVN: r3094 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-11 11:54:06 -0400 (Tue, 11 Jun 2013)
New Revision: 3094
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
put back the jlibtool .. Otherwise httpd doesn't work.
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2013-06-11 13:29:53 UTC (rev 3093)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2013-06-11 15:54:06 UTC (rev 3094)
@@ -144,8 +144,7 @@
add_conf_sys="$add_conf_sys --enable-pie"
;;
hpux*)
- add_conf_sys="$add_conf_sys --enable-shared --without-pgsql"
- # broken add_conf_sys="$add_conf_sys --enable-experimental-libtool --enable-shared --without-pgsql"
+ add_conf_sys="$add_conf_sys --enable-experimental-libtool --enable-shared --without-pgsql"
;;
esac
case ${BUILD_CPU} in
11 years, 6 months
JBoss Native SVN: r3093 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-11 09:29:53 -0400 (Tue, 11 Jun 2013)
New Revision: 3093
Modified:
trunk/build/unix/util/applypatch.sh
Log:
Arrange the patch applier script.
Modified: trunk/build/unix/util/applypatch.sh
===================================================================
--- trunk/build/unix/util/applypatch.sh 2013-06-11 11:43:40 UTC (rev 3092)
+++ trunk/build/unix/util/applypatch.sh 2013-06-11 13:29:53 UTC (rev 3093)
@@ -41,20 +41,24 @@
xb_applypatch()
{
basefilename=`basename $xbap_package_dir`
- if [ -f $xbap_build_top/../patch/$basefilename.patch ]; then
+ filename=$basefilename.patch
+ if $xbap_is_rhel; then
+ filename=$basefilename.rhel.patch
+ else
+ if [ $BUILD_SYS = "linux2" ]; then
+ dist=`lsb_release -i -s`
+ ver=`lsb_release -r -s`
+ if [ -f $xbap_build_top/../patch/$basefilename.$dist.$ver.patch ]; then
+ filename=$basefilename.$dist.$ver.patch
+ fi
+ fi
+ fi
+ if [ -f $xbap_build_top/../patch/$filename ]; then
(cd $xbap_package_dir
- echo "Applying patch $ap_build_top/../patch/$basefilename.patch in $xbap_package_dir"
- $patch -tf -p0 -i $xbap_build_top/../patch/$basefilename.patch
+ echo "Applying patch $ap_build_top/../patch/$filename in $xbap_package_dir"
+ $patch -tf -p0 -i $xbap_build_top/../patch/$filename
) || return 1
fi
- if $xbap_is_rhel; then
- if [ -f $xbap_build_top/../patch/$basefilename.rhel.patch ]; then
- (cd $xbap_package_dir
- echo "Applying rhel patch $ap_build_top/../patch/$basefilename.rhel.patch in $xbap_package_dir"
- $patch -tf -p0 -i $xbap_build_top/../patch/$basefilename.rhel.patch
- ) || return 1
- fi
- fi
}
# Apply patch for the component
11 years, 6 months
JBoss Native SVN: r3092 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-11 07:43:40 -0400 (Tue, 11 Jun 2013)
New Revision: 3092
Modified:
trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch
Log:
try to arrange the patch.
Modified: trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch
===================================================================
--- trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch 2013-06-11 11:40:01 UTC (rev 3091)
+++ trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch 2013-06-11 11:43:40 UTC (rev 3092)
@@ -15,3 +15,120 @@
!IF EXIST($(SRCDIR)\file_io\win32\buffer.c)
OBJECTS = $(OBJECTS) \
+--- modules/ssl/config.m4 2006-04-22 03:53:06.000000000 +0200
++++ modules/ssl/config.m4 2013-06-11 13:36:18.828481185 +0200
+@@ -120,7 +120,13 @@
+ if test "x$enable_ssl" = "xshared"; then
+ # The only symbol which needs to be exported is the module
+ # structure, so ask libtool to hide everything else:
+- APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
++ case $host in
++ *-apple-darwin*)
++ ;;
++ *)
++ APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
++ ;;
++ esac
+ fi
+ ])
+
+--- srclib/apr/buildconf 2010-03-05 13:38:36.000000000 +0100
++++ srclib/apr/buildconf 2013-06-11 13:36:22.922531224 +0200
+@@ -50,7 +50,7 @@
+ lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
+ IFS=.; set $lt_version; IFS=' '
+ if test "$1" = "1"; then
+- $libtoolize --copy --automake --force $verbose
++ $libtoolize --copy --automake --force --install $verbose
+ if [ -f libtool.m4 ]; then
+ ltfile=`pwd`/libtool.m4
+ else
+@@ -72,7 +72,7 @@
+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+ fi
+ if test "$1" = "2"; then
+- $libtoolize --copy --force $verbose
++ $libtoolize --copy --force --install $verbose
+ fi
+
+ # Clean up any leftovers
+--- srclib/apr/network_io/unix/multicast.c 2008-01-03 04:37:18.000000000 +0100
++++ srclib/apr/network_io/unix/multicast.c 2013-06-11 13:36:22.922531224 +0200
+@@ -214,6 +214,7 @@
+ }
+ }
+ else if (sock_is_ipv6(sock)) {
++ unsigned int hopsopt = value;
+ if (type == IP_MULTICAST_TTL) {
+ type = IPV6_MULTICAST_HOPS;
+ }
+@@ -222,7 +223,7 @@
+ }
+
+ if (setsockopt(sock->socketdes, IPPROTO_IPV6, type,
+- &value, sizeof(value)) == -1) {
++ (const void *) &hopsopt, sizeof(hopsopt)) == -1) {
+ rv = errno;
+ }
+ }
+--- srclib/apr-util/xml/expat/buildconf.sh 2010-09-29 18:57:31.000000000 +0200
++++ srclib/apr-util/xml/expat/buildconf.sh 2013-06-11 13:36:22.923531236 +0200
+@@ -1,5 +1,10 @@
+ #! /bin/sh
+
++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
++ verbose="--verbose"
++ shift
++fi
++
+ #
+ # Find libtoolize. Prefer 1.x versions.
+ #
+@@ -27,7 +32,7 @@
+ (cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files)
+ rm -rf autom4te*.cache aclocal.m4
+
+-$libtoolize --copy --automake
++$libtoolize --copy --automake --force $verbose
+
+ #
+ # find libtool.m4
+@@ -43,6 +48,9 @@
+ exit 1
+ fi
+ fi
++if [ ! -f conftools/libtool.m4 ]; then
++ mv aclocal.m4 conftools/libtool.m4
++fi
+
+ #
+ # Build aclocal.m4 from libtool's m4 files
+@@ -66,11 +74,11 @@
+ # Generate the autoconf header template (config.h.in) and ./configure
+ #
+ echo "Creating config.h.in ..."
+-${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
++${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning"
+
+ echo "Creating configure ..."
+ ### do some work to toss config.cache?
+-${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
++${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning"
+
+ # Remove autoconf caches
+ rm -rf autom4te*.cache aclocal.m4
+--- srclib/apr-util/xml/expat/configure.in 2010-09-29 16:00:14.000000000 +0200
++++ srclib/apr-util/xml/expat/configure.in 2013-06-11 13:36:22.923531236 +0200
+@@ -39,6 +39,12 @@
+ AC_CONFIG_HEADER(expat_config.h)
+
+ sinclude(conftools/ac_c_bigendian_cross.m4)
++sinclude(conftools/libtool.m4)
++sinclude(conftools/ltsugar.m4)
++sinclude(conftools/argz.m4)
++sinclude(conftools/ltoptions.m4)
++sinclude(conftools/ltversion.m4)
++sinclude(conftools/lt~obsolete.m4)
+
+ AC_CANONICAL_SYSTEM
+
11 years, 6 months
JBoss Native SVN: r3091 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-11 07:40:01 -0400 (Tue, 11 Jun 2013)
New Revision: 3091
Modified:
trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch
Log:
keep only the windows patch.
Modified: trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch
===================================================================
--- trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch 2013-06-11 11:26:01 UTC (rev 3090)
+++ trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch 2013-06-11 11:40:01 UTC (rev 3091)
@@ -1,20 +1,3 @@
---- modules/ssl/config.m4 (revision 793871)
-+++ modules/ssl/config.m4 (working copy)
-@@ -120,7 +120,13 @@
- if test "x$enable_ssl" = "xshared"; then
- # The only symbol which needs to be exported is the module
- # structure, so ask libtool to hide everything else:
-- APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
-+ case $host in
-+ *-apple-darwin*)
-+ ;;
-+ *)
-+ APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
-+ ;;
-+ esac
- fi
- ])
-
--- srclib/apr/NMAKEmakefile (revision 2617)
+++ srclib/apr/NMAKEmakefile (working copy)
@@ -106,11 +106,12 @@
@@ -32,103 +15,3 @@
!IF EXIST($(SRCDIR)\file_io\win32\buffer.c)
OBJECTS = $(OBJECTS) \
---- srclib/apr/network_io/unix/multicast.c 2012/04/04 11:17:32 1309331
-+++ srclib/apr/network_io/unix/multicast.c 2012/04/04 11:20:43 1309332
-@@ -217,6 +217,7 @@
- }
- }
- else if (sock_is_ipv6(sock)) {
-+ unsigned int hopsopt = value;
- if (type == IP_MULTICAST_TTL) {
- type = IPV6_MULTICAST_HOPS;
- }
-@@ -225,7 +226,7 @@
- }
-
- if (setsockopt(sock->socketdes, IPPROTO_IPV6, type,
-- &value, sizeof(value)) == -1) {
-+ (const void *) &hopsopt, sizeof(hopsopt)) == -1) {
- rv = errno;
- }
- }
---- ./srclib/apr/buildconf 2010-03-05 13:38:36.000000000 +0100
-+++ ./srclib/apr/buildconf 2013-06-06 14:24:21.833677315 +0200
-@@ -50,7 +50,7 @@
- lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
- IFS=.; set $lt_version; IFS=' '
- if test "$1" = "1"; then
-- $libtoolize --copy --automake --force $verbose
-+ $libtoolize --copy --automake --force $verbose
- if [ -f libtool.m4 ]; then
- ltfile=`pwd`/libtool.m4
- else
-@@ -72,7 +72,7 @@
- cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
- fi
- if test "$1" = "2"; then
-- $libtoolize --copy --force $verbose
-+ $libtoolize --copy --force $verbose
- fi
-
- # Clean up any leftovers
---- ./srclib/apr-util/xml/expat/configure.in 2013-06-05 19:03:46.000584753 +0200
-+++ ./srclib/apr-util/xml/expat/configure.in 2013-06-06 14:21:30.167618342 +0200
-@@ -39,6 +39,12 @@
- AC_CONFIG_HEADER(expat_config.h)
-
- sinclude(conftools/ac_c_bigendian_cross.m4)
-+sinclude(conftools/libtool.m4)
-+sinclude(conftools/ltsugar.m4)
-+sinclude(conftools/argz.m4)
-+sinclude(conftools/ltoptions.m4)
-+sinclude(conftools/ltversion.m4)
-+sinclude(conftools/lt~obsolete.m4)
-
- AC_CANONICAL_SYSTEM
-
---- ./srclib/apr-util/xml/expat/buildconf.sh 2013-06-05 19:03:58.464733329 +0200
-+++ ./srclib/apr-util/xml/expat/buildconf.sh 2013-06-06 14:16:20.001058561 +0200
-@@ -1,5 +1,10 @@
- #! /bin/sh
-
-+if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
-+ verbose="--verbose"
-+ shift
-+fi
-+
- #
- # Find libtoolize. Prefer 1.x versions.
- #
-@@ -27,7 +32,7 @@
- (cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files)
- rm -rf autom4te*.cache aclocal.m4
-
--$libtoolize --copy --automake
-+$libtoolize --copy --automake --force $verbose
-
- #
- # find libtool.m4
-@@ -43,6 +48,9 @@
- exit 1
- fi
- fi
-+if [ ! -f conftools/libtool.m4 ]; then
-+ mv aclocal.m4 conftools/libtool.m4
-+fi
-
- #
- # Build aclocal.m4 from libtool's m4 files
-@@ -66,11 +74,11 @@
- # Generate the autoconf header template (config.h.in) and ./configure
- #
- echo "Creating config.h.in ..."
--${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
-+${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning"
-
- echo "Creating configure ..."
- ### do some work to toss config.cache?
--${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
-+${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning"
-
- # Remove autoconf caches
- rm -rf autom4te*.cache aclocal.m4
11 years, 6 months
JBoss Native SVN: r3090 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-11 07:26:01 -0400 (Tue, 11 Jun 2013)
New Revision: 3090
Modified:
trunk/build/unix/build.sh
Log:
typo...
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-06-11 10:13:16 UTC (rev 3089)
+++ trunk/build/unix/build.sh 2013-06-11 11:26:01 UTC (rev 3090)
@@ -1167,7 +1167,7 @@
if [ $BUILD_SYS = "linux2" ]; then
dist=`lsb_release -i -s`
ver=`lsb_release -r -s`
- if [ -f -f $build_top/../patch/$basefilename.$dist.$ver.patch ]; then
+ if [ -f $build_top/../patch/$basefilename.$dist.$ver.patch ]; then
filename=$basefilename.$dist.$ver.patch
fi
fi
11 years, 6 months
JBoss Native SVN: r3089 - in trunk/build: unix and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-11 06:13:16 -0400 (Tue, 11 Jun 2013)
New Revision: 3089
Added:
trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch
Modified:
trunk/build/unix/build.sh
Log:
Add special logic for old rhel4.
Added: trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch
===================================================================
--- trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch (rev 0)
+++ trunk/build/patch/httpd-2.2.21.RedHatEnterpriseES.4.patch 2013-06-11 10:13:16 UTC (rev 3089)
@@ -0,0 +1,134 @@
+--- modules/ssl/config.m4 (revision 793871)
++++ modules/ssl/config.m4 (working copy)
+@@ -120,7 +120,13 @@
+ if test "x$enable_ssl" = "xshared"; then
+ # The only symbol which needs to be exported is the module
+ # structure, so ask libtool to hide everything else:
+- APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
++ case $host in
++ *-apple-darwin*)
++ ;;
++ *)
++ APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
++ ;;
++ esac
+ fi
+ ])
+
+--- srclib/apr/NMAKEmakefile (revision 2617)
++++ srclib/apr/NMAKEmakefile (working copy)
+@@ -106,11 +106,12 @@
+ $(WORKDIR)\signals.obj \
+ $(WORKDIR)\thread.obj \
+ $(WORKDIR)\threadpriv.obj \
+- $(WORKDIR)\access.obj \
+ $(WORKDIR)\time.obj \
+ $(WORKDIR)\timestr.obj \
+ $(WORKDIR)\groupinfo.obj \
+- $(WORKDIR)\userinfo.obj
++ $(WORKDIR)\userinfo.obj \
++ $(WORKDIR)\poll.obj \
++ $(WORKDIR)\pollset.obj
+
+ !IF EXIST($(SRCDIR)\file_io\win32\buffer.c)
+ OBJECTS = $(OBJECTS) \
+--- srclib/apr/network_io/unix/multicast.c 2012/04/04 11:17:32 1309331
++++ srclib/apr/network_io/unix/multicast.c 2012/04/04 11:20:43 1309332
+@@ -217,6 +217,7 @@
+ }
+ }
+ else if (sock_is_ipv6(sock)) {
++ unsigned int hopsopt = value;
+ if (type == IP_MULTICAST_TTL) {
+ type = IPV6_MULTICAST_HOPS;
+ }
+@@ -225,7 +226,7 @@
+ }
+
+ if (setsockopt(sock->socketdes, IPPROTO_IPV6, type,
+- &value, sizeof(value)) == -1) {
++ (const void *) &hopsopt, sizeof(hopsopt)) == -1) {
+ rv = errno;
+ }
+ }
+--- ./srclib/apr/buildconf 2010-03-05 13:38:36.000000000 +0100
++++ ./srclib/apr/buildconf 2013-06-06 14:24:21.833677315 +0200
+@@ -50,7 +50,7 @@
+ lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
+ IFS=.; set $lt_version; IFS=' '
+ if test "$1" = "1"; then
+- $libtoolize --copy --automake --force $verbose
++ $libtoolize --copy --automake --force $verbose
+ if [ -f libtool.m4 ]; then
+ ltfile=`pwd`/libtool.m4
+ else
+@@ -72,7 +72,7 @@
+ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4
+ fi
+ if test "$1" = "2"; then
+- $libtoolize --copy --force $verbose
++ $libtoolize --copy --force $verbose
+ fi
+
+ # Clean up any leftovers
+--- ./srclib/apr-util/xml/expat/configure.in 2013-06-05 19:03:46.000584753 +0200
++++ ./srclib/apr-util/xml/expat/configure.in 2013-06-06 14:21:30.167618342 +0200
+@@ -39,6 +39,12 @@
+ AC_CONFIG_HEADER(expat_config.h)
+
+ sinclude(conftools/ac_c_bigendian_cross.m4)
++sinclude(conftools/libtool.m4)
++sinclude(conftools/ltsugar.m4)
++sinclude(conftools/argz.m4)
++sinclude(conftools/ltoptions.m4)
++sinclude(conftools/ltversion.m4)
++sinclude(conftools/lt~obsolete.m4)
+
+ AC_CANONICAL_SYSTEM
+
+--- ./srclib/apr-util/xml/expat/buildconf.sh 2013-06-05 19:03:58.464733329 +0200
++++ ./srclib/apr-util/xml/expat/buildconf.sh 2013-06-06 14:16:20.001058561 +0200
+@@ -1,5 +1,10 @@
+ #! /bin/sh
+
++if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
++ verbose="--verbose"
++ shift
++fi
++
+ #
+ # Find libtoolize. Prefer 1.x versions.
+ #
+@@ -27,7 +32,7 @@
+ (cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files)
+ rm -rf autom4te*.cache aclocal.m4
+
+-$libtoolize --copy --automake
++$libtoolize --copy --automake --force $verbose
+
+ #
+ # find libtool.m4
+@@ -43,6 +48,9 @@
+ exit 1
+ fi
+ fi
++if [ ! -f conftools/libtool.m4 ]; then
++ mv aclocal.m4 conftools/libtool.m4
++fi
+
+ #
+ # Build aclocal.m4 from libtool's m4 files
+@@ -66,11 +74,11 @@
+ # Generate the autoconf header template (config.h.in) and ./configure
+ #
+ echo "Creating config.h.in ..."
+-${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
++${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning"
+
+ echo "Creating configure ..."
+ ### do some work to toss config.cache?
+-${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
++${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning"
+
+ # Remove autoconf caches
+ rm -rf autom4te*.cache aclocal.m4
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-06-11 09:10:36 UTC (rev 3088)
+++ trunk/build/unix/build.sh 2013-06-11 10:13:16 UTC (rev 3089)
@@ -1160,20 +1160,25 @@
DIR=$1
isrhel=$2
basefilename=`basename $DIR`
- if [ -f $build_top/../patch/$basefilename.patch ]; then
+ filename=$basefilename.patch
+ if $isrhel; then
+ filename=$basefilename.rhel.patch
+ else
+ if [ $BUILD_SYS = "linux2" ]; then
+ dist=`lsb_release -i -s`
+ ver=`lsb_release -r -s`
+ if [ -f -f $build_top/../patch/$basefilename.$dist.$ver.patch ]; then
+ filename=$basefilename.$dist.$ver.patch
+ fi
+ fi
+ fi
+
+ if [ -f $build_top/../patch/$ilename ]; then
(cd $DIR
- echo "Applying patch $build_top/../patch/$basefilename.patch in $DIR"
- $patch -tf -p0 -i $build_top/../patch/$basefilename.patch
+ echo "Applying patch $build_top/../patch/$filename in $DIR"
+ $patch -tf -p0 -i $build_top/../patch/$filename
) || return 1
fi
- if $isrhel; then
- if [ -f $build_top/../patch/$basefilename.rhel.patch ]; then
- (cd $DIR
- echo "Applying patch $build_top/../patch/$basefilename.rhel.patch in $DIR"
- $patch -tf -p0 -i $build_top/../patch/$basefilename.rhel.patch
- ) || return 1
- fi
- fi
}
# Check and download
11 years, 6 months
JBoss Native SVN: r3088 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-11 05:10:36 -0400 (Tue, 11 Jun 2013)
New Revision: 3088
Modified:
trunk/build/unix/buildbin.mod_cluster.sh
Log:
Try with the normal libtool.
libtool (GNU libtool) 2.4.2 on HPUX
Modified: trunk/build/unix/buildbin.mod_cluster.sh
===================================================================
--- trunk/build/unix/buildbin.mod_cluster.sh 2013-06-07 09:28:19 UTC (rev 3087)
+++ trunk/build/unix/buildbin.mod_cluster.sh 2013-06-11 09:10:36 UTC (rev 3088)
@@ -144,7 +144,8 @@
add_conf_sys="$add_conf_sys --enable-pie"
;;
hpux*)
- add_conf_sys="$add_conf_sys --enable-experimental-libtool --enable-shared --without-pgsql"
+ add_conf_sys="$add_conf_sys --enable-shared --without-pgsql"
+ # broken add_conf_sys="$add_conf_sys --enable-experimental-libtool --enable-shared --without-pgsql"
;;
esac
case ${BUILD_CPU} in
11 years, 6 months
JBoss Native SVN: r3087 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-07 05:28:19 -0400 (Fri, 07 Jun 2013)
New Revision: 3087
Modified:
trunk/build/patch/openssl-0.9.8r.patch
Log:
try another fix.
Modified: trunk/build/patch/openssl-0.9.8r.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8r.patch 2013-06-07 07:23:39 UTC (rev 3086)
+++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-07 09:28:19 UTC (rev 3087)
@@ -1,5 +1,5 @@
---- util/pl/VC-32.pl.orig 2010-05-27 15:16:28.000000000 +0200
-+++ util/pl/VC-32.pl 2013-06-07 09:21:08.371962819 +0200
+--- util/pl/VC-32.pl 2013-06-07 11:24:43.418413009 +0200
++++ util/pl/VC-32.pl 2013-06-07 11:25:55.801206458 +0200
@@ -49,7 +49,7 @@
$base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
@@ -18,11 +18,11 @@
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -371,6 +371,7 @@
- $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
- $ex.=' crypt32.lib';
- $ex.= $oflow;
-+ $ex.=' $(EXTRA_LIBS)';
- }
- $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
+@@ -170,6 +170,7 @@
+ {
+ $ex_libs.=' gdi32.lib crypt32.lib advapi32.lib user32.lib';
+ $ex_libs.= $oflow;
++ $ex_libs.=' $(EXTRA_LIBS)';
+ }
+
11 years, 6 months
JBoss Native SVN: r3086 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-07 03:23:39 -0400 (Fri, 07 Jun 2013)
New Revision: 3086
Modified:
trunk/build/patch/openssl-0.9.8r.patch
Log:
Arrange the patch.
Modified: trunk/build/patch/openssl-0.9.8r.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8r.patch 2013-06-06 16:12:57 UTC (rev 3085)
+++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-07 07:23:39 UTC (rev 3086)
@@ -1,28 +1,28 @@
---- util/pl/VC-32.pl.org 2013-06-06 18:03:18.555201964 +0200
-+++ util/pl/VC-32.pl 2013-06-06 18:10:08.247319371 +0200
-@@ -31,7 +31,7 @@
+--- util/pl/VC-32.pl.orig 2010-05-27 15:16:28.000000000 +0200
++++ util/pl/VC-32.pl 2013-06-07 09:21:08.371962819 +0200
+@@ -49,7 +49,7 @@
$base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
$base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
-- my $f = $shlib?' /MD':' /MT';
+- my $f = $shlib || $fips ?' /MD':' /MT';
+ my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -96,7 +96,7 @@
+@@ -114,7 +114,7 @@
$base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
$base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
$base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
-- my $f = $shlib?' /MD':' /MT';
+- my $f = $shlib || $fips ?' /MD':' /MT';
+ my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -288,6 +288,7 @@
+@@ -371,6 +371,7 @@
$ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
$ex.=' crypt32.lib';
- $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
+ $ex.= $oflow;
+ $ex.=' $(EXTRA_LIBS)';
}
$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
- $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
+
11 years, 6 months
JBoss Native SVN: r3085 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-06-06 12:12:57 -0400 (Thu, 06 Jun 2013)
New Revision: 3085
Modified:
trunk/build/patch/openssl-0.9.8r.patch
Log:
Arrange the patch.
Modified: trunk/build/patch/openssl-0.9.8r.patch
===================================================================
--- trunk/build/patch/openssl-0.9.8r.patch 2013-06-06 15:19:45 UTC (rev 3084)
+++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-06 16:12:57 UTC (rev 3085)
@@ -1,28 +1,28 @@
---- util/pl/VC-32.pl
-+++ util/pl/VC-32.pl
-@@ -43,7 +43,7 @@
- # considered safe to ignore.
- #
- $base_cflags= " $mf_cflag";
-- my $f = $shlib || $fips ?' /MD':' /MT';
+--- util/pl/VC-32.pl.org 2013-06-06 18:03:18.555201964 +0200
++++ util/pl/VC-32.pl 2013-06-06 18:10:08.247319371 +0200
+@@ -31,7 +31,7 @@
+ $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DOPENSSL_SYSNAME_WIN32 -DOPENSSL_SYSNAME_WINNT -DUNICODE -D_UNICODE';
+ $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
+ $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+- my $f = $shlib?' /MD':' /MT';
+ my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -124,7 +124,7 @@
- else # Win32
- {
- $base_cflags= " $mf_cflag";
-- my $f = $shlib || $fips ?' /MD':' /MT';
+@@ -96,7 +96,7 @@
+ $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
+ $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE'; # shut up VC8
+ $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE'; # shut up VC8
+- my $f = $shlib?' /MD':' /MT';
+ my $f = ' /MD';
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
$opt_cflags=$f.' /Ox /O2 /Ob2';
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -175,6 +175,7 @@
- {
- $ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
- $ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
-+ $ex_libs.=' $(EXTRA_LIBS)';
- # WIN32 UNICODE build gets linked with unicows.lib for
- # backward compatibility with Win9x.
- $ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ /\-DUNICODE/);
+@@ -288,6 +288,7 @@
+ $ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
+ $ex.=' crypt32.lib';
+ $ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
++ $ex.=' $(EXTRA_LIBS)';
+ }
+ $ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
+ $ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
11 years, 6 months