June 2013 - jbossnative-commits - Jboss List Archives

JBoss Native SVN: r3125 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2013-06-14 07:55:25 -0400 (Fri, 14 Jun 2013) New Revision: 3125 Modified: trunk/build/patch/openssl-0.9.8r.patch Log: Fix missing _getpid Modified: trunk/build/patch/openssl-0.9.8r.patch =================================================================== --- trunk/build/patch/openssl-0.9.8r.patch 2013-06-14 08:17:19 UTC (rev 3124) +++ trunk/build/patch/openssl-0.9.8r.patch 2013-06-14 11:55:25 UTC (rev 3125) @@ -51,3 +51,14 @@ #endif static void s_time_init(void) +--- engines/e_aep.c ++++ engines/e_aep.c +@@ -870,7 +870,7 @@ + #ifdef NETWARE_CLIB + curr_pid = GetThreadID(); + #elif defined(_WIN32) +- curr_pid = _getpid(); ++ curr_pid = GetCurrentThreadId(); + #else + curr_pid = getpid(); + #endif

11 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3124 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2013-06-14 04:17:19 -0400 (Fri, 14 Jun 2013) New Revision: 3124 Modified: trunk/build/unix/build.sh Log: Favor -static option when building OpenSSL Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-06-14 06:54:31 UTC (rev 3123) +++ trunk/build/unix/build.sh 2013-06-14 08:17:19 UTC (rev 3124) @@ -675,8 +675,10 @@ ssl_static=$2 if $ssl_static ; then ssl_common_dir=${build_common_dir}-static + ssl_win32_mk=nt.mak else ssl_common_dir=${build_common_dir} + ssl_win32_mk=ntdll.mak fi if [ -f ${ssl_common_dir}/include/openssl/opensslv.h ]; then @@ -740,11 +742,9 @@ cygspawn perl Configure ${ssl_target} VC-WIN32 # openssl 1.0.x uses do_nasm, not do_masm :D ms/do_nasm.bat - nmake -f ms/nt.mak clean - nmake -f ms/nt.mak || exit 1 - #CPERL=`cygpath -w /usr/bin/perl` - #nmake -f ms/nt.mak install PERL="$CPERL" - nmake -f ms/nt.mak install || exit 1 + nmake -f ms/$ssl_win32_mk clean + nmake -f ms/$ssl_win32_mk || exit 1 + nmake -f ms/$ssl_win32_mk install || exit 1 ;; windows-x64|windows-amd64) echo "Doing: perl Configure ${ssl_target} VC-WIN64A" @@ -752,8 +752,8 @@ rm -rf tmp32 cygspawn perl Configure ${ssl_target} VC-WIN64A ms/do_win64a.bat - nmake -f ms/nt.mak PERL=sperl || exit 1 - nmake -f ms/nt.mak PERL=sperl install + nmake -f ms/$ssl_win32_mk PERL=sperl || exit 1 + nmake -f ms/$ssl_win32_mk PERL=sperl install ;; windows-i64) echo "Doing: perl Configure ${ssl_target} VC-WIN64I" @@ -761,13 +761,8 @@ rm -rf tmp32 cygspawn perl Configure ${ssl_target} no-des VC-WIN64I ms/do_win64i.bat - nmake -f ms/nt.mak || exit 1 - nmake -f ms/nt.mak install - #nmake -f ms/nt.mak - #sed "s:=ml :=ias :" ms/nt.mak > $$.mak - #mv $$.mak ms/nt.mak - #sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak - #mv $$.mak ms/ntdll.mak + nmake -f ms/$ssl_win32_mk || exit 1 + nmake -f ms/$ssl_win32_mk install ;; *) ./config ${ssl_target} -fPIC ${ssl_common_flags} ${ssl_build_flags} || exit 1

11 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3122 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 14:06:35 -0400 (Thu, 13 Jun 2013) New Revision: 3122 Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh Log: the openssl dll aren't produced bu do we need them? Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.windows.sh 2013-06-13 17:36:38 UTC (rev 3121) +++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2013-06-13 18:06:35 UTC (rev 3122) @@ -101,8 +101,8 @@ # copy the openssl libraries. if $has_openssl ; then echo "cp ${win_common_loc}/bin/*.dll ${win_output_loc}/bin/" - cp ${win_common_loc}/bin/libeay32.dll ${win_output_loc}/bin/ || exit 1 - cp ${win_common_loc}/bin/ssleay32.dll ${win_output_loc}/bin/ || exit 1 + cp ${win_common_loc}/bin/libeay32.dll ${win_output_loc}/bin/ + cp ${win_common_loc}/bin/ssleay32.dll ${win_output_loc}/bin/ fi # Add default mod_cluster conf in httpd.conf

11 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3121 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 13:36:38 -0400 (Thu, 13 Jun 2013) New Revision: 3121 Modified: trunk/build/unix/buildbin.mod_cluster.sh Log: Arrange location of the .so files. Modified: trunk/build/unix/buildbin.mod_cluster.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 17:25:26 UTC (rev 3120) +++ trunk/build/unix/buildbin.mod_cluster.sh 2013-06-13 17:36:38 UTC (rev 3121) @@ -236,15 +236,15 @@ echo "Add the mod_cluster modules now because with can't use buildconf on hpux" cat >> "${RPM_BUILD_ROOT}/opt/jboss/httpd/httpd/conf/httpd.conf" <<EOF -LoadModule proxy_module modules/mod_proxy.so -LoadModule proxy_ajp_module modules/mod_proxy_ajp.so -LoadModule proxy_http_module modules/mod_proxy_http.so +LoadModule proxy_module /opt/jboss/httpd/lib/httpd/modules/mod_proxy.so +LoadModule proxy_ajp_module /opt/jboss/httpd/lib/httpd/modules/mod_proxy_ajp.so +LoadModule proxy_http_module /opt/jboss/httpd/lib/httpd/modules/mod_proxy_http.so -LoadModule proxy_cluster_module modules/mod_proxy_cluster.so +LoadModule proxy_cluster_module /opt/jboss/httpd/lib/httpd/modules/mod_proxy_cluster.so -LoadModule manager_module modules/mod_manager.so -LoadModule slotmem_module modules/mod_slotmem.so -LoadModule advertise_module modules/mod_advertise.so +LoadModule manager_module /opt/jboss/httpd/lib/httpd/modules/mod_manager.so +LoadModule slotmem_module /opt/jboss/httpd/lib/httpd/modules/mod_slotmem.so +LoadModule advertise_module /opt/jboss/httpd/lib/httpd/modules/mod_advertise.so EOF fi

11 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3120 - trunk/build/unix/util.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 13:25:26 -0400 (Thu, 13 Jun 2013) New Revision: 3120 Modified: trunk/build/unix/util/applypatch.sh Log: arrange logic. Modified: trunk/build/unix/util/applypatch.sh =================================================================== --- trunk/build/unix/util/applypatch.sh 2013-06-13 15:29:53 UTC (rev 3119) +++ trunk/build/unix/util/applypatch.sh 2013-06-13 17:25:26 UTC (rev 3120) @@ -45,9 +45,9 @@ if $xbap_is_rhel; then filename=$basefilename.rhel.patch else + dist="" + ver="" if [ $BUILD_SYS = "linux2" ]; then - dist="" - ver="" if [ -f /etc/redhat-release ]; then dist=RedHatEnterpriseES grep "release 4" /etc/redhat-release @@ -58,19 +58,20 @@ if [ $? -eq 0 ]; then ver=4 fi - box_name=`uname -n` - if [ $box_name = "dev92.mw.lab.eng.bos.redhat.com" ]; then - dist=RedHatEnterpriseES - ver=4 - fi fi # lsb_release is not always installed :-( #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 + # Hack for old libtool :-( + box_name=`uname -n` + if [ $box_name = "dev92.mw.lab.eng.bos.redhat.com" ]; then + dist=RedHatEnterpriseES + ver=4 + fi + if [ -f $xbap_build_top/../patch/$basefilename.$dist.$ver.patch ]; then + filename=$basefilename.$dist.$ver.patch + fi fi if [ -f $xbap_build_top/../patch/$filename ]; then (cd $xbap_package_dir

11 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3119 - trunk/build/unix/util.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 11:29:53 -0400 (Thu, 13 Jun 2013) New Revision: 3119 Modified: trunk/build/unix/util/applypatch.sh Log: quick for dev92.mw.lab.eng.bos.redhat.com that also as a old libtool. Modified: trunk/build/unix/util/applypatch.sh =================================================================== --- trunk/build/unix/util/applypatch.sh 2013-06-13 15:03:58 UTC (rev 3118) +++ trunk/build/unix/util/applypatch.sh 2013-06-13 15:29:53 UTC (rev 3119) @@ -58,6 +58,11 @@ if [ $? -eq 0 ]; then ver=4 fi + box_name=`uname -n` + if [ $box_name = "dev92.mw.lab.eng.bos.redhat.com" ]; then + dist=RedHatEnterpriseES + ver=4 + fi fi # lsb_release is not always installed :-( #dist=`lsb_release -i -s`

11 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3118 - trunk/build/unix/util.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 11:03:58 -0400 (Thu, 13 Jun 2013) New Revision: 3118 Modified: trunk/build/unix/util/applypatch.sh Log: In fact all version 5 also have the old libtool. Modified: trunk/build/unix/util/applypatch.sh =================================================================== --- trunk/build/unix/util/applypatch.sh 2013-06-13 14:28:50 UTC (rev 3117) +++ trunk/build/unix/util/applypatch.sh 2013-06-13 15:03:58 UTC (rev 3118) @@ -54,6 +54,10 @@ if [ $? -eq 0 ]; then ver=4 fi + grep "release 5" /etc/redhat-release + if [ $? -eq 0 ]; then + ver=4 + fi fi # lsb_release is not always installed :-( #dist=`lsb_release -i -s`

11 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3117 - in trunk/httpd/httpd-2.2: srclib/apr-util and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: mladen.turk(a)jboss.com Date: 2013-06-13 10:28:50 -0400 (Thu, 13 Jun 2013) New Revision: 3117 Modified: trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile Log: Fix typos Modified: trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2013-06-13 14:01:13 UTC (rev 3116) +++ trunk/httpd/httpd-2.2/modules/proxy/NMAKEmakefile 2013-06-13 14:28:50 UTC (rev 3117) @@ -31,15 +31,6 @@ !include <..\..\NMAKEhttpd.inc> MODULES = \ - $(SRCDIR)\NMAKEproxy \ - $(SRCDIR)\NMAKEproxyajp \ - $(SRCDIR)\NMAKEproxyhttp \ - $(SRCDIR)\NMAKEproxyftp \ - $(SRCDIR)\NMAKEproxyconnect \ - $(SRCDIR)\NMAKEproxybalancer \ - $(SRCDIR)\NMAKEproxycluster - -MODULES = \ $(SRCDIR)\NMAKEproxy\~ \ $(SRCDIR)\NMAKEproxyajp\~ \ $(SRCDIR)\NMAKEproxyhttp\~ \ Modified: trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile =================================================================== --- trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2013-06-13 14:01:13 UTC (rev 3116) +++ trunk/httpd/httpd-2.2/srclib/apr-util/NMAKEmakefile 2013-06-13 14:28:50 UTC (rev 3117) @@ -40,7 +40,7 @@ $(SRCDIR)\NMAKEapuldap\~ $(MODULES): - @$(MAKE) -nologo -f $@ PREFIX=$(PREFIX) install + @$(MAKE) -nologo -f $(@D) PREFIX=$(PREFIX) install $(WORKDIR): @$(MAKEWORKDIR)

11 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3116 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 10:01:13 -0400 (Thu, 13 Jun 2013) New Revision: 3116 Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh Log: rollback r3112 Modified: trunk/build/unix/buildbin.mod_cluster.windows.sh =================================================================== --- trunk/build/unix/buildbin.mod_cluster.windows.sh 2013-06-13 13:59:36 UTC (rev 3115) +++ trunk/build/unix/buildbin.mod_cluster.windows.sh 2013-06-13 14:01:13 UTC (rev 3116) @@ -70,9 +70,9 @@ echo "Running nmake at `pwd`" echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all and install" echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all" > make.bat - nmake -s -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all || exit 1 + nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} all || exit 1 echo "nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install" >> make.bat - nmake -s -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install || exit 1 + nmake -f NMAKEmakefile PREFIX=${win_output_loc} ${add_conf} install || exit 1 ) || exit 1 # Also build the java part.

11 years, 6 months

1
0
0 / 0

JBoss Native SVN: r3115 - trunk/build/windows.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 09:59:36 -0400 (Thu, 13 Jun 2013) New Revision: 3115 Modified: trunk/build/windows/tools.ini Log: remove nmake debug, thanks Mladen. Modified: trunk/build/windows/tools.ini =================================================================== --- trunk/build/windows/tools.ini 2013-06-13 13:54:00 UTC (rev 3114) +++ trunk/build/windows/tools.ini 2013-06-13 13:59:36 UTC (rev 3115) @@ -7,4 +7,4 @@ #!CMDSWITCHES +I # Debugging information -!CMDSWITCHES +D +#!CMDSWITCHES +D

11 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits June 2013