[ooo-build-commit] .: 2 commits - patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Tue Jun 22 00:16:50 PDT 2010
patches/dev300/apply | 5
patches/dev300/cws-systemlibc.diff | 457 +++++++++++++++++--------------------
2 files changed, 216 insertions(+), 246 deletions(-)
New commits:
commit 817fc0ceb9b675f0f280d580e544d07b82a038ab
Author: Rene Engelhard <rene at debian.org>
Date: Tue Jun 22 03:11:16 2010 +0200
update cws systemlibc with integrated version
* patches/dev300/apply:
* patches/dev300/cws-systemlibc.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 717653f..863be79 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1358,7 +1358,7 @@ vcl-bitmap2-negative-height.diff
[ SystemBits ]
fix-system-mythes-for-mythes-1.2.diff
-[ SystemBits and not Win32Only and not MacOSXOnly < dev300-m84 ]
+[ SystemBits < dev300-m84 ]
# use getopt() and readdir_r() from system glibc
cws-systemlibc.diff, i#69033, rengelha
diff --git a/patches/dev300/cws-systemlibc.diff b/patches/dev300/cws-systemlibc.diff
index 626ba43..55f81a0 100644
--- a/patches/dev300/cws-systemlibc.diff
+++ b/patches/dev300/cws-systemlibc.diff
@@ -1,50 +1,29 @@
----
- configure.in | 15 ++++++
- external/glibc-2.1.3.patch | 11 ++++-
- external/glibc/makefile.mk | 10 ++++-
- idlc/source/preproc/getopt.c | 94 ---------------------------------------
- idlc/source/preproc/makefile.mk | 1 -
- idlc/source/preproc/nlist.c | 3 -
- idlc/source/preproc/unix.c | 6 +--
- set_soenv.in | 3 +
- soltools/cpp/_getopt.c | 71 -----------------------------
- soltools/cpp/_nlist.c | 3 -
- soltools/cpp/_unix.c | 6 +--
- soltools/cpp/makefile.mk | 1 -
- soltools/javadep/javadep.c | 48 +-------------------
- tools/bootstrp/rscdep.cxx | 49 +--------------------
- 14 files changed, 42 insertions(+), 279 deletions(-)
- delete mode 100644 idlc/source/preproc/getopt.c
- delete mode 100644 soltools/cpp/_getopt.c
-
-diff --git configure.in configure.in
-index 17d5b1e..12fbec8 100644
+diff --git a/configure.in b/configure.in
--- configure.in
+++ configure.in
-@@ -5291,6 +5291,21 @@ if test "$_os" = "Linux"; then
+@@ -5134,6 +5134,21 @@
fi
fi
-+if test "$_os" != "WINNT"; then
++if test "$_os" != "WNT"; then
+ AC_CHECK_FUNCS(getopt, HAVE_GETOPT=YES, [HAVE_GETOPT=NO])
+ AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
+ if test "$HAVE_GETOPT" = "YES" -a "$HAVE_READDIR_R" = "YES"; then
-+ SYSTEM_GLIBC=YES
++ SYSTEM_LIBC=YES
+ fi
+else
+ HAVE_GETOPT=NO
+ HAVE_READDIR_R=NO
-+ SYSTEM_GLIBC=NO
++ SYSTEM_LIBC=YES
+fi
+AC_SUBST(HAVE_GETOPT)
+AC_SUBST(HAVE_READDIR_R)
-+AC_SUBST(SYSTEM_GLIBC)
++AC_SUBST(SYSTEM_LIBC)
+
dnl =========================================
dnl Check for the Microsoft Platform SDK.
dnl =========================================
-diff --git external/glibc-2.1.3.patch external/glibc-2.1.3.patch
-index 57aae6a..a9c7e7b 100644
+diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
--- external/glibc-2.1.3.patch
+++ external/glibc-2.1.3.patch
@@ -76,7 +76,7 @@
@@ -52,7 +31,7 @@ index 57aae6a..a9c7e7b 100644
--- misc/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:50 2008
+++ misc/build/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:38 2008
-@@ -1 +1,63 @@
-+@@ -1 +1,69 @@
++@@ -1 +1,70 @@
-dummy
+#*************************************************************************
+#
@@ -70,7 +49,7 @@ index 57aae6a..a9c7e7b 100644
++.ENDIF
+
-+.IF "$(OS)"=="NETBSD"
-++.IF "$(HAVE_READDIR_R)" != "YES"
+++.IF "$(HAVE_READDIR_R)" != "YES" && "$(OS)" != "WNT"
+TARGET2=gnu_readdir_r
+OBJFILES+= $(OBJ)$/readdir_r.obj
+LIB2TARGET=$(SLB)$/$(TARGET2).lib
@@ -86,11 +65,10 @@ index 57aae6a..a9c7e7b 100644
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
-diff --git external/glibc/makefile.mk external/glibc/makefile.mk
-index cf45165..fb8e530 100644
+diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
--- external/glibc/makefile.mk
+++ external/glibc/makefile.mk
-@@ -36,10 +36,14 @@ TARGET=getopt
+@@ -36,10 +36,14 @@
# --- Files --------------------------------------------------------
@@ -106,20 +84,36 @@ index cf45165..fb8e530 100644
PATCH_FILES=$(PRJ)$/glibc-2.1.3.patch
-@@ -48,6 +52,10 @@ CONFIGURE_ACTION=
-
+@@ -49,6 +53,15 @@
BUILD_DIR=posix
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+
++OUT2INC= \
++ posix/getopt.h \
++ posix/config.h
++
+.ELSE
+ at all:
+ @echo "Nothing to do here."
+.ENDIF
-
++
# --- Targets ------------------------------------------------------
-diff --git idlc/source/preproc/getopt.c idlc/source/preproc/getopt.c
+ .INCLUDE : set_ext.mk
+diff --git a/external/prj/d.lst b/external/prj/d.lst
+--- external/prj/d.lst
++++ external/prj/d.lst
+@@ -12,6 +12,8 @@
+ ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
+ ..\%__SRC%\lib\libgnu_getopt_static.a %_DEST%\lib%_EXT%\libgnu_getopt_static.a
+
++..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\glibc\*.h
++
+ ..\%__SRC%\misc\mingw\include\*.h %_DEST%\inc%_EXT%\external\mingw\include\*
+ ..\%__SRC%\misc\mingw\include\atl\*.h %_DEST%\inc%_EXT%\external\mingw\include\atl\*
+ ..\%__SRC%\misc\mingw\include\sys\*.h %_DEST%\inc%_EXT%\external\mingw\include\sys\*
+diff --git a/idlc/source/preproc/getopt.c b/idlc/source/preproc/getopt.c
deleted file mode 100644
-index a8ee22a..0000000
--- idlc/source/preproc/getopt.c
+++ /dev/null
@@ -1,94 +0,0 @@
@@ -217,20 +211,31 @@ index a8ee22a..0000000
- }
- return c;
-}
-diff --git idlc/source/preproc/makefile.mk idlc/source/preproc/makefile.mk
-index 7347f81..f65f37e 100644
+diff --git a/idlc/source/preproc/makefile.mk b/idlc/source/preproc/makefile.mk
--- idlc/source/preproc/makefile.mk
+++ idlc/source/preproc/makefile.mk
-@@ -43,7 +43,6 @@ LIBSALCPPRT=$(0)
+@@ -43,7 +43,6 @@
OBJFILES= \
- $(OBJ)$/cpp.obj \
- $(OBJ)$/eval.obj \
-- $(OBJ)$/getopt.obj \
- $(OBJ)$/include.obj \
- $(OBJ)$/lex.obj \
- $(OBJ)$/macro.obj \
-diff --git idlc/source/preproc/nlist.c idlc/source/preproc/nlist.c
-index e1b3089..1fde3ce 100644
+ $(OBJ)$/cpp.obj \
+ $(OBJ)$/eval.obj \
+- $(OBJ)$/getopt.obj \
+ $(OBJ)$/include.obj \
+ $(OBJ)$/lex.obj \
+ $(OBJ)$/macro.obj \
+@@ -64,6 +63,12 @@
+
+ APP1LIBS= $(LB)$/idlcpp.lib
+
++.IF "$(HAVE_GETOPT)" != "YES"
++.IF "$(GUI)" == "WNT"
++APP1STDLIBS=gnu_getopt.lib
++.ENDIF
++.ENDIF
++
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
+diff --git a/idlc/source/preproc/nlist.c b/idlc/source/preproc/nlist.c
--- idlc/source/preproc/nlist.c
+++ idlc/source/preproc/nlist.c
@@ -29,9 +29,6 @@
@@ -243,11 +248,17 @@ index e1b3089..1fde3ce 100644
extern int Cplusplus;
Nlist *kwdefined;
char wd[128];
-diff --git idlc/source/preproc/unix.c idlc/source/preproc/unix.c
-index fae4359..215161e 100644
+diff --git a/idlc/source/preproc/unix.c b/idlc/source/preproc/unix.c
--- idlc/source/preproc/unix.c
+++ idlc/source/preproc/unix.c
-@@ -39,9 +39,7 @@
+@@ -33,15 +33,14 @@
+ #if (defined(_WIN32) || defined(_MSDOS) || defined(__IBMC__))
+ #include <io.h>
+ #include <sys/stat.h>
++#include <external/glibc/getopt.h>
+ #else
+ #include <unistd.h>
+ #endif
#include "cpp.h"
@@ -258,7 +269,7 @@ index fae4359..215161e 100644
int Pflag = 0; /* print no line information */
int Iflag = 0; /* print includes */
-@@ -62,7 +60,7 @@ void
+@@ -62,7 +61,7 @@
Tokenrow tr;
setup_kwtab();
@@ -267,99 +278,20 @@ index fae4359..215161e 100644
switch (c)
{
case 'N':
-diff --git set_soenv.in set_soenv.in
-index 4f05db1..51ca48d 100644
+diff --git a/set_soenv.in b/set_soenv.in
--- set_soenv.in
+++ set_soenv.in
-@@ -1932,6 +1932,9 @@ ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
+@@ -1875,6 +1875,9 @@
ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
ToFile( "SYSTEM_LPSOLVE", "@SYSTEM_LPSOLVE@", "e" );
+ToFile( "HAVE_GETOPT", "@HAVE_GETOPT@", "e" );
+ToFile( "HAVE_READDIR_R", "@HAVE_READDIR_R@", "e" );
-+ToFile( "SYSTEM_GLIBC", "@SYSTEM_GLIBC@", "e" );
++ToFile( "SYSTEM_LIBC", "@SYSTEM_LIBC@", "e" );
ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );
ToFile( "HYPHEN_LIB", "@HYPHEN_LIB@", "e" );
ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
-diff --git soltools/cpp/_getopt.c soltools/cpp/_getopt.c
-deleted file mode 100644
-index 3b1b183..0000000
---- soltools/cpp/_getopt.c
-+++ /dev/null
-@@ -1,71 +0,0 @@
--#include <stdio.h>
--#include <string.h>
--
--#define EPR fprintf(stderr,
--#define ERR(str, chr) if(opterr) { EPR "%s%c\n", str, chr); }
--
--int opterr = 1;
--int optind = 1;
--int optopt;
--char *optarg;
--
--int
-- stgetopt(int argc, char *const argv[], const char *opts)
--{
-- static int sp = 1;
-- register int c;
-- register char *cp;
--
-- if (sp == 1)
-- {
-- if (optind >= argc ||
-- argv[optind][0] != '-' || argv[optind][1] == '\0')
-- return -1;
-- else if (strcmp(argv[optind], "--") == 0)
-- {
-- optind++;
-- return -1;
-- }
-- else if (strcmp(argv[optind], "-isysroot") == 0)
-- {
-- // skip Mac OS X SDK selection flags
-- optind++; optind++;
-- }
-- }
-- optopt = c = argv[optind][sp];
-- if (c == ':' || (cp = strchr(opts, c)) == 0)
-- {
-- ERR(": illegal option -- ", c);
-- if (argv[optind][++sp] == '\0')
-- {
-- optind++;
-- sp = 1;
-- }
-- return '?';
-- }
-- if (*++cp == ':')
-- {
-- if (argv[optind][sp + 1] != '\0')
-- optarg = &argv[optind++][sp + 1];
-- else
-- if (++optind >= argc)
-- {
-- ERR(": option requires an argument -- ", c);
-- sp = 1;
-- return '?';
-- }
-- else
-- optarg = argv[optind++];
-- sp = 1;
-- }
-- else
-- {
-- if (argv[optind][++sp] == '\0')
-- {
-- sp = 1;
-- optind++;
-- }
-- optarg = 0;
-- }
-- return c;
--}
-diff --git soltools/cpp/_nlist.c soltools/cpp/_nlist.c
-index 38b8c7a..edef14b 100644
+diff --git a/soltools/cpp/_nlist.c b/soltools/cpp/_nlist.c
--- soltools/cpp/_nlist.c
+++ soltools/cpp/_nlist.c
@@ -3,9 +3,6 @@
@@ -372,120 +304,160 @@ index 38b8c7a..edef14b 100644
extern int Cplusplus;
Nlist *kwdefined;
char wd[128];
-diff --git soltools/cpp/_unix.c soltools/cpp/_unix.c
-index 627a29f..7c7df2a 100644
+diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c
--- soltools/cpp/_unix.c
+++ soltools/cpp/_unix.c
-@@ -12,9 +12,7 @@
+@@ -12,9 +12,15 @@
#include "cpp.h"
--extern int stgetopt(int, char *const *, const char *);
++#if defined MACOSX || !defined HAVE_GETOPT
+ extern int stgetopt(int, char *const *, const char *);
-extern char *optarg, rcsid[];
--extern int optind;
++extern char *optarg;
+ extern int optind;
++#else
++#include <getopt.h>
++#endif
++
+extern char rcsid[];
int Pflag = 0; /* print no line information */
int Iflag = 0; /* print includes */
-@@ -36,7 +34,7 @@ void
+@@ -36,7 +42,11 @@
Tokenrow tr;
setup_kwtab();
-- while ((c = stgetopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
++#if defined MACOSX || !defined HAVE_GETOPT
+ while ((c = stgetopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
++#else
+ while ((c = getopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
++#endif
switch (c)
{
case 'N':
-diff --git soltools/cpp/makefile.mk soltools/cpp/makefile.mk
-index 818c270..5143e01 100644
+diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
--- soltools/cpp/makefile.mk
+++ soltools/cpp/makefile.mk
-@@ -45,7 +45,6 @@ LIBSALCPPRT=$(0)
+@@ -45,7 +45,6 @@
OBJFILES= \
- $(OBJ)$/_cpp.obj \
- $(OBJ)$/_eval.obj \
-- $(OBJ)$/_getopt.obj \
- $(OBJ)$/_include.obj \
- $(OBJ)$/_lex.obj \
- $(OBJ)$/_macro.obj \
-diff --git soltools/javadep/javadep.c soltools/javadep/javadep.c
-index 6e61a33..6c43ef3 100644
+ $(OBJ)$/_cpp.obj \
+ $(OBJ)$/_eval.obj \
+- $(OBJ)$/_getopt.obj \
+ $(OBJ)$/_include.obj \
+ $(OBJ)$/_lex.obj \
+ $(OBJ)$/_macro.obj \
+@@ -54,6 +53,15 @@
+ $(OBJ)$/_tokens.obj \
+ $(OBJ)$/_unix.obj
+
++# nonstandard cpp options needed for Mac (-isysroot),
++# needs the custom stgetopt defined here :/
++.IF "$(OS)" == "MACOSX" || "$(HAVE_GETOPT)" == "NO"
++OBJFILES += $(OBJ)$/_getopt.obj
++.ENDIF
++.IF "$(HAVE_GETOPT)" == "YES"
++CDEFS += -DHAVE_GETOPT
++.ENDIF
++
+ APP1TARGET = $(TARGET)
+ .IF "$(GUI)" != "OS2"
+ APP1STACK = 1000000
+diff --git a/soltools/javadep/javadep.c b/soltools/javadep/javadep.c
--- soltools/javadep/javadep.c
+++ soltools/javadep/javadep.c
-@@ -138,13 +138,6 @@ void usage(void);
+@@ -138,12 +138,14 @@
void err_quit(const char *, ...);
void silent_quit(void);
--/* poor man's getopt() */
--int simple_getopt(char *pargv[], const char *poptstring);
--char *optarg = NULL;
--int optind = 1;
--int optopt = 0;
--int opterr = 0;
--
++#ifdef WNT
+ /* poor man's getopt() */
+ int simple_getopt(char *pargv[], const char *poptstring);
+ char *optarg = NULL;
+ int optind = 1;
+ int optopt = 0;
+ int opterr = 0;
++#endif
+
uint8
read_uint8(const file_t *pfile)
- {
-@@ -731,45 +724,6 @@ usage()
- pprogname);
+@@ -748,7 +750,7 @@
+ char *popt;
+ int c = parg[1];
+ if ( (popt = strchr(poptstring, c)) == NULL ) {
+- optopt = c;
++ optopt = c;
+ if ( opterr )
+ fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
+ return '?';
+@@ -769,7 +771,6 @@
+ return -1;
}
--/* my very simple minded implementation of getopt()
-- * it's to sad that getopt() is not available everywhere
-- * note: this is not a full POSIX conforming getopt()
-- */
--int simple_getopt(char *pargv[], const char *poptstring)
--{
-- char *parg = pargv[optind];
--
-- /* skip all response file arguments */
-- if ( parg ) {
-- while ( *parg == '@' )
-- parg = pargv[++optind];
--
-- if ( parg[0] == '-' && parg[1] != '\0' ) {
-- char *popt;
-- int c = parg[1];
-- if ( (popt = strchr(poptstring, c)) == NULL ) {
-- optopt = c;
-- if ( opterr )
-- fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
-- return '?';
-- }
-- if ( *(++popt) == ':') {
-- if ( parg[2] != '\0' ) {
-- optarg = ++parg;
-- } else {
-- optarg = pargv[++optind];
-- }
-- } else {
-- optarg = NULL;
-- }
-- ++optind;
-- return c;
-- }
-- }
-- return -1;
--}
--
-
int CDECL
main(int argc, char *argv[])
{
-@@ -817,7 +771,7 @@ main(int argc, char *argv[])
+@@ -817,7 +818,11 @@
opterr = 0;
pincs = allocate_growable();
- while( (c = simple_getopt(pall_argv, ":i:I:s:S:o:OhHvV")) != -1 ) {
++#ifdef WNT
++ while( (c = simple_getopt(pall_argv, ":i:I:s:S:o:OhHvV")) != -1 ) {
++#else
+ while( (c = getopt(nall_argc, pall_argv, ":i:I:s:S:o:OhHvV")) != -1 ) {
++#endif
switch(c) {
case 'i':
case 'I':
-diff --git tools/bootstrp/rscdep.cxx tools/bootstrp/rscdep.cxx
-index 612b854..eb6ff84 100644
+diff --git a/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
+--- tools/bootstrp/makefile.mk
++++ tools/bootstrp/makefile.mk
+@@ -38,6 +38,10 @@
+
+ CDEFS+=-D_TOOLS_STRINGLIST
+
++.IF "$(HAVE_GETOPT)" == "YES"
++CDEFS += -DHAVE_GETOPT
++.ENDIF
++
+ # --- Files --------------------------------------------------------
+
+ OBJFILES= \
+@@ -83,6 +87,11 @@
+ APP2OBJS= $(OBJ)$/rscdep.obj
+ APP2LIBS= $(LB)$/$(TARGET).lib $(LB)$/$(TARGET1).lib
+ APP2STDLIBS= $(SALLIB) $(VOSLIB) $(TOOLSLIB) $(BASEGFXLIB) $(UCBHELPERLIB) $(CPPULIB) $(COMPHELPERLIB) $(I18NISOLANGLIB) $(CPPUHELPERLIB) $(SALHELPERLIB)
++.IF "$(HAVE_GETOPT)" != "YES"
++.IF "$(OS)"=="WNT"
++APP2STDLIBS+=gnu_getopt.lib
++.ENDIF
++.ENDIF
+ APP2RPATH= NONE
+ APP2RPATH= NONE
+ APP2RPATH= NONE
+diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
--- tools/bootstrp/rscdep.cxx
+++ tools/bootstrp/rscdep.cxx
-@@ -70,15 +70,6 @@ void RscHrcDep::Execute()
+@@ -45,6 +45,16 @@
+
+ #include "cppdep.hxx"
+
++#if defined WNT
++#if !defined HAVE_GETOPT
++#define __STDC__ 1
++#define __GNU_LIBRARY__
++#include <external/glibc/getopt.h>
++#else
++#include <getopt.h>
++#endif
++#endif
++
+ class RscHrcDep : public CppDep
+ {
+ public:
+@@ -70,15 +80,6 @@
//static String aDelim;
@@ -500,18 +472,18 @@ index 612b854..eb6ff84 100644
-
SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
{
- int c;
-@@ -179,7 +170,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
+ int c;
+@@ -179,7 +180,7 @@
- while( 1 )
- {
-- c = simple_getopt( argv,
+ while( 1 )
+ {
+- c = simple_getopt( argv,
+ c = getopt( argc, argv,
- "_abcdefghi:jklmnopqrstuvwxyzABCDEFGHI:JKLMNOPQRSTUVWXYZ1234567890/-+=.\\()\"");
- if ( c == -1 )
- break;
-@@ -296,41 +287,3 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
- return 0;
+ "_abcdefghi:jklmnopqrstuvwxyzABCDEFGHI:JKLMNOPQRSTUVWXYZ1234567890/-+=.\\()\"");
+ if ( c == -1 )
+ break;
+@@ -296,41 +297,3 @@
+ return 0;
}
-/* my very simple minded implementation of getopt()
@@ -524,34 +496,31 @@ index 612b854..eb6ff84 100644
-
- /* skip all response file arguments */
- if ( arg ) {
-- while ( *arg == '@' )
-- arg = argv[++optind];
+- while ( *arg == '@' )
+- arg = argv[++optind];
-
-- if ( arg[0] == '-' && arg[1] != '\0' ) {
-- const char *popt;
-- int c = arg[1];
-- if ( (popt = strchr(optstring, c)) == NULL ) {
-- optopt = c;
-- if ( opterr )
-- fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
-- return '?';
-- }
-- if ( *(++popt) == ':') {
-- if ( arg[2] != '\0' ) {
-- optarg = ++arg;
-- } else {
-- optarg = argv[++optind];
-- }
-- } else {
-- optarg = NULL;
-- }
-- ++optind;
-- return c;
-- }
-- }
+- if ( arg[0] == '-' && arg[1] != '\0' ) {
+- const char *popt;
+- int c = arg[1];
+- if ( (popt = strchr(optstring, c)) == NULL ) {
+- optopt = c;
+- if ( opterr )
+- fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
+- return '?';
+- }
+- if ( *(++popt) == ':') {
+- if ( arg[2] != '\0' ) {
+- optarg = ++arg;
+- } else {
+- optarg = argv[++optind];
+- }
+- } else {
+- optarg = NULL;
+- }
+- ++optind;
+- return c;
+- }
+- }
- return -1;
-}
-
---
-1.7.0.1
-
commit b8d3b74b14cd99e2b4cd779b72e12fdae6fab50b
Author: Rene Engelhard <rene at debian.org>
Date: Mon Jun 21 23:49:55 2010 +0200
calctabcolor and systemlibc are in m84
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b9a5e8b..717653f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -179,7 +179,7 @@ helpcontent-scalc-01.diff, kohei
[ LocalizeFixes ]
# FIXME dev300-m77 helpcontent-scalc-01-localize.diff, kohei
-[ CWSBackports ]
+[ CWSBackports < dev300-m84 ]
# calctabcolor cws (tab color feature by Daniel Watson)
cws-calctabcolor-accessibility.diff, kohei
cws-calctabcolor-filter.diff, kohei
@@ -191,6 +191,7 @@ cws-calctabcolor-svtools.diff, kohei
cws-calctabcolor-tools.diff, kohei
cws-calctabcolor-xmloff.diff, kohei
+[ CWSBackports ]
# row limit increase perf cws
cws-koheirowlimitperf-mdds.diff, kohei
cws-koheirowlimitperf-sc.diff, kohei
@@ -1357,7 +1358,7 @@ vcl-bitmap2-negative-height.diff
[ SystemBits ]
fix-system-mythes-for-mythes-1.2.diff
-[ SystemBits and not Win32Only ]
+[ SystemBits and not Win32Only and not MacOSXOnly < dev300-m84 ]
# use getopt() and readdir_r() from system glibc
cws-systemlibc.diff, i#69033, rengelha
More information about the ooo-build-commit
mailing list