[packages/libreoffice.git] / openoffice-system-getopt.patch

--- oo_1.0_src/tools/bootstrp/addexes/makefile.mk.systemgo	Sun Jun  2 19:50:01 2002
+++ oo_1.0_src/tools/bootstrp/addexes/makefile.mk	Sun Jun  2 19:50:11 2002
@@ -98,7 +98,6 @@
 #APP3TARGET=	ldump
 APP3STACK=	16000
 APP3OBJS=   $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
-APP3STDLIBS=gnu_getopt.lib
 APP3DEPN=   $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
 
 #APP4TARGET=	readmap
--- oo_1.0_src/tools/bootstrp/cprjexe.cxx.systemgo	Fri Oct 20 17:02:47 2000
+++ oo_1.0_src/tools/bootstrp/cprjexe.cxx	Sun Jun  2 19:29:10 2002
@@ -62,23 +62,23 @@
 #ifdef WNT
 #define __STDC__ 1
 #ifdef BOOTSTRAPPER
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #else
-#include <glibc/getopt.h>
+#include <getopt.h>
 #endif
 #endif
 #ifdef UNX
 #ifdef BOOTSTRAPPER
 #ifndef SOLARIS
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #endif
 #ifdef MACOSX
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #endif
 #else
-#include <glibc/config.h>
+// #include <config.h>
 #ifndef SOLARIS
-#include <glibc/getopt.h>
+#include <getopt.h>
 #endif
 #endif
 #endif
--- oo_1.0_src/tools/bootstrp/cppdep.cxx.systemgo	Wed Jun 13 15:43:51 2001
+++ oo_1.0_src/tools/bootstrp/cppdep.cxx	Sun Jun  2 19:29:10 2002
@@ -64,18 +64,18 @@
  
 #ifdef WNT
 #ifdef BOOTSTRAPPER
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #else
-#include <glibc/getopt.h>
+#include <getopt.h>
 #endif
 #endif
  
 #ifdef UNX
 #ifdef MACOSX
 #ifdef BOOTSTRAPPER
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #else
-#include <glibc/getopt.h>
+#include <getopt.h>
 #endif
 #endif
 #include <unistd.h>
--- oo_1.0_src/tools/bootstrp/rscdep.cxx.systemgo	Wed Jun 13 15:59:43 2001
+++ oo_1.0_src/tools/bootstrp/rscdep.cxx	Sun Jun  2 19:29:10 2002
@@ -69,23 +69,23 @@
 #ifdef WNT
 #define __STDC__ 1
 #ifdef BOOTSTRAPPER
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #else
-#include <glibc/getopt.h>
+#include <getopt.h>
 #endif
 #endif
 #ifdef UNX
 #ifdef BOOTSTRAPPER
 #ifndef SOLARIS 
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #endif
 #ifdef MACOSX
-#include <glibc/posix/getopt.h>
+#include <getopt.h>
 #endif
 #else
-#include <glibc/config.h>
+// #include <config.h>
 #ifndef SOLARIS 
-#include <glibc/getopt.h>
+#include <getopt.h>
 #endif
 #endif
 #endif
--- oo_1.0_src/tools/bootstrp/static.mk.systemgo	Sun Jun  2 19:49:29 2002
+++ oo_1.0_src/tools/bootstrp/static.mk	Sun Jun  2 19:49:52 2002
@@ -95,9 +95,6 @@
 STATIC_LIBS		+= 	aosl.lib							\
 					artl.lib
 .ENDIF
-.IF "$(UPD)" >= "597"
-STATIC_LIBS		+= 	gnu_getopt.lib
-.ENDIF
 .IF "$(LIBSTLPORT)" != ""
 STATIC_LIBS		+= 	$(LIBSTLPORT)
 .ENDIF
@@ -137,10 +134,6 @@
 					-lrtl$(UPD)$(DLLPOSTFIX)
 .ENDIF
 
-.IF "$(UPD)" >= "597"
-STATIC_LIBS		+= 	-lgnu_getopt
-.ENDIF
-
 .IF "$(COM)"=="C52"
 .IF "$(BUILD_SOSL)"==""
 STATIC_LIBS		+= -lCrun_static
--- oo_1.0_src/external/glibc/sdfiles/makefile.mk.systemgo	Sun Jun  2 19:47:20 2002
+++ oo_1.0_src/external/glibc/sdfiles/makefile.mk	Sun Jun  2 19:48:16 2002
@@ -60,6 +60,13 @@
 #
 #*************************************************************************
 
+# We use glibc. There's no need to dupe its functionality, especially not
+# with legacy versions of known good code.
+
+all:
+	@echo ignoring gnu_getopt
+
+
 PRJ=..$/..
 
 PRJNAME=3rdparty
--- oo_1.0_src/external/glibc/makefile.mk.systemgo	Tue Nov 21 11:22:34 2000
+++ oo_1.0_src/external/glibc/makefile.mk	Sun Jun  2 19:29:10 2002
@@ -60,6 +60,11 @@
 #
 #*************************************************************************
 
+.IF "$(GUI)" == "UNX"
+all:
+	@echo "Assuming you already have glibc - no need to do anything."
+.ENDIF
+
 MAKEFILERC=yes
 
 .IF "$(OS)" == "WNT"
--- oo_1.0_src/external/prj/d.lst.systemgo	Sun Jun  2 19:48:45 2002
+++ oo_1.0_src/external/prj/d.lst	Sun Jun  2 19:49:02 2002
@@ -54,8 +54,6 @@
 ..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a
 ..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a
 ..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a
-..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
-..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
 ..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
 ..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
 ..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a
Commit	Line	Data
27a626b6 PG	1	--- oo_1.0_src/tools/bootstrp/addexes/makefile.mk.systemgo Sun Jun 2 19:50:01 2002
	2	+++ oo_1.0_src/tools/bootstrp/addexes/makefile.mk Sun Jun 2 19:50:11 2002
	3	@@ -98,7 +98,6 @@
	4	#APP3TARGET= ldump
	5	APP3STACK= 16000
	6	APP3OBJS= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
	7	-APP3STDLIBS=gnu_getopt.lib
	8	APP3DEPN= $(OBJ)$/ldump.obj $(OBJ)$/hashtbl.obj
	9
	10	#APP4TARGET= readmap
	11	--- oo_1.0_src/tools/bootstrp/cprjexe.cxx.systemgo Fri Oct 20 17:02:47 2000
	12	+++ oo_1.0_src/tools/bootstrp/cprjexe.cxx Sun Jun 2 19:29:10 2002
	13	@@ -62,23 +62,23 @@
	14	#ifdef WNT
	15	#define __STDC__ 1
	16	#ifdef BOOTSTRAPPER
	17	-#include <glibc/posix/getopt.h>
	18	+#include <getopt.h>
	19	#else
	20	-#include <glibc/getopt.h>
	21	+#include <getopt.h>
	22	#endif
	23	#endif
	24	#ifdef UNX
	25	#ifdef BOOTSTRAPPER
	26	#ifndef SOLARIS
	27	-#include <glibc/posix/getopt.h>
	28	+#include <getopt.h>
	29	#endif
	30	#ifdef MACOSX
	31	-#include <glibc/posix/getopt.h>
	32	+#include <getopt.h>
	33	#endif
	34	#else
	35	-#include <glibc/config.h>
	36	+// #include <config.h>
	37	#ifndef SOLARIS
	38	-#include <glibc/getopt.h>
	39	+#include <getopt.h>
	40	#endif
	41	#endif
	42	#endif
	43	--- oo_1.0_src/tools/bootstrp/cppdep.cxx.systemgo Wed Jun 13 15:43:51 2001
	44	+++ oo_1.0_src/tools/bootstrp/cppdep.cxx Sun Jun 2 19:29:10 2002
	45	@@ -64,18 +64,18 @@
	46
	47	#ifdef WNT
	48	#ifdef BOOTSTRAPPER
	49	-#include <glibc/posix/getopt.h>
	50	+#include <getopt.h>
	51	#else
	52	-#include <glibc/getopt.h>
	53	+#include <getopt.h>
	54	#endif
	55	#endif
	56
	57	#ifdef UNX
	58	#ifdef MACOSX
	59	#ifdef BOOTSTRAPPER
	60	-#include <glibc/posix/getopt.h>
	61	+#include <getopt.h>
	62	#else
	63	-#include <glibc/getopt.h>
	64	+#include <getopt.h>
65	#endif
66	#endif
67	#include <unistd.h>
68	--- oo_1.0_src/tools/bootstrp/rscdep.cxx.systemgo Wed Jun 13 15:59:43 2001
69	+++ oo_1.0_src/tools/bootstrp/rscdep.cxx Sun Jun 2 19:29:10 2002
70	@@ -69,23 +69,23 @@
71	#ifdef WNT
72	#define __STDC__ 1
73	#ifdef BOOTSTRAPPER
74	-#include <glibc/posix/getopt.h>
75	+#include <getopt.h>
76	#else
77	-#include <glibc/getopt.h>
78	+#include <getopt.h>
79	#endif
80	#endif
81	#ifdef UNX
82	#ifdef BOOTSTRAPPER
83	#ifndef SOLARIS
84	-#include <glibc/posix/getopt.h>
85	+#include <getopt.h>
86	#endif
87	#ifdef MACOSX
88	-#include <glibc/posix/getopt.h>
89	+#include <getopt.h>
90	#endif
91	#else
92	-#include <glibc/config.h>
93	+// #include <config.h>
94	#ifndef SOLARIS
95	-#include <glibc/getopt.h>
96	+#include <getopt.h>
97	#endif
98	#endif
99	#endif
100	--- oo_1.0_src/tools/bootstrp/static.mk.systemgo Sun Jun 2 19:49:29 2002
101	+++ oo_1.0_src/tools/bootstrp/static.mk Sun Jun 2 19:49:52 2002
102	@@ -95,9 +95,6 @@
103	STATIC_LIBS += aosl.lib \
104	artl.lib
105	.ENDIF
106	-.IF "$(UPD)" >= "597"
107	-STATIC_LIBS += gnu_getopt.lib
108	-.ENDIF
109	.IF "$(LIBSTLPORT)" != ""
110	STATIC_LIBS += $(LIBSTLPORT)
111	.ENDIF
112	@@ -137,10 +134,6 @@
113	-lrtl$(UPD)$(DLLPOSTFIX)
114	.ENDIF
115
116	-.IF "$(UPD)" >= "597"
117	-STATIC_LIBS += -lgnu_getopt
118	-.ENDIF
119	-
120	.IF "$(COM)"=="C52"
121	.IF "$(BUILD_SOSL)"==""
122	STATIC_LIBS += -lCrun_static
123	--- oo_1.0_src/external/glibc/sdfiles/makefile.mk.systemgo Sun Jun 2 19:47:20 2002
124	+++ oo_1.0_src/external/glibc/sdfiles/makefile.mk Sun Jun 2 19:48:16 2002
125	@@ -60,6 +60,13 @@
126	#
127	#*************************************************************************
128
129	+# We use glibc. There's no need to dupe its functionality, especially not
130	+# with legacy versions of known good code.
131	+
132	+all:
133	+ @echo ignoring gnu_getopt
134	+
135	+
136	PRJ=..$/..
137
138	PRJNAME=3rdparty
139	--- oo_1.0_src/external/glibc/makefile.mk.systemgo Tue Nov 21 11:22:34 2000
140	+++ oo_1.0_src/external/glibc/makefile.mk Sun Jun 2 19:29:10 2002
141	@@ -60,6 +60,11 @@
142	#
143	#*************************************************************************
144
145	+.IF "$(GUI)" == "UNX"
146	+all:
147	+ @echo "Assuming you already have glibc - no need to do anything."
148	+.ENDIF
149	+
150	MAKEFILERC=yes
151
152	.IF "$(OS)" == "WNT"
153	--- oo_1.0_src/external/prj/d.lst.systemgo Sun Jun 2 19:48:45 2002
154	+++ oo_1.0_src/external/prj/d.lst Sun Jun 2 19:49:02 2002
155	@@ -54,8 +54,6 @@
156	..\%__SRC%\lib\libexpat_xmltok.a %_DEST%\lib%_EXT%\libexpat_xmltok.a
157	..\%__SRC%\lib\libexpat_xmlparse.a %_DEST%\lib%_EXT%\libexpat_xmlparse.a
158	..\%__SRC%\lib\libascii_expat_xmlparse.a %_DEST%\lib%_EXT%\libascii_expat_xmlparse.a
159	-..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
160	-..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
161	..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
162	..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
163	..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a