[Libreoffice-commits] .: 7 commits - cppunit/aix.patch cppunit/makefile.mk cppunit/prj external/gcc3_specific libtextcat/libtextcat-aix.patch libtextcat/makefile.mk lpsolve/lp_solve-aix.patch lpsolve/makefile.mk mythes/makefile.mk redland/raptor redland/rasqal redland/redland x11_extensions/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Oct 13 12:32:38 PDT 2010
cppunit/aix.patch | 21 +++++
cppunit/makefile.mk | 4
cppunit/prj/d.lst | 3
external/gcc3_specific/makefile.mk | 14 +++
libtextcat/libtextcat-aix.patch | 86 ++++++++++++++++++++
libtextcat/makefile.mk | 8 +
lpsolve/lp_solve-aix.patch | 39 +++++++++
lpsolve/makefile.mk | 6 +
mythes/makefile.mk | 2
redland/raptor/makefile.mk | 11 ++
redland/raptor/raptor-aix.patch | 21 +++++
redland/rasqal/makefile.mk | 7 +
redland/rasqal/rasqal-aix.patch | 44 ++++++++++
redland/redland/makefile.mk | 7 +
redland/redland/redland-aix.patch | 21 +++++
x11_extensions/inc/shape.h | 155 +++++++++++++++++++++++++++++++++++++
x11_extensions/inc/shapeconst.h | 55 +++++++++++++
17 files changed, 496 insertions(+), 8 deletions(-)
New commits:
commit c42e519e0bfb599cf736454342ff045ceeaf9cb6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 20:11:10 2010 +0100
tweak for AIX
diff --git a/external/gcc3_specific/makefile.mk b/external/gcc3_specific/makefile.mk
index 144a9f8..d285fb3 100644
--- a/external/gcc3_specific/makefile.mk
+++ b/external/gcc3_specific/makefile.mk
@@ -48,6 +48,18 @@ $(MINGWGXXDLL) :
.EXPORT : CC
+.IF "$(OS)"=="AIX"
+
+all .SEQUENTIAL : $(LB)$/libstdc++.a $(LB)$/libgcc_s.a
+
+$(LB)$/libstdc++.a :
+ $(GCCINSTLIB) libstdc++.a $(LB)
+
+$(LB)$/libgcc_s.a :
+ $(GCCINSTLIB) libgcc_s.a $(LB)
+
+.ELSE
+
all .SEQUENTIAL : $(LB)$/libstdc++.so.$(SHORTSTDCPP3) $(LB)$/libgcc_s.so.$(SHORTSTDC3)
@@ -58,6 +70,8 @@ $(LB)$/libgcc_s.so.$(SHORTSTDC3) :
$(GCCINSTLIB) libgcc_s.so.$(SHORTSTDC3) $(LB)
.ENDIF
+
+.ENDIF
.ENDIF
.ENDIF
commit 8ca26c81b5a8cc4d190b3e41cd849f893ebb96a0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 15:42:45 2010 +0100
add these to make life easier on AIX
diff --git a/x11_extensions/inc/shape.h b/x11_extensions/inc/shape.h
new file mode 100644
index 0000000..7992f7a
--- /dev/null
+++ b/x11_extensions/inc/shape.h
@@ -0,0 +1,155 @@
+/* $XFree86: xc/include/extensions/shape.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */
+/************************************************************
+
+Copyright 1989, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+********************************************************/
+
+/* $Xorg: shape.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
+
+#ifndef _SHAPE_H_
+#define _SHAPE_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/shapeconst.h>
+
+#ifndef _SHAPE_SERVER_
+#include <X11/Xutil.h>
+
+typedef struct {
+ int type; /* of event */
+ unsigned long serial; /* # of last request processed by server */
+ Bool send_event; /* true if this came frome a SendEvent request */
+ Display *display; /* Display the event was read from */
+ Window window; /* window of event */
+ int kind; /* ShapeBounding or ShapeClip */
+ int x, y; /* extents of new region */
+ unsigned width, height;
+ Time time; /* server timestamp when region changed */
+ Bool shaped; /* true if the region exists */
+} XShapeEvent;
+
+_XFUNCPROTOBEGIN
+
+extern Bool XShapeQueryExtension (
+ Display* /* display */,
+ int* /* event_base */,
+ int* /* error_base */
+);
+
+extern Status XShapeQueryVersion (
+ Display* /* display */,
+ int* /* major_version */,
+ int* /* minor_version */
+);
+
+extern void XShapeCombineRegion (
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */,
+ Region /* region */,
+ int /* op */
+);
+
+extern void XShapeCombineRectangles (
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */,
+ XRectangle* /* rectangles */,
+ int /* n_rects */,
+ int /* op */,
+ int /* ordering */
+);
+
+extern void XShapeCombineMask (
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */,
+ Pixmap /* src */,
+ int /* op */
+);
+
+extern void XShapeCombineShape (
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */,
+ Window /* src */,
+ int /* src_kind */,
+ int /* op */
+);
+
+extern void XShapeOffsetShape (
+ Display* /* display */,
+ Window /* dest */,
+ int /* dest_kind */,
+ int /* x_off */,
+ int /* y_off */
+);
+
+extern Status XShapeQueryExtents (
+ Display* /* display */,
+ Window /* window */,
+ Bool* /* bounding_shaped */,
+ int* /* x_bounding */,
+ int* /* y_bounding */,
+ unsigned int* /* w_bounding */,
+ unsigned int* /* h_bounding */,
+ Bool* /* clip_shaped */,
+ int* /* x_clip */,
+ int* /* y_clip */,
+ unsigned int* /* w_clip */,
+ unsigned int* /* h_clip */
+);
+
+extern void XShapeSelectInput (
+ Display* /* display */,
+ Window /* window */,
+ unsigned long /* mask */
+);
+
+extern unsigned long XShapeInputSelected (
+ Display* /* display */,
+ Window /* window */
+);
+
+extern XRectangle *XShapeGetRectangles (
+ Display* /* display */,
+ Window /* window */,
+ int /* kind */,
+ int* /* count */,
+ int* /* ordering */
+);
+
+_XFUNCPROTOEND
+
+#endif /* !_SHAPE_SERVER_ */
+
+#endif /* _SHAPE_H_ */
diff --git a/x11_extensions/inc/shapeconst.h b/x11_extensions/inc/shapeconst.h
new file mode 100644
index 0000000..9088956
--- /dev/null
+++ b/x11_extensions/inc/shapeconst.h
@@ -0,0 +1,55 @@
+/************************************************************
+
+Copyright 1989, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+********************************************************/
+
+#ifndef _SHAPECONST_H_
+#define _SHAPECONST_H_
+
+/*
+ * Protocol requests constants and alignment values
+ * These would really be in SHAPE's X.h and Xproto.h equivalents
+ */
+
+#define SHAPENAME "SHAPE"
+
+#define SHAPE_MAJOR_VERSION 1 /* current version numbers */
+#define SHAPE_MINOR_VERSION 1
+
+#define ShapeSet 0
+#define ShapeUnion 1
+#define ShapeIntersect 2
+#define ShapeSubtract 3
+#define ShapeInvert 4
+
+#define ShapeBounding 0
+#define ShapeClip 1
+#define ShapeInput 2
+
+#define ShapeNotifyMask (1L << 0)
+#define ShapeNotify 0
+
+#define ShapeNumberEvents (ShapeNotify + 1)
+
+#endif /* _SHAPECONST_H_ */
commit 1aa2c62bcaeaf4cdfab6f49741ae2f15db74911c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 14:50:45 2010 +0100
update libtooling and config.guess for aix 7
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 62d4f70..c6d8efc 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -57,7 +57,7 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.win32 \
-
+ raptor-aix.patch
PATCH_FILES=$(OOO_PATCH_FILES)
@@ -108,6 +108,10 @@ CFLAGS=-m64
CPPFLAGS+:=-I$(SOLARINCDIR)$/external
LDFLAGS+:=-L$(SOLARLIBDIR)
+.IF "$(OS)"=="AIX"
+LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
+.ENDIF
+
.IF "$(SYSBASE)"!=""
CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
@@ -141,6 +145,9 @@ OUT2INC+=src$/raptor.h
.IF "$(OS)"=="MACOSX"
OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
OUT2BIN+=src/raptor-config
+.ELIF "$(OS)"=="AIX"
+OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
+OUT2BIN+=src/raptor-config
.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
OUT2LIB+=src$/.libs$/*.a
@@ -152,7 +159,7 @@ OUT2BIN+=src/raptor-config
.ELIF "$(GUI)"=="OS2"
# if we use dmake, this is done automagically
.ELSE
-OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
+OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR)
OUT2BIN+=src/raptor-config
.ENDIF
diff --git a/redland/raptor/raptor-aix.patch b/redland/raptor/raptor-aix.patch
new file mode 100644
index 0000000..d6427c5
--- /dev/null
+++ b/redland/raptor/raptor-aix.patch
@@ -0,0 +1,21 @@
+--- misc/raptor-1.4.18/config.guess 2010-09-16 03:07:14.000000000 -0500
++++ misc/build/raptor-1.4.18/config.guess 2010-09-16 03:08:00.000000000 -0500
+@@ -532,7 +532,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -544,6 +544,9 @@
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
++ if [ "$IBM_REV" == "V7BETA" ]; then
++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:*:*)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index efe099c..9066b01 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -56,7 +56,8 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.autotools \
$(TARFILE_NAME).patch.ooo_build \
$(TARFILE_NAME).patch.dmake \
- $(TARFILE_NAME).patch.win32
+ $(TARFILE_NAME).patch.win32 \
+ rasqal-aix.patch
PATCH_FILES=$(OOO_PATCH_FILES)
@@ -104,6 +105,10 @@ CFLAGS=-m64
CPPFLAGS+:=-I$(SOLARINCDIR)$/external
LDFLAGS+:=-L$(SOLARLIBDIR)
+.IF "$(OS)"=="AIX"
+LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
+.ENDIF
+
.IF "$(SYSBASE)"!=""
CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
diff --git a/redland/rasqal/rasqal-aix.patch b/redland/rasqal/rasqal-aix.patch
new file mode 100644
index 0000000..86470d4
--- /dev/null
+++ b/redland/rasqal/rasqal-aix.patch
@@ -0,0 +1,44 @@
+--- misc/rasqal-0.9.16/config.guess 2010-09-16 03:13:19.000000000 -0500
++++ misc/build/rasqal-0.9.16/config.guess 2010-09-16 03:15:05.000000000 -0500
+@@ -532,7 +532,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -544,6 +544,9 @@
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
++ if [ "$IBM_REV" == "V7BETA" ]; then
++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:*:*)
+--- misc/rasqal-0.9.16/src/rasqal_literal.c 2010-09-09 14:53:30.000000000 -0500
++++ misc/build/rasqal-0.9.16/src/rasqal_literal.c 2010-09-09 14:54:47.000000000 -0500
+@@ -36,8 +36,20 @@
+ #include <stdlib.h>
+ #endif
+ #include <stdarg.h>
++#ifdef _AIX
++# ifndef isnan
++# define isnan(x) \
++ (sizeof (x) == sizeof (long double) ? isnan_ld (x) \
++ : sizeof (x) == sizeof (double) ? isnan_d (x) \
++ : isnan_f (x))
++ static inline int isnan_f (float x) { return x != x; }
++ static inline int isnan_d (double x) { return x != x; }
++ static inline int isnan_ld (long double x) { return x != x; }
++# endif
++#else
+ /* for isnan() */
+ #include <math.h>
++#endif
+
+ #ifdef RASQAL_REGEX_PCRE
+ #include <pcre.h>
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 3db7c05..d7b8002 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -56,7 +56,8 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.autotools \
$(TARFILE_NAME).patch.dmake \
$(TARFILE_NAME).patch.ooo_build \
- $(TARFILE_NAME).patch.win32
+ $(TARFILE_NAME).patch.win32 \
+ redland-aix.patch
PATCH_FILES=$(OOO_PATCH_FILES) \
@@ -104,6 +105,10 @@ CFLAGS=-m64
CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external
LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR)
+.IF "$(OS)"=="AIX"
+LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
+.ENDIF
+
.IF "$(SYSBASE)"!=""
CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
diff --git a/redland/redland/redland-aix.patch b/redland/redland/redland-aix.patch
new file mode 100644
index 0000000..20d52e4
--- /dev/null
+++ b/redland/redland/redland-aix.patch
@@ -0,0 +1,21 @@
+--- misc/redland-1.0.8/config.guess 2010-09-16 03:21:03.000000000 -0500
++++ misc/build/redland-1.0.8/config.guess 2010-09-16 03:22:33.000000000 -0500
+@@ -532,7 +532,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -544,6 +544,9 @@
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
++ if [ "$IBM_REV" == "V7BETA" ]; then
++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:*:*)
commit 5c84dfdf8f6bfb2b80d4dcf8ff00d095be793e4b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 14:31:58 2010 +0100
adjust for AIX
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index f373a5d..b1667c3 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -61,6 +61,8 @@ CONFIGURE_FLAGS= --disable-shared --with-pic
.IF "$(COM)"=="C52" && "$(CPU)"=="U"
LCL_CONFIGURE_CFLAGS+=-m64
+.ELIF "$(OS)"=="AIX"
+LCL_CONFIGURE_CFLAG+=-D_LINUX_SOURCE_COMPAT
.ENDIF
.IF "$(SYSBASE)"!=""
commit b48cddd652d7e952c89a172932abbff3bb994cc3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 13:47:39 2010 +0100
update libtooling and config.guess for aix 7
diff --git a/lpsolve/lp_solve-aix.patch b/lpsolve/lp_solve-aix.patch
new file mode 100644
index 0000000..6ad5877
--- /dev/null
+++ b/lpsolve/lp_solve-aix.patch
@@ -0,0 +1,39 @@
+--- /dev/null 2010-07-28 04:47:47.000000000 -0500
++++ misc/build/lp_solve_5.5/lpsolve55/ccc.aix.gcc 2010-06-29 17:44:53.000000000 -0500
+@@ -0,0 +1,25 @@
++src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
++c=$CC
++
++def=
++so=
++if [ "$PLATFORM" = "SCO_UNIX" ]
++then def='-dy -K PIC -DNOLONGLONG'
++ dl=-lc
++else dl=-ldl
++ so=y
++fi
++
++opts='-O3'
++
++$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++ranlib liblpsolve55.a
++
++if [ "$so" != "" ]
++then
++ $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++ $c -shared $lpsolve_LDFLAGS -o liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
++fi
++
++rm *.o 2>/dev/null
+--- misc/lp_solve_5.5/lp_lib.h 2010-07-28 05:15:10.000000000 -0500
++++ misc/build/lp_solve_5.5/lp_lib.h 2010-07-28 05:15:55.000000000 -0500
+@@ -56,7 +56,7 @@
+ /* Define user program feature option switches */
+ /* ------------------------------------------------------------------------- */
+
+-#if !defined _WINDOWS && !defined _WIN32 && !defined WIN32
++#if !defined _WINDOWS && !defined _WIN32 && !defined WIN32 && !defined(_AIX)
+ # define _isnan(x) FALSE
+ #endif
+
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index 3e66303..5261bc9 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -42,7 +42,9 @@ TARFILE_MD5=26b3e95ddf3d9c077c480ea45874b3b8
.IF "$(GUI)"=="WNT"
PATCH_FILES=lp_solve_5.5-windows.patch
.ELSE
-PATCH_FILES=lp_solve_5.5.patch
+PATCH_FILES=\
+ lp_solve_5.5.patch \
+ lp_solve-aix.patch
ADDITIONAL_FILES=lpsolve55$/ccc.solaris lpsolve55$/ccc.os2
.ENDIF
@@ -76,6 +78,8 @@ OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dylib
.ELSE
.IF "$(COMNAME)"=="sunpro5"
BUILD_ACTION=sh ccc.solaris
+.ELIF "$(OS)$(COM)"=="AIXGCC"
+BUILD_ACTION=lpsolve_LDFLAGS="$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)" sh ccc.aix.gcc
.ELSE
BUILD_ACTION=sh ccc
.ENDIF
commit 151e28ec5ea9a02fe1c1638dee34ce5748221a63
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 13:44:25 2010 +0100
update libtooling and config.guess for aix 7
diff --git a/libtextcat/libtextcat-aix.patch b/libtextcat/libtextcat-aix.patch
new file mode 100644
index 0000000..26fb48c
--- /dev/null
+++ b/libtextcat/libtextcat-aix.patch
@@ -0,0 +1,86 @@
+--- misc/libtextcat-2.2/config.guess 2010-09-10 03:09:48.000000000 -0500
++++ misc/build/libtextcat-2.2/config.guess 2010-09-10 03:20:55.000000000 -0500
+@@ -548,7 +548,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -560,6 +560,9 @@
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
++ if [ "$IBM_REV" == "V7BETA" ]; then
++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:*:*)
+--- misc/libtextcat-2.2/configure 2010-09-10 03:45:41.000000000 -0500
++++ misc/build/libtextcat-2.2/configure 2010-09-10 03:48:35.000000000 -0500
+@@ -3371,7 +3371,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -4944,7 +4944,7 @@
+ else
+ # PORTME Check for PIC flags for the system compiler.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix*)
+ lt_cv_prog_cc_wl='-Wl,'
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+@@ -5448,7 +5448,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX, the GNU linker is very broken
+ # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
+ ld_shlibs=no
+@@ -5650,7 +5650,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -5663,7 +5663,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -6157,7 +6157,7 @@
+ soname_spec='${libname}${release}.so$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -6563,7 +6563,7 @@
+ fi
+ ;;
+
+-aix4*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 661a49c..526c23c 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -46,8 +46,9 @@ TARFILE_NAME=libtextcat-2.2
TARFILE_MD5=128cfc86ed5953e57fe0f5ae98b62c2e
TARFILE_ROOTDIR=libtextcat-2.2
-PATCH_FILES=libtextcat-2.2.patch
-
+PATCH_FILES=\
+ libtextcat-2.2.patch \
+ libtextcat-aix.patch
ADDITIONAL_FILES= \
src$/utf8misc.h \
@@ -62,6 +63,9 @@ ADDITIONAL_FILES= \
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
+.IF "$(OS)"=="AIX"
+CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
+.ENDIF
BUILD_ACTION=make
commit 2c85ae1ae3c791ea3eecfb9428e381887dc0a171
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 13:13:31 2010 +0100
update libtooling and config.guess for aix 7
diff --git a/cppunit/aix.patch b/cppunit/aix.patch
new file mode 100644
index 0000000..2bc78f3
--- /dev/null
+++ b/cppunit/aix.patch
@@ -0,0 +1,21 @@
+--- misc/cppunit-1.12.1.orig/config/config.guess 2010-09-15 10:25:54.000000000 -0500
++++ misc/build/cppunit-1.12.1/config/config.guess 2010-09-15 10:26:50.000000000 -0500
+@@ -532,7 +532,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -544,6 +544,9 @@
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
++ if [ "$IBM_REV" == "V7BETA" ]; then
++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit ;;
+ *:AIX:*:*)
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 7da32f7..50d4893 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19
# from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
# cppunit-1.12.1.tar.gz/download>
-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch
+PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch
# solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
# aid=2912590&group_id=11795&atid=311795>
# warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
@@ -181,6 +181,8 @@ OUT2BIN = ooo-install/bin/DllPlugInTester
.IF "$(OS)" == "MACOSX"
OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib
EXTRPATH = NONE
+.ELIF "$(OS)" == "AIX"
+OUT2LIB = ooo-install/lib/libcppunit-1.12.a
.ELSE
OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1
.END
diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst
index 6ecac46..e881e4a 100644
--- a/cppunit/prj/d.lst
+++ b/cppunit/prj/d.lst
@@ -24,6 +24,9 @@ symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.
..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1
symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so
+..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit-1.12.a
+symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit.a
+
..\%__SRC%\bin\DllPlugInTester %_DEST%\bin%_EXT%\DllPlugInTester
..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin%_EXT%\DllPlugInTester.exe
..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin%_EXT%\DllPlugInTester_dll.exe
More information about the Libreoffice-commits
mailing list