March 2010 - jbossnative-commits - Jboss List Archives

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-03-18 04:54:30 -0400 (Thu, 18 Mar 2010) New Revision: 2635 Added: trunk/build/patch/zlib-1.2.4.patch Log: configure and Makefile.in are broken on HPUX. Added: trunk/build/patch/zlib-1.2.4.patch =================================================================== --- trunk/build/patch/zlib-1.2.4.patch (rev 0) +++ trunk/build/patch/zlib-1.2.4.patch 2010-03-18 08:54:30 UTC (rev 2635) @@ -0,0 +1,33 @@ +--- Makefile.in 2010-03-14 03:10:27.000000000 +0100 ++++ Makefile.in 2010-03-18 09:44:28.293204500 +0100 +@@ -134,7 +134,7 @@ + -@mv objs/$*.o $@ + + $(SHAREDLIBV): $(PIC_OBJS) +- $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc ++ $(LDSHARED) -o $@ $(PIC_OBJS) -lc + rm -f $(SHAREDLIB) $(SHAREDLIBM) + ln -s $@ $(SHAREDLIB) + ln -s $@ $(SHAREDLIBM) +--- configure 2010-03-12 16:06:14.000000000 +0100 ++++ configure 2010-03-18 09:44:14.990204825 +0100 +@@ -197,7 +197,7 @@ + echo Checking for shared library support... + # we must test in two steps (cc then ld), required at least on SunOS 4.x + if test "`($CC -w -c $SFLAGS $test.c) 2>&1`" = "" && +- test "`($LDSHARED $SFLAGS -o $test$shared_ext $test.o) 2>&1`" = ""; then ++ test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then + echo Building shared library $SHAREDLIBV with $CC. + elif test -z "$old_cc" -a -z "$old_cflags"; then + echo No shared library support. +@@ -205,8 +205,8 @@ + else + echo Tested $CC -w -c $SFLAGS $test.c + $CC -w -c $SFLAGS $test.c +- echo Tested $LDSHARED $SFLAGS -o $test$shared_ext $test.o +- $LDSHARED $SFLAGS -o $test$shared_ext $test.o ++ echo Tested $LDSHARED -o $test$shared_ext $test.o ++ $LDSHARED -o $test$shared_ext $test.o + echo 'No shared library support; try without defining CC and CFLAGS' + shared=0; + fi

14 years, 9 months

1
0
0 / 0

JBoss Native SVN: r2634 - in trunk/srclib: zlib-1.2.4 and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-03-17 13:31:44 -0400 (Wed, 17 Mar 2010) New Revision: 2634 Added: trunk/srclib/zlib-1.2.4/ trunk/srclib/zlib-1.2.4/NMAKEmakefile Log: Add Makefile for 1.2.4 Added: trunk/srclib/zlib-1.2.4/NMAKEmakefile =================================================================== --- trunk/srclib/zlib-1.2.4/NMAKEmakefile (rev 0) +++ trunk/srclib/zlib-1.2.4/NMAKEmakefile 2010-03-17 17:31:44 UTC (rev 2634) @@ -0,0 +1,151 @@ +# Copyright 2001-2006 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master Zlib makefile. +# Usage: +# DLL=1 Build DLL version +# ASM=1 Use Masm +# DEBUG=1 Build DEBUG version of Zlib +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +!IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == "" +TARGET=DLL +PROJECT = libzlib-1 +CFLAGS = -DZLIB_DLL -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) +!ELSE +TARGET=LIB +PROJECT = zlib-1 +CFLAGS = -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS) +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\..\NMAKEcommon.inc> + +!IF "$(CPU)" != "X86" +CFLAGS = $(CFLAGS) -GS- +!ENDIF + +!IF "$(TARGET)" != "LIB" +LFLAGS = $(LFLAGS) /version:1.3 +!ENDIF + +INCLUDES = -I$(SRCDIR) +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\adler32.obj \ + $(WORKDIR)\compress.obj \ + $(WORKDIR)\crc32.obj \ + $(WORKDIR)\deflate.obj \ + $(WORKDIR)\infback.obj \ + $(WORKDIR)\inffast.obj \ + $(WORKDIR)\inflate.obj \ + $(WORKDIR)\inftrees.obj \ + $(WORKDIR)\trees.obj \ + $(WORKDIR)\uncompr.obj \ + $(WORKDIR)\zutil.obj + +!IFDEF ZLIB_ASM +CFLAGS = -DASMV -DASMINF $(CFLAGS) +!IF "$(CPU)" == "X64" +ASM_OBJECTS = \ + $(WORKDIR)\inffas8664.obj \ + $(WORKDIR)\gvmat64.obj \ + $(WORKDIR)\inffas64.obj + +!ELSE +ASM_OBJECTS = \ + $(WORKDIR)\gvmat32c.obj \ + $(WORKDIR)\gvmat32.obj \ + $(WORKDIR)\inffas32.obj + +!ENDIF +!ELSE +ASM_OBJECTS = +!ENDIF + +BUILDINC = $(PREFIX)\include\apr-1 +BUILDLIB = $(PREFIX)\lib +!IF "$(TARGET)" == "DLL" +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest +!ELSE +BUILDBIN = $(WORKDIR)\$(PROJECT).lib +!ENDIF + +all : $(WORKDIR) $(BUILDBIN) + +$(BUILDINC) : + @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32" + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +{$(SRCDIR)}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +!IF "$(CPU)" == "X64" +{$(SRCDIR)/contrib/masmx64}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/contrib/masmx64}.asm{$(WORKDIR)}.obj: + $(ML) $(AFLAGS) /Fo$@ $< + +!ELSE +{$(SRCDIR)/contrib/masmx86}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/contrib/masmx86}.asm{$(WORKDIR)}.obj: + $(ML) $(AFLAGS) /Fo$@ $< + +!ENDIF + + +$(OBJECTS): $(SRCDIR)/*.h + +!IFDEF DLL +$(BUILDRES): win32/zlib1.rc + $(RC) $(RCFLAGS) /fo $(BUILDRES) win32/zlib1.rc +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) $(LIBS) /def:win32/zlib.def /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\zlib.h" "$(BUILDINC)" /Y /Q + @xcopy "$(SRCDIR)\zconf.h" "$(BUILDINC)" /Y /Q + @xcopy "$(SRCDIR)\zutil.h" "$(BUILDINC)" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL

14 years, 9 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

14 years, 9 months

1
0
0 / 0

JBoss Native SVN: r2632 - trunk/httpd/httpd-2.2/modules/jk.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-03-17 06:20:07 -0400 (Wed, 17 Mar 2010) New Revision: 2632 Modified: trunk/httpd/httpd-2.2/modules/jk/configure.in Log: Fix for 1.2.20 Modified: trunk/httpd/httpd-2.2/modules/jk/configure.in =================================================================== --- trunk/httpd/httpd-2.2/modules/jk/configure.in 2010-03-17 10:11:00 UTC (rev 2631) +++ trunk/httpd/httpd-2.2/modules/jk/configure.in 2010-03-17 10:20:07 UTC (rev 2632) @@ -88,6 +88,24 @@ pid_t_fmt='#error Can not determine the proper size for pid_t' fi +JK_CHECK_SIZEOF_EXTENDED([#include <pthread.h>], pthread_t, 8) + +if test "$ac_cv_sizeof_pthread_t" = "$ac_cv_sizeof_short"; then + pthread_t_fmt='#define JK_PTHREAD_T_FMT "hu"' + pthread_t_value="short" +elif test "$ac_cv_sizeof_pthread_t" = "$ac_cv_sizeof_int"; then + pthread_t_fmt='#define JK_PTHREAD_T_FMT "u"' + pthread_t_value="int" +elif test "$ac_cv_sizeof_pthread_t" = "$ac_cv_sizeof_long"; then + pthread_t_fmt='#define JK_PTHREAD_T_FMT "lu"' + pthread_t_value="long" +elif test "$ac_cv_sizeof_pthread_t" = "$ac_cv_sizeof_long_long"; then + pthread_t_fmt='#define JK_PTHREAD_T_FMT "llu"' + pthread_t_value="long long" +else + pthread_t_fmt='#error Can not determine the proper size for pthread_t' +fi + # Basically, we have tried to figure out the correct format strings # for pid_t which varies between platforms, but we don't always get # it right. If you find that we don't get it right for your platform, @@ -109,6 +127,8 @@ AC_SUBST(uint64_t_fmt) AC_SUBST(uint64_t_hex_fmt) AC_SUBST(pid_t_fmt) +AC_SUBST(pthread_t_fmt) +AC_SUBST(pthread_t_value) dnl check for snprintf and vsnprintf. AC_CHECK_FUNC(snprintf, AC_DEFINE(HAVE_SNPRINTF,1,[Have snprintf()]))

14 years, 9 months

1
0
0 / 0

JBoss Native SVN: r2631 - trunk/httpd/httpd-2.2/modules/jk.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-03-17 06:11:00 -0400 (Wed, 17 Mar 2010) New Revision: 2631 Modified: trunk/httpd/httpd-2.2/modules/jk/configure.in Log: Revert previous... Modified: trunk/httpd/httpd-2.2/modules/jk/configure.in =================================================================== --- trunk/httpd/httpd-2.2/modules/jk/configure.in 2010-03-17 10:03:44 UTC (rev 2630) +++ trunk/httpd/httpd-2.2/modules/jk/configure.in 2010-03-17 10:11:00 UTC (rev 2631) @@ -78,16 +78,12 @@ if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then pid_t_fmt='#define JK_PID_T_FMT "hd"' - pthread_t_value="short" elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_int"; then pid_t_fmt='#define JK_PID_T_FMT "d"' - pthread_t_value="int" elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long"; then pid_t_fmt='#define JK_PID_T_FMT "ld"' - pthread_t_value="long" elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long_long"; then pid_t_fmt='#define JK_PID_T_FMT JK_INT64_T_FMT' - pthread_t_value="long long" else pid_t_fmt='#error Can not determine the proper size for pid_t' fi

14 years, 9 months

1
0
0 / 0

JBoss Native SVN: r2630 - trunk/httpd/httpd-2.2/modules/jk.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-03-17 06:03:44 -0400 (Wed, 17 Mar 2010) New Revision: 2630 Modified: trunk/httpd/httpd-2.2/modules/jk/configure.in Log: Needed for 1.3.20. Modified: trunk/httpd/httpd-2.2/modules/jk/configure.in =================================================================== --- trunk/httpd/httpd-2.2/modules/jk/configure.in 2010-03-17 08:38:09 UTC (rev 2629) +++ trunk/httpd/httpd-2.2/modules/jk/configure.in 2010-03-17 10:03:44 UTC (rev 2630) @@ -78,12 +78,16 @@ if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then pid_t_fmt='#define JK_PID_T_FMT "hd"' + pthread_t_value="short" elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_int"; then pid_t_fmt='#define JK_PID_T_FMT "d"' + pthread_t_value="int" elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long"; then pid_t_fmt='#define JK_PID_T_FMT "ld"' + pthread_t_value="long" elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long_long"; then pid_t_fmt='#define JK_PID_T_FMT JK_INT64_T_FMT' + pthread_t_value="long long" else pid_t_fmt='#error Can not determine the proper size for pid_t' fi

14 years, 9 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

14 years, 9 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

14 years, 9 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-03-10 03:45:39 -0500 (Wed, 10 Mar 2010) New Revision: 2627 Modified: trunk/build/patch/httpd-2.2.15.patch Log: Add missing object for the 1.4.x APR version. Modified: trunk/build/patch/httpd-2.2.15.patch =================================================================== --- trunk/build/patch/httpd-2.2.15.patch 2010-03-09 15:25:51 UTC (rev 2626) +++ trunk/build/patch/httpd-2.2.15.patch 2010-03-10 08:45:39 UTC (rev 2627) @@ -28,3 +28,15 @@ } #endif return rv; +--- srclib/apr/NMAKEmakefile (revision 2617) ++++ srclib/apr/NMAKEmakefile (working copy) +@@ -110,7 +110,8 @@ + $(WORKDIR)\time.obj \ + $(WORKDIR)\timestr.obj \ + $(WORKDIR)\groupinfo.obj \ +- $(WORKDIR)\userinfo.obj ++ $(WORKDIR)\userinfo.obj \ ++ $(WORKDIR)\pollset.obj + + !IF EXIST($(SRCDIR)\file_io\win32\buffer.c) + OBJECTS = $(OBJECTS) \

14 years, 9 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2010-03-09 10:25:51 -0500 (Tue, 09 Mar 2010) New Revision: 2626 Modified: trunk/build/patch/httpd-2.2.13.patch Log: Add missing object. Modified: trunk/build/patch/httpd-2.2.13.patch =================================================================== --- trunk/build/patch/httpd-2.2.13.patch 2010-03-09 14:16:27 UTC (rev 2625) +++ trunk/build/patch/httpd-2.2.13.patch 2010-03-09 15:25:51 UTC (rev 2626) @@ -14,4 +14,16 @@ + esac fi ]) + +--- srclib/apr/NMAKEmakefile (revision 2617) ++++ srclib/apr/NMAKEmakefile (working copy) +@@ -110,7 +110,8 @@ + $(WORKDIR)\time.obj \ + $(WORKDIR)\timestr.obj \ + $(WORKDIR)\groupinfo.obj \ +- $(WORKDIR)\userinfo.obj ++ $(WORKDIR)\userinfo.obj \ ++ $(WORKDIR)\pollset.obj + !IF EXIST($(SRCDIR)\file_io\win32\buffer.c) + OBJECTS = $(OBJECTS) \

14 years, 9 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 March 2010