head 1.2; access; symbols perseant-exfatfs-base-20250801:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.10 perseant-exfatfs-base:1.2 netbsd-8-3-RELEASE:1.1.1.2.26.1 cjep_sun2x:1.2.0.8 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 cjep_staticlib_x:1.2.0.6 cjep_staticlib_x-base:1.2 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 phil-wifi-20200406:1.2 netbsd-8-2-RELEASE:1.1.1.2.26.1 netbsd-8-1-RELEASE:1.1.1.2.26.1 netbsd-8-1-RC1:1.1.1.2.26.1 pgoyette-compat-merge-20190127:1.2 pgoyette-compat-20190127:1.2 pgoyette-compat-20190118:1.2 pgoyette-compat-1226:1.2 pgoyette-compat-1126:1.2 pgoyette-compat-1020:1.2 pgoyette-compat-0930:1.2 pgoyette-compat-0906:1.2 netbsd-7-2-RELEASE:1.1.1.2.12.1 pgoyette-compat-0728:1.2 netbsd-8-0-RELEASE:1.1.1.2.26.1 pgoyette-compat-0625:1.2 netbsd-8-0-RC2:1.1.1.2.26.1 pgoyette-compat-0521:1.2 pgoyette-compat-0502:1.2 pgoyette-compat-0422:1.2 netbsd-8-0-RC1:1.1.1.2.26.1 pgoyette-compat-0415:1.2 pgoyette-compat-0407:1.2 pgoyette-compat-0330:1.2 pgoyette-compat-0322:1.2 pgoyette-compat-0315:1.2 netbsd-7-1-2-RELEASE:1.1.1.2.22.1 pgoyette-compat:1.2.0.4 pgoyette-compat-base:1.2 netbsd-7-1-1-RELEASE:1.1.1.2.22.1 perseant-stdc-iso10646:1.2.0.2 perseant-stdc-iso10646-base:1.2 netbsd-8:1.1.1.2.0.26 netbsd-8-base:1.1.1.2 prg-localcount2-base3:1.1.1.2 prg-localcount2-base2:1.1.1.2 prg-localcount2-base1:1.1.1.2 prg-localcount2:1.1.1.2.0.24 prg-localcount2-base:1.1.1.2 pgoyette-localcount-20170426:1.1.1.2 bouyer-socketcan-base1:1.1.1.2 pgoyette-localcount-20170320:1.1.1.2 netbsd-7-1:1.1.1.2.0.22 netbsd-7-1-RELEASE:1.1.1.2 netbsd-7-1-RC2:1.1.1.2 expat-2-2-0:1.1.1.2 netbsd-7-nhusb-base-20170116:1.1.1.2 bouyer-socketcan:1.1.1.2.0.20 bouyer-socketcan-base:1.1.1.2 pgoyette-localcount-20170107:1.1.1.2 netbsd-7-1-RC1:1.1.1.2 pgoyette-localcount-20161104:1.1.1.2 netbsd-7-0-2-RELEASE:1.1.1.2 localcount-20160914:1.1.1.2 netbsd-7-nhusb:1.1.1.2.0.18 netbsd-7-nhusb-base:1.1.1.2 pgoyette-localcount-20160806:1.1.1.2 pgoyette-localcount-20160726:1.1.1.2 pgoyette-localcount:1.1.1.2.0.16 pgoyette-localcount-base:1.1.1.2 netbsd-7-0-1-RELEASE:1.1.1.2 expat-2-1-1:1.1.1.2 netbsd-7-0:1.1.1.2.0.14 netbsd-7-0-RELEASE:1.1.1.2 netbsd-7-0-RC3:1.1.1.2 netbsd-7-0-RC2:1.1.1.2 netbsd-7-0-RC1:1.1.1.2 netbsd-6-0-6-RELEASE:1.1.1.1 netbsd-6-1-5-RELEASE:1.1.1.1 netbsd-7:1.1.1.2.0.12 netbsd-7-base:1.1.1.2 yamt-pagecache-base9:1.1.1.2 yamt-pagecache-tag8:1.1.1.2.2.2 netbsd-6-1-4-RELEASE:1.1.1.1 netbsd-6-0-5-RELEASE:1.1.1.1 tls-earlyentropy:1.1.1.2.0.10 tls-earlyentropy-base:1.1.1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.2 riastradh-drm2-base3:1.1.1.2 netbsd-6-1-3-RELEASE:1.1.1.1 netbsd-6-0-4-RELEASE:1.1.1.1 netbsd-6-1-2-RELEASE:1.1.1.1 netbsd-6-0-3-RELEASE:1.1.1.1 netbsd-6-1-1-RELEASE:1.1.1.1 riastradh-drm2-base2:1.1.1.2 riastradh-drm2-base1:1.1.1.2 riastradh-drm2:1.1.1.2.0.6 riastradh-drm2-base:1.1.1.2 netbsd-6-1:1.1.1.1.0.8 netbsd-6-0-2-RELEASE:1.1.1.1 netbsd-6-1-RELEASE:1.1.1.1 netbsd-6-1-RC4:1.1.1.1 netbsd-6-1-RC3:1.1.1.1 agc-symver:1.1.1.2.0.8 agc-symver-base:1.1.1.2 netbsd-6-1-RC2:1.1.1.1 netbsd-6-1-RC1:1.1.1.1 yamt-pagecache-base8:1.1.1.2 netbsd-6-0-1-RELEASE:1.1.1.1 yamt-pagecache-base7:1.1.1.2 matt-nb6-plus-nbase:1.1.1.1 yamt-pagecache-base6:1.1.1.2 netbsd-6-0:1.1.1.1.0.6 netbsd-6-0-RELEASE:1.1.1.1 netbsd-6-0-RC2:1.1.1.1 tls-maxphys:1.1.1.2.0.4 tls-maxphys-base:1.1.1.2 matt-nb6-plus:1.1.1.1.0.4 matt-nb6-plus-base:1.1.1.1 netbsd-6-0-RC1:1.1.1.1 yamt-pagecache-base5:1.1.1.2 yamt-pagecache:1.1.1.2.0.2 yamt-pagecache-base4:1.1.1.2 expat-2-1-0:1.1.1.2 netbsd-6:1.1.1.1.0.2 netbsd-6-base:1.1.1.1 expat-2-0-1:1.1.1.1 expat:1.1.1; locks; strict; comment @# @; 1.2 date 2017.06.17.22.05.20; author christos; state dead; branches; next 1.1; commitid m7aW4SzMkvoF9MVz; 1.1 date 2012.02.11.18.18.20; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2012.02.11.18.18.20; author tron; state Exp; branches 1.1.1.1.2.1 1.1.1.1.6.1 1.1.1.1.8.1; next 1.1.1.2; 1.1.1.2 date 2012.04.06.10.23.28; author spz; state Exp; branches 1.1.1.2.2.1 1.1.1.2.12.1 1.1.1.2.14.1 1.1.1.2.22.1 1.1.1.2.26.1; next ; 1.1.1.1.2.1 date 2016.05.18.10.49.22; author snj; state Exp; branches; next 1.1.1.1.2.2; commitid rBQKbLw2qANU6X6z; 1.1.1.1.2.2 date 2017.06.21.16.56.31; author snj; state dead; branches; next ; commitid IH7Wjl3kVIGYigWz; 1.1.1.1.6.1 date 2016.05.18.10.40.42; author snj; state Exp; branches; next 1.1.1.1.6.2; commitid sn3ewMlOwSnM3X6z; 1.1.1.1.6.2 date 2017.06.21.16.41.41; author snj; state dead; branches; next ; commitid kpn3A6rkfpJ9egWz; 1.1.1.1.8.1 date 2016.05.18.10.45.13; author snj; state Exp; branches; next 1.1.1.1.8.2; commitid 5xlzCAOqLNUu5X6z; 1.1.1.1.8.2 date 2017.06.21.16.46.21; author snj; state dead; branches; next ; commitid a3XYbeElG2M9ggWz; 1.1.1.2.2.1 date 2012.04.06.10.23.28; author yamt; state dead; branches; next 1.1.1.2.2.2; 1.1.1.2.2.2 date 2012.04.17.00.04.39; author yamt; state Exp; branches; next ; 1.1.1.2.12.1 date 2017.06.21.17.23.42; author snj; state dead; branches; next ; commitid BajWUxizDuBUsgWz; 1.1.1.2.14.1 date 2017.06.21.17.09.14; author snj; state dead; branches; next ; commitid z7jn49JteMN0ogWz; 1.1.1.2.22.1 date 2017.06.21.17.15.27; author snj; state dead; branches; next ; commitid vkx34HN3ERMKpgWz; 1.1.1.2.26.1 date 2017.06.21.18.09.06; author snj; state dead; branches; next ; commitid NuwQOtsJ0kfEIgWz; desc @@ 1.2 log @merge conflicts @ text @# # Makefile for AmigaOS # .PHONY: help all staticlib sharedlib check clean install vpath %.c ../lib ../examples ../xmlwf ../tests vpath %.h ../lib ../tests # # Set these for SDK installation. # tooldir = SDK:Local/C staticlibdir = SDK:Local/clib2/lib staticincludedir = SDK:Local/clib2/include sharedlibdir = SDK:Local/Libs sharedincludedir = SDK:Local/common/include ifeq ($(MAKECMDGOALS), staticlib) DESTDIR = lib else DESTDIR = libs endif STATICLIB = $(DESTDIR)/libexpat.a SHAREDLIB = $(DESTDIR)/expat.library XMLWF = $(DESTDIR)/xmlwf ELEMENTS = $(DESTDIR)/elements OUTLINE = $(DESTDIR)/outline RUNTESTS = $(DESTDIR)/runtests BENCHMARK = $(DESTDIR)/benchmark help: @@echo "Requires:" @@echo " AmigaOS 4.0" @@echo " SDK 51.22" @@echo " clib2 1.202" @@echo "" @@echo "Targets:" @@echo " all - make expat libraries, xmlwf, examples and run test suite" @@echo " install - install expat libraries and tools into SDK" all: -makedir force lib libs $(MAKE) staticlib $(MAKE) sharedlib staticlib: $(STATICLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check @@echo done sharedlib: $(SHAREDLIB) $(XMLWF) $(ELEMENTS) $(OUTLINE) $(RUNTESTS) $(BENCHMARK) check @@echo done check: $(RUNTESTS) clean: -delete lib/#?.o quiet -delete libs/#?.o quiet install: copy libs/xmlwf $(tooldir) quiet copy /lib/expat.h /lib/expat_external.h $(staticincludedir) quiet copy lib/libexpat.a $(staticlibdir) quiet copy libs/expat.library $(sharedlibdir) quiet copy include $(sharedincludedir) quiet all CC = gcc LIBTOOL = ar STRIP = strip LDFLAGS = LIBS = CFLAGS = -DNDEBUG -O2 LTFLAGS = -crs STRIPFLAGS = -R.comment LAUNCH = ifeq ($(MAKECMDGOALS), staticlib) CFLAGS += -mcrt=clib2 LDFLAGS += -mcrt=clib2 LIBS += $(STATICLIB) INCLUDES = -I../lib endif ifeq ($(MAKECMDGOALS), sharedlib) CFLAGS += -mcrt=newlib -D__USE_INLINE__ LDFLAGS += -mcrt=newlib INCLUDES = -I. -Iinclude -Iinclude/libraries -I../lib LAUNCH = $(DESTDIR)/launch.o endif COMPILE = $(CC) $(CFLAGS) $(INCLUDES) -c LINK = $(CC) $(LDFLAGS) -o $@@ $(STATICLIB): $(DESTDIR)/xmlparse.o $(DESTDIR)/xmltok.o $(DESTDIR)/xmlrole.o $(LIBTOOL) $(LTFLAGS) $@@ $^ $(DESTDIR)/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h $(COMPILE) $< -o $@@ $(DESTDIR)/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h $(COMPILE) $< -o $@@ $(DESTDIR)/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h $(COMPILE) $< -o $@@ $(SHAREDLIB): $(DESTDIR)/expat_lib.o $(DESTDIR)/expat_vectors.o $(DESTDIR)/stdlib.o lib/libexpat.a $(LINK) -nostartfiles -nostdlib -o $@@ $^ $(DESTDIR)/expat_lib.o: expat_lib.c $(COMPILE) $< -o $@@ $(DESTDIR)/expat_vectors.o: expat_vectors.c $(COMPILE) $< -o $@@ $(DESTDIR)/stdlib.o: stdlib.c $(COMPILE) $< -o $@@ $(LAUNCH): launch.c $(COMPILE) $< -o $@@ $(XMLWF): $(DESTDIR)/xmlwf.o $(DESTDIR)/xmlfile.o $(DESTDIR)/codepage.o $(DESTDIR)/readfilemap.o $(LAUNCH) $(LINK) $^ $(LIBS) $(STRIP) $(STRIPFLAGS) $@@ $(DESTDIR)/xmlwf.o: xmlwf.c $(COMPILE) $< -o $@@ $(DESTDIR)/xmlfile.o: xmlfile.c $(COMPILE) $< -o $@@ $(DESTDIR)/codepage.o: codepage.c $(COMPILE) $< -o $@@ $(DESTDIR)/readfilemap.o: readfilemap.c $(COMPILE) $< -o $@@ $(ELEMENTS): $(DESTDIR)/elements.o $(LAUNCH) $(LINK) $^ $(LIBS) $(STRIP) $(STRIPFLAGS) $@@ $(DESTDIR)/elements.o: elements.c $(COMPILE) $< -o $@@ $(OUTLINE): $(DESTDIR)/outline.o $(LAUNCH) $(LINK) $^ $(LIBS) $(STRIP) $(STRIPFLAGS) $@@ $(DESTDIR)/outline.o: outline.c $(COMPILE) $< -o $@@ $(RUNTESTS): $(DESTDIR)/runtests.o $(DESTDIR)/chardata.o $(DESTDIR)/minicheck.o $(LAUNCH) $(LINK) $^ $(LIBS) $(DESTDIR)/chardata.o: chardata.c chardata.h $(COMPILE) $< -o $@@ $(DESTDIR)/minicheck.o: minicheck.c minicheck.h $(COMPILE) $< -o $@@ $(DESTDIR)/runtests.o: runtests.c chardata.h $(COMPILE) $< -o $@@ $(BENCHMARK): $(DESTDIR)/benchmark.o $(LAUNCH) $(LINK) $^ $(LIBS) -lm $(DESTDIR)/benchmark.o: benchmark/benchmark.c $(COMPILE) $< -o $@@ @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Initial import of "expat" 2.0.1 into base: This is James Clark's expat XML parser library in C. It is a stream oriented parser that requires setting handlers to deal with the structure that the parser discovers in the document. This is the first part of the fix for PR lib/40346. @ text @@ 1.1.1.1.2.1 log @Pull up following revision(s) (requested by spz in ticket #1383): distrib/sets/lists/base/ad.mips64eb: patch distrib/sets/lists/base/ad.mips64el: patch distrib/sets/lists/base/md.amd64: patch distrib/sets/lists/base/md.sparc64: patch distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch distrib/sets/lists/comp/ad.mips64eb: patch distrib/sets/lists/comp/ad.mips64el: patch distrib/sets/lists/comp/md.amd64: patch distrib/sets/lists/comp/md.sparc64: patch distrib/sets/lists/comp/mi: 1.2035 via patch distrib/sets/lists/comp/shl.mi: patch external/mit/expat/dist/CMake.README: up to 1.1.1.2 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.3 external/mit/expat/dist/ConfigureChecks.cmake: up to 1.1.1.1 external/mit/expat/dist/MANIFEST: up to 1.1.1.3 external/mit/expat/dist/Makefile.in: up to 1.1.1.3 external/mit/expat/dist/README: up to 1.1.1.3 external/mit/expat/dist/aclocal.m4: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.3 external/mit/expat/dist/configure.ac: up to 1.1.1.1 external/mit/expat/dist/configure.in: up to 1.1.1.2 external/mit/expat/dist/expat.pc.in: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.cmake: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3 external/mit/expat/dist/amiga/Makefile: up to 1.1.1.2 external/mit/expat/dist/amiga/README.txt: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_68k.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_base.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2 external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2 external/mit/expat/dist/amiga/stdlib.c: delete external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/outline.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.2 external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4: up to 1.4 external/mit/expat/dist/conftools/config.guess: up to 1.1.1.3 external/mit/expat/dist/conftools/config.sub: up to 1.1.1.3 external/mit/expat/dist/conftools/expat.m4: up to 1.1.1.2 external/mit/expat/dist/conftools/install-sh: up to 1.1.1.3 external/mit/expat/dist/conftools/libtool.m4: delete external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.3 external/mit/expat/dist/conftools/mkinstalldirs: up to 1.4 external/mit/expat/dist/doc/reference.html: up to 1.1.1.3 external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.2 external/mit/expat/dist/doc/xmlwf.sgml: up to 1.1.1.3 external/mit/expat/dist/examples/elements.c: up to 1.1.1.2 external/mit/expat/dist/examples/elements.dsp: up to 1.1.1.2 external/mit/expat/dist/examples/outline.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/amigaconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/expat.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/libexpat.def: up to 1.1.1.2 external/mit/expat/dist/lib/libexpatw.def: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.4 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.2 external/mit/expat/dist/lib/xmltok.c: up to 1.1.1.2 external/mit/expat/dist/lib/xmltok.h: up to 1.1.1.1 external/mit/expat/dist/lib/xmltok_impl.c: up to 1.3 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.2 external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.2 external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.1 external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.2 external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.1 external/mit/expat/dist/tests/README.txt: up to 1.1.1.2 external/mit/expat/dist/tests/chardata.c: up to 1.1.1.2 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.2 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.2 external/mit/expat/dist/tests/xmltest.sh: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/README.txt: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.2 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.3 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.2 external/mit/expat/lib/libexpat/Makefile: up to 1.2 external/mit/expat/lib/libexpat/expat.pc.in: up to 1.1 external/mit/expat/lib/libexpat/expat_config.h: up to 1.3 external/mit/expat/lib/libexpat/shlib_version: up to 1.3 Update expat to 2.1.1. Apply fixes for CVE-2016-0718. @ text @d5 1 a5 2 .PHONY: help all check clean package .PHONY: clib2 newlib library so d7 1 a7 1 vpath %.c ../lib ../examples ../xmlwf ../tests ../tests/benchmark d10 26 a35 1 ############################################################################# d39 3 a41 2 @@echo " AmigaOS 4.x" @@echo " SDK 53.13" d44 1 a44 1 @@echo " all - make libraries, xmlwf, examples and runs tests" a45 5 @@echo " clean - clean object files" @@echo " check - run all the tests" @@echo " package - prepare distribution archive" all: clib2 newlib library so check d47 4 a50 1 clib2: clib2/libexpat.a clib2/xmlwf clib2/elements clib2/outline clib2/runtests clib2/benchmark d52 2 a53 1 newlib: newlib/libexpat.a newlib/xmlwf newlib/elements newlib/outline newlib/runtests newlib/benchmark d55 2 a56 1 library: libs/expat.library libs/xmlwf libs/elements libs/outline libs/runtests libs/benchmark d58 2 a59 7 so: so/libexpat.so so/xmlwf so/elements so/outline so/runtests so/benchmark check: clib2/runtests newlib/runtests libs/runtests so/runtests clib2/runtests newlib/runtests libs/runtests so/runtests d62 1 a62 2 -delete clib2/#?.o quiet -delete newlib/#?.o quiet a63 59 -delete so/#?.o quiet package: $(MAKE) all -delete T:expat all force quiet makedir all T:expat/Workbench/Libs copy clone libs/expat.library T:expat/Workbench/Libs makedir all T:expat/Workbench/SObjs copy clone so/libexpat.so T:expat/Workbench/SObjs makedir all T:expat/SDK/Local/C copy clone libs/xmlwf T:expat/SDK/Local/C makedir all T:expat/SDK/Local/clib2/lib copy clone clib2/libexpat.a T:expat/SDK/Local/clib2/lib makedir all T:expat/SDK/Local/newlib/lib copy clone newlib/libexpat.a T:expat/SDK/Local/newlib/lib makedir all T:expat/SDK/Local/common/include copy clone /lib/expat.h /lib/expat_external.h T:expat/SDK/Local/common/include makedir all T:expat/SDK/Include/include_h/inline4 copy clone include/inline4/expat.h T:expat/SDK/Include/include_h/inline4 makedir all T:expat/SDK/Include/include_h/interfaces copy clone include/interfaces/expat.h T:expat/SDK/Include/include_h/interfaces makedir all T:expat/SDK/Include/include_h/libraries copy clone include/libraries/expat.h T:expat/SDK/Include/include_h/libraries makedir all T:expat/SDK/Include/include_h/proto copy clone include/proto/expat.h T:expat/SDK/Include/include_h/proto makedir all T:expat/SDK/Documentation/Libs/Expat copy clone /COPYING T:expat/SDK/Documentation/Libs/Expat copy clone /README T:expat/SDK/Documentation/Libs/Expat copy clone README.txt T:expat/SDK/Documentation/Libs/Expat/README.AmigaOS -delete expat.lha lha -r a expat.lha T:expat ############################################################################# CC := gcc LIBTOOL := ar STRIP := strip CFLAGS := -DNDEBUG -O3 LTFLAGS := -crs STRIPFLAGS := -R.comment ############################################################################# clib2/libexpat.a: clib2/xmlparse.o clib2/xmltok.o clib2/xmlrole.o $(LIBTOOL) $(LTFLAGS) $@@ $^ protect $@@ -e clib2/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h clib2/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h clib2/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# d65 32 a96 3 clib2/xmlwf: clib2/xmlwf.o clib2/xmlfile.o clib2/codepage.o clib2/readfilemap.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ a97 1 clib2/xmlwf.o: xmlwf.c d99 1 a99 11 clib2/xmlfile.o: xmlfile.c clib2/codepage.o: codepage.c clib2/readfilemap.o: readfilemap.c ############################################################################# clib2/elements: clib2/elements.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ d101 1 a101 1 clib2/elements.o: elements.c a102 1 ############################################################################# d104 1 a104 27 clib2/outline: clib2/outline.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ clib2/outline.o: outline.c ############################################################################# clib2/runtests: clib2/runtests.o clib2/chardata.o clib2/minicheck.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a clib2/chardata.o: chardata.c chardata.h clib2/minicheck.o: minicheck.c minicheck.h clib2/runtests.o: runtests.c chardata.h ############################################################################# clib2/benchmark: clib2/benchmark.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a -lm clib2/benchmark.o: benchmark.c ############################################################################# newlib/libexpat.a: newlib/xmlparse.o newlib/xmltok.o newlib/xmlrole.o a105 1 protect $@@ -e d107 1 a107 1 newlib/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ d109 1 d111 1 a111 1 newlib/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ d113 1 d115 1 a115 1 newlib/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ d118 1 a119 42 ############################################################################# newlib/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/xmlwf.o: xmlwf.c newlib/xmlfile.o: xmlfile.c newlib/codepage.o: codepage.c newlib/readfilemap.o: readfilemap.c ############################################################################# newlib/elements: newlib/elements.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/elements.o: elements.c ############################################################################# newlib/outline: newlib/outline.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/outline.o: outline.c ############################################################################# newlib/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a newlib/chardata.o: chardata.c chardata.h newlib/minicheck.o: minicheck.c minicheck.h newlib/runtests.o: runtests.c chardata.h ############################################################################# d121 2 a122 2 newlib/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a d124 2 a125 1 newlib/benchmark.o: benchmark.c d127 2 a128 1 ############################################################################# d130 2 a131 8 libs/expat.library: libs/expat_lib.o libs/expat_68k.o libs/expat_68k_handler_stubs.o libs/expat_vectors.o newlib/libexpat.a $(CC) -mcrt=newlib -nostartfiles $^ -o $@@ newlib/libexpat.a -Wl,--cref,-M,-Map=$@@.map protect $@@ -e $(STRIP) $(STRIPFLAGS) $@@ libs/expat_lib.o: expat_lib.c expat_base.h libs/expat_68k.o: expat_68k.c expat_68k.h expat_base.h d133 2 a134 1 libs/expat_68k_handler_stubs.o: expat_68k_handler_stubs.c expat_68k.h a135 1 libs/expat_vectors.o: expat_vectors.c d137 2 a138 6 libs/launch.o: launch.c ############################################################################# libs/xmlwf: libs/xmlwf.o libs/xmlfile.o libs/codepage.o libs/readfilemap.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ d141 2 a142 1 libs/xmlwf.o: xmlwf.c d144 2 a145 1 libs/xmlfile.o: xmlfile.c d147 2 a148 1 libs/codepage.o: codepage.c d150 2 a151 1 libs/readfilemap.o: readfilemap.c a152 1 ############################################################################# d154 2 a155 2 libs/elements: libs/elements.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ d158 2 a159 55 libs/elements.o: elements.c ############################################################################# libs/outline: libs/outline.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ $(STRIP) $(STRIPFLAGS) $@@ libs/outline.o: outline.c ############################################################################# libs/runtests: libs/runtests.o libs/chardata.o libs/minicheck.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/chardata.o: chardata.c chardata.h libs/minicheck.o: minicheck.c minicheck.h libs/runtests.o: runtests.c chardata.h ############################################################################# libs/benchmark: libs/benchmark.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/benchmark.o: benchmark.c ############################################################################# so/libexpat.so: so/xmlparse.o so/xmltok.o so/xmlrole.o $(CC) -mcrt=newlib -shared -o $@@ $^ protect $@@ -e so/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h so/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h so/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# so/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ ############################################################################# so/elements: newlib/elements.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ a160 1 ############################################################################# d162 2 a163 2 so/outline: newlib/outline.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d166 2 a167 1 ############################################################################# a168 2 so/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d170 2 a171 1 ############################################################################# d173 2 a174 2 so/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d176 2 a177 1 ############################################################################# d179 2 a180 2 clib2/%.o: %.c $(CC) -mcrt=clib2 $(CFLAGS) -I../lib -c $< -o $@@ a181 2 newlib/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -I../lib -c $< -o $@@ d183 2 a184 2 libs/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -D__USE_INLINE__ -I. -Iinclude -Iinclude/libraries -I../lib -c $< -o $@@ d186 2 a187 2 so/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -fPIC -I../lib -c $< -o $@@ @ 1.1.1.1.2.2 log @Pull up following revision(s) (requested by spz in ticket #1458): external/mit/expat/dist/AUTHORS: up to 1.1.1.1 external/mit/expat/dist/CMake.README: up to 1.1.1.4 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.4 external/mit/expat/dist/COPYING: up to 1.1.1.3 external/mit/expat/dist/Changes: up to 1.1.1.5 external/mit/expat/dist/MANIFEST: up to 1.1.1.5 external/mit/expat/dist/Makefile.in: up to 1.1.1.5 external/mit/expat/dist/README: up to 1.1.1.5 external/mit/expat/dist/amiga/Makefile delete external/mit/expat/dist/amiga/README.txt delete external/mit/expat/dist/amiga/expat.xml delete external/mit/expat/dist/amiga/expat_68k.c delete external/mit/expat/dist/amiga/expat_68k.h delete external/mit/expat/dist/amiga/expat_68k_handler_stubs.c delete external/mit/expat/dist/amiga/expat_base.h delete external/mit/expat/dist/amiga/expat_lib.c delete external/mit/expat/dist/amiga/expat_vectors.c delete external/mit/expat/dist/amiga/include/inline4/expat.h delete external/mit/expat/dist/amiga/include/interfaces/expat.h delete external/mit/expat/dist/amiga/include/libraries/expat.h delete external/mit/expat/dist/amiga/include/proto/expat.h delete external/mit/expat/dist/amiga/launch.c delete external/mit/expat/dist/bcb5/README.txt delete external/mit/expat/dist/bcb5/all_projects.bpg delete external/mit/expat/dist/bcb5/elements.bpf delete external/mit/expat/dist/bcb5/elements.bpr delete external/mit/expat/dist/bcb5/elements.mak delete external/mit/expat/dist/bcb5/expat.bpf delete external/mit/expat/dist/bcb5/expat.bpr delete external/mit/expat/dist/bcb5/expat.mak delete external/mit/expat/dist/bcb5/expat_static.bpf delete external/mit/expat/dist/bcb5/expat_static.bpr delete external/mit/expat/dist/bcb5/expat_static.mak delete external/mit/expat/dist/bcb5/expatw.bpf delete external/mit/expat/dist/bcb5/expatw.bpr delete external/mit/expat/dist/bcb5/expatw.mak delete external/mit/expat/dist/bcb5/expatw_static.bpf delete external/mit/expat/dist/bcb5/expatw_static.bpr delete external/mit/expat/dist/bcb5/expatw_static.mak delete external/mit/expat/dist/bcb5/libexpat_mtd.def delete external/mit/expat/dist/bcb5/libexpatw_mtd.def delete external/mit/expat/dist/bcb5/makefile.mak delete external/mit/expat/dist/bcb5/outline.bpf delete external/mit/expat/dist/bcb5/outline.bpr delete external/mit/expat/dist/bcb5/outline.mak delete external/mit/expat/dist/bcb5/setup.bat delete external/mit/expat/dist/bcb5/xmlwf.bpf delete external/mit/expat/dist/bcb5/xmlwf.bpr delete external/mit/expat/dist/bcb5/xmlwf.mak delete external/mit/expat/dist/configure: up to 1.1.1.5 external/mit/expat/dist/configure.ac: up to 1.1.1.3 external/mit/expat/dist/configure.in delete external/mit/expat/dist/doc/reference.html: up to 1.1.1.4 external/mit/expat/dist/examples/elements.c: up to 1.1.1.4 external/mit/expat/dist/examples/elements.dsp delete external/mit/expat/dist/examples/outline.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.dsp delete external/mit/expat/dist/expat.dsw delete external/mit/expat/dist/expat_config.h.in: up to 1.1.1.5 external/mit/expat/dist/lib/Makefile.MPW delete external/mit/expat/dist/lib/amigaconfig.h delete external/mit/expat/dist/lib/expat.dsp delete external/mit/expat/dist/lib/expat.h: up to 1.1.1.5 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp delete external/mit/expat/dist/lib/expatw.dsp delete external/mit/expat/dist/lib/expatw_static.dsp delete external/mit/expat/dist/lib/macconfig.h delete external/mit/expat/dist/lib/siphash.h: up to 1.1.1.1 external/mit/expat/dist/lib/winconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.7 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.4 external/mit/expat/dist/lib/xmltok.c: up to 1.4 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.4 external/mit/expat/dist/run.sh.in: up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/benchmark.c: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp delete external/mit/expat/dist/tests/benchmark/benchmark.dsw delete external/mit/expat/dist/tests/memcheck.c: up to 1.1.1.1 external/mit/expat/dist/tests/memcheck.h: up to 1.1.1.1 external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.3 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.4 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.4 external/mit/expat/dist/tests/xmltest.sh: up to 1.3 external/mit/expat/dist/vms/README.vms delete external/mit/expat/dist/vms/descrip.mms delete external/mit/expat/dist/vms/expat_config.h delete external/mit/expat/dist/win32/MANIFEST.txt: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.4 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.5 external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/filemap.h: up to 1.1.1.2 external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.4 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/win32filemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.5 external/mit/expat/dist/xmlwf/xmlwf.dsp delete Update expat to 2.2.1. @ text @@ 1.1.1.1.8.1 log @Pull up following revision(s) (requested by spz in ticket #1383): distrib/sets/lists/base/ad.mips64eb: patch distrib/sets/lists/base/ad.mips64el: patch distrib/sets/lists/base/md.amd64: patch distrib/sets/lists/base/md.sparc64: patch distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch distrib/sets/lists/comp/ad.mips64eb: patch distrib/sets/lists/comp/ad.mips64el: patch distrib/sets/lists/comp/md.amd64: patch distrib/sets/lists/comp/md.sparc64: patch distrib/sets/lists/comp/mi: 1.2035 via patch distrib/sets/lists/comp/shl.mi: patch external/mit/expat/dist/CMake.README: up to 1.1.1.2 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.3 external/mit/expat/dist/ConfigureChecks.cmake: up to 1.1.1.1 external/mit/expat/dist/MANIFEST: up to 1.1.1.3 external/mit/expat/dist/Makefile.in: up to 1.1.1.3 external/mit/expat/dist/README: up to 1.1.1.3 external/mit/expat/dist/aclocal.m4: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.3 external/mit/expat/dist/configure.ac: up to 1.1.1.1 external/mit/expat/dist/configure.in: up to 1.1.1.2 external/mit/expat/dist/expat.pc.in: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.cmake: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3 external/mit/expat/dist/amiga/Makefile: up to 1.1.1.2 external/mit/expat/dist/amiga/README.txt: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_68k.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_base.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2 external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2 external/mit/expat/dist/amiga/stdlib.c: delete external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/outline.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.2 external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4: up to 1.4 external/mit/expat/dist/conftools/config.guess: up to 1.1.1.3 external/mit/expat/dist/conftools/config.sub: up to 1.1.1.3 external/mit/expat/dist/conftools/expat.m4: up to 1.1.1.2 external/mit/expat/dist/conftools/install-sh: up to 1.1.1.3 external/mit/expat/dist/conftools/libtool.m4: delete external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.3 external/mit/expat/dist/conftools/mkinstalldirs: up to 1.4 external/mit/expat/dist/doc/reference.html: up to 1.1.1.3 external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.2 external/mit/expat/dist/doc/xmlwf.sgml: up to 1.1.1.3 external/mit/expat/dist/examples/elements.c: up to 1.1.1.2 external/mit/expat/dist/examples/elements.dsp: up to 1.1.1.2 external/mit/expat/dist/examples/outline.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/amigaconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/expat.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/libexpat.def: up to 1.1.1.2 external/mit/expat/dist/lib/libexpatw.def: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.4 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.2 external/mit/expat/dist/lib/xmltok.c: up to 1.1.1.2 external/mit/expat/dist/lib/xmltok.h: up to 1.1.1.1 external/mit/expat/dist/lib/xmltok_impl.c: up to 1.3 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.2 external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.2 external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.1 external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.2 external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.1 external/mit/expat/dist/tests/README.txt: up to 1.1.1.2 external/mit/expat/dist/tests/chardata.c: up to 1.1.1.2 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.2 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.2 external/mit/expat/dist/tests/xmltest.sh: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/README.txt: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.2 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.3 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.2 external/mit/expat/lib/libexpat/Makefile: up to 1.2 external/mit/expat/lib/libexpat/expat.pc.in: up to 1.1 external/mit/expat/lib/libexpat/expat_config.h: up to 1.3 external/mit/expat/lib/libexpat/shlib_version: up to 1.3 Update expat to 2.1.1. Apply fixes for CVE-2016-0718. @ text @d5 1 a5 2 .PHONY: help all check clean package .PHONY: clib2 newlib library so d7 1 a7 1 vpath %.c ../lib ../examples ../xmlwf ../tests ../tests/benchmark d10 26 a35 1 ############################################################################# d39 3 a41 2 @@echo " AmigaOS 4.x" @@echo " SDK 53.13" d44 1 a44 1 @@echo " all - make libraries, xmlwf, examples and runs tests" a45 5 @@echo " clean - clean object files" @@echo " check - run all the tests" @@echo " package - prepare distribution archive" all: clib2 newlib library so check d47 4 a50 1 clib2: clib2/libexpat.a clib2/xmlwf clib2/elements clib2/outline clib2/runtests clib2/benchmark d52 2 a53 1 newlib: newlib/libexpat.a newlib/xmlwf newlib/elements newlib/outline newlib/runtests newlib/benchmark d55 2 a56 1 library: libs/expat.library libs/xmlwf libs/elements libs/outline libs/runtests libs/benchmark d58 2 a59 7 so: so/libexpat.so so/xmlwf so/elements so/outline so/runtests so/benchmark check: clib2/runtests newlib/runtests libs/runtests so/runtests clib2/runtests newlib/runtests libs/runtests so/runtests d62 1 a62 2 -delete clib2/#?.o quiet -delete newlib/#?.o quiet a63 59 -delete so/#?.o quiet package: $(MAKE) all -delete T:expat all force quiet makedir all T:expat/Workbench/Libs copy clone libs/expat.library T:expat/Workbench/Libs makedir all T:expat/Workbench/SObjs copy clone so/libexpat.so T:expat/Workbench/SObjs makedir all T:expat/SDK/Local/C copy clone libs/xmlwf T:expat/SDK/Local/C makedir all T:expat/SDK/Local/clib2/lib copy clone clib2/libexpat.a T:expat/SDK/Local/clib2/lib makedir all T:expat/SDK/Local/newlib/lib copy clone newlib/libexpat.a T:expat/SDK/Local/newlib/lib makedir all T:expat/SDK/Local/common/include copy clone /lib/expat.h /lib/expat_external.h T:expat/SDK/Local/common/include makedir all T:expat/SDK/Include/include_h/inline4 copy clone include/inline4/expat.h T:expat/SDK/Include/include_h/inline4 makedir all T:expat/SDK/Include/include_h/interfaces copy clone include/interfaces/expat.h T:expat/SDK/Include/include_h/interfaces makedir all T:expat/SDK/Include/include_h/libraries copy clone include/libraries/expat.h T:expat/SDK/Include/include_h/libraries makedir all T:expat/SDK/Include/include_h/proto copy clone include/proto/expat.h T:expat/SDK/Include/include_h/proto makedir all T:expat/SDK/Documentation/Libs/Expat copy clone /COPYING T:expat/SDK/Documentation/Libs/Expat copy clone /README T:expat/SDK/Documentation/Libs/Expat copy clone README.txt T:expat/SDK/Documentation/Libs/Expat/README.AmigaOS -delete expat.lha lha -r a expat.lha T:expat ############################################################################# CC := gcc LIBTOOL := ar STRIP := strip CFLAGS := -DNDEBUG -O3 LTFLAGS := -crs STRIPFLAGS := -R.comment ############################################################################# clib2/libexpat.a: clib2/xmlparse.o clib2/xmltok.o clib2/xmlrole.o $(LIBTOOL) $(LTFLAGS) $@@ $^ protect $@@ -e clib2/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h clib2/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h clib2/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# d65 32 a96 3 clib2/xmlwf: clib2/xmlwf.o clib2/xmlfile.o clib2/codepage.o clib2/readfilemap.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ a97 1 clib2/xmlwf.o: xmlwf.c d99 1 a99 11 clib2/xmlfile.o: xmlfile.c clib2/codepage.o: codepage.c clib2/readfilemap.o: readfilemap.c ############################################################################# clib2/elements: clib2/elements.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ d101 1 a101 1 clib2/elements.o: elements.c a102 1 ############################################################################# d104 1 a104 27 clib2/outline: clib2/outline.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ clib2/outline.o: outline.c ############################################################################# clib2/runtests: clib2/runtests.o clib2/chardata.o clib2/minicheck.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a clib2/chardata.o: chardata.c chardata.h clib2/minicheck.o: minicheck.c minicheck.h clib2/runtests.o: runtests.c chardata.h ############################################################################# clib2/benchmark: clib2/benchmark.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a -lm clib2/benchmark.o: benchmark.c ############################################################################# newlib/libexpat.a: newlib/xmlparse.o newlib/xmltok.o newlib/xmlrole.o a105 1 protect $@@ -e d107 1 a107 1 newlib/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ d109 1 d111 1 a111 1 newlib/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ d113 1 d115 1 a115 1 newlib/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ d118 1 a119 42 ############################################################################# newlib/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/xmlwf.o: xmlwf.c newlib/xmlfile.o: xmlfile.c newlib/codepage.o: codepage.c newlib/readfilemap.o: readfilemap.c ############################################################################# newlib/elements: newlib/elements.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/elements.o: elements.c ############################################################################# newlib/outline: newlib/outline.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/outline.o: outline.c ############################################################################# newlib/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a newlib/chardata.o: chardata.c chardata.h newlib/minicheck.o: minicheck.c minicheck.h newlib/runtests.o: runtests.c chardata.h ############################################################################# d121 2 a122 2 newlib/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a d124 2 a125 1 newlib/benchmark.o: benchmark.c d127 2 a128 1 ############################################################################# d130 2 a131 8 libs/expat.library: libs/expat_lib.o libs/expat_68k.o libs/expat_68k_handler_stubs.o libs/expat_vectors.o newlib/libexpat.a $(CC) -mcrt=newlib -nostartfiles $^ -o $@@ newlib/libexpat.a -Wl,--cref,-M,-Map=$@@.map protect $@@ -e $(STRIP) $(STRIPFLAGS) $@@ libs/expat_lib.o: expat_lib.c expat_base.h libs/expat_68k.o: expat_68k.c expat_68k.h expat_base.h d133 2 a134 1 libs/expat_68k_handler_stubs.o: expat_68k_handler_stubs.c expat_68k.h a135 1 libs/expat_vectors.o: expat_vectors.c d137 2 a138 6 libs/launch.o: launch.c ############################################################################# libs/xmlwf: libs/xmlwf.o libs/xmlfile.o libs/codepage.o libs/readfilemap.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ d141 2 a142 1 libs/xmlwf.o: xmlwf.c d144 2 a145 1 libs/xmlfile.o: xmlfile.c d147 2 a148 1 libs/codepage.o: codepage.c d150 2 a151 1 libs/readfilemap.o: readfilemap.c a152 1 ############################################################################# d154 2 a155 2 libs/elements: libs/elements.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ d158 2 a159 55 libs/elements.o: elements.c ############################################################################# libs/outline: libs/outline.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ $(STRIP) $(STRIPFLAGS) $@@ libs/outline.o: outline.c ############################################################################# libs/runtests: libs/runtests.o libs/chardata.o libs/minicheck.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/chardata.o: chardata.c chardata.h libs/minicheck.o: minicheck.c minicheck.h libs/runtests.o: runtests.c chardata.h ############################################################################# libs/benchmark: libs/benchmark.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/benchmark.o: benchmark.c ############################################################################# so/libexpat.so: so/xmlparse.o so/xmltok.o so/xmlrole.o $(CC) -mcrt=newlib -shared -o $@@ $^ protect $@@ -e so/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h so/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h so/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# so/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ ############################################################################# so/elements: newlib/elements.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ a160 1 ############################################################################# d162 2 a163 2 so/outline: newlib/outline.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d166 2 a167 1 ############################################################################# a168 2 so/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d170 2 a171 1 ############################################################################# d173 2 a174 2 so/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d176 2 a177 1 ############################################################################# d179 2 a180 2 clib2/%.o: %.c $(CC) -mcrt=clib2 $(CFLAGS) -I../lib -c $< -o $@@ a181 2 newlib/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -I../lib -c $< -o $@@ d183 2 a184 2 libs/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -D__USE_INLINE__ -I. -Iinclude -Iinclude/libraries -I../lib -c $< -o $@@ d186 2 a187 2 so/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -fPIC -I../lib -c $< -o $@@ @ 1.1.1.1.8.2 log @Pull up following revision(s) (requested by spz in ticket #1458): external/mit/expat/dist/AUTHORS: up to 1.1.1.1 external/mit/expat/dist/CMake.README: up to 1.1.1.4 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.4 external/mit/expat/dist/COPYING: up to 1.1.1.3 external/mit/expat/dist/Changes: up to 1.1.1.5 external/mit/expat/dist/MANIFEST: up to 1.1.1.5 external/mit/expat/dist/Makefile.in: up to 1.1.1.5 external/mit/expat/dist/README: up to 1.1.1.5 external/mit/expat/dist/amiga/Makefile delete external/mit/expat/dist/amiga/README.txt delete external/mit/expat/dist/amiga/expat.xml delete external/mit/expat/dist/amiga/expat_68k.c delete external/mit/expat/dist/amiga/expat_68k.h delete external/mit/expat/dist/amiga/expat_68k_handler_stubs.c delete external/mit/expat/dist/amiga/expat_base.h delete external/mit/expat/dist/amiga/expat_lib.c delete external/mit/expat/dist/amiga/expat_vectors.c delete external/mit/expat/dist/amiga/include/inline4/expat.h delete external/mit/expat/dist/amiga/include/interfaces/expat.h delete external/mit/expat/dist/amiga/include/libraries/expat.h delete external/mit/expat/dist/amiga/include/proto/expat.h delete external/mit/expat/dist/amiga/launch.c delete external/mit/expat/dist/bcb5/README.txt delete external/mit/expat/dist/bcb5/all_projects.bpg delete external/mit/expat/dist/bcb5/elements.bpf delete external/mit/expat/dist/bcb5/elements.bpr delete external/mit/expat/dist/bcb5/elements.mak delete external/mit/expat/dist/bcb5/expat.bpf delete external/mit/expat/dist/bcb5/expat.bpr delete external/mit/expat/dist/bcb5/expat.mak delete external/mit/expat/dist/bcb5/expat_static.bpf delete external/mit/expat/dist/bcb5/expat_static.bpr delete external/mit/expat/dist/bcb5/expat_static.mak delete external/mit/expat/dist/bcb5/expatw.bpf delete external/mit/expat/dist/bcb5/expatw.bpr delete external/mit/expat/dist/bcb5/expatw.mak delete external/mit/expat/dist/bcb5/expatw_static.bpf delete external/mit/expat/dist/bcb5/expatw_static.bpr delete external/mit/expat/dist/bcb5/expatw_static.mak delete external/mit/expat/dist/bcb5/libexpat_mtd.def delete external/mit/expat/dist/bcb5/libexpatw_mtd.def delete external/mit/expat/dist/bcb5/makefile.mak delete external/mit/expat/dist/bcb5/outline.bpf delete external/mit/expat/dist/bcb5/outline.bpr delete external/mit/expat/dist/bcb5/outline.mak delete external/mit/expat/dist/bcb5/setup.bat delete external/mit/expat/dist/bcb5/xmlwf.bpf delete external/mit/expat/dist/bcb5/xmlwf.bpr delete external/mit/expat/dist/bcb5/xmlwf.mak delete external/mit/expat/dist/configure: up to 1.1.1.5 external/mit/expat/dist/configure.ac: up to 1.1.1.3 external/mit/expat/dist/configure.in delete external/mit/expat/dist/doc/reference.html: up to 1.1.1.4 external/mit/expat/dist/examples/elements.c: up to 1.1.1.4 external/mit/expat/dist/examples/elements.dsp delete external/mit/expat/dist/examples/outline.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.dsp delete external/mit/expat/dist/expat.dsw delete external/mit/expat/dist/expat_config.h.in: up to 1.1.1.5 external/mit/expat/dist/lib/Makefile.MPW delete external/mit/expat/dist/lib/amigaconfig.h delete external/mit/expat/dist/lib/expat.dsp delete external/mit/expat/dist/lib/expat.h: up to 1.1.1.5 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp delete external/mit/expat/dist/lib/expatw.dsp delete external/mit/expat/dist/lib/expatw_static.dsp delete external/mit/expat/dist/lib/macconfig.h delete external/mit/expat/dist/lib/siphash.h: up to 1.1.1.1 external/mit/expat/dist/lib/winconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.7 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.4 external/mit/expat/dist/lib/xmltok.c: up to 1.4 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.4 external/mit/expat/dist/run.sh.in: up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/benchmark.c: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp delete external/mit/expat/dist/tests/benchmark/benchmark.dsw delete external/mit/expat/dist/tests/memcheck.c: up to 1.1.1.1 external/mit/expat/dist/tests/memcheck.h: up to 1.1.1.1 external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.3 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.4 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.4 external/mit/expat/dist/tests/xmltest.sh: up to 1.3 external/mit/expat/dist/vms/README.vms delete external/mit/expat/dist/vms/descrip.mms delete external/mit/expat/dist/vms/expat_config.h delete external/mit/expat/dist/win32/MANIFEST.txt: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.4 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.5 external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/filemap.h: up to 1.1.1.2 external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.4 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/win32filemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.5 external/mit/expat/dist/xmlwf/xmlwf.dsp delete Update expat to 2.2.1. @ text @@ 1.1.1.1.6.1 log @Pull up following revision(s) (requested by spz in ticket #1383): distrib/sets/lists/base/ad.mips64eb: patch distrib/sets/lists/base/ad.mips64el: patch distrib/sets/lists/base/md.amd64: patch distrib/sets/lists/base/md.sparc64: patch distrib/sets/lists/base/shl.mi: 1.771, 1.772 via patch distrib/sets/lists/comp/ad.mips64eb: patch distrib/sets/lists/comp/ad.mips64el: patch distrib/sets/lists/comp/md.amd64: patch distrib/sets/lists/comp/md.sparc64: patch distrib/sets/lists/comp/mi: 1.2035 via patch distrib/sets/lists/comp/shl.mi: patch external/mit/expat/dist/CMake.README: up to 1.1.1.2 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.2 external/mit/expat/dist/Changes: up to 1.1.1.3 external/mit/expat/dist/ConfigureChecks.cmake: up to 1.1.1.1 external/mit/expat/dist/MANIFEST: up to 1.1.1.3 external/mit/expat/dist/Makefile.in: up to 1.1.1.3 external/mit/expat/dist/README: up to 1.1.1.3 external/mit/expat/dist/aclocal.m4: up to 1.1.1.2 external/mit/expat/dist/configure: up to 1.1.1.3 external/mit/expat/dist/configure.ac: up to 1.1.1.1 external/mit/expat/dist/configure.in: up to 1.1.1.2 external/mit/expat/dist/expat.pc.in: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.cmake: up to 1.1.1.1 external/mit/expat/dist/expat_config.h.in: up to 1.1.1.3 external/mit/expat/dist/amiga/Makefile: up to 1.1.1.2 external/mit/expat/dist/amiga/README.txt: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_68k.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_base.h: up to 1.1.1.1 external/mit/expat/dist/amiga/expat_lib.c: up to 1.1.1.2 external/mit/expat/dist/amiga/expat_vectors.c: up to 1.1.1.2 external/mit/expat/dist/amiga/launch.c: up to 1.1.1.2 external/mit/expat/dist/amiga/stdlib.c: delete external/mit/expat/dist/bcb5/elements.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expat_static.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/expatw_static.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/outline.bpr: up to 1.1.1.2 external/mit/expat/dist/bcb5/xmlwf.bpr: up to 1.1.1.2 external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4: up to 1.4 external/mit/expat/dist/conftools/config.guess: up to 1.1.1.3 external/mit/expat/dist/conftools/config.sub: up to 1.1.1.3 external/mit/expat/dist/conftools/expat.m4: up to 1.1.1.2 external/mit/expat/dist/conftools/install-sh: up to 1.1.1.3 external/mit/expat/dist/conftools/libtool.m4: delete external/mit/expat/dist/conftools/ltmain.sh: up to 1.1.1.3 external/mit/expat/dist/conftools/mkinstalldirs: up to 1.4 external/mit/expat/dist/doc/reference.html: up to 1.1.1.3 external/mit/expat/dist/doc/xmlwf.1: up to 1.1.1.2 external/mit/expat/dist/doc/xmlwf.sgml: up to 1.1.1.3 external/mit/expat/dist/examples/elements.c: up to 1.1.1.2 external/mit/expat/dist/examples/elements.dsp: up to 1.1.1.2 external/mit/expat/dist/examples/outline.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/amigaconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/expat.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/expat.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/expatw.dsp: up to 1.1.1.2 external/mit/expat/dist/lib/libexpat.def: up to 1.1.1.2 external/mit/expat/dist/lib/libexpatw.def: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.4 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.2 external/mit/expat/dist/lib/xmltok.c: up to 1.1.1.2 external/mit/expat/dist/lib/xmltok.h: up to 1.1.1.1 external/mit/expat/dist/lib/xmltok_impl.c: up to 1.3 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.2 external/mit/expat/dist/m4/ltoptions.m4: up to 1.1.1.2 external/mit/expat/dist/m4/ltsugar.m4: up to 1.1.1.1 external/mit/expat/dist/m4/ltversion.m4: up to 1.1.1.2 external/mit/expat/dist/m4/lt~obsolete.m4: up to 1.1.1.1 external/mit/expat/dist/tests/README.txt: up to 1.1.1.2 external/mit/expat/dist/tests/chardata.c: up to 1.1.1.2 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.2 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.2 external/mit/expat/dist/tests/xmltest.sh: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/README.txt: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.2 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.3 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.dsp: up to 1.1.1.2 external/mit/expat/lib/libexpat/Makefile: up to 1.2 external/mit/expat/lib/libexpat/expat.pc.in: up to 1.1 external/mit/expat/lib/libexpat/expat_config.h: up to 1.3 external/mit/expat/lib/libexpat/shlib_version: up to 1.3 Update expat to 2.1.1. Apply fixes for CVE-2016-0718. @ text @d5 1 a5 2 .PHONY: help all check clean package .PHONY: clib2 newlib library so d7 1 a7 1 vpath %.c ../lib ../examples ../xmlwf ../tests ../tests/benchmark d10 26 a35 1 ############################################################################# d39 3 a41 2 @@echo " AmigaOS 4.x" @@echo " SDK 53.13" d44 1 a44 1 @@echo " all - make libraries, xmlwf, examples and runs tests" a45 5 @@echo " clean - clean object files" @@echo " check - run all the tests" @@echo " package - prepare distribution archive" all: clib2 newlib library so check d47 4 a50 1 clib2: clib2/libexpat.a clib2/xmlwf clib2/elements clib2/outline clib2/runtests clib2/benchmark d52 2 a53 1 newlib: newlib/libexpat.a newlib/xmlwf newlib/elements newlib/outline newlib/runtests newlib/benchmark d55 2 a56 1 library: libs/expat.library libs/xmlwf libs/elements libs/outline libs/runtests libs/benchmark d58 2 a59 7 so: so/libexpat.so so/xmlwf so/elements so/outline so/runtests so/benchmark check: clib2/runtests newlib/runtests libs/runtests so/runtests clib2/runtests newlib/runtests libs/runtests so/runtests d62 1 a62 2 -delete clib2/#?.o quiet -delete newlib/#?.o quiet a63 59 -delete so/#?.o quiet package: $(MAKE) all -delete T:expat all force quiet makedir all T:expat/Workbench/Libs copy clone libs/expat.library T:expat/Workbench/Libs makedir all T:expat/Workbench/SObjs copy clone so/libexpat.so T:expat/Workbench/SObjs makedir all T:expat/SDK/Local/C copy clone libs/xmlwf T:expat/SDK/Local/C makedir all T:expat/SDK/Local/clib2/lib copy clone clib2/libexpat.a T:expat/SDK/Local/clib2/lib makedir all T:expat/SDK/Local/newlib/lib copy clone newlib/libexpat.a T:expat/SDK/Local/newlib/lib makedir all T:expat/SDK/Local/common/include copy clone /lib/expat.h /lib/expat_external.h T:expat/SDK/Local/common/include makedir all T:expat/SDK/Include/include_h/inline4 copy clone include/inline4/expat.h T:expat/SDK/Include/include_h/inline4 makedir all T:expat/SDK/Include/include_h/interfaces copy clone include/interfaces/expat.h T:expat/SDK/Include/include_h/interfaces makedir all T:expat/SDK/Include/include_h/libraries copy clone include/libraries/expat.h T:expat/SDK/Include/include_h/libraries makedir all T:expat/SDK/Include/include_h/proto copy clone include/proto/expat.h T:expat/SDK/Include/include_h/proto makedir all T:expat/SDK/Documentation/Libs/Expat copy clone /COPYING T:expat/SDK/Documentation/Libs/Expat copy clone /README T:expat/SDK/Documentation/Libs/Expat copy clone README.txt T:expat/SDK/Documentation/Libs/Expat/README.AmigaOS -delete expat.lha lha -r a expat.lha T:expat ############################################################################# CC := gcc LIBTOOL := ar STRIP := strip CFLAGS := -DNDEBUG -O3 LTFLAGS := -crs STRIPFLAGS := -R.comment ############################################################################# clib2/libexpat.a: clib2/xmlparse.o clib2/xmltok.o clib2/xmlrole.o $(LIBTOOL) $(LTFLAGS) $@@ $^ protect $@@ -e clib2/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h clib2/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h clib2/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# d65 32 a96 3 clib2/xmlwf: clib2/xmlwf.o clib2/xmlfile.o clib2/codepage.o clib2/readfilemap.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ a97 1 clib2/xmlwf.o: xmlwf.c d99 1 a99 11 clib2/xmlfile.o: xmlfile.c clib2/codepage.o: codepage.c clib2/readfilemap.o: readfilemap.c ############################################################################# clib2/elements: clib2/elements.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ d101 1 a101 1 clib2/elements.o: elements.c a102 1 ############################################################################# d104 1 a104 27 clib2/outline: clib2/outline.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ clib2/outline.o: outline.c ############################################################################# clib2/runtests: clib2/runtests.o clib2/chardata.o clib2/minicheck.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a clib2/chardata.o: chardata.c chardata.h clib2/minicheck.o: minicheck.c minicheck.h clib2/runtests.o: runtests.c chardata.h ############################################################################# clib2/benchmark: clib2/benchmark.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a -lm clib2/benchmark.o: benchmark.c ############################################################################# newlib/libexpat.a: newlib/xmlparse.o newlib/xmltok.o newlib/xmlrole.o a105 1 protect $@@ -e d107 1 a107 1 newlib/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ d109 1 d111 1 a111 1 newlib/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ d113 1 d115 1 a115 1 newlib/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ d118 1 a119 42 ############################################################################# newlib/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/xmlwf.o: xmlwf.c newlib/xmlfile.o: xmlfile.c newlib/codepage.o: codepage.c newlib/readfilemap.o: readfilemap.c ############################################################################# newlib/elements: newlib/elements.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/elements.o: elements.c ############################################################################# newlib/outline: newlib/outline.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/outline.o: outline.c ############################################################################# newlib/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a newlib/chardata.o: chardata.c chardata.h newlib/minicheck.o: minicheck.c minicheck.h newlib/runtests.o: runtests.c chardata.h ############################################################################# d121 2 a122 2 newlib/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a d124 2 a125 1 newlib/benchmark.o: benchmark.c d127 2 a128 1 ############################################################################# d130 2 a131 8 libs/expat.library: libs/expat_lib.o libs/expat_68k.o libs/expat_68k_handler_stubs.o libs/expat_vectors.o newlib/libexpat.a $(CC) -mcrt=newlib -nostartfiles $^ -o $@@ newlib/libexpat.a -Wl,--cref,-M,-Map=$@@.map protect $@@ -e $(STRIP) $(STRIPFLAGS) $@@ libs/expat_lib.o: expat_lib.c expat_base.h libs/expat_68k.o: expat_68k.c expat_68k.h expat_base.h d133 2 a134 1 libs/expat_68k_handler_stubs.o: expat_68k_handler_stubs.c expat_68k.h a135 1 libs/expat_vectors.o: expat_vectors.c d137 2 a138 6 libs/launch.o: launch.c ############################################################################# libs/xmlwf: libs/xmlwf.o libs/xmlfile.o libs/codepage.o libs/readfilemap.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ d141 2 a142 1 libs/xmlwf.o: xmlwf.c d144 2 a145 1 libs/xmlfile.o: xmlfile.c d147 2 a148 1 libs/codepage.o: codepage.c d150 2 a151 1 libs/readfilemap.o: readfilemap.c a152 1 ############################################################################# d154 2 a155 2 libs/elements: libs/elements.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ d158 2 a159 55 libs/elements.o: elements.c ############################################################################# libs/outline: libs/outline.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ $(STRIP) $(STRIPFLAGS) $@@ libs/outline.o: outline.c ############################################################################# libs/runtests: libs/runtests.o libs/chardata.o libs/minicheck.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/chardata.o: chardata.c chardata.h libs/minicheck.o: minicheck.c minicheck.h libs/runtests.o: runtests.c chardata.h ############################################################################# libs/benchmark: libs/benchmark.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/benchmark.o: benchmark.c ############################################################################# so/libexpat.so: so/xmlparse.o so/xmltok.o so/xmlrole.o $(CC) -mcrt=newlib -shared -o $@@ $^ protect $@@ -e so/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h so/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h so/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# so/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ ############################################################################# so/elements: newlib/elements.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ a160 1 ############################################################################# d162 2 a163 2 so/outline: newlib/outline.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d166 2 a167 1 ############################################################################# a168 2 so/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d170 2 a171 1 ############################################################################# d173 2 a174 2 so/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d176 2 a177 1 ############################################################################# d179 2 a180 2 clib2/%.o: %.c $(CC) -mcrt=clib2 $(CFLAGS) -I../lib -c $< -o $@@ a181 2 newlib/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -I../lib -c $< -o $@@ d183 2 a184 2 libs/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -D__USE_INLINE__ -I. -Iinclude -Iinclude/libraries -I../lib -c $< -o $@@ d186 2 a187 2 so/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -fPIC -I../lib -c $< -o $@@ @ 1.1.1.1.6.2 log @Pull up following revision(s) (requested by spz in ticket #1458): external/mit/expat/dist/AUTHORS: up to 1.1.1.1 external/mit/expat/dist/CMake.README: up to 1.1.1.4 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.4 external/mit/expat/dist/COPYING: up to 1.1.1.3 external/mit/expat/dist/Changes: up to 1.1.1.5 external/mit/expat/dist/MANIFEST: up to 1.1.1.5 external/mit/expat/dist/Makefile.in: up to 1.1.1.5 external/mit/expat/dist/README: up to 1.1.1.5 external/mit/expat/dist/amiga/Makefile delete external/mit/expat/dist/amiga/README.txt delete external/mit/expat/dist/amiga/expat.xml delete external/mit/expat/dist/amiga/expat_68k.c delete external/mit/expat/dist/amiga/expat_68k.h delete external/mit/expat/dist/amiga/expat_68k_handler_stubs.c delete external/mit/expat/dist/amiga/expat_base.h delete external/mit/expat/dist/amiga/expat_lib.c delete external/mit/expat/dist/amiga/expat_vectors.c delete external/mit/expat/dist/amiga/include/inline4/expat.h delete external/mit/expat/dist/amiga/include/interfaces/expat.h delete external/mit/expat/dist/amiga/include/libraries/expat.h delete external/mit/expat/dist/amiga/include/proto/expat.h delete external/mit/expat/dist/amiga/launch.c delete external/mit/expat/dist/bcb5/README.txt delete external/mit/expat/dist/bcb5/all_projects.bpg delete external/mit/expat/dist/bcb5/elements.bpf delete external/mit/expat/dist/bcb5/elements.bpr delete external/mit/expat/dist/bcb5/elements.mak delete external/mit/expat/dist/bcb5/expat.bpf delete external/mit/expat/dist/bcb5/expat.bpr delete external/mit/expat/dist/bcb5/expat.mak delete external/mit/expat/dist/bcb5/expat_static.bpf delete external/mit/expat/dist/bcb5/expat_static.bpr delete external/mit/expat/dist/bcb5/expat_static.mak delete external/mit/expat/dist/bcb5/expatw.bpf delete external/mit/expat/dist/bcb5/expatw.bpr delete external/mit/expat/dist/bcb5/expatw.mak delete external/mit/expat/dist/bcb5/expatw_static.bpf delete external/mit/expat/dist/bcb5/expatw_static.bpr delete external/mit/expat/dist/bcb5/expatw_static.mak delete external/mit/expat/dist/bcb5/libexpat_mtd.def delete external/mit/expat/dist/bcb5/libexpatw_mtd.def delete external/mit/expat/dist/bcb5/makefile.mak delete external/mit/expat/dist/bcb5/outline.bpf delete external/mit/expat/dist/bcb5/outline.bpr delete external/mit/expat/dist/bcb5/outline.mak delete external/mit/expat/dist/bcb5/setup.bat delete external/mit/expat/dist/bcb5/xmlwf.bpf delete external/mit/expat/dist/bcb5/xmlwf.bpr delete external/mit/expat/dist/bcb5/xmlwf.mak delete external/mit/expat/dist/configure: up to 1.1.1.5 external/mit/expat/dist/configure.ac: up to 1.1.1.3 external/mit/expat/dist/configure.in delete external/mit/expat/dist/doc/reference.html: up to 1.1.1.4 external/mit/expat/dist/examples/elements.c: up to 1.1.1.4 external/mit/expat/dist/examples/elements.dsp delete external/mit/expat/dist/examples/outline.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.dsp delete external/mit/expat/dist/expat.dsw delete external/mit/expat/dist/expat_config.h.in: up to 1.1.1.5 external/mit/expat/dist/lib/Makefile.MPW delete external/mit/expat/dist/lib/amigaconfig.h delete external/mit/expat/dist/lib/expat.dsp delete external/mit/expat/dist/lib/expat.h: up to 1.1.1.5 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp delete external/mit/expat/dist/lib/expatw.dsp delete external/mit/expat/dist/lib/expatw_static.dsp delete external/mit/expat/dist/lib/macconfig.h delete external/mit/expat/dist/lib/siphash.h: up to 1.1.1.1 external/mit/expat/dist/lib/winconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.7 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.4 external/mit/expat/dist/lib/xmltok.c: up to 1.4 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.4 external/mit/expat/dist/run.sh.in: up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/benchmark.c: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp delete external/mit/expat/dist/tests/benchmark/benchmark.dsw delete external/mit/expat/dist/tests/memcheck.c: up to 1.1.1.1 external/mit/expat/dist/tests/memcheck.h: up to 1.1.1.1 external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.3 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.4 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.4 external/mit/expat/dist/tests/xmltest.sh: up to 1.3 external/mit/expat/dist/vms/README.vms delete external/mit/expat/dist/vms/descrip.mms delete external/mit/expat/dist/vms/expat_config.h delete external/mit/expat/dist/win32/MANIFEST.txt: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.4 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.5 external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/filemap.h: up to 1.1.1.2 external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.4 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/win32filemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.5 external/mit/expat/dist/xmlwf/xmlwf.dsp delete Update expat to 2.2.1. @ text @@ 1.1.1.2 log @import of expat 2.1.0 Fixes CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security issues have been previously fixed in our tree) relevant Changes: Release 2.1.0 Sat March 24 2012 - Bug Fixes: #1742315: Harmful XML_ParserCreateNS suggestion. #2895533: CVE-2012-1147 - Resource leak in readfilemap.c. #1785430: Expat build fails on linux-amd64 with gcc version>=4.1 -O3. #1983953, 2517952, 2517962, 2649838: Build modifications using autoreconf instead of buildconf.sh. #2815947, #2884086: OBJEXT and EXEEXT support while building. #1990430: CVE-2009-3720 - Parser crash with special UTF-8 sequences. #2517938: xmlwf should return non-zero exit status if not well-formed. #2517946: Wrong statement about XMLDecl in xmlwf.1 and xmlwf.sgml. #2855609: Dangling positionPtr after error. #2894085: CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8(). #2958794: CVE-2012-1148 - Memory leak in poolGrow. #2990652: CMake support. #3010819: UNEXPECTED_STATE with a trailing "%" in entity value. #3206497: Unitialized memory returned from XML_Parse. #3287849: make check fails on mingw-w64. #3496608: CVE-2012-0876 - Hash DOS attack. - Patches: #1749198: pkg-config support. #3010222: Fix for bug #3010819. #3312568: CMake support. #3446384: Report byte offsets for attr names and values. - New Features / API changes: Added new API member XML_SetHashSalt() that allows setting an intial value (salt) for hash calculations. This is part of the fix for bug #3496608 to randomize hash parameters. When compiled with XML_ATTR_INFO defined, adds new API member XML_GetAttributeInfo() that allows retrieving the byte offsets for attribute names and values (patch #3446384). Added CMake build system. See bug #2990652 and patch #3312568. Added run-benchmark target to Makefile.in - relies on testdata module present in the same relative location as in the repository. @ text @d5 1 a5 2 .PHONY: help all check clean package .PHONY: clib2 newlib library so d7 1 a7 1 vpath %.c ../lib ../examples ../xmlwf ../tests ../tests/benchmark d10 26 a35 1 ############################################################################# d39 3 a41 2 @@echo " AmigaOS 4.x" @@echo " SDK 53.13" d44 1 a44 1 @@echo " all - make libraries, xmlwf, examples and runs tests" a45 5 @@echo " clean - clean object files" @@echo " check - run all the tests" @@echo " package - prepare distribution archive" all: clib2 newlib library so check d47 4 a50 1 clib2: clib2/libexpat.a clib2/xmlwf clib2/elements clib2/outline clib2/runtests clib2/benchmark d52 2 a53 1 newlib: newlib/libexpat.a newlib/xmlwf newlib/elements newlib/outline newlib/runtests newlib/benchmark d55 2 a56 1 library: libs/expat.library libs/xmlwf libs/elements libs/outline libs/runtests libs/benchmark d58 2 a59 7 so: so/libexpat.so so/xmlwf so/elements so/outline so/runtests so/benchmark check: clib2/runtests newlib/runtests libs/runtests so/runtests clib2/runtests newlib/runtests libs/runtests so/runtests d62 1 a62 2 -delete clib2/#?.o quiet -delete newlib/#?.o quiet a63 59 -delete so/#?.o quiet package: $(MAKE) all -delete T:expat all force quiet makedir all T:expat/Workbench/Libs copy clone libs/expat.library T:expat/Workbench/Libs makedir all T:expat/Workbench/SObjs copy clone so/libexpat.so T:expat/Workbench/SObjs makedir all T:expat/SDK/Local/C copy clone libs/xmlwf T:expat/SDK/Local/C makedir all T:expat/SDK/Local/clib2/lib copy clone clib2/libexpat.a T:expat/SDK/Local/clib2/lib makedir all T:expat/SDK/Local/newlib/lib copy clone newlib/libexpat.a T:expat/SDK/Local/newlib/lib makedir all T:expat/SDK/Local/common/include copy clone /lib/expat.h /lib/expat_external.h T:expat/SDK/Local/common/include makedir all T:expat/SDK/Include/include_h/inline4 copy clone include/inline4/expat.h T:expat/SDK/Include/include_h/inline4 makedir all T:expat/SDK/Include/include_h/interfaces copy clone include/interfaces/expat.h T:expat/SDK/Include/include_h/interfaces makedir all T:expat/SDK/Include/include_h/libraries copy clone include/libraries/expat.h T:expat/SDK/Include/include_h/libraries makedir all T:expat/SDK/Include/include_h/proto copy clone include/proto/expat.h T:expat/SDK/Include/include_h/proto makedir all T:expat/SDK/Documentation/Libs/Expat copy clone /COPYING T:expat/SDK/Documentation/Libs/Expat copy clone /README T:expat/SDK/Documentation/Libs/Expat copy clone README.txt T:expat/SDK/Documentation/Libs/Expat/README.AmigaOS -delete expat.lha lha -r a expat.lha T:expat ############################################################################# CC := gcc LIBTOOL := ar STRIP := strip CFLAGS := -DNDEBUG -O3 LTFLAGS := -crs STRIPFLAGS := -R.comment ############################################################################# clib2/libexpat.a: clib2/xmlparse.o clib2/xmltok.o clib2/xmlrole.o $(LIBTOOL) $(LTFLAGS) $@@ $^ protect $@@ -e clib2/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h clib2/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h clib2/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# d65 32 a96 3 clib2/xmlwf: clib2/xmlwf.o clib2/xmlfile.o clib2/codepage.o clib2/readfilemap.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ a97 1 clib2/xmlwf.o: xmlwf.c d99 1 a99 11 clib2/xmlfile.o: xmlfile.c clib2/codepage.o: codepage.c clib2/readfilemap.o: readfilemap.c ############################################################################# clib2/elements: clib2/elements.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ d101 1 a101 1 clib2/elements.o: elements.c a102 1 ############################################################################# d104 1 a104 27 clib2/outline: clib2/outline.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ clib2/outline.o: outline.c ############################################################################# clib2/runtests: clib2/runtests.o clib2/chardata.o clib2/minicheck.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a clib2/chardata.o: chardata.c chardata.h clib2/minicheck.o: minicheck.c minicheck.h clib2/runtests.o: runtests.c chardata.h ############################################################################# clib2/benchmark: clib2/benchmark.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a -lm clib2/benchmark.o: benchmark.c ############################################################################# newlib/libexpat.a: newlib/xmlparse.o newlib/xmltok.o newlib/xmlrole.o a105 1 protect $@@ -e d107 1 a107 1 newlib/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ d109 1 d111 1 a111 1 newlib/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ d113 1 d115 1 a115 1 newlib/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ d118 1 a119 42 ############################################################################# newlib/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/xmlwf.o: xmlwf.c newlib/xmlfile.o: xmlfile.c newlib/codepage.o: codepage.c newlib/readfilemap.o: readfilemap.c ############################################################################# newlib/elements: newlib/elements.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/elements.o: elements.c ############################################################################# newlib/outline: newlib/outline.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/outline.o: outline.c ############################################################################# newlib/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a newlib/chardata.o: chardata.c chardata.h newlib/minicheck.o: minicheck.c minicheck.h newlib/runtests.o: runtests.c chardata.h ############################################################################# d121 2 a122 2 newlib/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a d124 2 a125 1 newlib/benchmark.o: benchmark.c d127 2 a128 1 ############################################################################# d130 2 a131 8 libs/expat.library: libs/expat_lib.o libs/expat_68k.o libs/expat_68k_handler_stubs.o libs/expat_vectors.o newlib/libexpat.a $(CC) -mcrt=newlib -nostartfiles $^ -o $@@ newlib/libexpat.a -Wl,--cref,-M,-Map=$@@.map protect $@@ -e $(STRIP) $(STRIPFLAGS) $@@ libs/expat_lib.o: expat_lib.c expat_base.h libs/expat_68k.o: expat_68k.c expat_68k.h expat_base.h d133 2 a134 1 libs/expat_68k_handler_stubs.o: expat_68k_handler_stubs.c expat_68k.h a135 1 libs/expat_vectors.o: expat_vectors.c d137 2 a138 6 libs/launch.o: launch.c ############################################################################# libs/xmlwf: libs/xmlwf.o libs/xmlfile.o libs/codepage.o libs/readfilemap.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ d141 2 a142 1 libs/xmlwf.o: xmlwf.c d144 2 a145 1 libs/xmlfile.o: xmlfile.c d147 2 a148 1 libs/codepage.o: codepage.c d150 2 a151 1 libs/readfilemap.o: readfilemap.c a152 1 ############################################################################# d154 2 a155 2 libs/elements: libs/elements.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ d158 2 a159 55 libs/elements.o: elements.c ############################################################################# libs/outline: libs/outline.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ $(STRIP) $(STRIPFLAGS) $@@ libs/outline.o: outline.c ############################################################################# libs/runtests: libs/runtests.o libs/chardata.o libs/minicheck.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/chardata.o: chardata.c chardata.h libs/minicheck.o: minicheck.c minicheck.h libs/runtests.o: runtests.c chardata.h ############################################################################# libs/benchmark: libs/benchmark.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/benchmark.o: benchmark.c ############################################################################# so/libexpat.so: so/xmlparse.o so/xmltok.o so/xmlrole.o $(CC) -mcrt=newlib -shared -o $@@ $^ protect $@@ -e so/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h so/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h so/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# so/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ ############################################################################# so/elements: newlib/elements.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ a160 1 ############################################################################# d162 2 a163 2 so/outline: newlib/outline.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d166 2 a167 1 ############################################################################# a168 2 so/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d170 2 a171 1 ############################################################################# d173 2 a174 2 so/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat d176 2 a177 1 ############################################################################# d179 2 a180 2 clib2/%.o: %.c $(CC) -mcrt=clib2 $(CFLAGS) -I../lib -c $< -o $@@ a181 2 newlib/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -I../lib -c $< -o $@@ d183 2 a184 2 libs/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -D__USE_INLINE__ -I. -Iinclude -Iinclude/libraries -I../lib -c $< -o $@@ d186 2 a187 2 so/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -fPIC -I../lib -c $< -o $@@ @ 1.1.1.2.26.1 log @Pull up following revision(s) (requested by spz in ticket #48): doc/3RDPARTY: 1.1454 external/mit/expat/dist/AUTHORS: up to 1.1.1.1 external/mit/expat/dist/CMake.README: up to 1.1.1.4 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.4 external/mit/expat/dist/COPYING: up to 1.1.1.3 external/mit/expat/dist/Changes: up to 1.1.1.5 external/mit/expat/dist/MANIFEST: up to 1.1.1.5 external/mit/expat/dist/Makefile.in: up to 1.1.1.5 external/mit/expat/dist/README: up to 1.1.1.5 external/mit/expat/dist/amiga/Makefile: delete external/mit/expat/dist/amiga/README.txt: delete external/mit/expat/dist/amiga/expat.xml: delete external/mit/expat/dist/amiga/expat_68k.c: delete external/mit/expat/dist/amiga/expat_68k.h: delete external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: delete external/mit/expat/dist/amiga/expat_base.h: delete external/mit/expat/dist/amiga/expat_lib.c: delete external/mit/expat/dist/amiga/expat_vectors.c: delete external/mit/expat/dist/amiga/include/inline4/expat.h: delete external/mit/expat/dist/amiga/include/interfaces/expat.h: delete external/mit/expat/dist/amiga/include/libraries/expat.h: delete external/mit/expat/dist/amiga/include/proto/expat.h: delete external/mit/expat/dist/amiga/launch.c: delete external/mit/expat/dist/bcb5/README.txt: delete external/mit/expat/dist/bcb5/all_projects.bpg: delete external/mit/expat/dist/bcb5/elements.bpf: delete external/mit/expat/dist/bcb5/elements.bpr: delete external/mit/expat/dist/bcb5/elements.mak: delete external/mit/expat/dist/bcb5/expat.bpf: delete external/mit/expat/dist/bcb5/expat.bpr: delete external/mit/expat/dist/bcb5/expat.mak: delete external/mit/expat/dist/bcb5/expat_static.bpf: delete external/mit/expat/dist/bcb5/expat_static.bpr: delete external/mit/expat/dist/bcb5/expat_static.mak: delete external/mit/expat/dist/bcb5/expatw.bpf: delete external/mit/expat/dist/bcb5/expatw.bpr: delete external/mit/expat/dist/bcb5/expatw.mak: delete external/mit/expat/dist/bcb5/expatw_static.bpf: delete external/mit/expat/dist/bcb5/expatw_static.bpr: delete external/mit/expat/dist/bcb5/expatw_static.mak: delete external/mit/expat/dist/bcb5/libexpat_mtd.def: delete external/mit/expat/dist/bcb5/libexpatw_mtd.def: delete external/mit/expat/dist/bcb5/makefile.mak: delete external/mit/expat/dist/bcb5/outline.bpf: delete external/mit/expat/dist/bcb5/outline.bpr: delete external/mit/expat/dist/bcb5/outline.mak: delete external/mit/expat/dist/bcb5/setup.bat: delete external/mit/expat/dist/bcb5/xmlwf.bpf: delete external/mit/expat/dist/bcb5/xmlwf.bpr: delete external/mit/expat/dist/bcb5/xmlwf.mak: delete external/mit/expat/dist/configure: up to 1.1.1.5 external/mit/expat/dist/configure.ac: up to 1.1.1.3 external/mit/expat/dist/configure.in: delete external/mit/expat/dist/doc/reference.html: up to 1.1.1.4 external/mit/expat/dist/examples/elements.c: up to 1.1.1.4 external/mit/expat/dist/examples/elements.dsp: delete external/mit/expat/dist/examples/outline.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.dsp: delete external/mit/expat/dist/expat.dsw: delete external/mit/expat/dist/expat_config.h.in: up to 1.1.1.5 external/mit/expat/dist/lib/Makefile.MPW: delete external/mit/expat/dist/lib/amigaconfig.h: delete external/mit/expat/dist/lib/expat.dsp: delete external/mit/expat/dist/lib/expat.h: up to 1.1.1.5 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp: delete external/mit/expat/dist/lib/expatw.dsp: delete external/mit/expat/dist/lib/expatw_static.dsp: delete external/mit/expat/dist/lib/macconfig.h: delete external/mit/expat/dist/lib/siphash.h: up to 1.1.1.1 external/mit/expat/dist/lib/winconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.7 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.4 external/mit/expat/dist/lib/xmltok.c: up to 1.4 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.4 external/mit/expat/dist/run.sh.in: up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/benchmark.c: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp: delete external/mit/expat/dist/tests/benchmark/benchmark.dsw: delete external/mit/expat/dist/tests/memcheck.c: up to 1.1.1.1 external/mit/expat/dist/tests/memcheck.h: up to 1.1.1.1 external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.3 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.4 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.4 external/mit/expat/dist/tests/xmltest.sh: up to 1.3 external/mit/expat/dist/vms/README.vms: delete external/mit/expat/dist/vms/descrip.mms: delete external/mit/expat/dist/vms/expat_config.h: delete external/mit/expat/dist/win32/MANIFEST.txt: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.4 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.5 external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/filemap.h: up to 1.1.1.2 external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.4 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/win32filemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.5 external/mit/expat/dist/xmlwf/xmlwf.dsp: delete Update expat to 2.2.1. @ text @@ 1.1.1.2.12.1 log @Pull up following revision(s) (requested by spz in ticket #1437): doc/3RDPARTY: 1.1454 external/mit/expat/dist/AUTHORS: up to 1.1.1.1 external/mit/expat/dist/CMake.README: up to 1.1.1.4 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.4 external/mit/expat/dist/COPYING: up to 1.1.1.3 external/mit/expat/dist/Changes: up to 1.1.1.5 external/mit/expat/dist/MANIFEST: up to 1.1.1.5 external/mit/expat/dist/Makefile.in: up to 1.1.1.5 external/mit/expat/dist/README: up to 1.1.1.5 external/mit/expat/dist/amiga/Makefile: delete external/mit/expat/dist/amiga/README.txt: delete external/mit/expat/dist/amiga/expat.xml: delete external/mit/expat/dist/amiga/expat_68k.c: delete external/mit/expat/dist/amiga/expat_68k.h: delete external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: delete external/mit/expat/dist/amiga/expat_base.h: delete external/mit/expat/dist/amiga/expat_lib.c: delete external/mit/expat/dist/amiga/expat_vectors.c: delete external/mit/expat/dist/amiga/include/inline4/expat.h: delete external/mit/expat/dist/amiga/include/interfaces/expat.h: delete external/mit/expat/dist/amiga/include/libraries/expat.h: delete external/mit/expat/dist/amiga/include/proto/expat.h: delete external/mit/expat/dist/amiga/launch.c: delete external/mit/expat/dist/bcb5/README.txt: delete external/mit/expat/dist/bcb5/all_projects.bpg: delete external/mit/expat/dist/bcb5/elements.bpf: delete external/mit/expat/dist/bcb5/elements.bpr: delete external/mit/expat/dist/bcb5/elements.mak: delete external/mit/expat/dist/bcb5/expat.bpf: delete external/mit/expat/dist/bcb5/expat.bpr: delete external/mit/expat/dist/bcb5/expat.mak: delete external/mit/expat/dist/bcb5/expat_static.bpf: delete external/mit/expat/dist/bcb5/expat_static.bpr: delete external/mit/expat/dist/bcb5/expat_static.mak: delete external/mit/expat/dist/bcb5/expatw.bpf: delete external/mit/expat/dist/bcb5/expatw.bpr: delete external/mit/expat/dist/bcb5/expatw.mak: delete external/mit/expat/dist/bcb5/expatw_static.bpf: delete external/mit/expat/dist/bcb5/expatw_static.bpr: delete external/mit/expat/dist/bcb5/expatw_static.mak: delete external/mit/expat/dist/bcb5/libexpat_mtd.def: delete external/mit/expat/dist/bcb5/libexpatw_mtd.def: delete external/mit/expat/dist/bcb5/makefile.mak: delete external/mit/expat/dist/bcb5/outline.bpf: delete external/mit/expat/dist/bcb5/outline.bpr: delete external/mit/expat/dist/bcb5/outline.mak: delete external/mit/expat/dist/bcb5/setup.bat: delete external/mit/expat/dist/bcb5/xmlwf.bpf: delete external/mit/expat/dist/bcb5/xmlwf.bpr: delete external/mit/expat/dist/bcb5/xmlwf.mak: delete external/mit/expat/dist/configure: up to 1.1.1.5 external/mit/expat/dist/configure.ac: up to 1.1.1.3 external/mit/expat/dist/configure.in: delete external/mit/expat/dist/doc/reference.html: up to 1.1.1.4 external/mit/expat/dist/examples/elements.c: up to 1.1.1.4 external/mit/expat/dist/examples/elements.dsp: delete external/mit/expat/dist/examples/outline.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.dsp: delete external/mit/expat/dist/expat.dsw: delete external/mit/expat/dist/expat_config.h.in: up to 1.1.1.5 external/mit/expat/dist/lib/Makefile.MPW: delete external/mit/expat/dist/lib/amigaconfig.h: delete external/mit/expat/dist/lib/expat.dsp: delete external/mit/expat/dist/lib/expat.h: up to 1.1.1.5 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp: delete external/mit/expat/dist/lib/expatw.dsp: delete external/mit/expat/dist/lib/expatw_static.dsp: delete external/mit/expat/dist/lib/macconfig.h: delete external/mit/expat/dist/lib/siphash.h: up to 1.1.1.1 external/mit/expat/dist/lib/winconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.7 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.4 external/mit/expat/dist/lib/xmltok.c: up to 1.4 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.4 external/mit/expat/dist/run.sh.in: up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/benchmark.c: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp: delete external/mit/expat/dist/tests/benchmark/benchmark.dsw: delete external/mit/expat/dist/tests/memcheck.c: up to 1.1.1.1 external/mit/expat/dist/tests/memcheck.h: up to 1.1.1.1 external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.3 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.4 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.4 external/mit/expat/dist/tests/xmltest.sh: up to 1.3 external/mit/expat/dist/vms/README.vms: delete external/mit/expat/dist/vms/descrip.mms: delete external/mit/expat/dist/vms/expat_config.h: delete external/mit/expat/dist/win32/MANIFEST.txt: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.4 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.5 external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/filemap.h: up to 1.1.1.2 external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.4 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/win32filemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.5 external/mit/expat/dist/xmlwf/xmlwf.dsp: delete Update expat to 2.2.1. @ text @@ 1.1.1.2.22.1 log @Pull up following revision(s) (requested by spz in ticket #1437): doc/3RDPARTY: 1.1454 external/mit/expat/dist/AUTHORS: up to 1.1.1.1 external/mit/expat/dist/CMake.README: up to 1.1.1.4 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.4 external/mit/expat/dist/COPYING: up to 1.1.1.3 external/mit/expat/dist/Changes: up to 1.1.1.5 external/mit/expat/dist/MANIFEST: up to 1.1.1.5 external/mit/expat/dist/Makefile.in: up to 1.1.1.5 external/mit/expat/dist/README: up to 1.1.1.5 external/mit/expat/dist/amiga/Makefile: delete external/mit/expat/dist/amiga/README.txt: delete external/mit/expat/dist/amiga/expat.xml: delete external/mit/expat/dist/amiga/expat_68k.c: delete external/mit/expat/dist/amiga/expat_68k.h: delete external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: delete external/mit/expat/dist/amiga/expat_base.h: delete external/mit/expat/dist/amiga/expat_lib.c: delete external/mit/expat/dist/amiga/expat_vectors.c: delete external/mit/expat/dist/amiga/include/inline4/expat.h: delete external/mit/expat/dist/amiga/include/interfaces/expat.h: delete external/mit/expat/dist/amiga/include/libraries/expat.h: delete external/mit/expat/dist/amiga/include/proto/expat.h: delete external/mit/expat/dist/amiga/launch.c: delete external/mit/expat/dist/bcb5/README.txt: delete external/mit/expat/dist/bcb5/all_projects.bpg: delete external/mit/expat/dist/bcb5/elements.bpf: delete external/mit/expat/dist/bcb5/elements.bpr: delete external/mit/expat/dist/bcb5/elements.mak: delete external/mit/expat/dist/bcb5/expat.bpf: delete external/mit/expat/dist/bcb5/expat.bpr: delete external/mit/expat/dist/bcb5/expat.mak: delete external/mit/expat/dist/bcb5/expat_static.bpf: delete external/mit/expat/dist/bcb5/expat_static.bpr: delete external/mit/expat/dist/bcb5/expat_static.mak: delete external/mit/expat/dist/bcb5/expatw.bpf: delete external/mit/expat/dist/bcb5/expatw.bpr: delete external/mit/expat/dist/bcb5/expatw.mak: delete external/mit/expat/dist/bcb5/expatw_static.bpf: delete external/mit/expat/dist/bcb5/expatw_static.bpr: delete external/mit/expat/dist/bcb5/expatw_static.mak: delete external/mit/expat/dist/bcb5/libexpat_mtd.def: delete external/mit/expat/dist/bcb5/libexpatw_mtd.def: delete external/mit/expat/dist/bcb5/makefile.mak: delete external/mit/expat/dist/bcb5/outline.bpf: delete external/mit/expat/dist/bcb5/outline.bpr: delete external/mit/expat/dist/bcb5/outline.mak: delete external/mit/expat/dist/bcb5/setup.bat: delete external/mit/expat/dist/bcb5/xmlwf.bpf: delete external/mit/expat/dist/bcb5/xmlwf.bpr: delete external/mit/expat/dist/bcb5/xmlwf.mak: delete external/mit/expat/dist/configure: up to 1.1.1.5 external/mit/expat/dist/configure.ac: up to 1.1.1.3 external/mit/expat/dist/configure.in: delete external/mit/expat/dist/doc/reference.html: up to 1.1.1.4 external/mit/expat/dist/examples/elements.c: up to 1.1.1.4 external/mit/expat/dist/examples/elements.dsp: delete external/mit/expat/dist/examples/outline.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.dsp: delete external/mit/expat/dist/expat.dsw: delete external/mit/expat/dist/expat_config.h.in: up to 1.1.1.5 external/mit/expat/dist/lib/Makefile.MPW: delete external/mit/expat/dist/lib/amigaconfig.h: delete external/mit/expat/dist/lib/expat.dsp: delete external/mit/expat/dist/lib/expat.h: up to 1.1.1.5 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp: delete external/mit/expat/dist/lib/expatw.dsp: delete external/mit/expat/dist/lib/expatw_static.dsp: delete external/mit/expat/dist/lib/macconfig.h: delete external/mit/expat/dist/lib/siphash.h: up to 1.1.1.1 external/mit/expat/dist/lib/winconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.7 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.4 external/mit/expat/dist/lib/xmltok.c: up to 1.4 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.4 external/mit/expat/dist/run.sh.in: up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/benchmark.c: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp: delete external/mit/expat/dist/tests/benchmark/benchmark.dsw: delete external/mit/expat/dist/tests/memcheck.c: up to 1.1.1.1 external/mit/expat/dist/tests/memcheck.h: up to 1.1.1.1 external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.3 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.4 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.4 external/mit/expat/dist/tests/xmltest.sh: up to 1.3 external/mit/expat/dist/vms/README.vms: delete external/mit/expat/dist/vms/descrip.mms: delete external/mit/expat/dist/vms/expat_config.h: delete external/mit/expat/dist/win32/MANIFEST.txt: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.4 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.5 external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/filemap.h: up to 1.1.1.2 external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.4 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/win32filemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.5 external/mit/expat/dist/xmlwf/xmlwf.dsp: delete Update expat to 2.2.1. @ text @@ 1.1.1.2.14.1 log @Pull up following revision(s) (requested by spz in ticket #1437): doc/3RDPARTY: 1.1454 external/mit/expat/dist/AUTHORS: up to 1.1.1.1 external/mit/expat/dist/CMake.README: up to 1.1.1.4 external/mit/expat/dist/CMakeLists.txt: up to 1.1.1.4 external/mit/expat/dist/COPYING: up to 1.1.1.3 external/mit/expat/dist/Changes: up to 1.1.1.5 external/mit/expat/dist/MANIFEST: up to 1.1.1.5 external/mit/expat/dist/Makefile.in: up to 1.1.1.5 external/mit/expat/dist/README: up to 1.1.1.5 external/mit/expat/dist/amiga/Makefile: delete external/mit/expat/dist/amiga/README.txt: delete external/mit/expat/dist/amiga/expat.xml: delete external/mit/expat/dist/amiga/expat_68k.c: delete external/mit/expat/dist/amiga/expat_68k.h: delete external/mit/expat/dist/amiga/expat_68k_handler_stubs.c: delete external/mit/expat/dist/amiga/expat_base.h: delete external/mit/expat/dist/amiga/expat_lib.c: delete external/mit/expat/dist/amiga/expat_vectors.c: delete external/mit/expat/dist/amiga/include/inline4/expat.h: delete external/mit/expat/dist/amiga/include/interfaces/expat.h: delete external/mit/expat/dist/amiga/include/libraries/expat.h: delete external/mit/expat/dist/amiga/include/proto/expat.h: delete external/mit/expat/dist/amiga/launch.c: delete external/mit/expat/dist/bcb5/README.txt: delete external/mit/expat/dist/bcb5/all_projects.bpg: delete external/mit/expat/dist/bcb5/elements.bpf: delete external/mit/expat/dist/bcb5/elements.bpr: delete external/mit/expat/dist/bcb5/elements.mak: delete external/mit/expat/dist/bcb5/expat.bpf: delete external/mit/expat/dist/bcb5/expat.bpr: delete external/mit/expat/dist/bcb5/expat.mak: delete external/mit/expat/dist/bcb5/expat_static.bpf: delete external/mit/expat/dist/bcb5/expat_static.bpr: delete external/mit/expat/dist/bcb5/expat_static.mak: delete external/mit/expat/dist/bcb5/expatw.bpf: delete external/mit/expat/dist/bcb5/expatw.bpr: delete external/mit/expat/dist/bcb5/expatw.mak: delete external/mit/expat/dist/bcb5/expatw_static.bpf: delete external/mit/expat/dist/bcb5/expatw_static.bpr: delete external/mit/expat/dist/bcb5/expatw_static.mak: delete external/mit/expat/dist/bcb5/libexpat_mtd.def: delete external/mit/expat/dist/bcb5/libexpatw_mtd.def: delete external/mit/expat/dist/bcb5/makefile.mak: delete external/mit/expat/dist/bcb5/outline.bpf: delete external/mit/expat/dist/bcb5/outline.bpr: delete external/mit/expat/dist/bcb5/outline.mak: delete external/mit/expat/dist/bcb5/setup.bat: delete external/mit/expat/dist/bcb5/xmlwf.bpf: delete external/mit/expat/dist/bcb5/xmlwf.bpr: delete external/mit/expat/dist/bcb5/xmlwf.mak: delete external/mit/expat/dist/configure: up to 1.1.1.5 external/mit/expat/dist/configure.ac: up to 1.1.1.3 external/mit/expat/dist/configure.in: delete external/mit/expat/dist/doc/reference.html: up to 1.1.1.4 external/mit/expat/dist/examples/elements.c: up to 1.1.1.4 external/mit/expat/dist/examples/elements.dsp: delete external/mit/expat/dist/examples/outline.c: up to 1.1.1.3 external/mit/expat/dist/examples/outline.dsp: delete external/mit/expat/dist/expat.dsw: delete external/mit/expat/dist/expat_config.h.in: up to 1.1.1.5 external/mit/expat/dist/lib/Makefile.MPW: delete external/mit/expat/dist/lib/amigaconfig.h: delete external/mit/expat/dist/lib/expat.dsp: delete external/mit/expat/dist/lib/expat.h: up to 1.1.1.5 external/mit/expat/dist/lib/expat_external.h: up to 1.1.1.3 external/mit/expat/dist/lib/expat_static.dsp: delete external/mit/expat/dist/lib/expatw.dsp: delete external/mit/expat/dist/lib/expatw_static.dsp: delete external/mit/expat/dist/lib/macconfig.h: delete external/mit/expat/dist/lib/siphash.h: up to 1.1.1.1 external/mit/expat/dist/lib/winconfig.h: up to 1.1.1.2 external/mit/expat/dist/lib/xmlparse.c: up to 1.7 external/mit/expat/dist/lib/xmlrole.c: up to 1.1.1.4 external/mit/expat/dist/lib/xmltok.c: up to 1.4 external/mit/expat/dist/m4/libtool.m4: up to 1.1.1.4 external/mit/expat/dist/run.sh.in: up to 1.1.1.1 external/mit/expat/dist/tests/benchmark/benchmark.c: up to 1.1.1.2 external/mit/expat/dist/tests/benchmark/benchmark.dsp: delete external/mit/expat/dist/tests/benchmark/benchmark.dsw: delete external/mit/expat/dist/tests/memcheck.c: up to 1.1.1.1 external/mit/expat/dist/tests/memcheck.h: up to 1.1.1.1 external/mit/expat/dist/tests/minicheck.c: up to 1.1.1.3 external/mit/expat/dist/tests/minicheck.h: up to 1.1.1.4 external/mit/expat/dist/tests/runtests.c: up to 1.1.1.4 external/mit/expat/dist/tests/xmltest.sh: up to 1.3 external/mit/expat/dist/vms/README.vms: delete external/mit/expat/dist/vms/descrip.mms: delete external/mit/expat/dist/vms/expat_config.h: delete external/mit/expat/dist/win32/MANIFEST.txt: up to 1.1.1.2 external/mit/expat/dist/win32/README.txt: up to 1.1.1.4 external/mit/expat/dist/win32/expat.iss: up to 1.1.1.5 external/mit/expat/dist/xmlwf/codepage.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/filemap.h: up to 1.1.1.2 external/mit/expat/dist/xmlwf/readfilemap.c: up to 1.1.1.4 external/mit/expat/dist/xmlwf/unixfilemap.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/win32filemap.c: up to 1.1.1.2 external/mit/expat/dist/xmlwf/xmlfile.c: up to 1.1.1.3 external/mit/expat/dist/xmlwf/xmlwf.c: up to 1.1.1.5 external/mit/expat/dist/xmlwf/xmlwf.dsp: delete Update expat to 2.2.1. @ text @@ 1.1.1.2.2.1 log @file Makefile was added on branch yamt-pagecache on 2012-04-17 00:04:39 +0000 @ text @d1 336 @ 1.1.1.2.2.2 log @sync with head @ text @a0 336 # # Makefile for AmigaOS # .PHONY: help all check clean package .PHONY: clib2 newlib library so vpath %.c ../lib ../examples ../xmlwf ../tests ../tests/benchmark vpath %.h ../lib ../tests ############################################################################# help: @@echo "Requires:" @@echo " AmigaOS 4.x" @@echo " SDK 53.13" @@echo "" @@echo "Targets:" @@echo " all - make libraries, xmlwf, examples and runs tests" @@echo " install - install expat libraries and tools into SDK" @@echo " clean - clean object files" @@echo " check - run all the tests" @@echo " package - prepare distribution archive" all: clib2 newlib library so check clib2: clib2/libexpat.a clib2/xmlwf clib2/elements clib2/outline clib2/runtests clib2/benchmark newlib: newlib/libexpat.a newlib/xmlwf newlib/elements newlib/outline newlib/runtests newlib/benchmark library: libs/expat.library libs/xmlwf libs/elements libs/outline libs/runtests libs/benchmark so: so/libexpat.so so/xmlwf so/elements so/outline so/runtests so/benchmark check: clib2/runtests newlib/runtests libs/runtests so/runtests clib2/runtests newlib/runtests libs/runtests so/runtests clean: -delete clib2/#?.o quiet -delete newlib/#?.o quiet -delete libs/#?.o quiet -delete so/#?.o quiet package: $(MAKE) all -delete T:expat all force quiet makedir all T:expat/Workbench/Libs copy clone libs/expat.library T:expat/Workbench/Libs makedir all T:expat/Workbench/SObjs copy clone so/libexpat.so T:expat/Workbench/SObjs makedir all T:expat/SDK/Local/C copy clone libs/xmlwf T:expat/SDK/Local/C makedir all T:expat/SDK/Local/clib2/lib copy clone clib2/libexpat.a T:expat/SDK/Local/clib2/lib makedir all T:expat/SDK/Local/newlib/lib copy clone newlib/libexpat.a T:expat/SDK/Local/newlib/lib makedir all T:expat/SDK/Local/common/include copy clone /lib/expat.h /lib/expat_external.h T:expat/SDK/Local/common/include makedir all T:expat/SDK/Include/include_h/inline4 copy clone include/inline4/expat.h T:expat/SDK/Include/include_h/inline4 makedir all T:expat/SDK/Include/include_h/interfaces copy clone include/interfaces/expat.h T:expat/SDK/Include/include_h/interfaces makedir all T:expat/SDK/Include/include_h/libraries copy clone include/libraries/expat.h T:expat/SDK/Include/include_h/libraries makedir all T:expat/SDK/Include/include_h/proto copy clone include/proto/expat.h T:expat/SDK/Include/include_h/proto makedir all T:expat/SDK/Documentation/Libs/Expat copy clone /COPYING T:expat/SDK/Documentation/Libs/Expat copy clone /README T:expat/SDK/Documentation/Libs/Expat copy clone README.txt T:expat/SDK/Documentation/Libs/Expat/README.AmigaOS -delete expat.lha lha -r a expat.lha T:expat ############################################################################# CC := gcc LIBTOOL := ar STRIP := strip CFLAGS := -DNDEBUG -O3 LTFLAGS := -crs STRIPFLAGS := -R.comment ############################################################################# clib2/libexpat.a: clib2/xmlparse.o clib2/xmltok.o clib2/xmlrole.o $(LIBTOOL) $(LTFLAGS) $@@ $^ protect $@@ -e clib2/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h clib2/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h clib2/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# clib2/xmlwf: clib2/xmlwf.o clib2/xmlfile.o clib2/codepage.o clib2/readfilemap.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ clib2/xmlwf.o: xmlwf.c clib2/xmlfile.o: xmlfile.c clib2/codepage.o: codepage.c clib2/readfilemap.o: readfilemap.c ############################################################################# clib2/elements: clib2/elements.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ clib2/elements.o: elements.c ############################################################################# clib2/outline: clib2/outline.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ clib2/outline.o: outline.c ############################################################################# clib2/runtests: clib2/runtests.o clib2/chardata.o clib2/minicheck.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a clib2/chardata.o: chardata.c chardata.h clib2/minicheck.o: minicheck.c minicheck.h clib2/runtests.o: runtests.c chardata.h ############################################################################# clib2/benchmark: clib2/benchmark.o $(CC) -mcrt=clib2 $^ -o $@@ clib2/libexpat.a -lm clib2/benchmark.o: benchmark.c ############################################################################# newlib/libexpat.a: newlib/xmlparse.o newlib/xmltok.o newlib/xmlrole.o $(LIBTOOL) $(LTFLAGS) $@@ $^ protect $@@ -e newlib/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h newlib/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h newlib/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# newlib/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/xmlwf.o: xmlwf.c newlib/xmlfile.o: xmlfile.c newlib/codepage.o: codepage.c newlib/readfilemap.o: readfilemap.c ############################################################################# newlib/elements: newlib/elements.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/elements.o: elements.c ############################################################################# newlib/outline: newlib/outline.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a $(STRIP) $(STRIPFLAGS) $@@ newlib/outline.o: outline.c ############################################################################# newlib/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a newlib/chardata.o: chardata.c chardata.h newlib/minicheck.o: minicheck.c minicheck.h newlib/runtests.o: runtests.c chardata.h ############################################################################# newlib/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib $^ -o $@@ newlib/libexpat.a newlib/benchmark.o: benchmark.c ############################################################################# libs/expat.library: libs/expat_lib.o libs/expat_68k.o libs/expat_68k_handler_stubs.o libs/expat_vectors.o newlib/libexpat.a $(CC) -mcrt=newlib -nostartfiles $^ -o $@@ newlib/libexpat.a -Wl,--cref,-M,-Map=$@@.map protect $@@ -e $(STRIP) $(STRIPFLAGS) $@@ libs/expat_lib.o: expat_lib.c expat_base.h libs/expat_68k.o: expat_68k.c expat_68k.h expat_base.h libs/expat_68k_handler_stubs.o: expat_68k_handler_stubs.c expat_68k.h libs/expat_vectors.o: expat_vectors.c libs/launch.o: launch.c ############################################################################# libs/xmlwf: libs/xmlwf.o libs/xmlfile.o libs/codepage.o libs/readfilemap.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ $(STRIP) $(STRIPFLAGS) $@@ libs/xmlwf.o: xmlwf.c libs/xmlfile.o: xmlfile.c libs/codepage.o: codepage.c libs/readfilemap.o: readfilemap.c ############################################################################# libs/elements: libs/elements.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ $(STRIP) $(STRIPFLAGS) $@@ libs/elements.o: elements.c ############################################################################# libs/outline: libs/outline.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ $(STRIP) $(STRIPFLAGS) $@@ libs/outline.o: outline.c ############################################################################# libs/runtests: libs/runtests.o libs/chardata.o libs/minicheck.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/chardata.o: chardata.c chardata.h libs/minicheck.o: minicheck.c minicheck.h libs/runtests.o: runtests.c chardata.h ############################################################################# libs/benchmark: libs/benchmark.o libs/launch.o $(CC) -mcrt=newlib $^ -o $@@ libs/benchmark.o: benchmark.c ############################################################################# so/libexpat.so: so/xmlparse.o so/xmltok.o so/xmlrole.o $(CC) -mcrt=newlib -shared -o $@@ $^ protect $@@ -e so/xmlparse.o: xmlparse.c expat.h xmlrole.h xmltok.h \ expat_external.h internal.h amigaconfig.h so/xmlrole.o: xmlrole.c ascii.h xmlrole.h expat_external.h \ internal.h amigaconfig.h so/xmltok.o: xmltok.c xmltok_impl.c xmltok_ns.c ascii.h asciitab.h \ iasciitab.h latin1tab.h nametab.h utf8tab.h xmltok.h xmltok_impl.h \ expat_external.h internal.h amigaconfig.h ############################################################################# so/xmlwf: newlib/xmlwf.o newlib/xmlfile.o newlib/codepage.o newlib/readfilemap.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ ############################################################################# so/elements: newlib/elements.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ ############################################################################# so/outline: newlib/outline.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat $(STRIP) $(STRIPFLAGS) $@@ ############################################################################# so/runtests: newlib/runtests.o newlib/chardata.o newlib/minicheck.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat ############################################################################# so/benchmark: newlib/benchmark.o $(CC) -mcrt=newlib -use-dynld $^ -o $@@ -Lso -lexpat ############################################################################# clib2/%.o: %.c $(CC) -mcrt=clib2 $(CFLAGS) -I../lib -c $< -o $@@ newlib/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -I../lib -c $< -o $@@ libs/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -D__USE_INLINE__ -I. -Iinclude -Iinclude/libraries -I../lib -c $< -o $@@ so/%.o: %.c $(CC) -mcrt=newlib $(CFLAGS) -fPIC -I../lib -c $< -o $@@ @